login/edit: generic multi-values declaration

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 290a59670ba98955d69362f1b643105a2a72cd11..33a1f4440ed5469e3aee9e7be5c27913606053f2 100644 (file)
--- a/page.php
+++ b/page.php
@@ -23,12 +23,35 @@ function getoutput($blocks = [])
        }
 
        return preg_replace_callback(
-               '< \[\[ ([^]]*) \]\] >x',
+               '< \[\[ ([^] ]+) ([^]]*) \]\] >x',
                function ($sub) use ($blocks) {
-                       list ($placeholder, $name) = $sub;
+                       list ($placeholder, $name, $params) = $sub;
                        if (isset($blocks[$name])) {
                                $html = $blocks[$name];
                        }
+                       elseif (file_exists("$name.php")) {
+                               ob_start();
+                               $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>';
                        }
@@ -97,7 +120,7 @@ while (TRUE) {
                $PageAccess = $Page;
        }
 
-       if (file_exists("$Page.php")) {
+       if (file_exists("$Page/index.php")) {
                break;
        }
 
@@ -130,19 +153,24 @@ print "</div>\n\n";
 
 # execute dynamic code
 
+$Place = [];
+
 if ($Page) {
-       $found |= require "./$Page.php";
+       $found |= require "./$Page/index.php";
 }
 
-# global html
+$Place += [
+       'user'  => empty($User) ? '' : $User['name'],
+       'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
+];
 
-include_once 'page.inc.php';
+# global html
 
 if (!$found) {
        # no resulting output
        http_response_code(404);
-       ob_start();
        @require "./404.html";
-       print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
 }
 
+include_once 'page.inc.php';
+