Uncomment and 'complete' browsing in forum online list

git-svn-id: file:///svn/phpbb/trunk@1960 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-01-27 01:20:42 +00:00
parent 14d7d43c38
commit 7236058905

View file

@ -89,20 +89,16 @@ $s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['
// Get basic (usernames + totals) online // Get basic (usernames + totals) online
// situation // situation
// //
/* $user_forum_sql = ( !empty($forum_id) ) ? "AND ( u.user_session_page = $forum_id
if( !empty($forum_id) ) OR s.session_page = $forum_id)" : "";
{
$user_forum_sql = "AND ( u.user_session_page = $forum_id
OR s.session_page = $forum_id)";
}
*/
$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip
FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id WHERE u.user_id = s.session_user_id
AND ( s.session_time >= ".( time() - 300 ) . " AND ( s.session_time >= ".( time() - 300 ) . "
OR u.user_session_time >= " . ( time() - 300 ) . " ) OR u.user_session_time >= " . ( time() - 300 ) . " )
$user_forum_sql
ORDER BY u.username ASC"; ORDER BY u.username ASC";
//$user_forum_sql
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if(!$result) if(!$result)
{ {
@ -111,9 +107,12 @@ if(!$result)
$userlist_ary = array(); $userlist_ary = array();
$userlist_visible = array(); $userlist_visible = array();
$logged_visible_online = 0; $logged_visible_online = 0;
$logged_hidden_online = 0; $logged_hidden_online = 0;
$guests_online = 0; $guests_online = 0;
$online_userlist = "";
$prev_user_id = 0; $prev_user_id = 0;
while( $row = $db->sql_fetchrow($result) ) while( $row = $db->sql_fetchrow($result) )
@ -161,7 +160,11 @@ while( $row = $db->sql_fetchrow($result) )
$prev_user_id = $row['user_id']; $prev_user_id = $row['user_id'];
} }
$online_userlist = $lang['Registered_users'] . " " . $online_userlist; if( $online_userlist == "" )
{
$online_userlist = $lang['None'];
}
$online_userlist = ( ( isset($forum_id) ) ? $lang['Browsing_forum'] : $lang['Registered_users'] ) . " " . $online_userlist;
$total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online; $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
@ -239,7 +242,6 @@ else
$l_g_user_s = $lang['Guest_users_total']; $l_g_user_s = $lang['Guest_users_total'];
} }
$l_online_users = sprintf($l_t_user_s, $total_online_users); $l_online_users = sprintf($l_t_user_s, $total_online_users);
$l_online_users .= sprintf($l_r_user_s, $logged_visible_online); $l_online_users .= sprintf($l_r_user_s, $logged_visible_online);
$l_online_users .= sprintf($l_h_user_s, $logged_hidden_online); $l_online_users .= sprintf($l_h_user_s, $logged_hidden_online);
@ -381,7 +383,7 @@ $template->assign_vars(array(
"L_SEARCH_SELF" => $lang['Search_your_posts'], "L_SEARCH_SELF" => $lang['Search_your_posts'],
"L_WHOSONLINE_ADMIN" => sprintf($lang['Admin_online_color'], '<span style="color:' . $theme['fontcolor3'] . '">', '</span>'), "L_WHOSONLINE_ADMIN" => sprintf($lang['Admin_online_color'], '<span style="color:' . $theme['fontcolor3'] . '">', '</span>'),
"L_WHOSONLINE_MOD" => sprintf($lang['Mod_online_color'], '<span style="color:' . $theme['fontcolor2'] . '">', '</span>'), "L_WHOSONLINE_MOD" => sprintf($lang['Mod_online_color'], '<span style="color:' . $theme['fontcolor2'] . '">', '</span>'),
"L_RECORD_USERS" => sprintf($lang['Record_online_users'], $board_config['record_online_users'], date($lang['DATE_FORMAT'], $board_config['record_online_date']) ), "L_RECORD_USERS" => sprintf($lang['Record_online_users'], $board_config['record_online_users'], date($board_config['default_dateformat'], $board_config['record_online_date']) ),
"U_SEARCH_UNANSWERED" => append_sid("search.".$phpEx."?search_id=unanswered"), "U_SEARCH_UNANSWERED" => append_sid("search.".$phpEx."?search_id=unanswered"),
"U_SEARCH_SELF" => append_sid("search.".$phpEx."?search_id=egosearch"), "U_SEARCH_SELF" => append_sid("search.".$phpEx."?search_id=egosearch"),