X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/d25b72d1e59591449d5efeea4b4063d250ebb1a8..c1eb891eceb8be1f3621fda7f0e5a58875df4d3e:/page.php
diff --git a/page.php b/page.php
index 9acacc2..6d98863 100644
--- a/page.php
+++ b/page.php
@@ -2,9 +2,20 @@
error_reporting(E_ALL);
ini_set('display_errors', TRUE);
-set_exception_handler(function ($error) {
+function fail($error)
+{
+ http_response_code(500);
include_once 'page.inc.php';
- include_once '500.php';
+ ob_start();
+ require_once './500.html';
+ print getoutput(['debug' => $error]);
+}
+set_exception_handler('fail');
+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;
+ fail("Fatal: $error[message] in $error[file]:$error[line]");
});
include_once 'auth.inc.php';
@@ -28,44 +39,51 @@ while (TRUE) {
}
}
-# execute dynamic code
+# load static contents
-$prepend = $append = '';
-if ($Page) {
- require "./$Page.php";
- if (ob_get_level() > 1) $append = ob_get_clean();
- if (ob_get_level() > 0) $prepend = ob_get_clean();
+ob_start(); # page body
+ob_start(); # inner html
+print '
'."\n\n";
+
+$found = FALSE;
+if (file_exists("$Page$Args/index.html")) {
+ $found = include "./$Page$Args/index.html";
+}
+elseif (file_exists("$Page$Args.html")) {
+ $found = include "./$Page$Args.html";
}
-# prepare static contents
+print "
\n\n";
-include_once 'page.inc.php'; # global html
+# execute dynamic code
-if (file_exists("$Page$Args/index.html")) {
- $Args .= '/index';
+if ($Page) {
+ function getoutput($blocks = [])
+ {
+ $rep = [];
+ foreach ($blocks as $name => $html) {
+ $rep["[[$name]]"] = $html;
+ }
+ return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
+ }
+
+ $found |= require "./$Page.php";
}
-if (!$Page and !file_exists("$Page$Args.html")) {
- # include not found
- $Args = '';
+# global html
+
+include_once 'page.inc.php';
+
+if (!$found) {
+ # no resulting output
if (isset($User) and $User['admin']) {
- $Page = 'template';
+ require './template.html';
}
else {
- $Page = '404';
- require "./$Page.php";
+ http_response_code(404);
+ ob_start();
+ require "./404.html";
+ print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
}
}
-# output prepared html
-
-print $prepend;
-
-print ''."\n\n";
-if (file_exists("$Page$Args.html")) {
-include "./$Page$Args.html"; # static contents
-}
-print "
\n\n";
-
-print $append;
-