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

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

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

Modified Files:
	usercp_avatar.php 
Log Message:
Updates in line with 2.0.1

Index: usercp_avatar.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_avatar.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** usercp_avatar.php	20 Apr 2002 00:22:29 -0000	1.9
--- usercp_avatar.php	10 Jun 2002 01:52:48 -0000	1.10
***************
*** 75,79 ****
  	}
  
! 	if ( !preg_match('#^(http:\/\/[a-z0-9\-]+?\.([a-z0-9\-]+\.)*[a-z]+(:[0-9]+)*\/.*?\.(gif|jpg|jpeg|png)$)#is', $avatar_filename) )
  	{
  		$error = true;
--- 75,79 ----
  	}
  
! 	if ( !preg_match('#^(http:\/\/[a-z0-9\-]+?\.([a-z0-9\-]+\.)*[a-z]+(:[0-9]+)*\/[^\"]*?\.(gif|jpg|jpeg|png)$)#is', $avatar_filename) )
  	{
  		$error = true;
***************
*** 163,167 ****
  		if ( $avatar_filesize <= $board_config['avatar_filesize'] && $avatar_filesize > 0 )
  		{
! 			preg_match("'image\/[x\-]*([a-z]+)'", $avatar_filetype, $avatar_filetype);
  			$avatar_filetype = $avatar_filetype[1];
  		}
--- 163,167 ----
  		if ( $avatar_filesize <= $board_config['avatar_filesize'] && $avatar_filesize > 0 )
  		{
! 			preg_match('#image\/[x\-]*([a-z]+)#', $avatar_filetype, $avatar_filetype);
  			$avatar_filetype = $avatar_filetype[1];
  		}
***************
*** 185,189 ****
  	if ( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
  	{
! 		$new_filename = ( $current_avatar != '' && $mode != 'register' ) ? $current_avatar : uniqid($user_ip) . $imgtype;
  
  		if ( $mode == 'editprofile' && $current_type == USER_AVATAR_UPLOAD && $current_avatar != '' )
--- 185,189 ----
  	if ( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
  	{
! 		$new_filename = uniqid($user_ip) . $imgtype;
  
  		if ( $mode == 'editprofile' && $current_type == USER_AVATAR_UPLOAD && $current_avatar != '' )
***************
*** 234,238 ****
  }
  
! function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current_email, &$coppa, &$username, &$email, &$icq, &$aim, &$msn, &$yim, &$website, &$location, &$occupation, &$interests, &$signature, &$viewemail, &$notifypm, &$popuppm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$hideonline, &$style, &$language, &$timezone, &$dateformat)
  {
  	global $board_config, $db, $template, $lang, $images, $theme;
--- 234,238 ----
  }
  
! function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current_email, &$coppa, &$username, &$email, &$new_password, &$cur_password, &$password_confirm, &$icq, &$aim, &$msn, &$yim, &$website, &$location, &$occupation, &$interests, &$signature, &$viewemail, &$notifypm, &$popuppm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$hideonline, &$style, &$language, &$timezone, &$dateformat)
  {
  	global $board_config, $db, $template, $lang, $images, $theme;
***************
*** 310,314 ****
  	}
  
! 	$params = array('coppa', 'user_id', 'username', 'email', 'current_email', 'icq', 'aim', 'msn', 'yim', 'website', 'location', 'occupation', 'interests', 'signature', 'viewemail', 'notifypm', 'popuppm', 'notifyreply', 'attachsig', 'allowhtml', 'allowbbcode', 'allowsmilies', 'hideonline', 'style', 'language', 'timezone', 'dateformat');
  
  	$s_hidden_vars = '<input type="hidden" name="agreed" value="true" />';
--- 310,314 ----
  	}
  
! 	$params = array('coppa', 'user_id', 'username', 'email', 'current_email', 'cur_password', 'new_password', 'password_confirm', 'icq', 'aim', 'msn', 'yim', 'website', 'location', 'occupation', 'interests', 'signature', 'viewemail', 'notifypm', 'popuppm', 'notifyreply', 'attachsig', 'allowhtml', 'allowbbcode', 'allowsmilies', 'hideonline', 'style', 'language', 'timezone', 'dateformat');
  
  	$s_hidden_vars = '<input type="hidden" name="agreed" value="true" />';
***************
*** 334,336 ****
  }
  
! ?>
\ No newline at end of file
--- 334,336 ----
  }
  
! ?>