[Phpbb-checkins] CVS: phpBB2/includes usercp_register.php,1.9,1.10

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

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

Modified Files:
	usercp_register.php 
Log Message:
Fix blank error when not submitting any passwords during registration and alter error when no username is input

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** usercp_register.php	20 Mar 2002 23:57:18 -0000	1.9
--- usercp_register.php	21 Mar 2002 13:27:38 -0000	1.10
***************
*** 55,78 ****
  
  }
- 
- function parse_variables()
- {
- 
- }
- 
- function process_data()
- {
- 
- }
- 
- function show_profile_page()
- {
- 
- }
  //
  //
  //
  
- 
  $page_title = ( $mode == 'editprofile' ) ? $lang['Edit_profile'] : $lang['Register'];
  
--- 55,62 ----
***************
*** 90,94 ****
  }
  
- 
  $coppa = ( ( !$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa'] ) || $mode == 'register' ) ? 0 : TRUE;
  
--- 74,77 ----
***************
*** 127,131 ****
  	$username = str_replace(' ', '', $username);
  	$email = htmlspecialchars($email);
! 	$signature = str_replace('<br />', '\n', $signature);
  
  	// Run some validation on the optional fields. These are pass-by-ref, so they'll be changed to 
--- 110,114 ----
  	$username = str_replace('&nbsp;', '', $username);
  	$email = htmlspecialchars($email);
! 	$signature = str_replace('<br />', "\n", $signature);
  
  	// Run some validation on the optional fields. These are pass-by-ref, so they'll be changed to 
***************
*** 203,217 ****
  }
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  if ( isset($HTTP_POST_VARS['submit']) )
  {
--- 186,189 ----
***************
*** 282,286 ****
  		}
  	}
! 	else if ( ( $password && !$password_confirm ) || ( !$password && $password_confirm ) )
  	{
  		$error = TRUE;
--- 254,263 ----
  		}
  	}
! 	else if ( empty($password) && empty($password_confirm) )
! 	{
! 		$error = TRUE;
! 		$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
! 	}
! 	else 
  	{
  		$error = TRUE;
***************
*** 327,331 ****
  	if ( $board_config['allow_namechange'] || $mode == 'register' )
  	{
! 		if ( $username != $userdata['username'] || $mode == 'register' )
  		{
  			$result = validate_username($username);
--- 304,313 ----
  	if ( $board_config['allow_namechange'] || $mode == 'register' )
  	{
! 		if ( empty($username) )
! 		{
! 			$error = TRUE;
! 			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Username_disallowed'];
! 		}
! 		else if ( $username != $userdata['username'] || $mode == 'register' )
  		{
  			$result = validate_username($username);
***************
*** 410,416 ****
  				$user_actkey = gen_rand_string(true);
  
- 				//
- 				// The user is inactive, remove their session forcing them to login again before they can post.
- 				//
  				if ( $userdata['session_logged_in'] )
  				{
--- 392,395 ----
***************
*** 627,639 ****
  }
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
  if ( $error )
  {
--- 606,609 ----
***************
*** 700,718 ****
  }
  
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
  include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
--- 670,676 ----
  }
  
! //
! // Default pages
! //
  include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
***************
*** 972,974 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 930,932 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file