From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 16 Sep 2017 14:14:41 +0000 (+0200)
Subject: page: silence php reporting of handled fatal errors
X-Git-Tag: v2.2~6
X-Git-Url: http://git.shiar.net/minimedit.git/commitdiff_plain/96baae31f1f6b3091877a4bbd5559fddd1e1141f

page: silence php reporting of handled fatal errors

Prevent duplicate output.
---

diff --git a/page.php b/page.php
index 730f015..1c029a9 100644
--- a/page.php
+++ b/page.php
@@ -23,12 +23,15 @@ function fail($error)
 	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();
-	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]");
 });
+error_reporting(error_reporting() & ~E_FATAL);
 
 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();
-			require_once './403.html';
+			@require_once './403.html';
 			exit;
 		}
 	}
@@ -76,7 +79,7 @@ elseif (file_exists("$Page$Args.html")) {
 	$found = include "./$Page$Args.html";
 }
 elseif (isset($User) and $User['admin']) {
-	$found = require (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
+	$found = include (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
 }
 
 print "</div>\n\n";
@@ -84,7 +87,7 @@ print "</div>\n\n";
 # execute dynamic code
 
 if ($Page) {
-	$found |= require "./$Page.php";
+	$found |= @require "./$Page.php";
 }
 
 # global html
@@ -95,7 +98,7 @@ if (!$found) {
 	# no resulting output
 	http_response_code(404);
 	ob_start();
-	require "./404.html";
+	@require "./404.html";
 	print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
 }