diff --git a/phpBB/templates/subSilver/memberlist_body.html b/phpBB/templates/subSilver/memberlist_body.html index f8c79d972d..e0acef436a 100644 --- a/phpBB/templates/subSilver/memberlist_body.html +++ b/phpBB/templates/subSilver/memberlist_body.html @@ -67,7 +67,7 @@ function marklist(status) - {L_ACTIVE}: + {L_LAST_ACTIVE}: @@ -80,7 +80,7 @@ function marklist(status) {L_SORT_BY}:  - {S_SORT_OPTIONS} {S_ORDER_SELECT}  +      @@ -139,7 +139,7 @@ function marklist(status) - +
{L_MARK_ALL} :: {L_UNMARK_ALL}

{S_TIMEZONE}

{PAGINATION}
diff --git a/phpBB/templates/subSilver/viewonline_body.html b/phpBB/templates/subSilver/viewonline_body.html index e5b35d170b..fd8ce85052 100644 --- a/phpBB/templates/subSilver/viewonline_body.html +++ b/phpBB/templates/subSilver/viewonline_body.html @@ -26,8 +26,8 @@  {reg_user_row.FORUM_LOCATION}  - - + + {L_LEGEND} :: {LEGEND} {TOTAL_GUEST_USERS_ONLINE} diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 7808f4730b..371646d9bd 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -247,9 +247,23 @@ else $l_g_user_s = $user->lang['Guest_users_online']; } +// Grab group details for legend display +$sql = "SELECT group_name, group_colour, group_type + FROM " . GROUPS_TABLE . " + WHERE group_colour <> '' + AND group_display = 1"; +$result = $db->sql_query($sql); + +$legend = ''; +while ($row = $db->sql_fetchrow($result)) +{ + $legend .= (($legend != '') ? ', ' : '') . '' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . ''; +} + $template->assign_vars(array( 'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users), 'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_users), + 'LEGEND' => $legend, 'META' => '',