X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/f3264dbe1629fb53f70d1284190fe4781b61d6e5..v3.4-14-g970fb1d1b9:/page.php

diff --git a/page.php b/page.php
index c2dfd9f..33a1f44 100644
--- 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>';
@@ -137,15 +153,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'  => empty($User) ? '' : $User['name'],
+	'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
+];
+
 # global html
 
 if (!$found) {