diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-01-27 14:13:59 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-01-27 14:13:59 +0000 |
| commit | 11d212a83f3f52cb562d2d7b782511e6ce059648 (patch) | |
| tree | 54a906225a8882219e3ab73df07175233e03038b /phpBB/admin | |
| parent | eba70d3bb9e168dd4b3bd2c2bb8bf020a7cdb5c7 (diff) | |
| download | forums-11d212a83f3f52cb562d2d7b782511e6ce059648.tar forums-11d212a83f3f52cb562d2d7b782511e6ce059648.tar.gz forums-11d212a83f3f52cb562d2d7b782511e6ce059648.tar.bz2 forums-11d212a83f3f52cb562d2d7b782511e6ce059648.tar.xz forums-11d212a83f3f52cb562d2d7b782511e6ce059648.zip | |
Fixed content-type/length bugs
git-svn-id: file:///svn/phpbb/trunk@1970 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin')
| -rw-r--r-- | phpBB/admin/admin_users.php | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php index 491c99706f..5e7d2ede71 100644 --- a/phpBB/admin/admin_users.php +++ b/phpBB/admin/admin_users.php @@ -367,6 +367,7 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) | { case "jpeg": case "pjpeg": + case "jpg": $imgtype = '.jpg'; break; case "gif": @@ -393,12 +394,12 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) | if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "" ) { - if( @file_exists("./" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']) ) + if( @file_exists("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']) ) { - @unlink("./" . $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"); + @copy($user_avatar_loc, "./../" . $board_config['avatar_path'] . "/$avatar_filename"); $avatar_sql = ", user_avatar = '$avatar_filename', user_avatar_type = " . USER_AVATAR_UPLOAD; } @@ -457,15 +458,16 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) | } @fclose($fsock); - if( preg_match("/Content-Length\: ([0-9]+)[^\/]+Content-Type\: image\/[x\-]*([a-z]+)[\s]+/i", $avatar_data, $file_data) ) + 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_data[1]; - $file_type = $file_data[2]; + $file_size = $file_data1[1]; + $file_type = $file_data2[1]; switch( $file_type ) { case "jpeg": case "pjpeg": + case "jpg": $imgtype = '.jpg'; break; case "gif": @@ -501,12 +503,12 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) | if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "") { - if( file_exists("./" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']) ) + if( file_exists("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']) ) { - @unlink("./" . $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"); + @copy($tmp_filename, "./../" . $board_config['avatar_path'] . "/$avatar_filename"); @unlink($tmp_filename); $avatar_sql = ", user_avatar = '$avatar_filename', user_avatar_type = " . USER_AVATAR_UPLOAD; |