X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/7213175b8391e8f47f54096fada4fdc33d82b8a1..170f16e2dd3a643423ea3681bf4ea42d320e1cf4:/page.php

diff --git a/page.php b/page.php
index 5e52985..e23b3e2 100644
--- a/page.php
+++ b/page.php
@@ -55,7 +55,7 @@ function getoutput($blocks = [])
 	# keep either login or logout parts depending on user level
 	global $User;
 	$hideclass = empty($User) ? 'login' : 'logout';
-	$doc = preg_replace('{\s*<(p|li|span) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
+	$doc = preg_replace('{\s*<([a-z]+) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
 
 	return preg_replace_callback(
 		'{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }x',
@@ -83,11 +83,16 @@ set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 
 function fail($error)
 {
+	global $User, $Page, $Args;
 	http_response_code(500);
+	if (!isset($Article)) {
+		$Article = new ArchiveArticle(NULL);
+		$Article->title = 'Fout';
+	}
 	include_once 'page.inc.php';
 	ob_start();
-	require_once '500.html';
-	print getoutput(['debug' => $error]);
+	require '500.inc.html';
+	print getoutput(['debug' => htmlspecialchars($error)]);
 }
 
 set_exception_handler('fail');
@@ -159,46 +164,46 @@ if (file_exists("$Page$Args.html")) {
 elseif (file_exists("$Page$Args/index.html")) {
 	$staticpage = "$Page$Args/index.html";
 }
-elseif ($User and $User->admin) {
-	$staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
+elseif ($User and $User->admin("edit $Page$Args")) {
+	$staticpage = (file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
 }
 
-# load static contents
+# prepare page contents
 
 require_once('article.inc.php');
 $Article = new ArchiveArticle($staticpage);
 
 ob_start(); # page body
-ob_start(); # inner html
-print '<div class="static">'."\n\n";
-
-$found = FALSE;
-if (isset($Article->raw)) {
-	print $Article->raw;
-	$found = 1;
-}
-
-print "</div>\n\n";
-
-# execute dynamic code
-
-$Place = [];
-
-if ($Page) {
-	$found |= require "./$Page/index.php";
-}
-
-$Place += [
+$Place = [
 	'user'  => $User ? $User->login : '',
 	'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];
 
-# global html
+if (isset($Article->raw)) {
+	if ($User and $User->admin("edit $Page$Args")) {
+		# restore meta tags in static contents for editing
+		foreach (array_reverse($Article->meta) as $metaprop => $val) {
+			$Article->raw = sprintf(
+				'<meta property="%s" content="%s" />'."\n",
+				$metaprop, $val
+			) . $Article->raw;
+		}
+	}
+	$Article->raw = '<div class="static">'."\n\n".$Article->raw."</div>\n\n";
+}
+
+# output dynamic and/or static html
 
-if (!$found) {
-	# no resulting output
-	http_response_code(404);
-	@require '404.html';
+if (!$Page or require("./$Page/index.php")) {
+	# static contents
+	if (isset($Article->raw)) {
+		print $Article->raw;
+	}
+	else {
+		# no resulting output
+		http_response_code(404);
+		@require '404.inc.html';
+	}
 }
 
 include_once 'page.inc.php';