From b6fc4abeb1589894073be1d500a8b8b884ee0c7e Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 19 Sep 2017 01:33:35 +0200
Subject: [PATCH] page: replace login placeholder by precomposed paragraph

Prepare for more elaborate user details.
---
 page.inc.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/page.inc.php b/page.inc.php
index c0282ee..c607fcf 100644
--- a/page.inc.php
+++ b/page.inc.php
@@ -6,7 +6,12 @@ include_once DOCROOT.'head.inc.php';
 print "<header>\n";
 ob_start();
 include DOCROOT.'menu.html';
-$nav = ob_get_clean();
+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);
-- 
2.30.0