page: set placeholder after page script

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index c2dfd9f0ed6089d0f9171c16e8eb02c16fa62341..554735c69b53f9f0db275d5c6ea2fe6df80a4198 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])) {
@@ -32,7 +32,15 @@ function getoutput($blocks = [])
                        elseif (file_exists("$name.php")) {
                                ob_start();
                                $Page = $GLOBALS['Page'];
-                               $Args = $GLOBALS['Args'] . $params;
+                               $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();
                        }
@@ -137,15 +145,17 @@ 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'  => $User ? $User['name'] : '',
+       'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
+];
+
 # global html
 
 if (!$found) {