page: replace login placeholder by precomposed paragraph

[minimedit.git] / page.inc.php

diff --git a/page.inc.php b/page.inc.php
index 654f37fa7ebeee2a412b2348fc3bab61d1ac4d88..c607fcf12a1638cc64728fd8d8f81282f8ff272a 100644 (file)
--- a/page.inc.php
+++ b/page.inc.php
@@ -1,12 +1,17 @@
 <?php
 $body = ob_get_clean();
 
-include_once './head.inc.php';
+include_once DOCROOT.'head.inc.php';
 
 print "<header>\n";
 ob_start();
-include './menu.html';
-$nav = ob_get_clean();
+include DOCROOT.'menu.html';
+ob_start();
+if (isset($User)) {
+       printf('<p class="login">Ingelogd: %s</p>'."\n", $User['name']);
+}
+$nav = getoutput(['login' => ob_get_clean()]);
+
 $nav = preg_replace_callback('{<a href="([^"]+)">(.*?)</a>}', function ($m) {
        $request = $_SERVER['REQUEST_URI'];
        $html = $request == $m[1] ? $m[2] : $m[0]; # text or full link
@@ -14,7 +19,6 @@ $nav = preg_replace_callback('{<a href="([^"]+)">(.*?)</a>}', function ($m) {
 }, $nav);
 if (isset($User)) {
        $nav = preg_replace('{\s*<li class="logout">.*?</li>}', '', $nav);
-       $nav = str_replace('[[login]]', $User['name'], $nav);
 }
 else {
        $nav = preg_replace('{\s*<li class="login">.*?</li>}', '', $nav);
@@ -24,10 +28,9 @@ print "</header>\n\n";
 
 print $body;
 
-$footinc = realpath('footer.html'); # cwd lost during shutdown
 register_shutdown_function(function () {
        print '<footer>';
-       @include $GLOBALS['footinc'];
+       @include DOCROOT.'footer.html';
        print "</footer>\n";
 
        global $User;