X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/bb1eabd001954b5f9eb58b61f850a0cea111f87a..d6bf8fa992cc01adc311b2ba80f29d7af466c2f3:/page.php

diff --git a/page.php b/page.php
index 33a1f44..5e52985 100644
--- a/page.php
+++ b/page.php
@@ -8,6 +8,36 @@ function abort($body, $status = NULL) {
 	exit;
 }
 
+function placeholder_include($name, $params = [])
+{
+	$path = stream_resolve_include_path("widget/$name.php");
+	if (!file_exists($path)) {
+		return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
+	}
+
+	ob_start();
+	$Page = $GLOBALS['Page'] . $GLOBALS['Args'];
+	$Args = '';
+	$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;
+		}
+	}
+	try {
+		include "widget/$name.php";
+		return ob_get_clean();
+	}
+	catch (Exception $e) {
+		return sprintf('<strong class="warn">%s</strong>',
+			"fout in <em>$name</em>: {$e->getMessage()}"
+		);
+	}
+}
+
 function getoutput($blocks = [])
 {
 	$doc = ob_get_clean();
@@ -22,38 +52,20 @@ 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])) {
 				$html = $blocks[$name];
 			}
-			elseif (file_exists("$name.php")) {
-				ob_start();
-				$Page = $GLOBALS['Page'] . $GLOBALS['Args'];
-				$Args = '';
-				$Place = $GLOBALS['Place'];
-				foreach (explode(' ', $params) as $param) {
-					if ($set = strpos($param, '=')) {
-						$Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
-					}
-					elseif (!empty($param)) {
-						$Args .= '/'.$param;
-					}
-				}
-				try {
-					include "$name.php";
-					$html = ob_get_clean();
-				}
-				catch (Exception $e) {
-					$html = sprintf('<strong class="warn">%s</strong>',
-						"fout in <em>$name</em>: {$e->getMessage()}"
-					);
-				}
-			}
 			else {
-				$html = '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
+				$html = placeholder_include($name, explode(' ', $params));
 			}
 			return sprintf('<!--BLOCK:%s-->%s<!--/-->',
 				is_numeric($name) ? '' : $placeholder, # edit replacement
@@ -66,14 +78,15 @@ function getoutput($blocks = [])
 
 # custom error handling
 
-define('DOCROOT', getcwd().'/');
+define('DOCROOT', getcwd());
+set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 
 function fail($error)
 {
 	http_response_code(500);
 	include_once 'page.inc.php';
 	ob_start();
-	require_once DOCROOT.'500.html';
+	require_once '500.html';
 	print getoutput(['debug' => $error]);
 }
 
@@ -100,6 +113,7 @@ error_reporting(error_reporting() & ~E_FATAL);
 
 # user login and control
 
+$User = NULL;
 include_once 'auth.inc.php';
 $Edit = isset($_GET['edit']);
 
@@ -132,21 +146,36 @@ while (TRUE) {
 	}
 }
 
+$staticpage = NULL;
+if (file_exists("$Page$Args.html")) {
+	$staticpage = "$Page$Args.html";
+	if (is_link($staticpage)) {
+		$target = preg_replace('/\.html$/', '', readlink($staticpage));
+		header("HTTP/1.1 302 Shorthand");
+		header("Location: $target");
+		exit;
+	}
+}
+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');
+}
+
 # load static 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 (file_exists("$Page$Args.html")) {
-	$found = include "./$Page$Args.html";
-}
-elseif (file_exists("$Page$Args/index.html")) {
-	$found = include "./$Page$Args/index.html";
-}
-elseif (!empty($User['admin'])) {
-	$found = include (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
+if (isset($Article->raw)) {
+	print $Article->raw;
+	$found = 1;
 }
 
 print "</div>\n\n";
@@ -160,7 +189,7 @@ if ($Page) {
 }
 
 $Place += [
-	'user'  => empty($User) ? '' : $User['name'],
+	'user'  => $User ? $User->login : '',
 	'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];
 
@@ -169,7 +198,7 @@ $Place += [
 if (!$found) {
 	# no resulting output
 	http_response_code(404);
-	@require "./404.html";
+	@require '404.html';
 }
 
 include_once 'page.inc.php';