thumb: move imagemagick execution to separate function

[minimedit.git] / thumb / index.php

diff --git a/thumb/index.php b/thumb/index.php
index b49ca6ef47be6270f485de9509f1387a8fe6676a..66de10673a1dc4235f96f70a4b11b3769b70fbdd 100644 (file)
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -1,34 +1,56 @@
 <?php
 ob_clean();
 
-list ($height, $imgarg) = explode('/', ltrim($Args, '/'), 2);
+list ($height, $imgpath) = explode('/', ltrim($Args, '/'), 2);
 $width= 1000;
-$imgpath = "data/$imgarg";
+$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;
 }
 
-$target = preg_replace("{^data/}", "thumb/$height/", $imgpath, 1);
+$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);
+               exit;
+       }
+}
+
+header('Content-type: '.mime_content_type($target));
+readfile($target);
+exit;
+
+function mkthumb($source, $target, $width, $height)
+{
        @mkdir(dirname($target), 0777, TRUE);
+       return mkthumb_exec($source, $target, $width, $height);
+}
 
+function mkthumb_exec($source, $target, $width, $height)
+{
        $cmd = implode(' ', array_map('escapeshellarg', [
                'convert',
                '-trim',
                '-resize', "${width}x${height}",
                '-quality', '90%',
-               $imgpath, $target
+               $source, $target
        ]));
        $return = shell_exec("$cmd 2>&1");
        if ($return) {
-               http_response_code(500);
-               trigger_error("thumbnail creation failed: $return", E_USER_WARNING);
-               exit;
+               throw new Exception($return);
        }
 }
-
-header('Content-type: '.mime_content_type($target));
-readfile($target);
-exit;