Seemed to be a problem creeping back in with duplicated names due to switch in code ... fixed?

git-svn-id: file:///svn/phpbb/trunk@1277 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-11-05 00:23:14 +00:00
parent 8504825bb4
commit f92254ca6f

View file

@ -81,7 +81,7 @@ $sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, s.session_page, s
FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
WHERE u.user_id <> " . ANONYMOUS . " WHERE u.user_id <> " . ANONYMOUS . "
AND u.user_id = s.session_user_id AND u.user_id = s.session_user_id
AND s.session_time >= " . ( time() - 300 ) . " AND s.session_time >= " . ( time() - 1200 ) . "
AND s.session_logged_in = " . TRUE . " AND s.session_logged_in = " . TRUE . "
ORDER BY s.session_time DESC"; ORDER BY s.session_time DESC";
if(!$result = $db->sql_query($sql)) if(!$result = $db->sql_query($sql))
@ -93,7 +93,7 @@ $onlinerow_reg = $db->sql_fetchrowset($result);
$sql = "SELECT session_page, session_logged_in, session_time, session_ip $sql = "SELECT session_page, session_logged_in, session_time, session_ip
FROM " . SESSIONS_TABLE . " FROM " . SESSIONS_TABLE . "
WHERE session_logged_in = 0 WHERE session_logged_in = 0
AND session_time >= " . ( time() - 300 ) . " AND session_time >= " . ( time() - 1200 ) . "
ORDER BY session_time DESC"; ORDER BY session_time DESC";
if(!$result = $db->sql_query($sql)) if(!$result = $db->sql_query($sql))
{ {
@ -142,23 +142,23 @@ if( count($onlinerow_reg) )
$registered_users = 0; $registered_users = 0;
$hidden_users = 0; $hidden_users = 0;
$displayed_userid_list = "";
for($i = 0; $i < count($onlinerow_reg); $i++) for($i = 0; $i < count($onlinerow_reg); $i++)
{ {
if( !inarray($onlinerow_reg[$i]['user_id'], $reg_userid_ary) ) if( !inarray($onlinerow_reg[$i]['user_id'], $reg_userid_ary) )
{ {
$reg_userid_ary[] = $onlinerow_reg[$i]['user_id'];
$username = $onlinerow_reg[$i]['username'];
if( $onlinerow_reg[$i]['user_allow_viewonline'] || $userdata['user_level'] == ADMIN ) if( $onlinerow_reg[$i]['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
{ {
$username = $onlinerow_reg[$i]['username'];
$hidden = FALSE;
$registered_users++; $registered_users++;
$hidden = FALSE;
} }
else else
{ {
$username = $onlinerow_reg[$i]['username'];
$hidden = TRUE;
$hidden_users++; $hidden_users++;
$hidden = TRUE;
} }
if( $onlinerow_reg[$i]['session_page'] < 1 || !$is_auth_ary[$onlinerow_reg[$i]['session_page']]['auth_view'] ) if( $onlinerow_reg[$i]['session_page'] < 1 || !$is_auth_ary[$onlinerow_reg[$i]['session_page']]['auth_view'] )
@ -247,82 +247,78 @@ else
// //
// Guest users // Guest users
// //
$guest_userip_ary = array();
if( count($onlinerow_guest) ) if( count($onlinerow_guest) )
{ {
$guest_users = 0; $guest_users = 0;
for($i = 0; $i < count($onlinerow_guest); $i++) for($i = 0; $i < count($onlinerow_guest); $i++)
{ {
if( !inarray($onlinerow_guest[$i]['session_ip'], $guest_userip_ary) ) $guest_userip_ary[] = $onlinerow_guest[$i]['session_ip'];
$guest_users++;
if($onlinerow_guest[$i]['session_page'] < 1 || !$is_auth_ary[$onlinerow_reg[$i]['session_page']]['auth_view'] )
{ {
$guest_users++; switch($onlinerow_guest[$i]['session_page'])
if($onlinerow_guest[$i]['session_page'] < 1 || !$is_auth_ary[$onlinerow_reg[$i]['session_page']]['auth_view'] )
{ {
switch($onlinerow_guest[$i]['session_page']) case PAGE_INDEX:
{ $location = $lang['Forum_index'];
case PAGE_INDEX: $location_url = "index.$phpEx";
$location = $lang['Forum_index']; break;
$location_url = "index.$phpEx"; case PAGE_POSTING:
break; $location = $lang['Posting_message'];
case PAGE_POSTING: $location_url = "index.$phpEx";
$location = $lang['Posting_message']; break;
$location_url = "index.$phpEx"; case PAGE_LOGIN:
break; $location = $lang['Logging_on'];
case PAGE_LOGIN: $location_url = "index.$phpEx";
$location = $lang['Logging_on']; break;
$location_url = "index.$phpEx"; case PAGE_SEARCH:
break; $location = $lang['Searching_forums'];
case PAGE_SEARCH: $location_url = "search.$phpEx";
$location = $lang['Searching_forums']; break;
$location_url = "search.$phpEx"; case PAGE_PROFILE:
break; $location = $lang['Viewing_profile'];
case PAGE_PROFILE: $location_url = "index.$phpEx";
$location = $lang['Viewing_profile']; break;
$location_url = "index.$phpEx"; case PAGE_VIEWONLINE:
break; $location = $lang['Viewing_online'];
case PAGE_VIEWONLINE: $location_url = "viewonline.$phpEx";
$location = $lang['Viewing_online']; break;
$location_url = "viewonline.$phpEx"; case PAGE_VIEWMEMBERS:
break; $location = $lang['Viewing_member_list'];
case PAGE_VIEWMEMBERS: $location_url = "memberlist.$phpEx";
$location = $lang['Viewing_member_list']; break;
$location_url = "memberlist.$phpEx"; case PAGE_PRIVMSGS:
break; $location = $lang['Viewing_priv_msgs'];
case PAGE_PRIVMSGS: $location_url = "privmsg.$phpEx";
$location = $lang['Viewing_priv_msgs']; break;
$location_url = "privmsg.$phpEx"; case PAGE_FAQ:
break; $location = $lang['Viewing_FAQ'];
case PAGE_FAQ: $location_url = "faq.$phpEx";
$location = $lang['Viewing_FAQ']; break;
$location_url = "faq.$phpEx"; default:
break; $location = $lang['Forum_index'];
default: $location_url = "index.$phpEx";
$location = $lang['Forum_index'];
$location_url = "index.$phpEx";
}
} }
else
{
$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']);
$location = $forum_data[$onlinerow_guest[$i]['session_page']];
}
$row_color = ( $guest_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars("guest_user_row", array(
"ROW_COLOR" => "#" . $row_color,
"ROW_CLASS" => $row_class,
"USERNAME" => $lang['Guest'],
"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_time'], $board_config['board_timezone']),
"LOCATION" => $location,
"U_FORUM_LOCATION" => append_sid($location_url))
);
} }
else
{
$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']);
$location = $forum_data[$onlinerow_guest[$i]['session_page']];
}
$row_color = ( $guest_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars("guest_user_row", array(
"ROW_COLOR" => "#" . $row_color,
"ROW_CLASS" => $row_class,
"USERNAME" => $lang['Guest'],
"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_time'], $board_config['board_timezone']),
"LOCATION" => $location,
"U_FORUM_LOCATION" => append_sid($location_url))
);
} }
$l_g_user_s = ( $guest_users == 1 ) ? $lang['Guest_user_online'] : $lang['Guest_users_online']; $l_g_user_s = ( $guest_users == 1 ) ? $lang['Guest_user_online'] : $lang['Guest_users_online'];
@ -344,4 +340,4 @@ $template->pparse("body");
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
?> ?>