[Phpbb-checkins] CVS: phpBB2/includes usercp_register.php,1.20.2.3,1.20.2.4

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

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

Modified Files:
      Tag: phpBB-2_0_0
	usercp_register.php 
Log Message:
COPPA appears to be broken ... this should fix it

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -C2 -r1.20.2.3 -r1.20.2.4
*** usercp_register.php	8 Apr 2002 00:51:50 -0000	1.20.2.3
--- usercp_register.php	8 Apr 2002 01:47:10 -0000	1.20.2.4
***************
*** 28,36 ****
  }
  
! //
  // Load agreement template since user has not yet
  // agreed to registration conditions/coppa
  //
! function show_coppa(&$coppa)
  {
  	global $template, $lang, $phpbb_root_path, $phpEx;
--- 28,36 ----
  }
  
! // ---------------------------------------
  // Load agreement template since user has not yet
  // agreed to registration conditions/coppa
  //
! function show_coppa()
  {
  	global $template, $lang, $phpbb_root_path, $phpEx;
***************
*** 41,45 ****
  
  	$template->assign_vars(array(
- 		'COPPA' => $coppa,
  		'REGISTRATION' => $lang['Registration'], 
  		'AGREEMENT' => $lang['Reg_agreement'], 
--- 41,44 ----
***************
*** 56,61 ****
  }
  //
! //
! //
  
  $error = FALSE;
--- 55,59 ----
  }
  //
! // ---------------------------------------
  
  $error = FALSE;
***************
*** 66,75 ****
  	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
! 	show_coppa($coppa);
  
  	include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  }
  
! $coppa = ( ( !$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa'] ) || $mode == 'register' ) ? 0 : TRUE;
  
  //
--- 64,73 ----
  	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
! 	show_coppa();
  
  	include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  }
  
! $coppa = ( empty($HTTP_POST_VARS['coppa']) && empty($HTTP_GET_VARS['coppa']) ) ? 0 : TRUE;
  
  //
***************
*** 224,229 ****
  	else if ( $mode == 'register' )
  	{
- 		$coppa = (!$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa']) ? 0 : TRUE;
- 
  		if ( empty($username) || empty($password) || empty($password_confirm) || empty($email) )
  		{
--- 222,225 ----
***************
*** 231,235 ****
  			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Fields_empty'];
  		}
! 		
  	}
  
--- 227,231 ----
  			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Fields_empty'];
  		}
! 	
  	}
  
***************
*** 790,794 ****
  	//
  	$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
! 	$form_enctype = ( @$ini_val('file_uploads') == 0 || strtolower(@$ini_val('file_uploads') == 'off') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && @$ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"';
  	
  	$template->assign_vars(array(
--- 786,790 ----
  	//
  	$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
! 	$form_enctype = ( @$ini_val('file_uploads') == '0' || strtolower(@$ini_val('file_uploads') == 'off') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && @$ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"';
  	
  	$template->assign_vars(array(