login/pass: error messages below page title

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index f7c8f7d1b7841944154d0e99d5c1e3adaed90f44..30f0e3c59c2e645bd492b1b6f900b50d82a60f8c 100644 (file)
--- a/page.php
+++ b/page.php
@@ -16,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")) {
@@ -28,6 +26,10 @@ 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
@@ -35,10 +37,13 @@ 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');
        }
 }
 
@@ -46,21 +51,23 @@ 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');
 
 $Page->place += [
        'user'  => $User->login ?: '',
        'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];
 
-if ($User->admin("edit {$Page->link}")) {
+if ($Page->editable = $User->admin("edit {$Page->link}")) {
        include_once 'edit/head.inc.php';
 }
 
-if (isset($Page->raw)) {
+if (isset($Page->raw)
+and @$_SERVER['HTTP_ACCEPT'] !== 'application/xml') {
        $Page->raw = '<div class="static">'."\n\n".$Page->raw."</div>\n\n";
 }
 
@@ -69,7 +76,7 @@ if (isset($Page->raw)) {
 include_once 'format.inc.php';
 
 ob_start();
-if ($Page->handler and !require("./{$Page->handler}/index.php")) {
+if ($Page->handler and !$Page->index($Page->api)) {
        # replace contents by code output on false return
        $Page->raw = ob_get_clean();
 }
@@ -83,5 +90,11 @@ else {
        }
 }
 
-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();