}
return preg_replace_callback(
- '< \[\[ ([^]/]+) ([^]]*) \]\] >x',
+ '< \[\[ ([^] ]+) ([^]]*) \]\] >x',
function ($sub) use ($blocks) {
list ($placeholder, $name, $params) = $sub;
if (isset($blocks[$name])) {
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();
}
# 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) {