X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/e15f27487946afb29f3f846dd96edd1fb65e3f44..4486f69521f03fe56549394f13f7c529f57fa962:/thumb/index.php

diff --git a/thumb/index.php b/thumb/index.php
index 2a8e303..bd08d88 100644
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -1,7 +1,10 @@
 <?php
-ob_clean();
-
-list ($size, $imgpath) = explode('/', ltrim($Args, '/'), 2);
+if (!$User) return;
+$imgpath = ltrim($Page->path, '/');
+if (!preg_match('{^[0-9x]+/}', $imgpath)) {
+	return;
+}
+list ($size, $imgpath) = explode('/', $imgpath, 2);
 $imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
 
 if (!file_exists($imgpath)) {
@@ -17,9 +20,9 @@ try {
 }
 catch (Throwable $e) {
 	http_response_code($e->getCode() ?: 500);
+	header("X-Error: ".explode("\n", $e->getMessage())[0], FALSE);
 	$target = '500.png';
 	if (file_exists($target)) {
-		header("X-Error: ".$e->getMessage());
 		header('Content-type: '.mime_content_type($target));
 		readfile($target);
 		exit;
@@ -28,6 +31,7 @@ catch (Throwable $e) {
 	exit;
 }
 
+header('Cache-Control: max-age=2628000');
 header('Content-type: '.mime_content_type($target));
 readfile($target);
 exit;
@@ -88,10 +92,16 @@ function mkthumb_exec($source, $target, $width, $height)
 	}
 	$cmd = implode(' ', array_map('escapeshellarg', [
 		'convert',
+		'-delete', '1--1', # static
 		'-trim',
-		'-resize', "${width}x${height}",
-		'-quality', '90%',
-		$source, $target
+		'-background', 'white', '-layers', 'flatten', # opaque
+		'-auto-orient', # apply exif rotation
+		'-interlace', 'plane', # progressive
+		'-strip', '-taint', # omit metadata
+		'-sampling-factor', '4:2:0', '-colorspace', 'sRGB', # half chroma
+		'-resize', "${width}x${height}>",
+		'-quality', '85%',
+		$source, "jpg:$target"
 	]));
 	$return = shell_exec("$cmd 2>&1");
 	if ($return) {