edit: ignore html elements in sentence wrapping

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 856a08a55f15dec44e4fb486cb4643689d6d5574..8b264bf7e35e6512e6ac2b6cebc8bfeeafa97f43 100644 (file)
--- a/page.php
+++ b/page.php
@@ -2,12 +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';
        ob_start();
        require_once './500.html';
-       print str_replace('[[debug]]', $error, ob_get_clean());
+       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';
@@ -44,12 +52,27 @@ 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 (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]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
+                               is_numeric($name) ? '' : "[[$name]]",
+                               preg_replace('{<!--[^-]*-->}', '', $html)
+                       );
+               }
+               return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
+       }
+
        $found |= require "./$Page.php";
 }
 
@@ -59,15 +82,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";
-               $url = htmlspecialchars($_SERVER['REQUEST_URI']);
-               print str_replace('[[url]]', $url, ob_get_clean());
-       }
+       http_response_code(404);
+       ob_start();
+       require "./404.html";
+       print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
 }