X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/f8288b710e1090d88dcacb0fa28823cdbe14072a..4486f69521f03fe56549394f13f7c529f57fa962:/thumb/index.php diff --git a/thumb/index.php b/thumb/index.php index 27a194e..bd08d88 100644 --- a/thumb/index.php +++ b/thumb/index.php @@ -1,7 +1,10 @@ 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)) { @@ -28,6 +31,7 @@ catch (Throwable $e) { exit; } +header('Cache-Control: max-age=2628000'); header('Content-type: '.mime_content_type($target)); readfile($target); exit; @@ -88,9 +92,15 @@ function mkthumb_exec($source, $target, $width, $height) } $cmd = implode(' ', array_map('escapeshellarg', [ 'convert', + '-delete', '1--1', # static '-trim', - '-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");