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

diff --git a/page.php b/page.php
index e8023ff..6623c8b 100644
--- a/page.php
+++ b/page.php
@@ -14,22 +14,42 @@ function getoutput($blocks = [])
 	return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
 }
 
+# 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']);
 
@@ -39,6 +59,17 @@ $Args = '';
 $Page = preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']);
 $Page = urldecode(trim($Page, '/')) ?: 'index';
 while (TRUE) {
+	if (file_exists("$Page/.private")) {
+		# access restriction
+		if (!isset($User)) {
+			http_response_code(303);
+			$target = urlencode($_SERVER['REQUEST_URI']);
+			header("Location: /login?goto=$target");
+			exit;
+		}
+		$PageAccess = $Page;
+	}
+
 	if (file_exists("$Page.php")) {
 		break;
 	}
@@ -65,7 +96,7 @@ elseif (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');
+	$found = include (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
 }
 
 print "</div>\n\n";
@@ -84,7 +115,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']) ]);
 }