iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #2386 update filters in users activity logs (#2399)

Browse Source 
* Add an action filter and a date filter. 

* Additional filters on a specific object (photo/album/group) are available from their dedicated administration page.

* Performances of the page was improved : instead of loading 100k lines in activity table, we loop on 500 activity lines until 100 aggregated lines are found for the current page.
This commit is contained in:
Perrom
2025-08-08 15:17:50 +02:00
committed by GitHub
parent 2465654752
commit 4dc2fc9f8d
16 changed files with 1238 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
admin/user_activity.php
View File

@@ -142,6 +142,105 @@ SELECT COUNT(*)
list($nb_users) = pwg_db_fetch_row(pwg_query($query));
$template->assign('nb_users', $nb_users);
$query = '
SELECT
occured_on
FROM '.ACTIVITY_TABLE.'
WHERE object != \'system\'
;';
$result = query2array($query);
$dates = array();
foreach($result as $time){
list($date, $hour) = explode(' ', $time['occured_on']);
$dates[] = date_format(date_create($date),"Y-m-d");
}
$dates = array_unique($dates);
$list_dates['allDates'] = implode(',',$dates);
$list_dates['min'] = $dates[0];
$list_dates['max'] = end($dates);
$template->assign('ACTIVITY_DATES', $list_dates);
$additional_filt_type = false;
$additional_filt_name = null;
$additional_filt_value = null;
if(isset($_GET['photo']))
{
$query = '
SELECT
name
FROM '.IMAGES_TABLE.'
WHERE id = '.$_GET['photo'].';';
$additional_filt_type = 'photo';
$additional_filt_name = query2array($query)[0]['name'];
$additional_filt_value = $_GET['photo'];
}
else if (isset($_GET['album']))
{
$query = '
SELECT
name
FROM '.CATEGORIES_TABLE.'
WHERE id = '.$_GET['album'].';';
$additional_filt_type = 'album';
$additional_filt_name = query2array($query)[0]['name'];
$additional_filt_value = $_GET['album'];
}
else if (isset($_GET['group']))
{
$query = '
SELECT
name
FROM '.GROUPS_TABLE.'
WHERE id = '.$_GET['group'].';';
$additional_filt_type = 'group';
$additional_filt_name = query2array($query)[0]['name'];
$additional_filt_value = $_GET['group'];
}
$template->assign('ADDITIONAL_FILT', array(
'type' => $additional_filt_type,
'name' => $additional_filt_name,
'value' => $additional_filt_value
));
$query = '
SELECT
object,
action,
count(*) AS counter
FROM '.ACTIVITY_TABLE.'
WHERE object != \'system\'';
if ($additional_filt_type)
{
$query .= '
AND object = "'.$additional_filt_type.'"';
}
$query .= '
GROUP BY
action,
object
ORDER BY object ASC
;';
$actions = query2array($query);
foreach($actions as &$action){
$action['value'] = $action['object'].'/'.$action['action'];
}
$template->assign('ACTIONS', $actions);
$template->assign_var_from_handle('ADMIN_CONTENT', 'user_activity');
?>