git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
thumb: show 404.png for missing requests
[minimedit.git]
/
thumb
/
index.php
diff --git
a/thumb/index.php
b/thumb/index.php
index 66de10673a1dc4235f96f70a4b11b3769b70fbdd..f7c36d9d0a6d776bde1a4ff3008b2f401958e770 100644
(file)
--- a/
thumb/index.php
+++ b/
thumb/index.php
@@
-5,17
+5,12
@@
list ($height, $imgpath) = explode('/', ltrim($Args, '/'), 2);
$width= 1000;
$imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
$width= 1000;
$imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
-if (!function_exists('popen')) {
- http_response_code(501);
- $target = '501.png';
- header('Content-type: '.mime_content_type($target));
- readfile($target);
- exit;
-}
-
if (!file_exists($imgpath)) {
http_response_code(404);
if (!file_exists($imgpath)) {
http_response_code(404);
- exit;
+ $imgpath = '404.png';
+ if (!file_exists($imgpath)) {
+ exit;
+ }
}
$target = "thumb/$height/$imgpath";
}
$target = "thumb/$height/$imgpath";
@@
-24,7
+19,14
@@
if (!file_exists($target)) {
mkthumb($imgpath, $target, $width, $height);
}
catch (Exception $e) {
mkthumb($imgpath, $target, $width, $height);
}
catch (Exception $e) {
- http_response_code(500);
+ http_response_code($e->getCode() ?: 500);
+ $target = '500.png';
+ if (file_exists($target)) {
+ header("X-Error: ".$e->getMessage());
+ header('Content-type: '.mime_content_type($target));
+ readfile($target);
+ exit;
+ }
trigger_error("thumbnail creation failed: ".$e->getMessage(), E_USER_WARNING);
exit;
}
trigger_error("thumbnail creation failed: ".$e->getMessage(), E_USER_WARNING);
exit;
}
@@
-42,6
+44,9
@@
function mkthumb($source, $target, $width, $height)
function mkthumb_exec($source, $target, $width, $height)
{
function mkthumb_exec($source, $target, $width, $height)
{
+ if (!function_exists('popen')) {
+ throw new Exception("exec disallowed on this server", 501);
+ }
$cmd = implode(' ', array_map('escapeshellarg', [
'convert',
'-trim',
$cmd = implode(' ', array_map('escapeshellarg', [
'convert',
'-trim',