edit: store file uploads to data/$year/

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 1c029a99b9d352969f79dfff4561c4912c18e5e8..6623c8b39c2281de2038d4dc6ae7e43df58992db 100644 (file)
--- a/page.php
+++ b/page.php
@@ -14,25 +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_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']);
 
@@ -45,12 +62,12 @@ 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';
+                       http_response_code(303);
+                       $target = urlencode($_SERVER['REQUEST_URI']);
+                       header("Location: /login?goto=$target");
                        exit;
                }
+               $PageAccess = $Page;
        }
 
        if (file_exists("$Page.php")) {
@@ -87,7 +104,7 @@ print "</div>\n\n";
 # execute dynamic code
 
 if ($Page) {
-       $found |= @require "./$Page.php";
+       $found |= require "./$Page.php";
 }
 
 # global html