From 130231b1c611644b68b8a6635589dcfff457b5c3 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 10 Feb 2019 23:38:53 +0100
Subject: [PATCH] foto: common override of navigation root title

Slight code simplification.
---
 foto/index.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/foto/index.php b/foto/index.php
index f77b9c1..cd939f3 100644
--- a/foto/index.php
+++ b/foto/index.php
@@ -1,13 +1,13 @@
 <?php
 $intro = ob_get_clean();
 
-$rootdir = 'foto' . $Args;
+$rootdir = $Page . $Args;
 
 if (!empty($User['admin'])) {
 	$access = '🔓 Openbaar';
 	if (isset($PageAccess)) {
 		$access = "🔒 Bewoners";
-		if ($PageAccess != $Page.$Args) {
+		if ($PageAccess != $rootdir) {
 			$access .= sprintf(' vanaf <a href="%s">%s</a>',
 				"/$PageAccess", pathinfo($PageAccess, PATHINFO_FILENAME)
 			);
@@ -16,16 +16,17 @@ if (!empty($User['admin'])) {
 	print "<aside>$access</aside>\n\n";
 }
 
-$nav = explode('/', $Page.$Args);
+$nav = explode('/', $rootdir);
+$nav[0] = "Foto's"; # override of root 'foto'
 $title = array_pop($nav);
-$rootname = "Foto's"; # override of 'foto'
+
 $link = '';
 print "<h2>";
 foreach ($nav as $i => $linktitle) {
-	$link .= "/$linktitle";
-	printf('<a href="%s">%s</a> →'."\n", $link, $i ? $linktitle : $rootname);
+	$link .= '/' . ($i ? $linktitle : $Page);
+	printf('<a href="%s">%s</a> →'."\n", $link, $linktitle);
 }
-print $Args ? $title : $rootname;
+print $title;
 print "</h2>\n\n";
 
 print $intro;
-- 
2.30.0