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

fixes #1968 new values for date_posted filter

Browse Source 
* add 24h, 3m and yNNNN (year 2023 or 2022...)
* remove 1y
* provide labels from backend instead of managing it in javascript
This commit is contained in:
plegall
2023-08-26 12:55:12 +02:00
parent ab111cdbe2
commit e0a82909fa
8 changed files with 55 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_search.inc.php
+12 -1
View File
@@ -268,12 +268,23 @@ SELECT
if (!empty($search['fields']['date_posted']))
{
$options = array(
'24h' => '24 HOUR',
'7d' => '7 DAY',
'30d' => '30 DAY',
'3m' => '3 MONTH',
'6m' => '6 MONTH',
'1y' => '1 YEAR',
);
$clauses[] = 'date_available > SUBDATE(NOW(), INTERVAL '.$options[ $search['fields']['date_posted'] ].')';
if (isset($options[ $search['fields']['date_posted'] ]))
{
$clauses[] = 'date_available > SUBDATE(NOW(), INTERVAL '.$options[ $search['fields']['date_posted'] ].')';
}
elseif (preg_match('/^y(\d+)$/', $search['fields']['date_posted'], $matches))
{
// that is for y2023 = all photos posted in 2022
$clauses[] = 'YEAR(date_available) = '.$matches[1];
}
}
if (!empty($search['fields']['filetypes']))
include/ws_functions/pwg.images.php
+1 -1
View File
@@ -838,7 +838,7 @@ function ws_images_filteredSearch_update($params, $service)
if (isset($params['date_posted']))
{
if (!preg_match('/^(7d|30d|6m|1y|)$/', $params['date_posted']))
if (!preg_match('/^(24h|7d|30d|3m|6m|y\d+|)$/', $params['date_posted']))
{
return new PwgError(WS_ERR_INVALID_PARAM, 'Invalid parameter date_posted');
}