page: move showdate() into formatting include

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index ba5830692e0eeaf65705b962c866e57e5a8a2c59..f493c7fb04f8cca4619dedd1ba66b2985da9f334 100644 (file)
--- a/page.php
+++ b/page.php
@@ -2,60 +2,10 @@
 error_reporting(E_ALL);
 ini_set('display_errors', TRUE);
 
-function abort($body, $status = NULL) {
-       if ($status) header("HTTP/1.1 $status");
-       print "$body\n";
-       exit;
-}
-
-# custom error handling
-
 define('DOCROOT', getcwd());
 set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 
-function fail($error)
-{
-       global $User, $Page;
-       http_response_code(500);
-       if (!isset($Page)) {
-               require_once('article.inc.php');
-               $Page = new ArchiveArticle(NULL);
-               $Page->title = 'Fout';
-       }
-       include_once 'page.inc.php';
-
-       ob_start();
-       require '500.inc.html';
-       $Page->place['debug'] = htmlspecialchars($error);
-       $Page->raw = ob_get_clean();
-       print $Page->render();
-}
-
-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'; // sets global $User
-$Edit = isset($_GET['edit']);
+include_once 'error.inc.php';
 
 # setup requested page
 
@@ -78,6 +28,10 @@ elseif (file_exists("$request/index.html")) {
 require_once('article.inc.php');
 $Page = new ArchiveArticle($staticpage);
 
+# user login and control
+
+include_once 'auth.inc.php'; // sets global $User
+
 if ($Page->restricted) {
        # access restriction
        if (!$User->login) {
@@ -129,6 +83,8 @@ if (isset($Page->raw)) {
 
 # output dynamic and/or static html
 
+include_once 'format.inc.php';
+
 ob_start();
 if ($Page->handler and !require("./{$Page->handler}/index.php")) {
        # replace contents by code output on false return