page: set placeholder after page script

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 76a99b5b8aa5ede7689faa37d1e0f68b895b816e..554735c69b53f9f0db275d5c6ea2fe6df80a4198 100644 (file)
--- a/page.php
+++ b/page.php
@@ -10,14 +10,8 @@ function abort($body, $status = NULL) {
 
 function getoutput($blocks = [])
 {
-       $rep = [];
-       foreach ($blocks as $name => $html) {
-               $rep["[[$name]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
-                       is_numeric($name) ? '' : "[[$name]]",
-                       preg_replace('{<!--[^-]*-->}', '', $html)
-               );
-       }
        $doc = ob_get_clean();
+
        if (!empty($blocks['warn'])) {
                $warn = '<p class="warn">[[warn]]</p>';
                if ($offset = strpos($doc, '</h2>')) {
@@ -27,7 +21,39 @@ function getoutput($blocks = [])
                        $doc = $warn . "\n\n" . $doc;
                }
        }
-       return str_replace(array_keys($rep), array_values($rep), $doc);
+
+       return preg_replace_callback(
+               '< \[\[ ([^] ]+) ([^]]*) \]\] >x',
+               function ($sub) use ($blocks) {
+                       list ($placeholder, $name, $params) = $sub;
+                       if (isset($blocks[$name])) {
+                               $html = $blocks[$name];
+                       }
+                       elseif (file_exists("$name.php")) {
+                               ob_start();
+                               $Page = $GLOBALS['Page'];
+                               $Args = $GLOBALS['Args'];
+                               foreach (explode(' ', $params) as $param) {
+                                       if ($set = strpos($param, '=')) {
+                                               $_GET[ substr($param, 0, $set) ] = substr($param, $set + 1);
+                                       }
+                                       elseif (!empty($param)) {
+                                               $Args .= '/'.$param;
+                                       }
+                               }
+                               include "$name.php";
+                               $html = ob_get_clean();
+                       }
+                       else {
+                               $html = '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
+                       }
+                       return sprintf('<!--BLOCK:%s-->%s<!--/-->',
+                               is_numeric($name) ? '' : $placeholder, # edit replacement
+                               preg_replace('{<!--[^-]*-->}', '', $html) # contents
+                       );
+               },
+               $doc
+       );
 }
 
 # custom error handling
@@ -86,7 +112,7 @@ while (TRUE) {
                $PageAccess = $Page;
        }
 
-       if (file_exists("$Page.php")) {
+       if (file_exists("$Page/index.php")) {
                break;
        }
 
@@ -119,19 +145,24 @@ print "</div>\n\n";
 
 # execute dynamic code
 
+$Place = [];
+
 if ($Page) {
-       $found |= require "./$Page.php";
+       $found |= require "./$Page/index.php";
 }
 
-# global html
+$Place += [
+       'user'  => $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';
+