X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/b06e0695bbf6a9710ed53eefb941134812a3ff27..212c5051484f6ee08b95f284c133337896c42f41:/page.php

diff --git a/page.php b/page.php
index 76a99b5..bb53a94 100644
--- 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,19 +21,60 @@ 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'] . $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>';
+			}
+			return sprintf('<!--BLOCK:%s-->%s<!--/-->',
+				is_numeric($name) ? '' : $placeholder, # edit replacement
+				preg_replace('{<!--[^-]*-->}', '', $html) # contents
+			);
+		},
+		$doc
+	);
 }
 
 # custom error handling
 
-define('DOCROOT', getcwd().'/');
+define('DOCROOT', getcwd());
+set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 
 function fail($error)
 {
 	http_response_code(500);
 	include_once 'page.inc.php';
 	ob_start();
-	require_once DOCROOT.'500.html';
+	require_once '500.html';
 	print getoutput(['debug' => $error]);
 }
 
@@ -86,7 +121,7 @@ while (TRUE) {
 		$PageAccess = $Page;
 	}
 
-	if (file_exists("$Page.php")) {
+	if (file_exists("$Page/index.php")) {
 		break;
 	}
 
@@ -119,19 +154,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']) ]);
+	@require '404.html';
 }
 
+include_once 'page.inc.php';
+