thumb: ensure exception message in X-Error header

[minimedit.git] / thumb / index.php

diff --git a/thumb/index.php b/thumb/index.php
index 1d369488c927b78399d9a2e208559286a109c595..27a194ee51584f5840c42eff880207e02e6a42da 100644 (file)
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -1,8 +1,7 @@
 <?php
 ob_clean();
 
-list ($height, $imgpath) = explode('/', ltrim($Args, '/'), 2);
-$width= 1000;
+list ($size, $imgpath) = explode('/', ltrim($Args, '/'), 2);
 $imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
 
 if (!file_exists($imgpath)) {
@@ -14,13 +13,13 @@ if (!file_exists($imgpath)) {
 }
 
 try {
-       $target = mkthumb($imgpath, $width, $height);
+       $target = mkthumb($imgpath, $size);
 }
 catch (Throwable $e) {
        http_response_code($e->getCode() ?: 500);
+       header("X-Error: ".explode("\n", $e->getMessage())[0], FALSE);
        $target = '500.png';
        if (file_exists($target)) {
-               header("X-Error: ".$e->getMessage());
                header('Content-type: '.mime_content_type($target));
                readfile($target);
                exit;
@@ -33,15 +32,27 @@ header('Content-type: '.mime_content_type($target));
 readfile($target);
 exit;
 
-function mkthumb($source, $width, $height)
+function mkthumb($source, $size)
 {
-       $target = "thumb/$height/$source";
+       if (strpos($size, 'x') !== FALSE) {
+               list ($width, $height) = explode('x', $size);
+               if (empty($height)) {
+                       $height = $width * 4;
+               }
+       }
+       else {
+               $height = $size;
+       }
+       if (empty($width)) {
+               $width = $height * 4;
+       }
+       $target = "thumb/$size/$source";
 
        if (isset($_GET['backend'])) {
                $backend = $_GET['backend'];
        }
        elseif (file_exists($target)) {
-               return;
+               return $target;
        }
        elseif (extension_loaded('gd')) {
                $backend = 'gd';
@@ -80,7 +91,7 @@ function mkthumb_exec($source, $target, $width, $height)
                '-trim',
                '-resize', "${width}x${height}",
                '-quality', '90%',
-               $source, $target
+               $source, "jpg:$target"
        ]));
        $return = shell_exec("$cmd 2>&1");
        if ($return) {