mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-06-01 20:04:51 +02:00
* First implementation of the new multi-criteria search. It replaces the old search.php form. * Displays live search criteria above search results. Each change reloads the list of results (displayed as thumbnails). * New API method pwg.images.filteredSearch.update called in AJAX to live change the filters. * New kind of filter: added_by
This commit is contained in:
Pierrick Le Gall
+49
-231
@@ -17,196 +17,36 @@ check_status(ACCESS_GUEST);
|
||||
|
||||
trigger_notify('loc_begin_search');
|
||||
|
||||
//------------------------------------------------------------------ form check
|
||||
$search = array();
|
||||
if (isset($_POST['submit']))
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | Create a default search |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
$search = array(
|
||||
'mode' => 'AND',
|
||||
'fields' => array(
|
||||
'allwords' => array(
|
||||
'words' => array(),
|
||||
'mode' => 'AND',
|
||||
'fields' => array('file', 'name', 'comment', 'tags', 'cat-title', 'cat-desc'),
|
||||
),
|
||||
'cat' => array(
|
||||
'words' => array(),
|
||||
'sub_inc' => true,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
if (count(get_available_tags()) > 0)
|
||||
{
|
||||
foreach ($_POST as $post_key => $post_value)
|
||||
{
|
||||
if (!is_array($post_value))
|
||||
{
|
||||
$_POST[$post_key] = pwg_db_real_escape_string($post_value);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_POST['search_allwords'])
|
||||
and !preg_match('/^\s*$/', $_POST['search_allwords']))
|
||||
{
|
||||
check_input_parameter('mode', $_POST, false, '/^(OR|AND)$/');
|
||||
check_input_parameter('fields', $_POST, true, '/^(name|comment|file)$/');
|
||||
|
||||
$drop_char_match = array(
|
||||
'-','^','$',';','#','&','(',')','<','>','`','\'','"','|',',','@','_',
|
||||
'?','%','~','.','[',']','{','}',':','\\','/','=','\'','!','*');
|
||||
$drop_char_replace = array(
|
||||
' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','','',' ',' ',' ',' ','',' ',
|
||||
' ',' ',' ',' ',' ',' ',' ',' ','' ,' ',' ',' ',' ',' ');
|
||||
|
||||
// Split words
|
||||
$search['fields']['allwords'] = array(
|
||||
'words' => array_unique(
|
||||
preg_split(
|
||||
'/\s+/',
|
||||
str_replace(
|
||||
$drop_char_match,
|
||||
$drop_char_replace,
|
||||
$_POST['search_allwords']
|
||||
)
|
||||
)
|
||||
),
|
||||
'mode' => $_POST['mode'],
|
||||
'fields' => $_POST['fields'],
|
||||
);
|
||||
|
||||
if (isset($_POST['search_in_tags']))
|
||||
{
|
||||
$search['fields']['search_in_tags'] = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_POST['tags']))
|
||||
{
|
||||
check_input_parameter('tags', $_POST, true, PATTERN_ID);
|
||||
check_input_parameter('tag_mode', $_POST, false, '/^(OR|AND)$/');
|
||||
|
||||
$search['fields']['tags'] = array(
|
||||
'words' => $_POST['tags'],
|
||||
'mode' => $_POST['tag_mode'],
|
||||
);
|
||||
}
|
||||
|
||||
if (isset($_POST['authors']) and is_array($_POST['authors']) and count($_POST['authors']) > 0)
|
||||
{
|
||||
$authors = array();
|
||||
|
||||
foreach ($_POST['authors'] as $author)
|
||||
{
|
||||
$authors[] = strip_tags($author);
|
||||
}
|
||||
|
||||
$search['fields']['author'] = array(
|
||||
'words' => $authors,
|
||||
'mode' => 'OR',
|
||||
);
|
||||
}
|
||||
|
||||
if (isset($_POST['cat']))
|
||||
{
|
||||
check_input_parameter('cat', $_POST, true, PATTERN_ID);
|
||||
|
||||
$search['fields']['cat'] = array(
|
||||
'words' => $_POST['cat'],
|
||||
'sub_inc' => ($_POST['subcats-included'] == 1) ? true : false,
|
||||
);
|
||||
}
|
||||
|
||||
// dates
|
||||
check_input_parameter('date_type', $_POST, false, '/^date_(creation|available)$/');
|
||||
|
||||
$type_date = $_POST['date_type'];
|
||||
|
||||
if (!empty($_POST['start_year']))
|
||||
{
|
||||
$search['fields'][$type_date.'-after'] = array(
|
||||
'date' => sprintf(
|
||||
'%d-%02d-%02d 00:00:00',
|
||||
$_POST['start_year'],
|
||||
$_POST['start_month'] != 0 ? $_POST['start_month'] : '01',
|
||||
$_POST['start_day'] != 0 ? $_POST['start_day'] : '01'
|
||||
),
|
||||
'inc' => true,
|
||||
);
|
||||
}
|
||||
|
||||
if (!empty($_POST['end_year']))
|
||||
{
|
||||
$search['fields'][$type_date.'-before'] = array(
|
||||
'date' => sprintf(
|
||||
'%d-%02d-%02d 23:59:59',
|
||||
$_POST['end_year'],
|
||||
$_POST['end_month'] != 0 ? $_POST['end_month'] : '12',
|
||||
$_POST['end_day'] != 0 ? $_POST['end_day'] : '31'
|
||||
),
|
||||
'inc' => true,
|
||||
);
|
||||
}
|
||||
|
||||
if (!empty($search))
|
||||
{
|
||||
// default search mode : each clause must be respected
|
||||
$search['mode'] = 'AND';
|
||||
|
||||
// register search rules in database, then they will be available on
|
||||
// thumbnails page and picture page.
|
||||
$query ='
|
||||
INSERT INTO '.SEARCH_TABLE.'
|
||||
(rules, last_seen)
|
||||
VALUES
|
||||
(\''.pwg_db_real_escape_string(serialize($search)).'\', NOW())
|
||||
;';
|
||||
pwg_query($query);
|
||||
|
||||
$search_id = pwg_db_insert_id(SEARCH_TABLE);
|
||||
}
|
||||
else
|
||||
{
|
||||
$page['errors'][] = l10n('Empty query. No criteria has been entered.');
|
||||
}
|
||||
}
|
||||
//----------------------------------------------------------------- redirection
|
||||
if (isset($_POST['submit']) and count($page['errors']) == 0)
|
||||
{
|
||||
redirect(
|
||||
make_index_url(
|
||||
array(
|
||||
'section' => 'search',
|
||||
'search' => $search_id,
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
//----------------------------------------------------- template initialization
|
||||
|
||||
//
|
||||
// Start output of page
|
||||
//
|
||||
$title= l10n('Search');
|
||||
$page['body_id'] = 'theSearchPage';
|
||||
|
||||
$template->set_filename('search' ,'search.tpl' );
|
||||
|
||||
$month_list = $lang['month'];
|
||||
$month_list[0]='------------';
|
||||
ksort($month_list);
|
||||
|
||||
$template->assign(
|
||||
array(
|
||||
'F_SEARCH_ACTION' => 'search.php',
|
||||
'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=search',
|
||||
|
||||
'month_list' => $month_list,
|
||||
'START_DAY_SELECTED' => @$_POST['start_day'],
|
||||
'START_MONTH_SELECTED' => @$_POST['start_month'],
|
||||
'END_DAY_SELECTED' => @$_POST['end_day'],
|
||||
'END_MONTH_SELECTED' => @$_POST['end_month'],
|
||||
)
|
||||
$search['fields']['tags'] = array(
|
||||
'words' => array(),
|
||||
'mode' => 'AND',
|
||||
);
|
||||
|
||||
$available_tags = get_available_tags();
|
||||
|
||||
if (count($available_tags) > 0)
|
||||
{
|
||||
usort( $available_tags, 'tag_alpha_compare');
|
||||
|
||||
$template->assign('TAGS', $available_tags);
|
||||
}
|
||||
|
||||
// authors
|
||||
$authors = array();
|
||||
|
||||
// does this Piwigo has authors for current user?
|
||||
$query = '
|
||||
SELECT
|
||||
author,
|
||||
id
|
||||
FROM '.IMAGES_TABLE.' AS i
|
||||
JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.image_id = i.id
|
||||
@@ -219,58 +59,36 @@ SELECT
|
||||
' WHERE '
|
||||
).'
|
||||
AND author IS NOT NULL
|
||||
GROUP BY author, id
|
||||
ORDER BY author
|
||||
LIMIT 1
|
||||
;';
|
||||
$author_counts = array();
|
||||
$result = pwg_query($query);
|
||||
while ($row = pwg_db_fetch_assoc($result))
|
||||
$first_author = query2array($query);
|
||||
|
||||
if (count($first_author) > 0)
|
||||
{
|
||||
if (!isset($author_counts[ $row['author'] ]))
|
||||
{
|
||||
$author_counts[ $row['author'] ] = 0;
|
||||
}
|
||||
|
||||
$author_counts[ $row['author'] ]++;
|
||||
$search['fields']['author'] = array(
|
||||
'words' => array(),
|
||||
'mode' => 'OR',
|
||||
);
|
||||
}
|
||||
|
||||
foreach ($author_counts as $author => $counter)
|
||||
{
|
||||
$authors[] = array(
|
||||
'author' => $author,
|
||||
'counter' => $counter,
|
||||
);
|
||||
}
|
||||
list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW()'));
|
||||
|
||||
$template->assign('AUTHORS', $authors);
|
||||
single_insert(
|
||||
SEARCH_TABLE,
|
||||
array(
|
||||
'rules' => pwg_db_real_escape_string(serialize($search)),
|
||||
'last_seen' => $dbnow,
|
||||
)
|
||||
);
|
||||
|
||||
//------------------------------------------------------------- categories form
|
||||
$query = '
|
||||
SELECT id,name,global_rank,uppercats
|
||||
FROM '.CATEGORIES_TABLE.'
|
||||
'.get_sql_condition_FandF
|
||||
(
|
||||
array
|
||||
(
|
||||
'forbidden_categories' => 'id',
|
||||
'visible_categories' => 'id'
|
||||
),
|
||||
'WHERE'
|
||||
).'
|
||||
;';
|
||||
display_select_cat_wrapper($query, array(), 'category_options', true);
|
||||
$search_id = pwg_db_insert_id(SEARCH_TABLE);
|
||||
|
||||
// include menubar
|
||||
$themeconf = $template->get_template_vars('themeconf');
|
||||
if (!isset($themeconf['hide_menu_on']) OR !in_array('theSearchPage', $themeconf['hide_menu_on']))
|
||||
{
|
||||
include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
|
||||
}
|
||||
|
||||
//------------------------------------------------------------ html code display
|
||||
include(PHPWG_ROOT_PATH.'include/page_header.php');
|
||||
trigger_notify('loc_end_search');
|
||||
flush_page_messages();
|
||||
$template->pparse('search');
|
||||
include(PHPWG_ROOT_PATH.'include/page_tail.php');
|
||||
redirect(
|
||||
make_index_url(
|
||||
array(
|
||||
'section' => 'search',
|
||||
'search' => $search_id,
|
||||
)
|
||||
)
|
||||
);
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user