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.

diff --git a/article.inc.php b/article.inc.php
index f56b2bedd27439e40e001e2141fbbdf2e9d5ca80..9e920942c76b888bbf1da2cb5b8a8a0b06f70ceb 100644 (file)
--- 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 ee6544c534ae4578e7abd9132deb432af0b8f1cd..42e9362e41fb762085050fa62881a7c008699dea 100644 (file)
--- 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'];