[Phpbb-checkins] CVS: phpBB2/includes usercp_register.php,1.16,1.17

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

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

Modified Files:
	usercp_register.php 
Log Message:
Check returned language string

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** usercp_register.php	24 Mar 2002 20:03:20 -0000	1.16
--- usercp_register.php	29 Mar 2002 00:24:13 -0000	1.17
***************
*** 146,150 ****
  	$user_style = ( isset($HTTP_POST_VARS['style']) ) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style'];
  
! 	$user_lang = ( !empty($HTTP_POST_VARS['language']) ) ? $HTTP_POST_VARS['language'] : $board_config['default_lang'];
  	$user_timezone = ( isset($HTTP_POST_VARS['timezone']) ) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone'];
  	$user_dateformat = ( !empty($HTTP_POST_VARS['dateformat']) ) ? trim($HTTP_POST_VARS['dateformat']) : $board_config['default_dateformat'];
--- 146,166 ----
  	$user_style = ( isset($HTTP_POST_VARS['style']) ) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style'];
  
! 	if ( !empty($HTTP_POST_VARS['language']) )
! 	{
! 		if ( preg_match('/^[a-z_]+$/i', $HTTP_POST_VARS['language']) )
! 		{
! 			$user_lang = $HTTP_POST_VARS['language'];
! 		}
! 		else
! 		{
! 			$error = true;
! 			$error_msg = $lang['Fields_empty'];
! 		}
! 	}
! 	else
! 	{
! 		$user_lang = $board_config['default_lang'];
! 	}
! 
  	$user_timezone = ( isset($HTTP_POST_VARS['timezone']) ) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone'];
  	$user_dateformat = ( !empty($HTTP_POST_VARS['dateformat']) ) ? trim($HTTP_POST_VARS['dateformat']) : $board_config['default_dateformat'];