adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-09 10:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

issue #2202 search filter, always display all filetypes

Browse Source
This commit is contained in:
plegall
2024-08-07 22:09:54 +02:00
parent dd6d1a91d7
commit c0d1245f19
4 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.php
+35 -2
View File
@@ -433,7 +433,27 @@ SELECT
{
$filter_clause = get_clause_for_filter('filetypes');
$query = '
// get all file extensions for this user in the gallery, whatever the current filters
$cache_key = $persistent_cache->make_key('file_exts'.$user['id'].$user['cache_update_time']);
if (!$persistent_cache->get($cache_key, $all_exts))
{
$query = '
SELECT
SUBSTRING_INDEX(path, ".", -1) AS ext,
COUNT(DISTINCT(id)) AS counter
FROM '.IMAGES_TABLE.' AS i
JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.image_id = i.id
WHERE 1=1'.$page['search_details']['forbidden'].'
GROUP BY ext
ORDER BY counter DESC
;';
$all_exts = query2array($query, 'ext', 'counter');
$persistent_cache->set($cache_key, $all_exts);
}
if (preg_match('/^image_id IN/', $filter_clause))
{
$query = '
SELECT
SUBSTRING_INDEX(path, ".", -1) AS ext,
COUNT(DISTINCT(id)) AS counter
@@ -443,7 +463,20 @@ SELECT
GROUP BY ext
ORDER BY counter DESC
;';
$template->assign('FILETYPES', query2array($query, 'ext', 'counter'));
$filtered_exts = query2array($query, 'ext', 'counter');
$exts = array();
foreach ($all_exts as $ext => $counter)
{
$exts[$ext] = $filtered_exts[$ext] ?? 0;
}
$template->assign('FILETYPES', $exts);
}
else
{
$template->assign('FILETYPES', $all_exts);
}
}
// For rating