page: silence php reporting of handled fatal errors

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 9e3388ee0757cc27a3d384066c74799d1f805ade..1c029a99b9d352969f79dfff4561c4912c18e5e8 100644 (file)
--- a/page.php
+++ b/page.php
@@ -2,6 +2,18 @@
 error_reporting(E_ALL);
 ini_set('display_errors', TRUE);
 
+function getoutput($blocks = [])
+{
+       $rep = [];
+       foreach ($blocks as $name => $html) {
+               $rep["[[$name]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
+                       is_numeric($name) ? '' : "[[$name]]",
+                       preg_replace('{<!--[^-]*-->}', '', $html)
+               );
+       }
+       return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
+}
+
 function fail($error)
 {
        http_response_code(500);
@@ -11,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']);
@@ -27,6 +42,17 @@ $Args = '';
 $Page = preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']);
 $Page = urldecode(trim($Page, '/')) ?: 'index';
 while (TRUE) {
+       if (file_exists("$Page/.private")) {
+               # access restriction
+               if (!isset($User)) {
+                       http_response_code(403);
+                       include_once 'page.inc.php';
+                       ob_start();
+                       @require_once './403.html';
+                       exit;
+               }
+       }
+
        if (file_exists("$Page.php")) {
                break;
        }
@@ -52,22 +78,16 @@ 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 = include (file_exists("$Page/template.html") ? "$Page/template.html" : './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";
+       $found |= @require "./$Page.php";
 }
 
 # global html
@@ -76,14 +96,9 @@ include_once 'page.inc.php';
 
 if (!$found) {
        # no resulting output
-       if (isset($User) and $User['admin']) {
-               require './template.html';
-       }
-       else {
-               http_response_code(404);
-               ob_start();
-               require "./404.html";
-               print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
-       }
+       http_response_code(404);
+       ob_start();
+       @require "./404.html";
+       print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
 }