Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander 2017-02-21 21:14:12 +01:00
commit efe6bcf95a
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -15,15 +15,30 @@ class acp_logs_info
{ {
function module() function module()
{ {
return array( global $phpbb_dispatcher;
'filename' => 'acp_logs',
'title' => 'ACP_LOGGING', $modes = array(
'modes' => array(
'admin' => array('title' => 'ACP_ADMIN_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')), 'admin' => array('title' => 'ACP_ADMIN_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
'mod' => array('title' => 'ACP_MOD_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')), 'mod' => array('title' => 'ACP_MOD_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
'users' => array('title' => 'ACP_USERS_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')), 'users' => array('title' => 'ACP_USERS_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
'critical' => array('title' => 'ACP_CRITICAL_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')), 'critical' => array('title' => 'ACP_CRITICAL_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
), );
/**
* Event to add or modify ACP log modulemodes
*
* @event core.acp_logs_info_modify_modes
* @var array modes Array with modes info
* @since 3.1.11-RC1
* @since 3.2.1-RC1
*/
$vars = array('modes');
extract($phpbb_dispatcher->trigger_event('core.acp_logs_info_modify_modes', compact($vars)));
return array(
'filename' => 'acp_logs',
'title' => 'ACP_LOGGING',
'modes' => $modes,
); );
} }