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

diff --git a/page.php b/page.php
index 8b264bf..02886a7 100644
--- a/page.php
+++ b/page.php
@@ -2,22 +2,54 @@
 error_reporting(E_ALL);
 ini_set('display_errors', TRUE);
 
+function getoutput($blocks = [])
+{
+	$rep = [];
+	foreach ($blocks as $name => $html) {
+		$rep["[[$name]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
+			is_numeric($name) ? '' : "[[$name]]",
+			preg_replace('{<!--[^-]*-->}', '', $html)
+		);
+	}
+	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']);
 
@@ -27,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(403);
+			include_once 'page.inc.php';
+			ob_start();
+			@require_once './403.html';
+			exit;
+		}
+	}
+
 	if (file_exists("$Page.php")) {
 		break;
 	}
@@ -53,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";
@@ -61,19 +104,7 @@ print "</div>\n\n";
 # execute dynamic code
 
 if ($Page) {
-	function getoutput($blocks = [])
-	{
-		$rep = [];
-		foreach ($blocks as $name => $html) {
-			$rep["[[$name]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
-				is_numeric($name) ? '' : "[[$name]]",
-				preg_replace('{<!--[^-]*-->}', '', $html)
-			);
-		}
-		return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
-	}
-
-	$found |= require "./$Page.php";
+	$found |= @require "./$Page.php";
 }
 
 # global html
@@ -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']) ]);
 }