[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.106,1.106.2.1

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

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

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

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.106
retrieving revision 1.106.2.1
diff -C2 -r1.106 -r1.106.2.1
*** page_header.php	1 Apr 2002 13:23:42 -0000	1.106
--- page_header.php	8 Apr 2002 14:37:16 -0000	1.106.2.1
***************
*** 86,96 ****
  // situation
  //
! $user_forum_sql = ( !empty($forum_id) ) ? "AND ( u.user_session_page = $forum_id 
! 	OR s.session_page = $forum_id)" : '';
  $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, 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 ) . " )
  		$user_forum_sql 
  	ORDER BY u.username ASC, s.session_ip ASC";
--- 86,94 ----
  // situation
  //
! $user_forum_sql = ( !empty($forum_id) ) ? "AND s.session_page = $forum_id" : '';
  $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, 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 ) . "
  		$user_forum_sql 
  	ORDER BY u.username ASC, s.session_ip ASC";