[Phpbb-checkins] CVS: phpBB2 login.php,1.34,1.35

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

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

Modified Files:
	login.php 
Log Message:
Removed test redirect headers

Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** login.php	2001/11/30 18:51:08	1.34
--- login.php	2001/12/02 01:04:25	1.35
***************
*** 53,57 ****
  		if(!$result)
  		{
! 			message_die(GENERAL_ERROR, "Error in obtaining userdata : login", __LINE__, __FILE__, $sql);
  		}
  
--- 53,57 ----
  		if(!$result)
  		{
! 			message_die(GENERAL_ERROR, "Error in obtaining userdata : login", "", __LINE__, __FILE__, $sql);
  		}
  
***************
*** 62,66 ****
  			if( $rowresult['user_level'] != ADMIN && $board_config['board_disable'] )
  			{
- 				header("HTTP/1.0 302 Redirect");
  				header("Location: " . append_sid("index.$phpEx", true));
  			}
--- 62,65 ----
***************
*** 77,86 ****
  						if( !empty($HTTP_POST_VARS['redirect']) )
  						{
- 							header("HTTP/1.0 302 Redirect");
  							header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  						}
  						else
  						{
- 							header("HTTP/1.0 302 Redirect");
  							header("Location: " . append_sid("index.$phpEx", true));
  						}
--- 76,83 ----
***************
*** 88,92 ****
  					else
  					{
! 						message_die(CRITICAL_ERROR, "Couldn't start session : login", __LINE__, __FILE__);
  					}
  				}
--- 85,89 ----
  					else
  					{
! 						message_die(CRITICAL_ERROR, "Couldn't start session : login", "", __LINE__, __FILE__);
  					}
  				}
***************
*** 127,136 ****
  		if( !empty($HTTP_POST_VARS['redirect']) )
  		{
- 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  		}
  		else
  		{
- 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid("index.$phpEx", true));
  		}
--- 124,131 ----
***************
*** 140,149 ****
  		if( !empty($HTTP_POST_VARS['redirect']) )
  		{
- 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  		}
  		else
  		{
- 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid("index.$phpEx", true));
  		}
--- 135,142 ----
***************
*** 156,160 ****
  	// user not already logged in
  	//
! 	if(!$userdata['session_logged_in'])
  	{
  		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
--- 149,153 ----
  	// user not already logged in
  	//
! 	if( !$userdata['session_logged_in'] )
  	{
  		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
***************
*** 203,207 ****
  		}
  
! 		$username = ($userdata['user_id'] != ANONYMOUS) ? $userdata['username'] : "";
  
  		$s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />';
--- 196,200 ----
  		}
  
! 		$username = ( $userdata['user_id'] != ANONYMOUS ) ? $userdata['username'] : "";
  
  		$s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />';
***************
*** 224,229 ****
  	else
  	{
! 		header("HTTP/1.0 302 Redirect");
! 		header("Location: index.$phpEx");
  	}
  
--- 217,221 ----
  	else
  	{
! 		header("Location: " . append_sid("index.$phpEx", true));
  	}