X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/7333dc046075c7873b15643ecd73f6e3b32c7a79..b64b2d8c38c4f3f6754bfd66bd3533cb53e7bab8:/page.php?ds=sidebyside

diff --git a/page.php b/page.php
index cb201f2..3c0977e 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';
@@ -41,12 +52,24 @@ if (file_exists("$Page$Args/index.html")) {
 elseif (file_exists("$Page$Args.html")) {
 	$found = include "./$Page$Args.html";
 }
+elseif (isset($User) and $User['admin']) {
+	$found = require './template.html';
+}
 
 print "</div>\n\n";
 
 # execute dynamic code
 
 if ($Page) {
+	function getoutput($blocks = [])
+	{
+		$rep = [];
+		foreach ($blocks as $name => $html) {
+			$rep["[[$name]]"] = "<!--BLOCK $name-->$html<!--/-->";
+		}
+		return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
+	}
+
 	$found |= require "./$Page.php";
 }
 
@@ -56,11 +79,9 @@ include_once 'page.inc.php';
 
 if (!$found) {
 	# no resulting output
-	if (isset($User) and $User['admin']) {
-		require './template.html';
-	}
-	else {
-		require "./404.php";
-	}
+	http_response_code(404);
+	ob_start();
+	require "./404.html";
+	print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
 }