X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/da2d6e5537e9fdcd6f424ea1cc8ab6ef8f45727e..72084f120c1e5a2270c0854540153c35819d0b35:/foto/index.php

diff --git a/foto/index.php b/foto/index.php
index a6378ef..e7f1bab 100644
--- a/foto/index.php
+++ b/foto/index.php
@@ -48,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('<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 (!$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";
 }
 
 if ($imgs = glob("$rootdir/*.jpg")) {
 	print '<ul class="gallery album">'."\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 '<li>'.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 '<li>';
+		printf('<a href="/%s"><%s /></a>'."\n", $target, $imgtag);
 	}
 	print '</ul>'."\n\n";