X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/e82cf405761c0c188f5e675f47ada92bd641ab34..v3.2-15-gf08646f0f4:/thumb/index.php

diff --git a/thumb/index.php b/thumb/index.php
index 066e88d..2849bb5 100644
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -13,34 +13,36 @@ 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';
 	}
@@ -48,6 +50,7 @@ function mkthumb($source, $target, $width, $height)
 
 	@mkdir(dirname($target), 0777, TRUE);
 	$backend($source, $target, $width, $height);
+	return $target;
 }
 
 function mkthumb_exec($source, $target, $width, $height)