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
WHERE u.user_id <> " . ANONYMOUS . "
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 . "
ORDER BY s.session_time DESC";
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
FROM " . SESSIONS_TABLE . "
WHERE session_logged_in = 0
AND session_time >= " . ( time() - 300 ) . "
AND session_time >= " . ( time() - 1200 ) . "
ORDER BY session_time DESC";
if(!$result = $db->sql_query($sql))
{
@ -142,23 +142,23 @@ if( count($onlinerow_reg) )
$registered_users = 0;
$hidden_users = 0;
$displayed_userid_list = "";
for($i = 0; $i < count($onlinerow_reg); $i++)
{
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 )
{
$username = $onlinerow_reg[$i]['username'];
$hidden = FALSE;
$registered_users++;
$hidden = FALSE;
}
else
{
$username = $onlinerow_reg[$i]['username'];
$hidden = TRUE;
$hidden_users++;
$hidden = TRUE;
}
if( $onlinerow_reg[$i]['session_page'] < 1 || !$is_auth_ary[$onlinerow_reg[$i]['session_page']]['auth_view'] )
@ -247,16 +247,13 @@ else
//
// Guest users
//
$guest_userip_ary = array();
if( count($onlinerow_guest) )
{
$guest_users = 0;
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'] )
@ -323,7 +320,6 @@ if( count($onlinerow_guest) )
"U_FORUM_LOCATION" => append_sid($location_url))
);
}
}
$l_g_user_s = ( $guest_users == 1 ) ? $lang['Guest_user_online'] : $lang['Guest_users_online'];