X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/caa254384466d5f8477de38fcf7492a1ecd3f938..a7cf507fa0aa8b275979dbe98d3d0ef34fa7f05a:/foto/index.php?ds=sidebyside
diff --git a/foto/index.php b/foto/index.php
index 1e973c7..e7f1bab 100644
--- a/foto/index.php
+++ b/foto/index.php
@@ -6,14 +6,16 @@ $nav[0] = "Foto's"; # override of root 'foto'
$title = array_pop($nav);
$Page->title = ($nav ? implode(' ', $nav) . ': ' : '') . $title;
-if (!$User) {
+if ($Page->api) {
$img = "$rootdir/index.jpg";
if (file_exists($img)) {
# cover image of current album
$Page->image = "/$img";
}
if (!$Page->path) {
- return glob("$rootdir/*", GLOB_ONLYDIR); #TODO: recurse
+ return array_map(function ($dir) {
+ return new ArchiveArticle($dir . '/index.html');
+ }, glob("$rootdir/*", GLOB_ONLYDIR)); #TODO: recurse
}
return;
}
@@ -46,60 +48,55 @@ 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/262/' . $target;
-
- @list ($order, $size, $title) = explode(':', pathinfo($path, PATHINFO_FILENAME), 3);
- $imgtag = 'img src="/'.$thumb.'"';
- if ($title) {
- $imgtag .= ' title="'.htmlspecialchars(urldecode($title)).'"';
- }
- if ($size) {
- $imgtag .= ' data-size="'.$size.'"';
- }
-
- return sprintf('<%s />'."\n", $target, $imgtag);
-}
-}
-
if ($imgs = glob("$rootdir/*", GLOB_ONLYDIR)) {
natsort($imgs);
print '
'."\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 = '';
+ $html = sprintf('', htmlspecialchars($cover));
$html .= "$album";
if (!$User->login and file_exists("$path/.private")) {
$html = ''.$html.'';
}
$html = "";
- printf('- %s'."\n", $album, "/$path", $html);
+ printf('
- ', $album);
+ printf('%s'."\n", htmlspecialchars($path), $html);
}
print "
\n\n";
}
if ($imgs = glob("$rootdir/*.jpg")) {
print ''."\n";
- foreach ($imgs as $img) {
- if ($img == "$rootdir/index.jpg") {
+ foreach ($imgs as $path) {
+ if ($path == "$rootdir/index.jpg") {
# cover image of current album
- $Page->image = "/$img";
+ $Page->image = "/$path";
continue;
}
- if (!is_link($img)) continue;
- print '- '.showthumb($img);
+ if (!is_link($path)) continue;
+
+ // assume all album entries are symlinks to archive originals
+ $target = preg_replace('{^(\.\./)*}', '', readlink($path));
+ $thumb = 'thumb/262/' . $target;
+
+ @list ($order, $size, $title) = explode(':', pathinfo($path, PATHINFO_FILENAME), 3);
+ $imgtag = 'img src="/'.$thumb.'"';
+ if ($title) {
+ $imgtag .= ' title="'.htmlspecialchars(urldecode($title)).'"';
+ }
+ if ($size) {
+ $imgtag .= ' data-size="'.$size.'"';
+ }
+
+ print '
- ';
+ printf('<%s />'."\n", $target, $imgtag);
}
print '
'."\n\n";