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 #1841 register system activities

Browse Source
This commit is contained in:
plegall
2022-12-24 17:36:35 +01:00
parent b08fd91edc
commit bb69269239
15 changed files with 151 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+15 -1
View File
@@ -536,6 +536,13 @@ function pwg_activity($object, $object_id, $action, $details=array())
return;
}
if (isset($_REQUEST['method']) and 'pwg.plugins.performAction' == $_REQUEST['method'] and $_REQUEST['action'] != $action)
{
// for example, if you "restore" a plugin, the internal sequence will perform deactivate/uninstall/install/activate.
// We only want to keep the last call to pwg_activity with the "restore" action.
return;
}
$object_ids = $object_id;
if (!is_array($object_id))
{
@@ -556,6 +563,13 @@ function pwg_activity($object, $object_id, $action, $details=array())
}
}
if ('autoupdate' == $action)
{
// autoupdate on a plugin can happen anywhere, the "script/method" is not meaningfull
unset($details['method']);
unset($details['script']);
}
$user_agent = null;
if ('user' == $object and 'login' == $action and isset($_SERVER['HTTP_USER_AGENT']))
{
@@ -588,7 +602,7 @@ function pwg_activity($object, $object_id, $action, $details=array())
foreach ($object_ids as $loop_object_id)
{
$performed_by = $user['id'];
$performed_by = $user['id'] ?? 0; // on a plugin autoupdate, $user is not yet loaded
if ('logout' == $action)
{