X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/8302e2ddeac5e241ad3f8bfaea0dbdfd069f26ef..028bc424ac17a0e6c9f1c50149b9214dce27cd04:/page.php

diff --git a/page.php b/page.php
index edb074e..50e098a 100644
--- a/page.php
+++ b/page.php
@@ -2,16 +2,16 @@
 error_reporting(E_ALL);
 ini_set('display_errors', TRUE);
 
+function abort($body, $status = NULL) {
+	if ($status) header("HTTP/1.1 $status");
+	print "$body\n";
+	exit;
+}
+
 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>')) {
@@ -21,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
@@ -80,7 +112,7 @@ while (TRUE) {
 		$PageAccess = $Page;
 	}
 
-	if (file_exists("$Page.php")) {
+	if (file_exists("$Page/index.php")) {
 		break;
 	}
 
@@ -99,12 +131,12 @@ ob_start(); # inner html
 print '<div class="static">'."\n\n";
 
 $found = FALSE;
-if (file_exists("$Page$Args/index.html")) {
-	$found = include "./$Page$Args/index.html";
-}
-elseif (file_exists("$Page$Args.html")) {
+if (file_exists("$Page$Args.html")) {
 	$found = include "./$Page$Args.html";
 }
+elseif (file_exists("$Page$Args/index.html")) {
+	$found = include "./$Page$Args/index.html";
+}
 elseif (!empty($User['admin'])) {
 	$found = include (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
 }
@@ -113,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'  => 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']) ]);
 }
 
+include_once 'page.inc.php';
+