X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/c7c13a51f9049afdd8d7be9a5f2129865642fbe7..33080d973223a1f322f2c1248bc896efe8b59dfc:/thumb/index.php

diff --git a/thumb/index.php b/thumb/index.php
index 28f3b9e..f7c36d9 100644
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -5,38 +5,57 @@ 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($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)
+{
 	@mkdir(dirname($target), 0777, TRUE);
+	return mkthumb_exec($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',
 		'-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;