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/feed: header to allow js access from any domain
[minimedit.git]
/
thumb
/
index.php
diff --git
a/thumb/index.php
b/thumb/index.php
index d662b5ffa2f26a29cd4620f294e56c11fddaff40..d296fbf1560e0f4d339912fa7e9aa6f8c5f575b9 100644
(file)
--- a/
thumb/index.php
+++ b/
thumb/index.php
@@
-1,8
+1,5
@@
<?php
<?php
-ob_clean();
-
-list ($height, $imgpath) = explode('/', ltrim($Args, '/'), 2);
-$width= 1000;
+list ($size, $imgpath) = explode('/', ltrim($Args, '/'), 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)) {
@@
-14,13
+11,13
@@
if (!file_exists($imgpath)) {
}
try {
}
try {
- $target = mkthumb($imgpath, $
width, $height
);
+ $target = mkthumb($imgpath, $
size
);
}
catch (Throwable $e) {
http_response_code($e->getCode() ?: 500);
}
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)) {
$target = '500.png';
if (file_exists($target)) {
- header("X-Error: ".$e->getMessage());
header('Content-type: '.mime_content_type($target));
readfile($target);
exit;
header('Content-type: '.mime_content_type($target));
readfile($target);
exit;
@@
-29,13
+26,26
@@
catch (Throwable $e) {
exit;
}
exit;
}
+header('Cache-Control: max-age=2628000');
header('Content-type: '.mime_content_type($target));
readfile($target);
exit;
header('Content-type: '.mime_content_type($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'];
if (isset($_GET['backend'])) {
$backend = $_GET['backend'];
@@
-77,10
+87,15
@@
function mkthumb_exec($source, $target, $width, $height)
}
$cmd = implode(' ', array_map('escapeshellarg', [
'convert',
}
$cmd = implode(' ', array_map('escapeshellarg', [
'convert',
+ '-delete', '1--1', # static
'-trim',
'-trim',
+ '-background', 'white', '-layers', 'flatten', # opaque
+ '-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
%',
- $source,
$target
+ '-quality', '
85
%',
+ $source,
"jpg:$target"
]));
$return = shell_exec("$cmd 2>&1");
if ($return) {
]));
$return = shell_exec("$cmd 2>&1");
if ($return) {