X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/4e1394082f1446017534b9c3d423a35d483da6ab..0c5ed43f3956281166535f0283a77195af2ae59a:/page.php

diff --git a/page.php b/page.php
index e8023ff..1f86e5b 100644
--- a/page.php
+++ b/page.php
@@ -11,34 +11,75 @@ function getoutput($blocks = [])
 			preg_replace('{<!--[^-]*-->}', '', $html)
 		);
 	}
-	return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
+	$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), $doc);
 }
 
+# custom error handling
+
+define('DOCROOT', getcwd().'/');
+
 function fail($error)
 {
 	http_response_code(500);
 	include_once 'page.inc.php';
 	ob_start();
-	require_once './500.html';
+	require_once DOCROOT.'500.html';
 	print getoutput(['debug' => $error]);
 }
+
 set_exception_handler('fail');
+
+define('E_FATAL', E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR);
+
+set_error_handler(function ($level, $error, $file, $line) {
+	if ($level & E_FATAL) {
+		fail($error);
+		return;
+	}
+	return FALSE;
+});
+
 register_shutdown_function(function () {
 	# display failure page for fatal exceptions
 	$error = error_get_last();
-	if (!($error['type'] & (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR))) return;
+	if (!($error['type'] & E_FATAL)) return;
 	fail("Fatal: $error[message] in $error[file]:$error[line]");
 });
 
+error_reporting(error_reporting() & ~E_FATAL);
+
+# user login and control
+
 include_once 'auth.inc.php';
 $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 (empty($User)) {
+			http_response_code(303);
+			$target = urlencode($_SERVER['REQUEST_URI']);
+			header("Location: /login?goto=$target");
+			exit;
+		}
+		$PageAccess = $Page;
+	}
+
 	if (file_exists("$Page.php")) {
 		break;
 	}
@@ -58,14 +99,14 @@ 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")) {
+if (file_exists("$Page$Args.html")) {
 	$found = include "./$Page$Args.html";
 }
-elseif (isset($User) and $User['admin']) {
-	$found = require (file_exists("$Page/template.html") ? "$Page/template.html" : './template.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');
 }
 
 print "</div>\n\n";
@@ -84,7 +125,7 @@ if (!$found) {
 	# no resulting output
 	http_response_code(404);
 	ob_start();
-	require "./404.html";
+	@require "./404.html";
 	print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
 }