From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 16 Jun 2018 13:32:49 +0000 (+0200)
Subject: thumb: prefix data path only for numeric roots
X-Git-Tag: v3.2~12
X-Git-Url: http://git.shiar.net/minimedit.git/commitdiff_plain/1c59746cd8e71b6150e2cb2914a640155ef66aeb

thumb: prefix data path only for numeric roots

Support other paths while retaining compatibility with /data-implied links.
---

diff --git a/thumb/index.php b/thumb/index.php
index b49ca6e..5327192 100644
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -1,16 +1,16 @@
 <?php
 ob_clean();
 
-list ($height, $imgarg) = explode('/', ltrim($Args, '/'), 2);
+list ($height, $imgpath) = explode('/', ltrim($Args, '/'), 2);
 $width= 1000;
-$imgpath = "data/$imgarg";
+$imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
 
 if (!file_exists($imgpath)) {
 	http_response_code(404);
 	exit;
 }
 
-$target = preg_replace("{^data/}", "thumb/$height/", $imgpath, 1);
+$target = "thumb/$height/$imgpath";
 if (!file_exists($target)) {
 	@mkdir(dirname($target), 0777, TRUE);