X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/d25b72d1e59591449d5efeea4b4063d250ebb1a8..42d01534123ab54ae8d2ceee5fe9357605b5e637:/page.php

diff --git a/page.php b/page.php
index 9acacc2..4944467 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 str_replace('[[debug]]', $error, ob_get_clean());
+}
+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,43 @@ 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 '<div class="static">'."\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 "</div>\n\n";
 
-include_once 'page.inc.php'; # global html
+# execute dynamic code
 
-if (file_exists("$Page$Args/index.html")) {
-	$Args .= '/index';
+if ($Page) {
+	$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";
+		$url = htmlspecialchars($_SERVER['REQUEST_URI']);
+		print str_replace('[[url]]', $url, ob_get_clean());
 	}
 }
 
-# output prepared html
-
-print $prepend;
-
-print '<div class="static">'."\n\n";
-if (file_exists("$Page$Args.html")) {
-include "./$Page$Args.html"; # static contents
-}
-print "</div>\n\n";
-
-print $append;
-