X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/251616969893b447852aad81a4e68be6853e202e..d3ed59c2753c2babd5aa9a1c5e0109c644904ba8:/foto/index.php

diff --git a/foto/index.php b/foto/index.php
index 550e7a3..a97ec1c 100644
--- a/foto/index.php
+++ b/foto/index.php
@@ -1,11 +1,9 @@
 <?php
-$intro = ob_get_clean();
-
 $rootdir = $Page . $Args;
 
-if ($User and $User->admin('foto')) {
+if ($User->admin('foto')) {
 	$access = '🔓 Openbaar';
-	if (isset($PageAccess)) {
+	if (!empty($PageAccess)) {
 		$access = "🔒 Bewoners";
 		if ($PageAccess != $rootdir) {
 			$access .= sprintf(' vanaf <a href="%s">%s</a>',
@@ -30,13 +28,15 @@ foreach ($nav as $i => $linktitle) {
 print $title;
 print "</h2>\n\n";
 
-print $intro;
+if (isset($Article->raw)) {
+	print $Article->raw;  # page intro
+}
 
 function showthumb($path)
 {
 	// assume all album entries are symlinks to archive originals
 	$target = preg_replace('{^(\.\./)*}', '', readlink($path));
-	$thumb = 'thumb/200/' . $target;
+	$thumb = 'thumb/262/' . $target;
 
 	@list ($order, $size, $title) = explode(':', pathinfo($path, PATHINFO_FILENAME), 3);
 	$imgtag = 'img src="/'.$thumb.'"';
@@ -64,7 +64,7 @@ if ($imgs = glob("$rootdir/*", GLOB_ONLYDIR)) {
 
 		$html = '<img src="/'.$cover.'" />';
 		$html .= "<figcaption>$album</figcaption>";
-		if (empty($User) and file_exists("$path/.private")) {
+		if (!$User->login and file_exists("$path/.private")) {
 			$html = '<strike title="bewoners">'.$html.'</strike>';
 		}
 		$html = "<figure>$html</figure>";
@@ -89,3 +89,5 @@ if ($imgs = glob("$rootdir/*.jpg")) {
 
 	include 'foto/album.inc.php';
 }
+
+return;