From: Mischa POSLAWSKY <perl@shiar.org>
Date: Thu, 5 Jul 2018 13:32:01 +0000 (+0200)
Subject: thumb: force reload with specified ?backend
X-Git-Tag: v3.3~12
X-Git-Url: http://git.shiar.net/minimedit.git/commitdiff_plain/9a24b86c2c7ddd574bf21ad86877c9c3bf0f229e

thumb: force reload with specified ?backend

Option indicates development, in which case cached results should be ignored
as well.
---

diff --git a/thumb/index.php b/thumb/index.php
index 066e88d..1267919 100644
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -14,22 +14,20 @@ if (!file_exists($imgpath)) {
 }
 
 $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);
+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));
@@ -41,6 +39,9 @@ function mkthumb($source, $target, $width, $height)
 	if (isset($_GET['backend'])) {
 		$backend = $_GET['backend'];
 	}
+	elseif (file_exists($target)) {
+		return;
+	}
 	else {
 		$backend = 'exec';
 	}