git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
page: silence php reporting of handled fatal errors
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index 730f0156935ed9b522e371e509e3860ffc6da103..1c029a99b9d352969f79dfff4561c4912c18e5e8 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-23,12
+23,15
@@
function fail($error)
print getoutput(['debug' => $error]);
}
set_exception_handler('fail');
print getoutput(['debug' => $error]);
}
set_exception_handler('fail');
+
+define('E_FATAL', E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR);
register_shutdown_function(function () {
# display failure page for fatal exceptions
$error = error_get_last();
register_shutdown_function(function () {
# display failure page for fatal exceptions
$error = error_get_last();
- if (!($error['type'] &
(E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR)
)) return;
+ if (!($error['type'] &
E_FATAL
)) return;
fail("Fatal: $error[message] in $error[file]:$error[line]");
});
fail("Fatal: $error[message] in $error[file]:$error[line]");
});
+error_reporting(error_reporting() & ~E_FATAL);
include_once 'auth.inc.php';
$Edit = isset($_GET['edit']);
include_once 'auth.inc.php';
$Edit = isset($_GET['edit']);
@@
-45,7
+48,7
@@
while (TRUE) {
http_response_code(403);
include_once 'page.inc.php';
ob_start();
http_response_code(403);
include_once 'page.inc.php';
ob_start();
- require_once './403.html';
+
@
require_once './403.html';
exit;
}
}
exit;
}
}
@@
-76,7
+79,7
@@
elseif (file_exists("$Page$Args.html")) {
$found = include "./$Page$Args.html";
}
elseif (isset($User) and $User['admin']) {
$found = include "./$Page$Args.html";
}
elseif (isset($User) and $User['admin']) {
- $found =
requir
e (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
+ $found =
includ
e (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
}
print "</div>\n\n";
}
print "</div>\n\n";
@@
-84,7
+87,7
@@
print "</div>\n\n";
# execute dynamic code
if ($Page) {
# execute dynamic code
if ($Page) {
- $found |= require "./$Page.php";
+ $found |=
@
require "./$Page.php";
}
# global html
}
# global html
@@
-95,7
+98,7
@@
if (!$found) {
# no resulting output
http_response_code(404);
ob_start();
# no resulting output
http_response_code(404);
ob_start();
- require "./404.html";
+
@
require "./404.html";
print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
}
print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
}