if (! is_file($newImgFile))
{
- $img = imagecreatefromjpeg($imgFile);
+ $ext = strtolower(substr($file, -4));
+ if ($ext == ".jpg")
+ $img = imagecreatefromjpeg($imgFile);
+ else
+ $img = imagecreatefrompng($imgFile);
$w = imagesx($img);
$h = imagesy($img);
imagecopyresampled($newImg, $img, 0, 0, 0, 0, $newW, $newH, $w, $h);
- imagejpeg($newImg, $newImgFile);
+ if ($ext == ".jpg")
+ imagejpeg($newImg, $newImgFile);
+ else
+ imagepng($newImg, $newImgFile);
imagedestroy($img);
imagedestroy($newImg);
function getAlbumPreview($dir)
{
foreach (scandir($dir) as $file) if ($file != '.' and $file != '..') {
- if (strtolower(substr($file, -4)) == ".jpg")
+ $ext = strtolower(substr($file, -4));
+ if ($ext == ".jpg" or $ext == ".png")
return getPreview("$dir/$file");
}
$shortPath = $_SERVER["PATH_INFO"];
if ($shortPath == '/') $shortPath = '';
+// extra security check to avoid /photos/index/../.. like urls, maybe useless but..
+if (strpos($shortPath, '..') !== false) die(".. found in url");
$folders = array();
$imageFiles = array();
else
{
$ext = strtolower(substr($file, -4));
- if ($ext == ".jpg")
+ if ($ext == ".jpg" or $ext == ".png")
$imageFiles[] = array( "name" => $file, "url" => getPreview("$realDir/$file"), "link" => dirname($scriptUrlPath)."/view/$shortPath/$file" );
else
$otherFiles[] = array( "name" => $file, "link" => dirname($scriptUrlPath)."/$realDir/$file" );
<html>
<head>
<style type="text/css">
+body {
+ padding-top: 2em;
+}
img {
border: 0;
- vertical-align: middle;
}
-
+a {
+ text-decoration: none;
+}
.square {
display: inline-block;
}
-
.image {
width: <?php echo THUMB_SIZE ?>px;
height: <?php echo THUMB_SIZE ?>px;
text-align: center;
vertical-align: middle;
}
+.foldername {
+ height: <?php echo THUMB_SIZE ?>px;
+ display: table-cell;
+ vertical-align: middle;
+}
+#parentfolder {
+ position: fixed;
+ font-size: 4em;
+ font-weight: bold;
+ top: 0;
+ left: 0;
+}
</style>
</head>
<body>
<?php foreach($folders as $folder) { ?>
<div class="folder">
- <a href="<?php echo $folder["link"] ?>">
- <?php if ($folder["preview"] !== "") { ?>
- <img src="<?php echo $folder["preview"] ?>" />
+ <?php if ($folder["preview"] === "") { ?>
+ <a href="<?php echo $folder["link"] ?>"><?php echo $folder["name"] ?></a>
+ <?php } else { ?>
+ <div class="square"><div class="image"><a href="<?php echo $folder["link"] ?>"><img src="<?php echo $folder["preview"] ?>" /></a></div></div>
+ <div class="square"><div class="foldername"><a href="<?php echo $folder["link"] ?>"><?php echo $folder["name"] ?></a></div></div>
<?php } ?>
- <?php echo $folder["name"] ?>
- </a>
</div>
<?php } ?>