X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/b49b76d0bd617a2d155540cd099515f48255b50c..cef03a4a82864b3f3a99c52bc75bf895d18f9308:/page.php

diff --git a/page.php b/page.php
index 9e3388e..8b264bf 100644
--- a/page.php
+++ b/page.php
@@ -52,6 +52,9 @@ if (file_exists("$Page$Args/index.html")) {
 elseif (file_exists("$Page$Args.html")) {
 	$found = include "./$Page$Args.html";
 }
+elseif (isset($User) and $User['admin']) {
+	$found = require (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
+}
 
 print "</div>\n\n";
 
@@ -62,7 +65,10 @@ if ($Page) {
 	{
 		$rep = [];
 		foreach ($blocks as $name => $html) {
-			$rep["[[$name]]"] = "<!--BLOCK $name-->$html<!--/-->";
+			$rep["[[$name]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
+				is_numeric($name) ? '' : "[[$name]]",
+				preg_replace('{<!--[^-]*-->}', '', $html)
+			);
 		}
 		return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
 	}
@@ -76,14 +82,9 @@ include_once 'page.inc.php';
 
 if (!$found) {
 	# no resulting output
-	if (isset($User) and $User['admin']) {
-		require './template.html';
-	}
-	else {
-		http_response_code(404);
-		ob_start();
-		require "./404.html";
-		print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
-	}
+	http_response_code(404);
+	ob_start();
+	require "./404.html";
+	print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
 }