git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nieuws: article index on sitemap request
[minimedit.git]
/
thumb
/
index.php
diff --git
a/thumb/index.php
b/thumb/index.php
index 5291047fc5fd422d93df89387141539f1999e066..a6b5bd7d66cce6d27560b120955a3fae695aaaa1 100644
(file)
--- a/
thumb/index.php
+++ b/
thumb/index.php
@@
-1,5
+1,6
@@
<?php
<?php
-list ($size, $imgpath) = explode('/', ltrim($Args, '/'), 2);
+if (!$User) return;
+list ($size, $imgpath) = explode('/', ltrim($Page->path, '/'), 2);
$imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
if (!file_exists($imgpath)) {
$imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
if (!file_exists($imgpath)) {
@@
-87,12
+88,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
+ '-strip', '-taint', # omit metadata
+ '-sampling-factor', '4:2:0', '-colorspace', 'sRGB', # half chroma
'-resize', "${width}x${height}",
'-resize', "${width}x${height}",
- '-quality', '
90
%',
+ '-quality', '
85
%',
$source, "jpg:$target"
]));
$return = shell_exec("$cmd 2>&1");
$source, "jpg:$target"
]));
$return = shell_exec("$cmd 2>&1");