[Phpbb-checkins] CVS: phpBB2 viewonline.php,1.54,1.54.2.1

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

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

Modified Files:
      Tag: phpBB-2_0_0
	viewonline.php 
Log Message:
Changes in sessions means a reduction in complexity for viewonline and page_header

Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -C2 -r1.54 -r1.54.2.1
*** viewonline.php	4 Apr 2002 11:25:56 -0000	1.54
--- viewonline.php	8 Apr 2002 14:37:17 -0000	1.54.2.1
***************
*** 80,88 ****
  // Get user list
  //
! $sql = "SELECT u.user_id, u.username, u.user_session_time, u.user_session_page, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_time, s.session_page, 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, s.session_ip ASC";
  if ( !($result = $db->sql_query($sql)) )
--- 80,87 ----
  // Get user list
  //
! $sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_time, s.session_page, 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 u.username ASC, s.session_ip ASC";
  if ( !($result = $db->sql_query($sql)) )
***************
*** 135,141 ****
  			}
  
- 			$last_update = $row['user_session_time'];
- 			$user_page = $row['user_session_page'];
- 
  			$which_counter = 'reg_counter';
  			$which_row = 'reg_user_row';
--- 134,137 ----
***************
*** 147,157 ****
  		if ( $row['session_ip'] != $prev_ip )
  		{
  			$view_online = true;
  			$guest_users++;
  	
- 			$username = $lang['Guest'];
- 			$last_update = $row['session_time'];
- 			$user_page = $row['session_page'];
- 
  			$which_counter = 'guest_counter';
  			$which_row = 'guest_user_row';
--- 143,150 ----
  		if ( $row['session_ip'] != $prev_ip )
  		{
+ 			$username = $lang['Guest'];
  			$view_online = true;
  			$guest_users++;
  	
  			$which_counter = 'guest_counter';
  			$which_row = 'guest_user_row';
***************
*** 163,169 ****
  	if ( $view_online )
  	{
! 		if ( $user_page < 1 || !$is_auth_ary[$user_page]['auth_view'] )
  		{
! 			switch( $user_page )
  			{
  				case PAGE_INDEX:
--- 156,162 ----
  	if ( $view_online )
  	{
! 		if ( $row['session_page'] < 1 || !$is_auth_ary[$row['session_page']]['auth_view'] )
  		{
! 			switch( $row['session_page'] )
  			{
  				case PAGE_INDEX:
***************
*** 210,215 ****
  		else
  		{
! 			$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $user_page);
! 			$location = $forum_data[$user_page];
  		}
  
--- 203,208 ----
  		else
  		{
! 			$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $row['session_page']);
! 			$location = $forum_data[$row['session_page']];
  		}
  
***************
*** 221,225 ****
  			'ROW_CLASS' => $row_class,
  			'USERNAME' => $username,
! 			'LASTUPDATE' => create_date($board_config['default_dateformat'], $last_update, $board_config['board_timezone']),
  			'FORUM_LOCATION' => $location,
  
--- 214,218 ----
  			'ROW_CLASS' => $row_class,
  			'USERNAME' => $username,
! 			'LASTUPDATE' => create_date($board_config['default_dateformat'], $row['session_time'], $board_config['board_timezone']),
  			'FORUM_LOCATION' => $location,