X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/bc04734cdf01d9b2ac8a9b9558c4782e61086821..772961fd4e9be46ad340cad1e55ee5f28cc5b968:/page.php

diff --git a/page.php b/page.php
index dee5ee0..a469a9d 100644
--- a/page.php
+++ b/page.php
@@ -16,17 +16,19 @@ function placeholder_include($name, $params = [])
 	}
 
 	ob_start();
-	$Page = $GLOBALS['Page'] . $GLOBALS['Args'];
-	$Args = '';
+	$Page = clone $GLOBALS['Page'];
+	$Page->handler = $Page->handler . $Page->path; // .= with explicit getter
+	$Page->path = '';
 	$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;
+			$Page->path .= '/'.$param;
 		}
 	}
+	$Page->link .= $Page->path;
 	try {
 		include "widget/$name.php";
 		return ob_get_clean();
@@ -54,23 +56,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
 	);
@@ -83,11 +83,12 @@ set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 
 function fail($error)
 {
-	global $User, $Page, $Args;
+	global $User, $Page;
 	http_response_code(500);
-	if (!isset($Article)) {
-		$Article = new ArchiveArticle(NULL);
-		$Article->title = 'Fout';
+	if (!isset($Page)) {
+		require_once('article.inc.php');
+		$Page = new ArchiveArticle(NULL);
+		$Page->title = 'Fout';
 	}
 	include_once 'page.inc.php';
 	ob_start();
@@ -118,17 +119,15 @@ 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
 
-$Args = '';
-$Page = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']);
-$Page = urldecode(trim($Page, '/')) ?: 'index';
+$request = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']);
+$request = urldecode(trim($request, '/')) ?: 'index';
 
-$staticpage = "$Page.html";
+$staticpage = "$request.html";
 if (file_exists($staticpage)) {
 	if (is_link($staticpage)) {
 		$target = preg_replace('/\.html$/', '', readlink($staticpage));
@@ -137,21 +136,18 @@ if (file_exists($staticpage)) {
 		exit;
 	}
 }
-elseif (file_exists("$Page/index.html")) {
-	$staticpage = "$Page/index.html";
+elseif (file_exists("$request/index.html")) {
+	$staticpage = "$request/index.html";
 }
 
 require_once('article.inc.php');
-$Article = new ArchiveArticle($staticpage);
-
-$Page = $Article->handler;
-$Args = $Article->path;
+$Page = new ArchiveArticle($staticpage);
 
-if ($PageAccess = $Article->restricted) {
+if ($Page->restricted) {
 	# access restriction
-	if (empty($User)) {
+	if (!$User->login) {
 		http_response_code(303);
-		$target = urlencode($Article->link);
+		$target = urlencode($Page->link);
 		header("Location: /login?goto=$target");
 		exit;
 	}
@@ -162,39 +158,46 @@ if ($PageAccess = $Article->restricted) {
 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)) {
-	if ($User and $User->admin("edit $Page$Args")) {
+if (!isset($Page->raw) and $User->admin("edit {$Page->link}")) {
+	# open bottom template as initial contents
+	$template = 'template.inc.html';
+	if ($Page->handler and file_exists("{$Page->handler}/$template")) {
+		$template = "{$Page->handler}/$template";
+	}
+	$Page->raw($template);
+	$Page->meta['article:published_time'] = date('Y-m-d h:i:s O');
+	$Page->meta['article:author'] = '/' . $User->dir;
+}
+
+if (isset($Page->raw)) {
+	if ($User->admin("edit {$Page->link}")) {
 		# 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",
+		foreach (array_reverse($Page->meta) as $metaprop => $val) {
+			$Page->raw = sprintf(
+				'<meta property="%s" content="%s">'."\n",
 				$metaprop, $val
-			) . $Article->raw;
+			) . $Page->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";
+	$Page->raw = '<div class="static">'."\n\n".$Page->raw."</div>\n\n";
 }
 
 # output dynamic and/or static html
 
-if (!$Page or require("./$Page/index.php")) {
+if (!$Page->handler or require("./{$Page->handler}/index.php")) {
 	# static contents
-	if (isset($Article->raw)) {
-		print $Article->raw;
+	if (isset($Page->raw)) {
+		print $Page->raw;
 	}
 	else {
 		# no resulting output