aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-08-05 15:03:08 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-08-05 15:03:08 +0200
commit5db76ee8b0e42cb9773f1b100c533af8ce666098 (patch)
treed1ecbb6fa0697f91190d06143217421e0528fa17 /phpBB/includes/acp/acp_users.php
parent6571ea1fc8fa636cb418344f87cc7b010dd8f187 (diff)
downloadforums-5db76ee8b0e42cb9773f1b100c533af8ce666098.tar
forums-5db76ee8b0e42cb9773f1b100c533af8ce666098.tar.gz
forums-5db76ee8b0e42cb9773f1b100c533af8ce666098.tar.bz2
forums-5db76ee8b0e42cb9773f1b100c533af8ce666098.tar.xz
forums-5db76ee8b0e42cb9773f1b100c533af8ce666098.zip
[feature/php-events] Move and fix event core.acp_users_display_overview
The event had some invalid variables, so the event was moved to give it some more power. PHPBB3-9550
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php26
1 files changed, 17 insertions, 9 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index de1e9afc83..20d93ed525 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -946,12 +946,6 @@ class acp_users
}
}
- $s_action_options = '<option class="sep" value="">' . $user->lang['SELECT_OPTION'] . '</option>';
- foreach ($quick_tool_ary as $value => $lang)
- {
- $s_action_options .= '<option value="' . $value . '">' . $user->lang['USER_ADMIN_' . $lang] . '</option>';
- }
-
if ($config['load_onlinetrack'])
{
$sql = 'SELECT MAX(session_time) AS session_time, MIN(session_viewonline) AS session_viewonline
@@ -966,6 +960,23 @@ class acp_users
unset($row);
}
+ /**
+ * Add additional quick tool options and overwrite user data
+ *
+ * @event core.acp_users_display_overview
+ * @var array user_row Array with user data
+ * @var array quick_tool_ary Ouick tool options
+ * @since 3.1-A1
+ */
+ $vars = array('user_row', 'quick_tool_ary');
+ extract($phpbb_dispatcher->trigger_event('core.acp_users_display_overview', compact($vars)));
+
+ $s_action_options = '<option class="sep" value="">' . $user->lang['SELECT_OPTION'] . '</option>';
+ foreach ($quick_tool_ary as $value => $lang)
+ {
+ $s_action_options .= '<option value="' . $value . '">' . $user->lang['USER_ADMIN_' . $lang] . '</option>';
+ }
+
$last_visit = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit'];
$inactive_reason = '';
@@ -1040,9 +1051,6 @@ class acp_users
'USER_INACTIVE_REASON' => $inactive_reason,
));
- $vars = array('data', 'check_ary', 'sql_ary', 'user_row', 'quick_tool_ary');
- extract($phpbb_dispatcher->trigger_event('core.acp_users_overview', compact($vars)));
-
break;
case 'feedback':