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

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

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

Modified Files:
	page_header.php 
Log Message:
Dropped 'GROUP BY' from whosonline query for compatibility with non-MySQL DB's

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** page_header.php	2002/01/11 12:38:34	1.84
--- page_header.php	2002/01/11 14:36:34	1.85
***************
*** 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);
--- 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);
***************
*** 108,136 ****
  $logged_hidden_online = 0;
  $guests_online = 0;
  
  while( $row = $db->sql_fetchrow($result) )
  {
  	if( $row['session_logged_in'] )
  	{
! 		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'];
  	}
  }
  
--- 107,142 ----
  $logged_hidden_online = 0;
  $guests_online = 0;
+ $prev_user_id = 0;
  
  while( $row = $db->sql_fetchrow($result) )
  {
+ 	// User is logged in and therefor not a guest
  	if( $row['session_logged_in'] )
  	{
! 		// Skip multiple sessions for one user
! 		if( $row['user_id'] != $prev_user_id )
  		{
! 			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++;
  	}
+ 	$prev_user_id = $row['user_id'];
  }