page: reenclose template contents in static container

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index fb0c4ddcba96d7edd2b3cd28bbbd3f1ea75017fc..12e06900b22d1993f3aa2f0aaa8dd0ffff523a18 100644 (file)
--- a/page.php
+++ b/page.php
@@ -83,6 +83,7 @@ set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 
 function fail($error)
 {
+       global $User, $Page, $Args;
        http_response_code(500);
        if (!isset($Article)) {
                $Article = new ArchiveArticle(NULL);
@@ -121,38 +122,14 @@ $User = NULL;
 include_once 'auth.inc.php';
 $Edit = isset($_GET['edit']);
 
-# distinguish subpage Args from topmost Page script
+# setup requested page
 
 $Args = '';
 $Page = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']);
 $Page = urldecode(trim($Page, '/')) ?: 'index';
-while (TRUE) {
-       if (file_exists("$Page/.private")) {
-               # access restriction
-               if (empty($User)) {
-                       http_response_code(303);
-                       $target = urlencode($_SERVER['REQUEST_URI']);
-                       header("Location: /login?goto=$target");
-                       exit;
-               }
-               $PageAccess = $Page;
-       }
-
-       if (file_exists("$Page/index.php")) {
-               break;
-       }
-
-       $up = strrpos($Page, '/');
-       $Args = substr($Page, $up) . $Args;
-       $Page = substr($Page, 0, $up);
-       if ($up === FALSE) {
-               break;
-       }
-}
 
-$staticpage = NULL;
-if (file_exists("$Page$Args.html")) {
-       $staticpage = "$Page$Args.html";
+$staticpage = "$Page.html";
+if (file_exists($staticpage)) {
        if (is_link($staticpage)) {
                $target = preg_replace('/\.html$/', '', readlink($staticpage));
                header("HTTP/1.1 302 Shorthand");
@@ -160,18 +137,28 @@ if (file_exists("$Page$Args.html")) {
                exit;
        }
 }
-elseif (file_exists("$Page$Args/index.html")) {
-       $staticpage = "$Page$Args/index.html";
-}
-elseif ($User and $User->admin("edit $Page$Args")) {
-       $staticpage = (file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
+elseif (file_exists("$Page/index.html")) {
+       $staticpage = "$Page/index.html";
 }
 
-# prepare page contents
-
 require_once('article.inc.php');
 $Article = new ArchiveArticle($staticpage);
 
+$Page = $Article->handler;
+$Args = $Article->path;
+
+if ($PageAccess = $Article->restricted) {
+       # access restriction
+       if (empty($User)) {
+               http_response_code(303);
+               $target = urlencode($Article->link);
+               header("Location: /login?goto=$target");
+               exit;
+       }
+}
+
+# prepare page contents
+
 ob_start(); # page body
 $Place = [
        'user'  => $User ? $User->login : '',
@@ -188,6 +175,11 @@ if (isset($Article->raw)) {
                        ) . $Article->raw;
                }
        }
+}
+elseif ($User and $User->admin("edit {$Article->link}")) {
+       $Article->raw(file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
+}
+if (isset($Article->raw)) {
        $Article->raw = '<div class="static">'."\n\n".$Article->raw."</div>\n\n";
 }