[Phpbb-checkins] CVS: phpBB2/admin index.php,1.28,1.29

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv17462/admin

Modified Files:
	index.php 
Log Message:
Remove guest user topic tracking via cookies, update viewtopic to re-fix highlighting of search terms, add lang capability to images, various other issues, removed remote avatar size reduction

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** index.php	2001/11/24 00:33:58	1.28
--- index.php	2001/12/14 03:12:05	1.29
***************
*** 288,302 ****
  	// Get users online information.
  	//
! 	$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, s.session_page, s.session_logged_in, s.session_time, s.session_ip
  		FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
! 		WHERE u.user_id = s.session_user_id
! 			AND s.session_time >= " . (time()-300) . "
  		ORDER BY s.session_time DESC";
  	if(!$result = $db->sql_query($sql))
  	{
! 		message_die(GENERAL_ERROR, "Couldn't obtain user/online information.", "", __LINE__, __FILE__, $sql);
  	}
- 	$onlinerow = $db->sql_fetchrowset($result);
  
  	$sql = "SELECT forum_name, forum_id
  		FROM " . FORUMS_TABLE;
--- 288,324 ----
  	// Get users online information.
  	//
! 	$sql = "SELECT u.user_id, u.username, u.user_session_time AS session_time, u.user_session_page AS session_page, session_ip  
  		FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
! 		WHERE s.session_logged_in = " . TRUE . " 
! 			AND u.user_id = s.session_user_id 
! 			AND u.user_id <> " . ANONYMOUS . " 
! 			AND u.user_session_time >= " . ( time() - 300 ) . " 
  		ORDER BY s.session_time DESC";
  	if(!$result = $db->sql_query($sql))
  	{
! 		message_die(GENERAL_ERROR, "Couldn't obtain regd user/online information.", "", __LINE__, __FILE__, $sql);
  	}
  
+ 	$onlinerow = array();
+ 	while( $row = $db->sql_fetchrow($result) )
+ 	{
+ 		$onlinerow[] = $row;
+ 	}
+ 
+ 	$sql = "SELECT session_user_id AS user_id, session_page, session_logged_in, session_time, session_ip  
+ 		FROM " . SESSIONS_TABLE . "
+ 		WHERE session_logged_in = 0
+ 			AND session_time >= " . ( time() - 300 ) . "
+ 		ORDER BY session_time DESC";
+ 	if(!$result = $db->sql_query($sql))
+ 	{
+ 		message_die(GENERAL_ERROR, "Couldn't obtain guest user/online information.", "", __LINE__, __FILE__, $sql);
+ 	}
+ 
+ 	while( $row = $db->sql_fetchrow($result) )
+ 	{
+ 		$onlinerow[] = $row;
+ 	}
+ 
  	$sql = "SELECT forum_name, forum_id
  		FROM " . FORUMS_TABLE;
***************
*** 313,317 ****
  	}
  
! 	$online_count = $db->sql_numrows($result);
  	if($online_count)
  	{
--- 335,339 ----
  	}
  
! 	$online_count = count($onlinerow);
  	if($online_count)
  	{
***************
*** 320,342 ****
  		for($i = 0; $i < $online_count; $i++)
  		{
! 			if($onlinerow[$i]['user_id'] != ANONYMOUS)
! 			{
! 				if($onlinerow[$i]['session_logged_in'])
! 				{
! 					$username = $onlinerow[$i]['username'];
! 				}
! 				else
! 				{
! 					$username = $onlinerow[$i]['username'];
! 				}
! 			}
! 			else
! 			{
! 				$username = $lang['Anonymous'];
! 			}
  
! 			if($onlinerow[$i]['session_page'] < 1)
  			{
! 				switch($onlinerow[$i]['session_page'])
  				{
  					case PAGE_INDEX:
--- 342,350 ----
  		for($i = 0; $i < $online_count; $i++)
  		{
! 			$username = ( $onlinerow[$i]['user_id'] == ANONYMOUS ) ? $lang['Anonymous'] : $onlinerow[$i]['username'];
  
! 			if( $onlinerow[$i]['session_page'] < 1 )
  			{
! 				switch( $onlinerow[$i]['session_page'] )
  				{
  					case PAGE_INDEX: