thumb: force reload with specified ?backend

[minimedit.git] / thumb / index.php

diff --git a/thumb/index.php b/thumb/index.php
index 66de10673a1dc4235f96f70a4b11b3769b70fbdd..1267919810daf320bbb9e00b9b9e2afd66d5674d 100644 (file)
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -5,29 +5,29 @@ list ($height, $imgpath) = explode('/', ltrim($Args, '/'), 2);
 $width= 1000;
 $imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
 
-if (!function_exists('popen')) {
-       http_response_code(501);
-       $target = '501.png';
-       header('Content-type: '.mime_content_type($target));
-       readfile($target);
-       exit;
-}
-
 if (!file_exists($imgpath)) {
        http_response_code(404);
-       exit;
+       $imgpath = '404.png';
+       if (!file_exists($imgpath)) {
+               exit;
+       }
 }
 
 $target = "thumb/$height/$imgpath";
-if (!file_exists($target)) {
-       try {
-               mkthumb($imgpath, $target, $width, $height);
-       }
-       catch (Exception $e) {
-               http_response_code(500);
-               trigger_error("thumbnail creation failed: ".$e->getMessage(), E_USER_WARNING);
+try {
+       mkthumb($imgpath, $target, $width, $height);
+}
+catch (Exception $e) {
+       http_response_code($e->getCode() ?: 500);
+       $target = '500.png';
+       if (file_exists($target)) {
+               header("X-Error: ".$e->getMessage());
+               header('Content-type: '.mime_content_type($target));
+               readfile($target);
                exit;
        }
+       trigger_error("thumbnail creation failed: ".$e->getMessage(), E_USER_WARNING);
+       exit;
 }
 
 header('Content-type: '.mime_content_type($target));
@@ -36,12 +36,26 @@ exit;
 
 function mkthumb($source, $target, $width, $height)
 {
+       if (isset($_GET['backend'])) {
+               $backend = $_GET['backend'];
+       }
+       elseif (file_exists($target)) {
+               return;
+       }
+       else {
+               $backend = 'exec';
+       }
+       $backend = "mkthumb_$backend";
+
        @mkdir(dirname($target), 0777, TRUE);
-       return mkthumb_exec($source, $target, $width, $height);
+       $backend($source, $target, $width, $height);
 }
 
 function mkthumb_exec($source, $target, $width, $height)
 {
+       if (!function_exists('popen')) {
+               throw new Exception("exec disallowed on this server", 501);
+       }
        $cmd = implode(' ', array_map('escapeshellarg', [
                'convert',
                '-trim',