thumb: content-length http header

[minimedit.git] / thumb / index.php

diff --git a/thumb/index.php b/thumb/index.php
index 532499f6aa2f14f3cd2f4aea9dbd7481ae9feea5..ee6544c534ae4578e7abd9132deb432af0b8f1cd 100644 (file)
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -1,8 +1,10 @@
 <?php
-ob_clean();
-
-list ($height, $imgpath) = explode('/', ltrim($Args, '/'), 2);
-$width= 1000;
+if (!$User) return;
+$imgpath = ltrim($Page->path, '/');
+if (!preg_match('{^[0-9x]+/}', $imgpath)) {
+       return;
+}
+list ($size, $imgpath) = explode('/', $imgpath, 2);
 $imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
 
 if (!file_exists($imgpath)) {
@@ -14,13 +16,13 @@ if (!file_exists($imgpath)) {
 }
 
 try {
-       $target = mkthumb($imgpath, $width, $height);
+       $target = mkthumb($imgpath, $size);
 }
-catch (Exception $e) {
+catch (Throwable $e) {
        http_response_code($e->getCode() ?: 500);
+       header("X-Error: ".explode("\n", $e->getMessage())[0], FALSE);
        $target = '500.png';
        if (file_exists($target)) {
-               header("X-Error: ".$e->getMessage());
                header('Content-type: '.mime_content_type($target));
                readfile($target);
                exit;
@@ -29,19 +31,33 @@ catch (Exception $e) {
        exit;
 }
 
-header('Content-type: '.mime_content_type($target));
+header('Cache-Control: max-age=2628000');
+header('Content-Type: '.mime_content_type($target));
+header('Content-Length: '.filesize($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'];
        }
        elseif (file_exists($target)) {
-               return;
+               return $target;
        }
        elseif (extension_loaded('gd')) {
                $backend = 'gd';
@@ -77,10 +93,16 @@ function mkthumb_exec($source, $target, $width, $height)
        }
        $cmd = implode(' ', array_map('escapeshellarg', [
                'convert',
+               '-delete', '1--1', # static
                '-trim',
-               '-resize', "${width}x${height}",
-               '-quality', '90%',
-               $source, $target
+               '-background', 'white', '-layers', 'flatten', # opaque
+               '-auto-orient', # apply exif rotation
+               '-interlace', 'plane', # progressive
+               '-strip', '-taint', # omit metadata
+               '-sampling-factor', '4:2:0', '-colorspace', 'sRGB', # half chroma
+               '-resize', "${width}x${height}>",
+               '-quality', '85%',
+               $source, "jpg:$target"
        ]));
        $return = shell_exec("$cmd 2>&1");
        if ($return) {