login/pass: error messages below page title

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 5eefadb5c8870e13ad8eeb045dce849f1ff258c3..30f0e3c59c2e645bd492b1b6f900b50d82a60f8c 100644 (file)
--- a/page.php
+++ b/page.php
@@ -2,58 +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);
-       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
 
@@ -64,9 +16,7 @@ $staticpage = "$request.html";
 if (file_exists($staticpage)) {
        if (is_link($staticpage)) {
                $target = preg_replace('/\.html$/', '', readlink($staticpage));
-               header("HTTP/1.1 302 Shorthand");
-               header("Location: $target");
-               exit;
+               abort($target, '307 Shorthand');
        }
 }
 elseif (file_exists("$request/index.html")) {
@@ -76,13 +26,24 @@ elseif (file_exists("$request/index.html")) {
 require_once('article.inc.php');
 $Page = new ArchiveArticle($staticpage);
 
+if (@$_SERVER['HTTP_ACCEPT'] === 'text/plain') {
+       $Page->api = TRUE;
+}
+
+# user login and control
+
+include_once 'auth.inc.php'; // sets global $User
+
 if ($Page->restricted) {
        # access restriction
        if (!$User->login) {
-               http_response_code(303);
                $target = urlencode($Page->link);
-               header("Location: /login?goto=$target");
-               exit;
+               abort("/login?goto=$target", '303 Eerst inloggen');
+       }
+       elseif ($check = file_get_contents("{$Page->restricted}/.private")
+       and !$User->admin(trim($check))) {
+               http_response_code(403);
+               $Page->raw('403.inc.html');
        }
 }
 
@@ -90,54 +51,50 @@ if ($Page->restricted) {
 
 header(sprintf('Content-Security-Policy: %s', implode('; ', [
        "default-src 'self' 'unsafe-inline' http://cdn.ckeditor.com", # some overrides remain
-       "img-src 'self' data: http://cdn.ckeditor.com", # inline svg (in css)
+       "img-src 'self' data: blob: http://cdn.ckeditor.com", # inline svg (in css)
        "base-uri 'self'", # only local pages
        "frame-ancestors 'none'", # prevent malicious embedding
 ])));
+header('Referrer-Policy: no-referrer-when-downgrade');
 
-ob_start(); # page body
 $Page->place += [
        'user'  => $User->login ?: '',
        'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];
 
-if (!isset($Page->raw) and $User->admin("edit {$Page->link}")) {
-       # open bottom template as initial contents
-       $template = 'template.inc.html';
-       if ($Page->handler and file_exists("{$Page->handler}/$template")) {
-               $template = "{$Page->handler}/$template";
-       }
-       $Page->raw($template);
-       $Page->meta['article:published_time'] = date('Y-m-d h:i:s O');
-       $Page->meta['article:author'] = '/' . $User->dir;
+if ($Page->editable = $User->admin("edit {$Page->link}")) {
+       include_once 'edit/head.inc.php';
 }
 
-if (isset($Page->raw)) {
-       if ($User->admin("edit {$Page->link}")) {
-               # restore meta tags in static contents for editing
-               foreach (array_reverse($Page->meta) as $metaprop => $val) {
-                       $Page->raw = sprintf(
-                               '<meta property="%s" content="%s">'."\n",
-                               $metaprop, $val
-                       ) . $Page->raw;
-               }
-       }
+if (isset($Page->raw)
+and @$_SERVER['HTTP_ACCEPT'] !== 'application/xml') {
        $Page->raw = '<div class="static">'."\n\n".$Page->raw."</div>\n\n";
 }
 
 # output dynamic and/or static html
 
-if (!$Page->handler or require("./{$Page->handler}/index.php")) {
-       # static contents
-       if (isset($Page->raw)) {
-               print $Page->raw;
-       }
-       else {
+include_once 'format.inc.php';
+
+ob_start();
+if ($Page->handler and !$Page->index($Page->api)) {
+       # replace contents by code output on false return
+       $Page->raw = ob_get_clean();
+}
+else {
+       # keep article contents
+       if (!isset($Page->body)) {
                # no resulting output
                http_response_code(404);
                @require '404.inc.html';
+               $Page->raw = ob_get_clean() . $Page->raw;
        }
 }
 
-include_once 'page.inc.php';
+if (@$_SERVER['HTTP_ACCEPT'] === 'application/xml') {
+       header('Access-Control-Allow-Origin: *');
+}
+elseif (!$Page->api) {
+       include_once 'page.inc.php';
+}
+print $Page->render();