From f1c8b901b85c7ca981eab8e26f83d40b4b5fe97b Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 5 Dec 2020 08:56:52 +0100
Subject: [PATCH] page: move custom error handling to include

---
 error.inc.php | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 page.php      | 47 +----------------------------------------------
 2 files changed, 50 insertions(+), 46 deletions(-)
 create mode 100644 error.inc.php

diff --git a/error.inc.php b/error.inc.php
new file mode 100644
index 0000000..faa7190
--- /dev/null
+++ b/error.inc.php
@@ -0,0 +1,49 @@
+<?php
+# custom error handling for MinimEdit
+
+function abort($body, $status = NULL)
+{
+	if ($status) header("HTTP/1.1 $status");
+	print "$body\n";
+	exit;
+}
+
+function fail($error)
+{
+	global $User, $Page;
+	http_response_code(500);
+	if (!isset($Page)) {
+		require_once('article.inc.php');
+		$Page = new ArchiveArticle(NULL);
+		$Page->title = 'Fout';
+	}
+	include_once 'page.inc.php';
+
+	ob_start();
+	require '500.inc.html';
+	$Page->place['debug'] = htmlspecialchars($error);
+	$Page->raw = ob_get_clean();
+	print $Page->render();
+}
+
+set_exception_handler('fail');
+
+define('E_FATAL', E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR);
+
+set_error_handler(function ($level, $error, $file, $line) {
+	if ($level & E_FATAL) {
+		fail($error);
+		return;
+	}
+	return FALSE;
+});
+
+register_shutdown_function(function () {
+	# display failure page for fatal exceptions
+	$error = error_get_last();
+	if (!($error['type'] & E_FATAL)) return;
+	fail("Fatal: $error[message] in $error[file]:$error[line]");
+});
+
+error_reporting(error_reporting() & ~E_FATAL);
+
diff --git a/page.php b/page.php
index ba58306..71bc74a 100644
--- a/page.php
+++ b/page.php
@@ -2,55 +2,10 @@
 error_reporting(E_ALL);
 ini_set('display_errors', TRUE);
 
-function abort($body, $status = NULL) {
-	if ($status) header("HTTP/1.1 $status");
-	print "$body\n";
-	exit;
-}
-
-# custom error handling
-
 define('DOCROOT', getcwd());
 set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 
-function fail($error)
-{
-	global $User, $Page;
-	http_response_code(500);
-	if (!isset($Page)) {
-		require_once('article.inc.php');
-		$Page = new ArchiveArticle(NULL);
-		$Page->title = 'Fout';
-	}
-	include_once 'page.inc.php';
-
-	ob_start();
-	require '500.inc.html';
-	$Page->place['debug'] = htmlspecialchars($error);
-	$Page->raw = ob_get_clean();
-	print $Page->render();
-}
-
-set_exception_handler('fail');
-
-define('E_FATAL', E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR);
-
-set_error_handler(function ($level, $error, $file, $line) {
-	if ($level & E_FATAL) {
-		fail($error);
-		return;
-	}
-	return FALSE;
-});
-
-register_shutdown_function(function () {
-	# display failure page for fatal exceptions
-	$error = error_get_last();
-	if (!($error['type'] & E_FATAL)) return;
-	fail("Fatal: $error[message] in $error[file]:$error[line]");
-});
-
-error_reporting(error_reporting() & ~E_FATAL);
+include_once 'error.inc.php';
 
 # user login and control
 
-- 
2.30.0