X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/77ab25edd98ec5a3871fc07bceaa0cd61949b69e..130231b1c611644b68b8a6635589dcfff457b5c3:/foto/index.php?ds=sidebyside

diff --git a/foto/index.php b/foto/index.php
index eadda91..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;
@@ -34,7 +35,7 @@ function showthumb($path)
 {
 	// assume all album entries are symlinks to archive originals
 	$target = preg_replace('{^(\.\./)*}', '', readlink($path));
-	$thumb = preg_replace('{^data/}', 'thumb/200/', $target);
+	$thumb = 'thumb/200/' . $target;
 
 	@list ($order, $size, $title) = explode(':', pathinfo($path, PATHINFO_FILENAME), 3);
 	$imgtag = 'img src="/'.$thumb.'"';
@@ -57,7 +58,7 @@ if ($imgs = glob("$rootdir/*", GLOB_ONLYDIR)) {
 		$cover = "$path/index.jpg";
 		if (!file_exists($cover)) $cover = 'foto/index.jpg';
 		if (is_link($cover)) {
-			$cover = preg_replace('{^(?:\.\./)*data/}', 'thumb/100/', readlink($cover));
+			$cover = preg_replace('{^(?:\.\./)*(?=data/)}', 'thumb/100/', readlink($cover));
 		}
 
 		$html = '<img src="/'.$cover.'" />';