[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.40,1.41

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

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv17536/admin

Modified Files:
	admin_users.php 
Log Message:
Fixed content-type/length bugs

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** admin_users.php	2002/01/24 02:51:00	1.40
--- admin_users.php	2002/01/27 14:13:59	1.41
***************
*** 368,371 ****
--- 368,372 ----
  							case "jpeg":
  							case "pjpeg":
+ 							case "jpg":
  								$imgtype = '.jpg';
  								break;
***************
*** 394,403 ****
  								if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "" )
  								{
! 									if( @file_exists("./" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']) )
  									{
! 										@unlink("./" . $board_config['avatar_path'] . "/". $this_userdata['user_avatar']);
  									}
  								}
! 								@copy($user_avatar_loc, "./" . $board_config['avatar_path'] . "/$avatar_filename");
  
  								$avatar_sql = ", user_avatar = '$avatar_filename', user_avatar_type = " . USER_AVATAR_UPLOAD;
--- 395,404 ----
  								if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "" )
  								{
! 									if( @file_exists("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']) )
  									{
! 										@unlink("./../" . $board_config['avatar_path'] . "/". $this_userdata['user_avatar']);
  									}
  								}
! 								@copy($user_avatar_loc, "./../" . $board_config['avatar_path'] . "/$avatar_filename");
  
  								$avatar_sql = ", user_avatar = '$avatar_filename', user_avatar_type = " . USER_AVATAR_UPLOAD;
***************
*** 458,465 ****
  						@fclose($fsock);
  
! 						if( preg_match("/Content-Length\: ([0-9]+)[^\/]+Content-Type\: image\/[x\-]*([a-z]+)[\s]+/i", $avatar_data, $file_data) )
  						{
! 							$file_size = $file_data[1];
! 							$file_type = $file_data[2];
  
  							switch( $file_type )
--- 459,466 ----
  						@fclose($fsock);
  
! 						if( preg_match("/Content-Length\: ([0-9]+)[^\/ ][\s]+/i", $avatar_data, $file_data1) && preg_match("/Content-Type\: image\/[x\-]*([a-z]+)[\s]+/i", $avatar_data, $file_data2) )
  						{
! 							$file_size = $file_data1[1]; 
! 							$file_type = $file_data2[1];
  
  							switch( $file_type )
***************
*** 467,470 ****
--- 468,472 ----
  								case "jpeg":
  								case "pjpeg":
+ 								case "jpg":
  									$imgtype = '.jpg';
  									break;
***************
*** 502,511 ****
  										if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "")
  										{
! 											if( file_exists("./" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']) )
  											{
! 												@unlink("./" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']);
  											}
  										}
! 										@copy($tmp_filename, "./" . $board_config['avatar_path'] . "/$avatar_filename");
  										@unlink($tmp_filename);
  
--- 504,513 ----
  										if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "")
  										{
! 											if( file_exists("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']) )
  											{
! 												@unlink("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']);
  											}
  										}
! 										@copy($tmp_filename, "./../" . $board_config['avatar_path'] . "/$avatar_filename");
  										@unlink($tmp_filename);