X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/85536cb70f85743054b6b3abfc36d05662e6878d..b0e06544a5299b3e77561f61544ff6a23094e3b1:/page.php

diff --git a/page.php b/page.php
index 2c3a68a..0707426 100644
--- a/page.php
+++ b/page.php
@@ -23,12 +23,35 @@ function getoutput($blocks = [])
 	}
 
 	return preg_replace_callback(
-		'< \[\[ ([^]]*) \]\] >x',
+		'< \[\[ ([^] ]+) ([^]]*) \]\] >x',
 		function ($sub) use ($blocks) {
-			list ($placeholder, $name) = $sub;
+			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>';
 			}
@@ -43,14 +66,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]);
 }
 
@@ -109,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
@@ -116,35 +157,31 @@ 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($staticpage)) {
+	$found = include "./$staticpage";
 }
 
 print "</div>\n\n";
 
 # execute dynamic code
 
-$Place = [
-	'user'  => $User['name'],
-	'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
-];
+$Place = [];
 
 if ($Page) {
 	$found |= require "./$Page/index.php";
 }
 
+$Place += [
+	'user'  => empty($User) ? '' : $User['name'],
+	'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
+];
+
 # global html
 
 if (!$found) {
 	# no resulting output
 	http_response_code(404);
-	@require "./404.html";
+	@require '404.html';
 }
 
 include_once 'page.inc.php';