Skip to content
This repository was archived by the owner on May 25, 2023. It is now read-only.

Gracefully handle scaled version failure #2193

Merged
merged 2 commits into from
Apr 8, 2013
Merged

Gracefully handle scaled version failure #2193

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0d4edc
Test existance of image functions and log an error if they do not exist.
lmartelli Apr 5, 2013
e22f52c
Show error message if creation of scaled image version fails
lmartelli Apr 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions server/php/UploadHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,10 @@ protected function create_scaled_image($file_name, $version, $options) {
} else {
$new_file_path = $file_path;
}
if (!function_exists('getimagesize')) {
error_log('Function not found: getimagesize');
return false;
}
list($img_width, $img_height) = @getimagesize($file_path);
if (!$img_width || !$img_height) {
return false;
Expand All @@ -295,6 +299,11 @@ protected function create_scaled_image($file_name, $version, $options) {
}
return true;
}

if (!function_exists('imagecreatetruecolor')) {
error_log('Function not found: imagecreatetruecolor');
return false;
}
if (empty($options['crop'])) {
$new_width = $img_width * $scale;
$new_height = $img_height * $scale;
Expand Down Expand Up @@ -569,6 +578,7 @@ protected function handle_file_upload($uploaded_file, $name, $size, $type, $erro
$this->orient_image($file_path);
}
$file->url = $this->get_download_url($file->name);
$failed_versions = array();
foreach($this->options['image_versions'] as $version => $options) {
if ($this->create_scaled_image($file->name, $version, $options)) {
if (!empty($version)) {
Expand All @@ -579,8 +589,20 @@ protected function handle_file_upload($uploaded_file, $name, $size, $type, $erro
} else {
$file_size = $this->get_file_size($file_path, true);
}
} else {
$failed_versions[] = $version;
}
}
switch (count($failed_versions)) {
case 0:
break;
case 1:
$file->error = 'Failed to create scaled version: '.$failed_versions[0];
break;
default:
$file->error = 'Failed to create scaled versions: '.implode($failed_versions,', ');
break;
}
} else if (!$content_range && $this->options['discard_aborted_uploads']) {
unlink($file_path);
$file->error = 'abort';
Expand Down