Skip to content
Snippets Groups Projects
Commit 42306f1e authored by Brice Maron's avatar Brice Maron
Browse files

Avoid error when no image is provided for cover or thumbnail

parent 9d46c378
No related branches found
No related tags found
No related merge requests found
......@@ -18,6 +18,7 @@ function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height, $tgtImg, $
default:
exit();
}
if(!$myImage) exit();
$ratio_orig = $width_orig/$height_orig;
if ($thumbnail_width/$thumbnail_height > $ratio_orig) {
......@@ -52,8 +53,11 @@ $targetImg = imagecreatetruecolor($numOfItems*$box_size, $box_size);
$counter = 0;
while (($i = $result->fetchRow()) && $counter < $numOfItems) {
$imagePath = OC::$CONFIG_DATADIRECTORY . $i['file_path'];
CroppedThumbnail($imagePath, $box_size, $box_size, $targetImg, $counter*$box_size);
$counter++;
if(file_exists($imagePath))
{
CroppedThumbnail($imagePath, $box_size, $box_size, $targetImg, $counter*$box_size);
$counter++;
}
}
header('Content-Type: image/png');
......
......@@ -21,6 +21,7 @@ function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height) { //$imgSr
default:
exit();
}
if(!$myImage) exit();
$ratio_orig = $width_orig/$height_orig;
if ($thumbnail_width/$thumbnail_height > $ratio_orig) {
......@@ -50,9 +51,10 @@ $img = $_GET['img'];
$tmp = OC::$CONFIG_DATADIRECTORY . $img;
header('Content-Type: image/png');
$image = CroppedThumbnail($tmp, $box_size, $box_size);
imagepng($image);
imagedestroy($image);
?>
if(file_exists($tmp))
{
header('Content-Type: image/png');
$image = CroppedThumbnail($tmp, $box_size, $box_size);
imagepng($image);
imagedestroy($image);
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment