X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/78b500b4027c74ccf7c4bf887183918f37307ddd..063591ce4b064ed149aad58f0c619895c9ae4014:/foto/index.php

diff --git a/foto/index.php b/foto/index.php
index ee37df1..0ce4d20 100644
--- a/foto/index.php
+++ b/foto/index.php
@@ -1,25 +1,25 @@
 <?php
-$intro = ob_get_clean();
-
 $rootdir = $Page . $Args;
 
-if (!empty($User['admin'])) {
-	$access = '🔓 Openbaar';
-	if (isset($PageAccess)) {
-		$access = "🔒 Bewoners";
+if ($User->admin('foto')) {
+	if (!empty($PageAccess)) {
+		$access = '<span class="icon icon-locked">&#x1F512;</span> Bewoners';
 		if ($PageAccess != $rootdir) {
 			$access .= sprintf(' vanaf <a href="%s">%s</a>',
 				"/$PageAccess", pathinfo($PageAccess, PATHINFO_FILENAME)
 			);
 		}
 	}
+	else {
+		$access = '<span class="icon icon-locked">&#x1F513;</span> Openbaar';
+	}
 	print "<aside>$access</aside>\n\n";
 }
 
 $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 +30,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 +66,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 +81,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 +91,5 @@ if ($imgs = glob("$rootdir/*.jpg")) {
 
 	include 'foto/album.inc.php';
 }
+
+return;