edit/page: editor notification of save results

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index c2dfd9f0ed6089d0f9171c16e8eb02c16fa62341..bb53a94a407306a04c99c13c3102a40562b2417c 100644 (file)
--- a/page.php
+++ b/page.php
@@ -23,7 +23,7 @@ function getoutput($blocks = [])
        }
 
        return preg_replace_callback(
-               '< \[\[ ([^]/]+) ([^]]*) \]\] >x',
+               '< \[\[ ([^] ]+) ([^]]*) \]\] >x',
                function ($sub) use ($blocks) {
                        list ($placeholder, $name, $params) = $sub;
                        if (isset($blocks[$name])) {
@@ -31,10 +31,26 @@ function getoutput($blocks = [])
                        }
                        elseif (file_exists("$name.php")) {
                                ob_start();
-                               $Page = $GLOBALS['Page'];
-                               $Args = $GLOBALS['Args'] . $params;
-                               include "$name.php";
-                               $html = ob_get_clean();
+                               $Page = $GLOBALS['Page'] . $GLOBALS['Args'];
+                               $Args = '';
+                               $Place = $GLOBALS['Place'];
+                               foreach (explode(' ', $params) as $param) {
+                                       if ($set = strpos($param, '=')) {
+                                               $Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
+                                       }
+                                       elseif (!empty($param)) {
+                                               $Args .= '/'.$param;
+                                       }
+                               }
+                               try {
+                                       include "$name.php";
+                                       $html = ob_get_clean();
+                               }
+                               catch (Exception $e) {
+                                       $html = sprintf('<strong class="warn">%s</strong>',
+                                               "fout in <em>$name</em>: {$e->getMessage()}"
+                                       );
+                               }
                        }
                        else {
                                $html = '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
@@ -50,14 +66,15 @@ function getoutput($blocks = [])
 
 # custom error handling
 
-define('DOCROOT', getcwd().'/');
+define('DOCROOT', getcwd());
+set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 
 function fail($error)
 {
        http_response_code(500);
        include_once 'page.inc.php';
        ob_start();
-       require_once DOCROOT.'500.html';
+       require_once '500.html';
        print getoutput(['debug' => $error]);
 }
 
@@ -137,21 +154,23 @@ print "</div>\n\n";
 
 # execute dynamic code
 
-$Place = [
-       'user'  => $User['name'],
-       'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
-];
+$Place = [];
 
 if ($Page) {
        $found |= require "./$Page/index.php";
 }
 
+$Place += [
+       'user'  => empty($User) ? '' : $User['name'],
+       'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
+];
+
 # global html
 
 if (!$found) {
        # no resulting output
        http_response_code(404);
-       @require "./404.html";
+       @require '404.html';
 }
 
 include_once 'page.inc.php';