From fc74e45e15e3b1f17312f229496c25f7caff7d60 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 26 Jan 2019 00:47:41 +0100
Subject: [PATCH] page: hide login class sections in all contents

Extend user-dependent classes .login/.logout in menu
to generic templating so any page can include optional parts.
---
 page.inc.php | 6 ------
 page.php     | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/page.inc.php b/page.inc.php
index 1253338..b6723e9 100644
--- a/page.inc.php
+++ b/page.inc.php
@@ -33,12 +33,6 @@ $nav = preg_replace_callback('{<a href="([^"]+)">(.*?)</a>}', function ($m) {
 	$html = $request == $m[1] ? $m[2] : $m[0]; # text or full link
 	return $m[1] == substr($request, 0, strlen($m[1])) ? "<b>$html</b>" : $html;
 }, $nav);
-if (!empty($User)) {
-	$nav = preg_replace('{\s*<li class="logout">.*?</li>}', '', $nav);
-}
-else {
-	$nav = preg_replace('{\s*<li class="login">.*?</li>}', '', $nav);
-}
 print $nav;
 print "</header>\n\n";
 
diff --git a/page.php b/page.php
index 9c88e79..bca7a67 100644
--- a/page.php
+++ b/page.php
@@ -52,6 +52,11 @@ function getoutput($blocks = [])
 		}
 	}
 
+	# keep either login or logout parts depending on user level
+	global $User;
+	$hideclass = empty($User) ? 'login' : 'logout';
+	$doc = preg_replace('{\s*<(p|li|span) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
+
 	return preg_replace_callback(
 		'{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }x',
 		function ($sub) use ($blocks) {
-- 
2.30.0