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

fixes #1529 rewrite list of filter users for activities

Browse Source 
* migration task to update activity.performed_by (with object_id) for logout action (was always user guest instead of the real user)
* activities: use the actual regrouped lines to list filter users (instead of performing a separate SQL query)
This commit is contained in:
plegall
2021-10-19 16:28:52 +02:00
parent f0110cead6
commit 8e2f12fdf0
4 changed files with 54 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ws_functions/pwg.php
+19 -29
View File
@@ -442,10 +442,8 @@ SELECT
session_idx,
ip_address,
occured_on,
details,
'.$conf['user_fields']['username'].' AS username
details
FROM '.ACTIVITY_TABLE.'
JOIN '.USERS_TABLE.' AS u ON performed_by = u.'.$conf['user_fields']['id'].'
ORDER BY activity_id DESC
;';
@@ -466,11 +464,6 @@ SELECT
$detailsType = 'script';
}
if ('user' == $row['object'])
{
$user_ids[ $row['object_id'] ] = 1;
}
$line_key = $row['session_idx'].'~'.$row['object'].'~'.$row['action'].'~'; // idx~photo~add
if ($line_key === $current_key)
@@ -491,13 +484,13 @@ SELECT
'ip_address' => $row['ip_address'],
'date' => format_date($date),
'hour' => $hour,
'username' => $row['username'],
'user_id' => $row['performed_by'],
'detailsType' => $detailsType,
'details' => $details,
'counter' => 1,
);
@$user_ids[ $row['performed_by'] ]++;
$current_key = $line_key;
$line_id++;
}
@@ -515,17 +508,6 @@ SELECT
WHERE `'.$conf['user_fields']['id'].'` IN ('.implode(',', array_keys($user_ids)).')
;';
$username_of = query2array($query, 'user_id', 'username');
$query = '
SELECT
performed_by,
count(*) as nb_lines
FROM '.ACTIVITY_TABLE.'
GROUP BY
performed_by
;';
$user_id_list = query2array($query, 'performed_by', 'nb_lines');
}
foreach ($output_lines as $idx => $output_line)
@@ -542,18 +524,26 @@ SELECT
$output_lines[$idx]['details']['users_string'] = implode(', ', $output_lines[$idx]['details']['users']);
}
}
}
$filterable_users = array();
foreach ($user_id_list as $key => $value) {
if (isset($username_of[$key])) {
$filterable_users[$username_of[$key]] = $value;
} else {
$filterable_users['user#'.$key] = $value;
$output_lines[$idx]['username'] = 'user#'.$output_lines[$idx]['user_id'];
if (isset($username_of[ $output_lines[$idx]['user_id'] ]))
{
$output_lines[$idx]['username'] = $username_of[ $output_lines[$idx]['user_id'] ];
}
}
unset($filterable_users['guest']);
$filterable_users = array();
foreach ($user_ids as $key => $value)
{
if (isset($username_of[$key]))
{
$filterable_users[$username_of[$key]] = $value;
}
else
{
$filterable_users['user#'.$key] = $value;
}
}
// return $output_lines;
return array(