X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/ce54c0c57e9b32a56d24699a3a870fef4b25ddb7..1428caff970f73f026f1467c7741798ca7c9272c:/page.php

diff --git a/page.php b/page.php
index 8979e62..9c88e79 100644
--- a/page.php
+++ b/page.php
@@ -8,6 +8,36 @@ function abort($body, $status = NULL) {
 	exit;
 }
 
+function placeholder_include($name, $params = [])
+{
+	$path = stream_resolve_include_path("$name.php");
+	if (!file_exists($path)) {
+		return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
+	}
+
+	ob_start();
+	$Page = $GLOBALS['Page'] . $GLOBALS['Args'];
+	$Args = '';
+	$Place = $GLOBALS['Place'];
+	foreach ($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";
+		return ob_get_clean();
+	}
+	catch (Exception $e) {
+		return sprintf('<strong class="warn">%s</strong>',
+			"fout in <em>$name</em>: {$e->getMessage()}"
+		);
+	}
+}
+
 function getoutput($blocks = [])
 {
 	$doc = ob_get_clean();
@@ -23,37 +53,14 @@ function getoutput($blocks = [])
 	}
 
 	return preg_replace_callback(
-		'< \[\[ ([^] ]+) ([^]]*) \]\] >x',
+		'{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }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>';
+				$html = placeholder_include($name, explode(' ', $params));
 			}
 			return sprintf('<!--BLOCK:%s-->%s<!--/-->',
 				is_numeric($name) ? '' : $placeholder, # edit replacement