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

diff --git a/foto/index.php b/foto/index.php
index f438cb9..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) {
+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>',
@@ -19,7 +17,7 @@ if ($User and $User->admin) {
 $nav = explode('/', $rootdir);
 $nav[0] = "Foto's"; # override of root 'foto'
 $title = array_pop($nav);
-$Place['title'] = implode(' ', $nav) . ': ' . $title;
+$Article->title = implode(' ', $nav) . ': ' . $title;
 
 $link = '';
 print "<h2>";
@@ -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>";
@@ -79,7 +79,7 @@ if ($imgs = glob("$rootdir/*.jpg")) {
 	foreach ($imgs as $img) {
 		if ($img == "$rootdir/index.jpg") {
 			# cover image of current album
-			$Place['image'] = "/thumb/640x/$img";
+			$Article->image = "/$img";
 			continue;
 		}
 		if (!is_link($img)) continue;
@@ -89,3 +89,5 @@ if ($imgs = glob("$rootdir/*.jpg")) {
 
 	include 'foto/album.inc.php';
 }
+
+return;