mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-05-09 18:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #1838 ability to hide connections from activities with a config setting

Browse source
This commit is contained in:
plegall 2022-12-21 17:18:31 +01:00
parent 80b64e32fa
commit 3b36ff0a91
2 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

45
include/ws_functions/pwg.php
View file

@ -434,8 +434,7 @@ function ws_getActivityList($param, &$service)
$user_ids = array();
if (isset($param['uid'])) {
$query = '
$query = '
SELECT
activity_id,
performed_by,
@ -447,29 +446,29 @@ SELECT
occured_on,
details,
user_agent
FROM '.ACTIVITY_TABLE.'
WHERE performed_by = '.$param['uid'].'
ORDER BY activity_id DESC LIMIT '.$page_size.' OFFSET '.$page_offset.';
;';
}
else
FROM '.ACTIVITY_TABLE;
if (isset($param['uid']))
{
$query = '
SELECT
activity_id,
performed_by,
object,
object_id,
action,
session_idx,
ip_address,
occured_on,
details,
user_agent
FROM '.ACTIVITY_TABLE.'
ORDER BY activity_id DESC LIMIT '.$page_size.' OFFSET '.$page_offset.';
;';
$query.= '
WHERE performed_by = '.$param['uid'];
}
elseif ('none' == $conf['activity_display_connections'])
{
$query.= '
WHERE action NOT IN (\'login\', \'logout\')';
}
elseif ('admins_only' == $conf['activity_display_connections'])
{
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
$query.= '
WHERE NOT (action IN (\'login\', \'logout\') AND object_id NOT IN ('.implode(',', get_admins()).'))';
}
$query.= '
ORDER BY activity_id DESC
LIMIT '.$page_size.' OFFSET '.$page_offset.'
;';
$line_id = 0;
$result = pwg_query($query);