adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

issue #1955 search in this set (an album or some tags)

Browse Source
This commit is contained in:
plegall
2023-08-12 16:49:42 +02:00
parent 3c5c62869a
commit 2c3b6ba6ec
12 changed files with 100 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search.php
+16 -2
View File
@@ -28,6 +28,13 @@ if (!empty($_GET['q']))
$words = split_allwords($_GET['q']);
}
$cat_ids = array();
if (isset($_GET['cat_id']))
{
check_input_parameter('cat_id', $_GET, false, PATTERN_ID);
$cat_ids = array($_GET['cat_id']);
}
$search = array(
'mode' => 'AND',
'fields' => array(
@@ -37,7 +44,7 @@ $search = array(
'fields' => array('file', 'name', 'comment', 'tags', 'cat-title', 'cat-desc'),
),
'cat' => array(
'words' => array(),
'words' => $cat_ids,
'sub_inc' => true,
),
),
@@ -45,8 +52,15 @@ $search = array(
if (count(get_available_tags()) > 0)
{
$tag_ids = array();
if (isset($_GET['tag_id']))
{
check_input_parameter('tag_id', $_GET, false, '/^\d+(,\d+)*$/');
$tag_ids = explode(',', $_GET['tag_id']);
}
$search['fields']['tags'] = array(
'words' => array(),
'words' => $tag_ids,
'mode' => 'AND',
);
}