[Phpbb-checkins] CVS: phpBB2 viewonline.php,1.46,1.47

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

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

Modified Files:
	viewonline.php 
Log Message:
Moron Moron Moron Moron ... <- Me

Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** viewonline.php	14 Feb 2002 02:06:32 -0000	1.46
--- viewonline.php	14 Feb 2002 02:22:42 -0000	1.47
***************
*** 113,120 ****
  	$reg_counter = 0;
  	$guest_counter = 0;
! 	$prev_user = "";
  
  	do
  	{
  		if ( $row['session_logged_in'] ) 
  		{
--- 113,122 ----
  	$reg_counter = 0;
  	$guest_counter = 0;
! 	$prev_user = 0;
  
  	do
  	{
+ 		$view_online = 0;
+ 
  		if ( $row['session_logged_in'] ) 
  		{
***************
*** 135,145 ****
  				}
  
! 				if ( !$row['user_allow_viewonline'] && $userdata['user_level'] == ADMIN )
  				{
! 					$username = '<i>' . $username . '<i>';
  					$hidden_users++;
  				}
  				else
  				{
  					$registered_users++;
  				}
--- 137,150 ----
  				}
  
! 				if ( !$row['user_allow_viewonline'] )
  				{
! 					$view_online = ( $userdata['user_level'] == ADMIN ) ? 1 : 0;
  					$hidden_users++;
+ 
+ 					$username = '<i>' . $username . '<i>';
  				}
  				else
  				{
+ 					$view_online = 1;
  					$registered_users++;
  				}
***************
*** 147,151 ****
  				$last_update = $row['user_session_time'];
  				$user_page = $row['user_session_page'];
- 				$view_online = $row['user_allow_viewonline'];
  
  				$which_counter = 'reg_counter';
--- 152,155 ----
***************
*** 156,159 ****
--- 160,164 ----
  		else
  		{
+ 			$view_online = 1;
  			$guest_users++;
  	
***************
*** 161,165 ****
  			$last_update = $row['session_time'];
  			$user_page = $row['session_page'];
- 			$view_online = 1;
  
  			$which_counter = 'guest_counter';
--- 166,169 ----
***************
*** 167,223 ****
  		}
  
! 		if ( $user_page < 1 || !$is_auth_ary[$user_page]['auth_view'] )
  		{
! 			switch( $user_page )
  			{
! 				case PAGE_INDEX:
! 					$location = $lang['Forum_index'];
! 					$location_url = "index.$phpEx";
! 					break;
! 				case PAGE_POSTING:
! 					$location = $lang['Posting_message'];
! 					$location_url = "index.$phpEx";
! 					break;
! 				case PAGE_LOGIN:
! 					$location = $lang['Logging_on'];
! 					$location_url = "index.$phpEx";
! 					break;
! 				case PAGE_SEARCH:
! 					$location = $lang['Searching_forums'];
! 					$location_url = "search.$phpEx";
! 					break;
! 				case PAGE_PROFILE:
! 					$location = $lang['Viewing_profile'];
! 					$location_url = "index.$phpEx";
! 					break;
! 				case PAGE_VIEWONLINE:
! 					$location = $lang['Viewing_online'];
! 					$location_url = "viewonline.$phpEx";
! 					break;
! 				case PAGE_VIEWMEMBERS:
! 					$location = $lang['Viewing_member_list'];
! 					$location_url = "memberlist.$phpEx";
! 					break;
! 				case PAGE_PRIVMSGS:
! 					$location = $lang['Viewing_priv_msgs'];
! 					$location_url = "privmsg.$phpEx";
! 					break;
! 				case PAGE_FAQ:
! 					$location = $lang['Viewing_FAQ'];
! 					$location_url = "faq.$phpEx";
! 					break;
! 				default:
! 					$location = $lang['Forum_index'];
! 					$location_url = "index.$phpEx";
  			}
- 		}
- 		else
- 		{
- 			$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $user_page);
- 			$location = $forum_data[$user_page];
- 		}
  
- 		if ( $view_online || $userdata['user_level'] == ADMIN )
- 		{
  			$row_color = ( $$which_counter % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
  			$row_class = ( $$which_counter % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
--- 171,227 ----
  		}
  
! 		if ( $view_online )
  		{
! 			if ( $user_page < 1 || !$is_auth_ary[$user_page]['auth_view'] )
  			{
! 				switch( $user_page )
! 				{
! 					case PAGE_INDEX:
! 						$location = $lang['Forum_index'];
! 						$location_url = "index.$phpEx";
! 						break;
! 					case PAGE_POSTING:
! 						$location = $lang['Posting_message'];
! 						$location_url = "index.$phpEx";
! 						break;
! 					case PAGE_LOGIN:
! 						$location = $lang['Logging_on'];
! 						$location_url = "index.$phpEx";
! 						break;
! 					case PAGE_SEARCH:
! 						$location = $lang['Searching_forums'];
! 						$location_url = "search.$phpEx";
! 						break;
! 					case PAGE_PROFILE:
! 						$location = $lang['Viewing_profile'];
! 						$location_url = "index.$phpEx";
! 						break;
! 					case PAGE_VIEWONLINE:
! 						$location = $lang['Viewing_online'];
! 						$location_url = "viewonline.$phpEx";
! 						break;
! 					case PAGE_VIEWMEMBERS:
! 						$location = $lang['Viewing_member_list'];
! 						$location_url = "memberlist.$phpEx";
! 						break;
! 					case PAGE_PRIVMSGS:
! 						$location = $lang['Viewing_priv_msgs'];
! 						$location_url = "privmsg.$phpEx";
! 						break;
! 					case PAGE_FAQ:
! 						$location = $lang['Viewing_FAQ'];
! 						$location_url = "faq.$phpEx";
! 						break;
! 					default:
! 						$location = $lang['Forum_index'];
! 						$location_url = "index.$phpEx";
! 				}
! 			}
! 			else
! 			{
! 				$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $user_page);
! 				$location = $forum_data[$user_page];
  			}
  
  			$row_color = ( $$which_counter % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
  			$row_class = ( $$which_counter % 2 ) ? $theme['td_class1'] : $theme['td_class2'];