X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/bcf10b57432fab3081d2c5c95f210711adc8e60b..2884a2a2fd31342c4c2e37b569b2b89a0949995e:/page.php

diff --git a/page.php b/page.php
index 175c2eb..932e729 100644
--- a/page.php
+++ b/page.php
@@ -10,7 +10,7 @@ function abort($body, $status = NULL) {
 
 function placeholder_include($name, $params = [])
 {
-	$path = stream_resolve_include_path("$name.php");
+	$path = stream_resolve_include_path("widget/$name.php");
 	if (!file_exists($path)) {
 		return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
 	}
@@ -28,7 +28,7 @@ function placeholder_include($name, $params = [])
 		}
 	}
 	try {
-		include "$name.php";
+		include "widget/$name.php";
 		return ob_get_clean();
 	}
 	catch (Exception $e) {
@@ -52,8 +52,13 @@ 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);
+
 	return preg_replace_callback(
-		'< \[\[ ([^] ]+) ([^]]*) \]\] >x',
+		'{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }x',
 		function ($sub) use ($blocks) {
 			list ($placeholder, $name, $params) = $sub;
 			if (isset($blocks[$name])) {
@@ -79,9 +84,13 @@ set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 function fail($error)
 {
 	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';
+	require_once '500.inc.html';
 	print getoutput(['debug' => $error]);
 }
 
@@ -108,6 +117,7 @@ error_reporting(error_reporting() & ~E_FATAL);
 
 # user login and control
 
+$User = NULL;
 include_once 'auth.inc.php';
 $Edit = isset($_GET['edit']);
 
@@ -153,42 +163,46 @@ if (file_exists("$Page$Args.html")) {
 elseif (file_exists("$Page$Args/index.html")) {
 	$staticpage = "$Page$Args/index.html";
 }
-elseif (!empty($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
 
-ob_start(); # page body
-ob_start(); # inner html
-print '<div class="static">'."\n\n";
-
-$found = FALSE;
-if (isset($staticpage)) {
-	$found = include "./$staticpage";
-}
+require_once('article.inc.php');
+$Article = new ArchiveArticle($staticpage);
 
-print "</div>\n\n";
-
-# execute dynamic code
-
-$Place = [];
-
-if ($Page) {
-	$found |= require "./$Page/index.php";
-}
-
-$Place += [
-	'user'  => empty($User) ? '' : $User['name'],
+ob_start(); # page body
+$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';