thumb: content-length http header

[minimedit.git] / thumb / index.php

diff --git a/thumb/index.php b/thumb/index.php
index fbea220b2bf7d48f5b0ae556862063c30271a816..ee6544c534ae4578e7abd9132deb432af0b8f1cd 100644 (file)
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -1,5 +1,10 @@
 <?php
-list ($size, $imgpath) = explode('/', ltrim($Args, '/'), 2);
+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)) {
@@ -27,7 +32,8 @@ catch (Throwable $e) {
 }
 
 header('Cache-Control: max-age=2628000');
-header('Content-type: '.mime_content_type($target));
+header('Content-Type: '.mime_content_type($target));
+header('Content-Length: '.filesize($target));
 readfile($target);
 exit;
 
@@ -87,11 +93,15 @@ function mkthumb_exec($source, $target, $width, $height)
        }
        $cmd = implode(' ', array_map('escapeshellarg', [
                'convert',
-               '-delete', '1--1',
+               '-delete', '1--1', # static
                '-trim',
-               '-background', 'white', '-layers', 'flatten',
-               '-resize', "${width}x${height}",
-               '-quality', '90%',
+               '-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");