[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.83,1.84

[Bart v. B. <ba...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv18367

Modified Files:
	page_header.php 
Log Message:
Cleaned up the viewonline code, wasnt giving correct output if you where admin

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** page_header.php	2001/12/29 16:20:25	1.83
--- page_header.php	2002/01/11 12:38:34	1.84
***************
*** 90,98 ****
  // situation
  //
! $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, s.session_logged_in, s.session_ip
  	FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  	WHERE u.user_id = s.session_user_id
  		AND ( s.session_time >= ".( time() - 300 ) . " 
! 			OR u.user_session_time >= " . ( time() - 300 ) . " )  
  	ORDER BY u.username ASC";
  $result = $db->sql_query($sql);
--- 90,99 ----
  // situation
  //
! $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, s.session_logged_in, s.session_ip, count(*) as online_count
  	FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  	WHERE u.user_id = s.session_user_id
  		AND ( s.session_time >= ".( time() - 300 ) . " 
! 			OR u.user_session_time >= " . ( time() - 300 ) . " )
! 	GROUP BY u.user_id
  	ORDER BY u.username ASC";
  $result = $db->sql_query($sql);
***************
*** 114,152 ****
  		if( $row['user_allow_viewonline'] )
  		{
! 			$userlist_ary[] = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . "\">" . $row['username'] . "</a>";
! 			$userlist_visible[] = 1;
  		}
  		else
  		{
! 			$userlist_ary[] = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . "\">" . $row['username'] . "</a>";
! 			$userlist_visible[] = 0;
  		}
  	}
  	else
  	{
! 		$guests_online++;
  	}
  }
  
- $online_userlist = "";
- for($i = 0; $i < count($userlist_ary); $i++)
- {
- 	if( !strstr($online_userlist, $userlist_ary[$i]) )
- 	{
- 		if( $userlist_visible[$i] || $userdata['user_level'] == ADMIN )
- 		{
- 			$online_userlist .= ($online_userlist != "") ? ", " . $userlist_ary[$i] : $userlist_ary[$i];
- 			$logged_visible_online++;
- 		}
- 		else
- 		{
- 			$logged_hidden_online++;
- 		}
- 	}
- }
  $online_userlist = $lang['Registered_users'] . " " . $online_userlist;
  
  $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
- 
  
  if( $total_online_users == 0 )
--- 115,141 ----
  		if( $row['user_allow_viewonline'] )
  		{
! 			$user_online_link = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . "\">" . $row['username'] . "</a>";
! 			$logged_visible_online++;
  		}
  		else
+ 		{
+ 			$user_online_link = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . "\"><i>" . $row['username'] . "</i></a>";
+ 			$logged_hidden_online++;
+ 		}
+ 		
+ 		if( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
  		{
! 			$online_userlist .= ($online_userlist != "") ? ", " . $user_online_link : $user_online_link;
  		}
  	}
  	else
  	{
! 		$guests_online += $row['online_count'];
  	}
  }
  
  $online_userlist = $lang['Registered_users'] . " " . $online_userlist;
  
  $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
  
  if( $total_online_users == 0 )