[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.93,1.94

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

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

Modified Files:
	page_header.php 
Log Message:
Uncomment and 'complete' browsing in forum online list

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -r1.93 -r1.94
*** page_header.php	2002/01/25 23:22:38	1.93
--- page_header.php	2002/01/27 01:20:42	1.94
***************
*** 90,100 ****
  // situation
  //
! /*
! if( !empty($forum_id) )
! {
! 	$user_forum_sql = "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
--- 90,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
***************
*** 102,107 ****
  		AND ( s.session_time >= ".( time() - 300 ) . " 
  			OR u.user_session_time >= " . ( time() - 300 ) . " )
  	ORDER BY u.username ASC";
- //$user_forum_sql 
  $result = $db->sql_query($sql);
  if(!$result)
--- 98,103 ----
  		AND ( s.session_time >= ".( time() - 300 ) . " 
  			OR u.user_session_time >= " . ( time() - 300 ) . " )
+ 		$user_forum_sql 
  	ORDER BY u.username ASC";
  $result = $db->sql_query($sql);
  if(!$result)
***************
*** 112,118 ****
--- 108,117 ----
  $userlist_ary = array();
  $userlist_visible = array();
+ 
  $logged_visible_online = 0;
  $logged_hidden_online = 0;
  $guests_online = 0;
+ $online_userlist = "";
+ 
  $prev_user_id = 0;
  
***************
*** 162,166 ****
  }
  
! $online_userlist = $lang['Registered_users'] . " " . $online_userlist;
  
  $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
--- 161,169 ----
  }
  
! if( $online_userlist == "" )
! {
! 	$online_userlist = $lang['None'];
! }
! $online_userlist = ( ( isset($forum_id) ) ? $lang['Browsing_forum'] : $lang['Registered_users'] ) . " " . $online_userlist;
  
  $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
***************
*** 240,244 ****
  }
  
- 
  $l_online_users = sprintf($l_t_user_s, $total_online_users);
  $l_online_users .= sprintf($l_r_user_s, $logged_visible_online); 
--- 243,246 ----
***************
*** 382,386 ****
  	"L_WHOSONLINE_ADMIN" => sprintf($lang['Admin_online_color'], '<span style="color:' . $theme['fontcolor3'] . '">', '</span>'), 
  	"L_WHOSONLINE_MOD" => sprintf($lang['Mod_online_color'], '<span style="color:' . $theme['fontcolor2'] . '">', '</span>'), 
! 	"L_RECORD_USERS" => sprintf($lang['Record_online_users'], $board_config['record_online_users'], date($lang['DATE_FORMAT'], $board_config['record_online_date']) ),
  
  	"U_SEARCH_UNANSWERED" => append_sid("search.".$phpEx."?search_id=unanswered"),
--- 384,388 ----
  	"L_WHOSONLINE_ADMIN" => sprintf($lang['Admin_online_color'], '<span style="color:' . $theme['fontcolor3'] . '">', '</span>'), 
  	"L_WHOSONLINE_MOD" => sprintf($lang['Mod_online_color'], '<span style="color:' . $theme['fontcolor2'] . '">', '</span>'), 
! 	"L_RECORD_USERS" => sprintf($lang['Record_online_users'], $board_config['record_online_users'], date($board_config['default_dateformat'], $board_config['record_online_date']) ),
  
  	"U_SEARCH_UNANSWERED" => append_sid("search.".$phpEx."?search_id=unanswered"),