foto: escape html (ampersands) in album links

[minimedit.git] / foto / index.php

diff --git a/foto/index.php b/foto/index.php
index d3e989873ca9c3491f9875c864b6e1ca5c4e8531..49e5483d24d4d23ecaa8b0b3dbc078d8a49cd759 100644 (file)
--- a/foto/index.php
+++ b/foto/index.php
@@ -1,42 +1,59 @@
 <?php
-$rootdir = $Page . $Args;
+$rootdir = $Page->link;
 
-if ($User and $User->admin('foto')) {
-       $access = '🔓 Openbaar';
-       if (isset($PageAccess)) {
-               $access = "🔒 Bewoners";
-               if ($PageAccess != $rootdir) {
+$nav = explode('/', $rootdir);
+$nav[0] = "Foto's"; # override of root 'foto'
+$title = array_pop($nav);
+$Page->title = ($nav ? implode(' ', $nav) . ': ' : '') . $title;
+
+if ($Page->api) {
+       $img = "$rootdir/index.jpg";
+       if (file_exists($img)) {
+               # cover image of current album
+               $Page->image = "/$img";
+       }
+       if (!$Page->path) {
+               return array_map(function ($dir) {
+                       return new ArchiveArticle($dir . '/index.html');
+               }, glob("$rootdir/*", GLOB_ONLYDIR)); #TODO: recurse
+       }
+       return;
+}
+
+if ($User->admin('foto')) {
+       if ($Page->restricted) {
+               $access = '<span class="icon icon-locked">&#x1F512;</span> Bewoners';
+               if ($Page->restricted != $rootdir) {
                        $access .= sprintf(' vanaf <a href="%s">%s</a>',
-                               "/$PageAccess", pathinfo($PageAccess, PATHINFO_FILENAME)
+                               "/{$Page->restricted}", pathinfo($Page->restricted, 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);
-$Article->title = implode(' ', $nav) . ': ' . $title;
-
 $link = '';
 print "<h2>";
 foreach ($nav as $i => $linktitle) {
-       $link .= '/' . ($i ? $linktitle : $Page);
+       $link .= '/' . ($i ? $linktitle : $Page->handler);
        printf('<a href="%s">%s</a> →'."\n", $link, $linktitle);
 }
 print $title;
 print "</h2>\n\n";
 
-if (isset($Article->raw)) {
-       print $Article->raw;  # page intro
+if (isset($Page->raw)) {
+       print $Page->raw;  # page intro
 }
 
+if (!function_exists('showthumb')) {
 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.'"';
@@ -49,27 +66,28 @@ function showthumb($path)
 
        return sprintf('<a href="/%s"><%s /></a>'."\n", $target, $imgtag);
 }
+}
 
 if ($imgs = glob("$rootdir/*", GLOB_ONLYDIR)) {
        natsort($imgs);
        print '<ul class="gallery cat">'."\n";
        foreach ($imgs as $path) {
-               $parts = pathinfo($path);
-               $album = $parts['filename'];
+               $album = htmlspecialchars(pathinfo($path, PATHINFO_FILENAME));
                $cover = "$path/index.jpg";
                if (!file_exists($cover)) $cover = 'foto/index.jpg';
                if (is_link($cover)) {
                        $cover = preg_replace('{^(?:\.\./)*(?=data/)}', 'thumb/100/', readlink($cover));
                }
 
-               $html = '<img src="/'.$cover.'" />';
+               $html = sprintf('<img src="/%s" />', htmlspecialchars($cover));
                $html .= "<figcaption>$album</figcaption>";
-               if (empty($User) and file_exists("$path/.private")) {
-                       $html = '<strike title="bewoners">'.$html.'</strike>';
+               if (!$User->login and file_exists("$path/.private")) {
+                       $html = '<s title="bewoners">'.$html.'</s>';
                }
                $html = "<figure>$html</figure>";
 
-               printf('<li id="%s"><a href="%s">%s</a>'."\n", $album, "/$path", $html);
+               printf('<li id="%s">', $album);
+               printf('<a href="/%s">%s</a>'."\n", htmlspecialchars($path), $html);
        }
        print "</ul>\n\n";
 }
@@ -79,7 +97,7 @@ if ($imgs = glob("$rootdir/*.jpg")) {
        foreach ($imgs as $img) {
                if ($img == "$rootdir/index.jpg") {
                        # cover image of current album
-                       $Article->image = "/$img";
+                       $Page->image = "/$img";
                        continue;
                }
                if (!is_link($img)) continue;