page: apply placeholder replacement to all page output

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 290a59670ba98955d69362f1b643105a2a72cd11..2c3a68ae4e172c86524bbe91004c551bec0794b3 100644 (file)
--- a/page.php
+++ b/page.php
@@ -97,7 +97,7 @@ while (TRUE) {
                $PageAccess = $Page;
        }
 
-       if (file_exists("$Page.php")) {
+       if (file_exists("$Page/index.php")) {
                break;
        }
 
@@ -130,19 +130,22 @@ print "</div>\n\n";
 
 # execute dynamic code
 
+$Place = [
+       'user'  => $User['name'],
+       'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
+];
+
 if ($Page) {
-       $found |= require "./$Page.php";
+       $found |= require "./$Page/index.php";
 }
 
 # global html
 
-include_once 'page.inc.php';
-
 if (!$found) {
        # no resulting output
        http_response_code(404);
-       ob_start();
        @require "./404.html";
-       print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
 }
 
+include_once 'page.inc.php';
+