X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/63c023f45bfa532dcc54b292906c150c10331e9e..5638a5a96b13b91c26f35ac1d860a2c5305e47e9:/page.php

diff --git a/page.php b/page.php
index 3dd8cba..5aac31f 100644
--- a/page.php
+++ b/page.php
@@ -54,23 +54,21 @@ function getoutput($blocks = [])
 
 	# keep either login or logout parts depending on user level
 	global $User;
-	$hideclass = empty($User) ? 'login' : 'logout';
+	$hideclass = $User && property_exists($User, 'login') && $User->login ? 'logout' : 'login';
 	$doc = preg_replace('{\s*<([a-z]+) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
 
 	return preg_replace_callback(
-		'{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }x',
+		'{ \[\[ ([^] ]+) ([^]]*) \]\] }x',
 		function ($sub) use ($blocks) {
 			list ($placeholder, $name, $params) = $sub;
-			if (isset($blocks[$name])) {
-				$html = $blocks[$name];
+			$html = $blocks[$name] ??
+				placeholder_include($name, explode(' ', $params));
+			if (empty($html) or $html[0] != '<') {
+				$html = "<span>$html</span>";
 			}
-			else {
-				$html = placeholder_include($name, explode(' ', $params));
-			}
-			return sprintf('<!--BLOCK:%s-->%s<!--/-->',
-				is_numeric($name) ? '' : $placeholder, # edit replacement
-				preg_replace('{<!--[^-]*-->}', '', $html) # contents
-			);
+			$attr = sprintf(' data-dyn="%s"', is_numeric($name) ? '' : $name.$params);
+			# contents with identifier in first tag
+			return preg_replace( '/(?=>)/', $attr, $html, 1);
 		},
 		$doc
 	);
@@ -86,6 +84,7 @@ function fail($error)
 	global $User, $Page, $Args;
 	http_response_code(500);
 	if (!isset($Article)) {
+		require_once('article.inc.php');
 		$Article = new ArchiveArticle(NULL);
 		$Article->title = 'Fout';
 	}
@@ -118,8 +117,7 @@ error_reporting(error_reporting() & ~E_FATAL);
 
 # user login and control
 
-$User = NULL;
-include_once 'auth.inc.php';
+include_once 'auth.inc.php'; // sets global $User
 $Edit = isset($_GET['edit']);
 
 # setup requested page
@@ -149,7 +147,7 @@ $Args = $Article->path;
 
 if ($PageAccess = $Article->restricted) {
 	# access restriction
-	if (empty($User)) {
+	if (!$User->login) {
 		http_response_code(303);
 		$target = urlencode($Article->link);
 		header("Location: /login?goto=$target");
@@ -159,29 +157,34 @@ if ($PageAccess = $Article->restricted) {
 
 # prepare page contents
 
-header("Content-Security-Policy: frame-ancestors 'none'");
+header(sprintf('Content-Security-Policy: %s', implode('; ', [
+	"default-src 'self' 'unsafe-inline' http://cdn.ckeditor.com", # some overrides remain
+	"img-src 'self' data: http://cdn.ckeditor.com", # inline svg (in css)
+	"base-uri 'self'", # only local pages
+	"frame-ancestors 'none'", # prevent malicious embedding
+])));
 
 ob_start(); # page body
 $Place = [
-	'user'  => $User ? $User->login : '',
+	'user'  => $User->login ?: '',
 	'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];
 
+if (!isset($Article->raw) and $User->admin("edit {$Article->link}")) {
+	# open template as initial contents
+	$Article->raw(file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
+}
+
 if (isset($Article->raw)) {
-	if ($User and $User->admin("edit $Page$Args")) {
+	if ($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",
+				'<meta property="%s" content="%s">'."\n",
 				$metaprop, $val
 			) . $Article->raw;
 		}
 	}
-}
-elseif ($User and $User->admin("edit {$Article->link}")) {
-	$Article->raw(file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
-}
-if (isset($Article->raw)) {
 	$Article->raw = '<div class="static">'."\n\n".$Article->raw."</div>\n\n";
 }