Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[com_actionlogs] - log actionlog purge/export #22740

Merged
merged 19 commits into from
Mar 7, 2019
Merged

[com_actionlogs] - log actionlog purge/export #22740

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
df8351f
log actionlog purge
alikon Oct 20, 2018
c38b8c0
log actionlog purge
alikon Oct 20, 2018
75155bf
lang string
alikon Oct 20, 2018
95fba24
export lang
alikon Oct 20, 2018
187252f
log export
alikon Oct 20, 2018
35a6ca3
log export
alikon Oct 20, 2018
01a0d91
Update plugins/actionlog/joomla/joomla.php
brianteeman Oct 20, 2018
71d3155
triggerEvent
alikon Oct 21, 2018
4f1d605
triggerEvent
alikon Oct 21, 2018
7d10986
namespaced
alikon Oct 22, 2018
a4b8b28
Update administrator/components/com_actionlogs/controllers/actionlogs…
Oct 26, 2018
7f60480
missing use Joomla\CMS\Factory
alikon Nov 8, 2018
48b72b4
Merge branch 'staging' into patch-117
alikon Jan 12, 2019
7edc35c
use namespaced
alikon Jan 12, 2019
b1dba97
one or more rows
alikon Jan 13, 2019
e051567
Merge branch 'staging' into patch-117
alikon Jan 20, 2019
a9da4b8
..
alikon Jan 20, 2019
a9d20a2
Merge branch 'staging' into patch-117
alikon Feb 10, 2019
38b2763
Merge branch 'staging' into patch-117
alikon Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion administrator/components/com_actionlogs/controllers/actionlogs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ public function exportLogs()
}

fclose($output);


alikon marked this conversation as resolved.
Show resolved Hide resolved
$app->triggerEvent('onAfterLogExport', array());
$app->close();
}
else
Expand Down
12 changes: 8 additions & 4 deletions administrator/components/com_actionlogs/models/actionlogs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,15 +289,17 @@ public function delete(&$pks)
try
{
$db->execute();

return true;
}
catch (RuntimeException $e)
{
$this->setError($e->getMessage());

return false;
}

Factory::getApplication()->triggerEvent('onAfterLogPurge', array());

return true;
}

/**
Expand All @@ -312,13 +314,15 @@ public function purge()
try
{
$this->getDbo()->truncateTable('#__action_logs');

return true;
}
catch (Exception $e)
{
return false;
}

Factory::getApplication()->triggerEvent('onAfterLogPurge', array());

return true;
}

/**
Expand Down
2 changes: 2 additions & 0 deletions administrator/language/en-GB/en-GB.plg_actionlog_joomla.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ PLG_ACTIONLOG_JOOMLA_TYPE_TEMPLATE="template"
PLG_ACTIONLOG_JOOMLA_TYPE_USER="user"
PLG_ACTIONLOG_JOOMLA_TYPE_USER_GROUP="user group"
PLG_ACTIONLOG_JOOMLA_TYPE_USER_NOTE="user note"
PLG_ACTIONLOG_JOOMLA_USER_LOG="User <a href='{accountlink}'>{username}</a> purged the action log"
PLG_ACTIONLOG_JOOMLA_USER_LOGEXPORT="User <a href='{accountlink}'>{username}</a> exported the action log"
PLG_ACTIONLOG_JOOMLA_USER_LOGGED_IN="User <a href='{accountlink}'>{username}</a> logged in to {app}"
PLG_ACTIONLOG_JOOMLA_USER_LOGGED_OUT="User <a href='{accountlink}'>{username}</a> logged out from {app}"
PLG_ACTIONLOG_JOOMLA_USER_LOGIN_FAILED="User <a href='{accountlink}'>{username}</a> tried to login to {app}"
Expand Down
60 changes: 60 additions & 0 deletions plugins/actionlog/joomla/joomla.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,4 +907,64 @@ public function onUserAfterRemind($user)

$this->addLog(array($message), 'PLG_ACTIONLOG_JOOMLA_USER_REMIND', $context, $user->id);
}

/**
* On after log action purge
*
* Method is called after user request to clean action log items.
*
* @param array $group Holds the group name.
*
* @return void
*
* @since __DEPLOY_VERSION__
*/
public function onAfterLogPurge($group = '')
{
$context = $this->app->input->get('option');
$user = JFactory::getUser();

$message = array(
'action' => 'actionlogs',
'type' => 'PLG_ACTIONLOG_JOOMLA_TYPE_USER',
'id' => $user->id,
'title' => $user->name,
'itemlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
'userid' => $user->id,
'username' => $user->name,
'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
);

$this->addLog(array($message), 'PLG_ACTIONLOG_JOOMLA_USER_LOG', $context, $user->id);
}

/**
* On after log export
*
* Method is called after user request to export action log items.
*
* @param array $group Holds the group name.
*
* @return void
*
* @since __DEPLOY_VERSION__
*/
public function onAfterLogExport($group = '')
{
$context = $this->app->input->get('option');
$user = JFactory::getUser();

$message = array(
'action' => 'actionlogs',
'type' => 'PLG_ACTIONLOG_JOOMLA_TYPE_USER',
'id' => $user->id,
'title' => $user->name,
'itemlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
'userid' => $user->id,
'username' => $user->name,
'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
);

$this->addLog(array($message), 'PLG_ACTIONLOG_JOOMLA_USER_LOGEXPORT', $context, $user->id);
}
}