git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
widget/reply: formatting syntax for _italics_
[minimedit.git]
/
thumb
/
index.php
diff --git
a/thumb/index.php
b/thumb/index.php
index 5291047fc5fd422d93df89387141539f1999e066..9232b3332be5de1c33370705b4ea41e273b427d3 100644
(file)
--- a/
thumb/index.php
+++ b/
thumb/index.php
@@
-1,17
+1,28
@@
<?php
<?php
-list ($size, $imgpath) = explode('/', ltrim($Args, '/'), 2);
+if ($Page->api) 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);
$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;
}
}
http_response_code(404);
$imgpath = '404.png';
if (!file_exists($imgpath)) {
exit;
}
}
+$target = "thumb/$size/$imgpath$ext";
try {
try {
-
$target = mkthumb($imgpath, $size
);
+
mkthumb($imgpath, $size, $target
);
}
catch (Throwable $e) {
http_response_code($e->getCode() ?: 500);
}
catch (Throwable $e) {
http_response_code($e->getCode() ?: 500);
@@
-27,11
+38,12
@@
catch (Throwable $e) {
}
header('Cache-Control: max-age=2628000');
}
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;
readfile($target);
exit;
-function mkthumb($source, $size)
+function mkthumb($source, $size
, $target
)
{
if (strpos($size, 'x') !== FALSE) {
list ($width, $height) = explode('x', $size);
{
if (strpos($size, 'x') !== FALSE) {
list ($width, $height) = explode('x', $size);
@@
-45,7
+57,6
@@
function mkthumb($source, $size)
if (empty($width)) {
$width = $height * 4;
}
if (empty($width)) {
$width = $height * 4;
}
- $target = "thumb/$size/$source";
if (isset($_GET['backend'])) {
$backend = $_GET['backend'];
if (isset($_GET['backend'])) {
$backend = $_GET['backend'];
@@
-87,12
+98,15
@@
function mkthumb_exec($source, $target, $width, $height)
}
$cmd = implode(' ', array_map('escapeshellarg', [
'convert',
}
$cmd = implode(' ', array_map('escapeshellarg', [
'convert',
- '-delete', '1--1',
+ '-delete', '1--1',
# static
'-trim',
'-trim',
- '-background', 'white', '-layers', 'flatten',
+ '-background', 'white', '-layers', 'flatten', # opaque
+ '-auto-orient', # apply exif rotation
'-interlace', 'plane', # progressive
'-interlace', 'plane', # progressive
- '-resize', "${width}x${height}",
- '-quality', '90%',
+ '-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");
$source, "jpg:$target"
]));
$return = shell_exec("$cmd 2>&1");