X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/fa949c0747fa001c345a139abb9889a18ba2563a..85d01336fad3b3110a6bdb395593e29260714acc:/page.php

diff --git a/page.php b/page.php
index 1488f1c..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,6 +83,7 @@ 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);
@@ -90,8 +91,8 @@ function fail($error)
 	}
 	include_once 'page.inc.php';
 	ob_start();
-	require_once '500.inc.html';
-	print getoutput(['debug' => $error]);
+	require '500.inc.html';
+	print getoutput(['debug' => htmlspecialchars($error)]);
 }
 
 set_exception_handler('fail');
@@ -179,6 +180,15 @@ $Place = [
 ];
 
 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";
 }