lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: create directory if not exist

Browse Source
This commit is contained in:
Regis Houssin 2011-07-04 13:47:34 +00:00
parent 347b20274a
commit e4ee479276
1 changed files with 50 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
htdocs/core/ajaxfileupload.php
View File

@ -119,50 +119,57 @@ class UploadHandler
private function create_scaled_image($file_name, $options) { private function create_scaled_image($file_name, $options) {
$file_path = $this->options['upload_dir'].$file_name; $file_path = $this->options['upload_dir'].$file_name;
$new_file_path = $options['upload_dir'].$file_name; $new_file_path = $options['upload_dir'].$file_name;
list($img_width, $img_height) = @getimagesize($file_path); if (create_exdir($options['upload_dir']) >= 0)
if (!$img_width || !$img_height) { {
return false; list($img_width, $img_height) = @getimagesize($file_path);
if (!$img_width || !$img_height) {
return false;
}
$scale = min(
$options['max_width'] / $img_width,
$options['max_height'] / $img_height
);
if ($scale > 1) {
$scale = 1;
}
$new_width = $img_width * $scale;
$new_height = $img_height * $scale;
$new_img = @imagecreatetruecolor($new_width, $new_height);
switch (strtolower(substr(strrchr($file_name, '.'), 1))) {
case 'jpg':
case 'jpeg':
$src_img = @imagecreatefromjpeg($file_path);
$write_image = 'imagejpeg';
break;
case 'gif':
$src_img = @imagecreatefromgif($file_path);
$write_image = 'imagegif';
break;
case 'png':
$src_img = @imagecreatefrompng($file_path);
$write_image = 'imagepng';
break;
default:
$src_img = $image_method = null;
}
$success = $src_img && @imagecopyresampled(
$new_img,
$src_img,
0, 0, 0, 0,
$new_width,
$new_height,
$img_width,
$img_height
) && $write_image($new_img, $new_file_path);
// Free up memory (imagedestroy does not delete files):
@imagedestroy($src_img);
@imagedestroy($new_img);
return $success;
} }
$scale = min( else
$options['max_width'] / $img_width, {
$options['max_height'] / $img_height return false;
);
if ($scale > 1) {
$scale = 1;
} }
$new_width = $img_width * $scale;
$new_height = $img_height * $scale;
$new_img = @imagecreatetruecolor($new_width, $new_height);
switch (strtolower(substr(strrchr($file_name, '.'), 1))) {
case 'jpg':
case 'jpeg':
$src_img = @imagecreatefromjpeg($file_path);
$write_image = 'imagejpeg';
break;
case 'gif':
$src_img = @imagecreatefromgif($file_path);
$write_image = 'imagegif';
break;
case 'png':
$src_img = @imagecreatefrompng($file_path);
$write_image = 'imagepng';
break;
default:
$src_img = $image_method = null;
}
$success = $src_img && @imagecopyresampled(
$new_img,
$src_img,
0, 0, 0, 0,
$new_width,
$new_height,
$img_width,
$img_height
) && $write_image($new_img, $new_file_path);
// Free up memory (imagedestroy does not delete files):
@imagedestroy($src_img);
@imagedestroy($new_img);
return $success;
} }
private function has_error($uploaded_file, $file, $error) { private function has_error($uploaded_file, $file, $error) {
@ -202,7 +209,7 @@ class UploadHandler
$file->size = intval($size); $file->size = intval($size);
$file->type = $type; $file->type = $type;
$error = $this->has_error($uploaded_file, $file, $error); $error = $this->has_error($uploaded_file, $file, $error);
if (!$error && $file->name) { if (!$error && $file->name && create_exdir($this->options['upload_dir']) >= 0) {
if ($file->name[0] === '.') { if ($file->name[0] === '.') {
$file->name = substr($file->name, 1); $file->name = substr($file->name, 1);
} }