From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 9 Jul 2018 18:13:07 +0000 (+0200)
Subject: thumb: optional width restriction in size parameter
X-Git-Tag: v3.5~14
X-Git-Url: http://git.shiar.net/minimedit.git/commitdiff_plain/e15f27487946afb29f3f846dd96edd1fb65e3f44

thumb: optional width restriction in size parameter

Support a width prefix (+x) in addition to or instead of height only.
Maximum WxH can be specified, or falls back to 4x the other resolution:
"100" is equivalent to "400x100", and "640x" will bound to "640x160".
---

diff --git a/thumb/index.php b/thumb/index.php
index d662b5f..2a8e303 100644
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -1,8 +1,7 @@
 <?php
 ob_clean();
 
-list ($height, $imgpath) = explode('/', ltrim($Args, '/'), 2);
-$width= 1000;
+list ($size, $imgpath) = explode('/', ltrim($Args, '/'), 2);
 $imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
 
 if (!file_exists($imgpath)) {
@@ -14,7 +13,7 @@ if (!file_exists($imgpath)) {
 }
 
 try {
-	$target = mkthumb($imgpath, $width, $height);
+	$target = mkthumb($imgpath, $size);
 }
 catch (Throwable $e) {
 	http_response_code($e->getCode() ?: 500);
@@ -33,9 +32,21 @@ header('Content-type: '.mime_content_type($target));
 readfile($target);
 exit;
 
-function mkthumb($source, $width, $height)
+function mkthumb($source, $size)
 {
-	$target = "thumb/$height/$source";
+	if (strpos($size, 'x') !== FALSE) {
+		list ($width, $height) = explode('x', $size);
+		if (empty($height)) {
+			$height = $width * 4;
+		}
+	}
+	else {
+		$height = $size;
+	}
+	if (empty($width)) {
+		$width = $height * 4;
+	}
+	$target = "thumb/$size/$source";
 
 	if (isset($_GET['backend'])) {
 		$backend = $_GET['backend'];