[Phpbb-checkins] CVS: phpBB2/includes usercp_register.php,1.7,1.8

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

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

Modified Files:
	usercp_register.php 
Log Message:
Fix issue where nothing is reported for avatars larger than max filesize, bug #526880

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** usercp_register.php	19 Mar 2002 21:54:47 -0000	1.7
--- usercp_register.php	20 Mar 2002 14:39:43 -0000	1.8
***************
*** 216,219 ****
--- 216,221 ----
  if ( isset($HTTP_POST_VARS['submit']) )
  {
+ 	include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx);
+ 
  	$error = FALSE;
  
***************
*** 355,399 ****
  	}
  
! 		include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx);
! 
! 		if ( isset($HTTP_POST_VARS['avatardel']) && $mode == 'editprofile' )
  		{
! 			$avatar_sql = user_avatar_delete($userdata['avatar_type'], $userdata['avatar_file']);
  		}
- 		else if ( ( $user_avatar_loc != '' || !empty($user_avatar_url) ) && $board_config['allow_avatar_upload'] )
- 		{
- 			if ( !empty($user_avatar_loc) && !empty($user_avatar_url) )
- 			{
- 				$error = true;
- 				$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . $lang['Only_one_avatar'];
- 			}
  
! 			$id = ( $mode == 'register' ) ? $new_user_id : $userdata['user_id'];
! 
! 			if ( !empty($user_avatar_loc) )
! 			{
! 				$avatar_sql = user_avatar_upload($mode, 'local', $id, $error, $error_msg, $user_avatar_loc, $user_avatar_name, $user_avatar_size, $user_avatar_filetype);
! 			}
! 			else if ( !empty($user_avatar_url) )
! 			{
! 				$avatar_sql = user_avatar_upload($mode, 'remote', $id, $error, $error_msg, $user_avatar_url, $user_avatar_name, $user_avatar_size, $user_avatar_filetype);
! 			}
! 			else if ( !empty($user_avatar_name) )
! 			{
! 				$l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024));
  
! 				$error = true;
! 				$error_msg = ( ( !empty($error_msg) ) ? '<br />' : '' ) . $l_avatar_size;
! 			}
! 		}
! 		else if ( $user_avatar_remoteurl != '' && $board_config['allow_avatar_remote'] )
  		{
! 			$avatar_sql = user_avatar_url($mode, $error, $error_msg, $user_avatar_remoteurl);
  		}
! 		else if ( $user_avatar_local != '' && $board_config['allow_avatar_local'] )
  		{
! 			$avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local);
  		}
  
  
  	if ( !$error )
--- 357,398 ----
  	}
  
! 	if ( isset($HTTP_POST_VARS['avatardel']) && $mode == 'editprofile' )
! 	{
! 		$avatar_sql = user_avatar_delete($userdata['avatar_type'], $userdata['avatar_file']);
! 	}
! 	else if ( ( $user_avatar_loc != '' || !empty($user_avatar_url) || !empty($user_avatar_name) ) && $board_config['allow_avatar_upload'] )
! 	{
! 		if ( !empty($user_avatar_loc) && !empty($user_avatar_url) )
  		{
! 			$error = true;
! 			$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . $lang['Only_one_avatar'];
  		}
  
! 		$id = ( $mode == 'register' ) ? $new_user_id : $userdata['user_id'];
  
! 		if ( !empty($user_avatar_loc) )
  		{
! 			$avatar_sql = user_avatar_upload($mode, 'local', $id, $error, $error_msg, $user_avatar_loc, $user_avatar_name, $user_avatar_size, $user_avatar_filetype);
  		}
! 		else if ( !empty($user_avatar_url) )
  		{
! 			$avatar_sql = user_avatar_upload($mode, 'remote', $id, $error, $error_msg, $user_avatar_url, $user_avatar_name, $user_avatar_size, $user_avatar_filetype);
  		}
+ 		else if ( !empty($user_avatar_name) )
+ 		{
+ 			$l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024));
  
+ 			$error = true;
+ 			$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . $l_avatar_size;
+ 		}
+ 	}
+ 	else if ( $user_avatar_remoteurl != '' && $board_config['allow_avatar_remote'] )
+ 	{
+ 		$avatar_sql = user_avatar_url($mode, $error, $error_msg, $user_avatar_remoteurl);
+ 	}
+ 	else if ( $user_avatar_local != '' && $board_config['allow_avatar_local'] )
+ 	{
+ 		$avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local);
+ 	}
  
  	if ( !$error )
***************
*** 832,836 ****
  	//
  	$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
! 	$form_enctype = ( !$ini_val('file_uploads') || 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(
--- 831,835 ----
  	//
  	$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
! 	$form_enctype = ( !@$ini_val('file_uploads') || 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(