X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/b9757db57858fdcff8af1a6566e299559e491b17..HEAD:/thumb/index.php

diff --git a/thumb/index.php b/thumb/index.php
index a6b5bd7..9232b33 100644
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -1,18 +1,28 @@
 <?php
-if (!$User) return;
-list ($size, $imgpath) = explode('/', ltrim($Page->path, '/'), 2);
+if ($Page->api) 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);
+$ext = ''; # explicit file type request
 
-if (!file_exists($imgpath)) {
+if (preg_match('/(.*)(\.jpg)$/', $imgpath, $imgpart) and file_exists($imgpart[1])) {
+	# source file without requested thumb extension
+	list (, $imgpath, $ext) = $imgpart;
+}
+elseif (!file_exists($imgpath)) {
 	http_response_code(404);
 	$imgpath = '404.png';
 	if (!file_exists($imgpath)) {
 		exit;
 	}
 }
+$target = "thumb/$size/$imgpath$ext";
 
 try {
-	$target = mkthumb($imgpath, $size);
+	mkthumb($imgpath, $size, $target);
 }
 catch (Throwable $e) {
 	http_response_code($e->getCode() ?: 500);
@@ -28,11 +38,12 @@ catch (Throwable $e) {
 }
 
 header('Cache-Control: max-age=2628000');
-header('Content-type: '.mime_content_type($target));
+header('Content-Type: '.mime_content_type($target));
+header('Content-Length: '.filesize($target));
 readfile($target);
 exit;
 
-function mkthumb($source, $size)
+function mkthumb($source, $size, $target)
 {
 	if (strpos($size, 'x') !== FALSE) {
 		list ($width, $height) = explode('x', $size);
@@ -46,7 +57,6 @@ function mkthumb($source, $size)
 	if (empty($width)) {
 		$width = $height * 4;
 	}
-	$target = "thumb/$size/$source";
 
 	if (isset($_GET['backend'])) {
 		$backend = $_GET['backend'];
@@ -95,7 +105,7 @@ function mkthumb_exec($source, $target, $width, $height)
 		'-interlace', 'plane', # progressive
 		'-strip', '-taint', # omit metadata
 		'-sampling-factor', '4:2:0', '-colorspace', 'sRGB', # half chroma
-		'-resize', "${width}x${height}",
+		'-resize', "${width}x${height}>",
 		'-quality', '85%',
 		$source, "jpg:$target"
 	]));