thumb: decide on cache location in mkthumb()

[minimedit.git] / thumb / index.php

diff --git a/thumb/index.php b/thumb/index.php
index f7c36d9d0a6d776bde1a4ff3008b2f401958e770..2849bb50d59f689bfdc927a34ae0b1eb04938f34 100644 (file)
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -13,33 +13,44 @@ if (!file_exists($imgpath)) {
        }
 }
 
-$target = "thumb/$height/$imgpath";
-if (!file_exists($target)) {
-       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);
+try {
+       $target = mkthumb($imgpath, $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));
 readfile($target);
 exit;
 
-function mkthumb($source, $target, $width, $height)
+function mkthumb($source, $width, $height)
 {
+       $target = "thumb/$height/$source";
+
+       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);
+       return $target;
 }
 
 function mkthumb_exec($source, $target, $width, $height)