From c6fc455432a9f8df5849176c6d72b03144f319e4 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 8 Sep 2014 15:54:16 -0700 Subject: [PATCH 1/4] [ticket/13051] Fix viewonline event, remove template data PHPBB3-13051 --- phpBB/viewonline.php | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 708d7c2349..a03a81a15e 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -357,7 +357,22 @@ while ($row = $db->sql_fetchrow($result)) break; } - $template_row = array( + /** + * Overwrite the location's name and URL, which are displayed in the list + * + * @event core.viewonline_overwrite_location + * @var array on_page File name and query string + * @var array row Array with the users sql row + * @var string location Page name to displayed in the list + * @var string location_url Page url to displayed in the list + * @var array forum_data Array with forum data + * @since 3.1.0-a1 + * @change 3.1.0-a2 Added var forum_data + */ + $vars = array('on_page', 'row', 'location', 'location_url', 'forum_data'); + extract($phpbb_dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars))); + + $template->assign_block_vars('user_row', array( 'USERNAME' => $row['username'], 'USERNAME_COLOUR' => $row['user_colour'], 'USERNAME_FULL' => $username_full, @@ -374,26 +389,7 @@ while ($row = $db->sql_fetchrow($result)) 'S_USER_HIDDEN' => $s_user_hidden, 'S_GUEST' => ($row['user_id'] == ANONYMOUS) ? true : false, 'S_USER_TYPE' => $row['user_type'], - ); - - /** - * Overwrite the location's name and URL, which are displayed in the list - * - * @event core.viewonline_overwrite_location - * @var array on_page File name and query string - * @var array row Array with the users sql row - * @var string location Page name to be displayed in the list - * @var string location_url Page url to be displayed in the list - * @var array forum_data Array with forum data - * @var array template_row Array with template variables for the user row - * @since 3.1.0-a1 - * @change 3.1.0-a2 Added var forum_data - * @change 3.1.0-RC4 Added var template_row - */ - $vars = array('on_page', 'row', 'location', 'location_url', 'forum_data', 'template_row'); - extract($phpbb_dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars))); - - $template->assign_block_vars('user_row', $template_row); + )); } $db->sql_freeresult($result); unset($prev_id, $prev_ip); From c56c0fce0dae103cc12f6786f20bedde24600bf0 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 9 Sep 2014 09:14:32 -0700 Subject: [PATCH 2/4] [ticket/13051] Add a new core event to handle the template array PHPBB3-13051 --- phpBB/viewonline.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index a03a81a15e..a0ba0f88d5 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -372,7 +372,7 @@ while ($row = $db->sql_fetchrow($result)) $vars = array('on_page', 'row', 'location', 'location_url', 'forum_data'); extract($phpbb_dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars))); - $template->assign_block_vars('user_row', array( + $template_row = array( 'USERNAME' => $row['username'], 'USERNAME_COLOUR' => $row['user_colour'], 'USERNAME_FULL' => $username_full, @@ -389,7 +389,22 @@ while ($row = $db->sql_fetchrow($result)) 'S_USER_HIDDEN' => $s_user_hidden, 'S_GUEST' => ($row['user_id'] == ANONYMOUS) ? true : false, 'S_USER_TYPE' => $row['user_type'], - )); + ); + + /** + * Modify viewonline template data before it is displayed in the list + * + * @event core.viewonline_modify_display + * @var array on_page File name and query string + * @var array row Array with the users sql row + * @var array forum_data Array with forum data + * @var array template_row Array with template variables for the user row + * @since 3.1.0-RC4 + */ + $vars = array('on_page', 'row', 'forum_data', 'template_row'); + extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_display', compact($vars))); + + $template->assign_block_vars('user_row', $template_row); } $db->sql_freeresult($result); unset($prev_id, $prev_ip); From 0861404121fd5491ac8f5b83ef0640d57498459f Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 9 Sep 2014 12:52:53 -0700 Subject: [PATCH 3/4] [ticket/13051] Rename new event core.viewonline_modify_user_row PHPBB3-13051 --- phpBB/viewonline.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index a0ba0f88d5..aab7e38082 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -394,7 +394,7 @@ while ($row = $db->sql_fetchrow($result)) /** * Modify viewonline template data before it is displayed in the list * - * @event core.viewonline_modify_display + * @event core.core.viewonline_modify_user_row * @var array on_page File name and query string * @var array row Array with the users sql row * @var array forum_data Array with forum data @@ -402,7 +402,7 @@ while ($row = $db->sql_fetchrow($result)) * @since 3.1.0-RC4 */ $vars = array('on_page', 'row', 'forum_data', 'template_row'); - extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_display', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.core.viewonline_modify_user_row', compact($vars))); $template->assign_block_vars('user_row', $template_row); } From 0fc5a27889a553d7e967a13521e187ea13401be7 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 9 Sep 2014 13:12:29 -0700 Subject: [PATCH 4/4] [ticket/13051] Fix core event name PHPBB3-13051 --- phpBB/viewonline.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index aab7e38082..9589fb54e2 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -394,7 +394,7 @@ while ($row = $db->sql_fetchrow($result)) /** * Modify viewonline template data before it is displayed in the list * - * @event core.core.viewonline_modify_user_row + * @event core.viewonline_modify_user_row * @var array on_page File name and query string * @var array row Array with the users sql row * @var array forum_data Array with forum data @@ -402,7 +402,7 @@ while ($row = $db->sql_fetchrow($result)) * @since 3.1.0-RC4 */ $vars = array('on_page', 'row', 'forum_data', 'template_row'); - extract($phpbb_dispatcher->trigger_event('core.core.viewonline_modify_user_row', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_user_row', compact($vars))); $template->assign_block_vars('user_row', $template_row); }