X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/d8990050a9613532c92b86ad86bfbc58a9c2e5c9..e48e424157d44fe42b1b448920d4b24424424ae2:/page.php

diff --git a/page.php b/page.php
index 02886a7..0707426 100644
--- a/page.php
+++ b/page.php
@@ -2,28 +2,79 @@
 error_reporting(E_ALL);
 ini_set('display_errors', TRUE);
 
+function abort($body, $status = NULL) {
+	if ($status) header("HTTP/1.1 $status");
+	print "$body\n";
+	exit;
+}
+
 function getoutput($blocks = [])
 {
-	$rep = [];
-	foreach ($blocks as $name => $html) {
-		$rep["[[$name]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
-			is_numeric($name) ? '' : "[[$name]]",
-			preg_replace('{<!--[^-]*-->}', '', $html)
-		);
+	$doc = ob_get_clean();
+
+	if (!empty($blocks['warn'])) {
+		$warn = '<p class="warn">[[warn]]</p>';
+		if ($offset = strpos($doc, '</h2>')) {
+			$doc = substr_replace($doc, "\n\n".$warn, $offset + 5, 0);
+		}
+		else {
+			$doc = $warn . "\n\n" . $doc;
+		}
 	}
-	return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
+
+	return preg_replace_callback(
+		'< \[\[ ([^] ]+) ([^]]*) \]\] >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>';
+			}
+			return sprintf('<!--BLOCK:%s-->%s<!--/-->',
+				is_numeric($name) ? '' : $placeholder, # edit replacement
+				preg_replace('{<!--[^-]*-->}', '', $html) # contents
+			);
+		},
+		$doc
+	);
 }
 
 # 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]);
 }
 
@@ -56,21 +107,21 @@ $Edit = isset($_GET['edit']);
 # distinguish subpage Args from topmost Page script
 
 $Args = '';
-$Page = preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']);
+$Page = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']);
 $Page = urldecode(trim($Page, '/')) ?: 'index';
 while (TRUE) {
 	if (file_exists("$Page/.private")) {
 		# access restriction
-		if (!isset($User)) {
-			http_response_code(403);
-			include_once 'page.inc.php';
-			ob_start();
-			@require_once './403.html';
+		if (empty($User)) {
+			http_response_code(303);
+			$target = urlencode($_SERVER['REQUEST_URI']);
+			header("Location: /login?goto=$target");
 			exit;
 		}
+		$PageAccess = $Page;
 	}
 
-	if (file_exists("$Page.php")) {
+	if (file_exists("$Page/index.php")) {
 		break;
 	}
 
@@ -82,6 +133,23 @@ while (TRUE) {
 	}
 }
 
+$staticpage = NULL;
+if (file_exists("$Page$Args.html")) {
+	$staticpage = "$Page$Args.html";
+	if (is_link($staticpage)) {
+		$target = 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 (!empty($User['admin'])) {
+	$staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
+}
+
 # load static contents
 
 ob_start(); # page body
@@ -89,33 +157,32 @@ ob_start(); # inner html
 print '<div class="static">'."\n\n";
 
 $found = FALSE;
-if (file_exists("$Page$Args/index.html")) {
-	$found = include "./$Page$Args/index.html";
-}
-elseif (file_exists("$Page$Args.html")) {
-	$found = include "./$Page$Args.html";
-}
-elseif (isset($User) and $User['admin']) {
-	$found = include (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
+if (isset($staticpage)) {
+	$found = include "./$staticpage";
 }
 
 print "</div>\n\n";
 
 # execute dynamic code
 
+$Place = [];
+
 if ($Page) {
-	$found |= @require "./$Page.php";
+	$found |= require "./$Page/index.php";
 }
 
-# global html
+$Place += [
+	'user'  => empty($User) ? '' : $User['name'],
+	'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
+];
 
-include_once 'page.inc.php';
+# global html
 
 if (!$found) {
 	# no resulting output
 	http_response_code(404);
-	ob_start();
-	@require "./404.html";
-	print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
+	@require '404.html';
 }
 
+include_once 'page.inc.php';
+