page: prefer named template in parent directory

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 4120a01bd05b4d0a476fe88c5eebbecc51327e90..1f86e5b2c63fbff6d08a42be713ffba1491d028b 100644 (file)
--- a/page.php
+++ b/page.php
@@ -11,7 +11,17 @@ function getoutput($blocks = [])
                        preg_replace('{<!--[^-]*-->}', '', $html)
                );
        }
-       return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
+       $doc = ob_get_clean();
+       if (!empty($blocks['warn'])) {
+               $warn = '<p class="warn">[[warn]]</p>';
+               if ($offset = strpos($doc, '</h2>')) {
+                       $doc = substr_replace($doc, "\n\n".$warn, $offset + 5, 0);
+               }
+               else {
+                       $doc = $warn . "\n\n" . $doc;
+               }
+       }
+       return str_replace(array_keys($rep), array_values($rep), $doc);
 }
 
 # custom error handling
@@ -56,16 +66,15 @@ $Edit = isset($_GET['edit']);
 # distinguish subpage Args from topmost Page script
 
 $Args = '';
-$Page = preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']);
+$Page = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']);
 $Page = urldecode(trim($Page, '/')) ?: 'index';
 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';
+               if (empty($User)) {
+                       http_response_code(303);
+                       $target = urlencode($_SERVER['REQUEST_URI']);
+                       header("Location: /login?goto=$target");
                        exit;
                }
                $PageAccess = $Page;
@@ -90,13 +99,13 @@ ob_start(); # inner html
 print '<div class="static">'."\n\n";
 
 $found = FALSE;
-if (file_exists("$Page$Args/index.html")) {
-       $found = include "./$Page$Args/index.html";
-}
-elseif (file_exists("$Page$Args.html")) {
+if (file_exists("$Page$Args.html")) {
        $found = include "./$Page$Args.html";
 }
-elseif (isset($User) and $User['admin']) {
+elseif (file_exists("$Page$Args/index.html")) {
+       $found = include "./$Page$Args/index.html";
+}
+elseif (!empty($User['admin'])) {
        $found = include (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
 }