From 714373870efc4f371ace2d324530a2354a696da7 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 29 Dec 2020 01:08:11 +0100
Subject: [PATCH] thumb: append .jpg extension to match file type

Rename example.png paths to example.png.jpg so its name corresponds to mime
type as warned by Dareboost.
---
 article.inc.php |  5 +++--
 thumb/index.php | 13 +++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/article.inc.php b/article.inc.php
index f56b2be..9e92094 100644
--- a/article.inc.php
+++ b/article.inc.php
@@ -165,8 +165,9 @@ class ArchiveArticle
 			return ltrim($this->image, '/');
 		}
 		return preg_replace(
-			['{^(?:/thumb/[^/]*)?}', '/\.groot(?=\.\w+$)/'], ["thumb/$size", ''],
-			$this->image
+			['{^(?:/thumb/[^/]*)?}', '/\.groot(?=\.\w+$)/', '/(?:\.jpg)?$/'],
+			[      "thumb/$size",    '',                         '.jpg'    ],
+			$this->image, 1
 		);
 	}
 
diff --git a/thumb/index.php b/thumb/index.php
index ee6544c..42e9362 100644
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -6,17 +6,23 @@ if (!preg_match('{^[0-9x]+/}', $imgpath)) {
 }
 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);
@@ -37,7 +43,7 @@ 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);
@@ -51,7 +57,6 @@ function mkthumb($source, $size)
 	if (empty($width)) {
 		$width = $height * 4;
 	}
-	$target = "thumb/$size/$source";
 
 	if (isset($_GET['backend'])) {
 		$backend = $_GET['backend'];
-- 
2.30.0