page: prefer page template from script root

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 9e3388ee0757cc27a3d384066c74799d1f805ade..d0a8826a1106bff518009ed2da7c3303e00a786b 100644 (file)
--- a/page.php
+++ b/page.php
@@ -52,6 +52,9 @@ if (file_exists("$Page$Args/index.html")) {
 elseif (file_exists("$Page$Args.html")) {
        $found = include "./$Page$Args.html";
 }
+elseif (isset($User) and $User['admin']) {
+       $found = require (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
+}
 
 print "</div>\n\n";
 
@@ -62,7 +65,9 @@ if ($Page) {
        {
                $rep = [];
                foreach ($blocks as $name => $html) {
-                       $rep["[[$name]]"] = "<!--BLOCK $name-->$html<!--/-->";
+                       $rep["[[$name]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
+                               is_numeric($name) ? '' : "[[$name]]", $html
+                       );
                }
                return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
        }
@@ -76,14 +81,9 @@ include_once 'page.inc.php';
 
 if (!$found) {
        # no resulting output
-       if (isset($User) and $User['admin']) {
-               require './template.html';
-       }
-       else {
-               http_response_code(404);
-               ob_start();
-               require "./404.html";
-               print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
-       }
+       http_response_code(404);
+       ob_start();
+       require "./404.html";
+       print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
 }