page: catch triggered php errors

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 730f0156935ed9b522e371e509e3860ffc6da103..dc7f0128a609ef0b0178b9318faff1e62d7f693f 100644 (file)
--- a/page.php
+++ b/page.php
@@ -14,6 +14,8 @@ function getoutput($blocks = [])
        return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
 }
 
+# custom error handling
+
 function fail($error)
 {
        http_response_code(500);
@@ -22,14 +24,30 @@ function fail($error)
        require_once './500.html';
        print getoutput(['debug' => $error]);
 }
+
 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_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);
+
+# user login and control
+
 include_once 'auth.inc.php';
 $Edit = isset($_GET['edit']);
 
@@ -45,7 +63,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 +94,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 +102,7 @@ print "</div>\n\n";
 # execute dynamic code
 
 if ($Page) {
-       $found |= require "./$Page.php";
+       $found |= @require "./$Page.php";
 }
 
 # global html
@@ -95,7 +113,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']) ]);
 }