From bfc7c4e9c7a4dcc1de8fc51c1feddb7ddcdf7658 Mon Sep 17 00:00:00 2001
From: Marc MAURICE <dooblempub@positon.org>
Date: Thu, 7 Oct 2010 22:27:18 +0200
Subject: [PATCH] Replaced mimetype check by extension check, and displayed
 parent directory properly

---
 index.php |   18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index 489e7b1..2d503c7 100644
--- a/index.php
+++ b/index.php
@@ -71,7 +71,7 @@ function getPreview($imgFile, $maxSize)
 function getAlbumPreview($dir)
 {
 	foreach (scandir($dir) as $file) if ($file != '.' and $file != '..') {
-		if (mime_content_type("$dir/$file") == "image/jpeg")
+		if (strtolower(substr($file, -4)) == ".jpg")
 			return getPreview("$dir/$file", 100);
 	}
 
@@ -88,7 +88,7 @@ $otherFiles = array();
 
 $realDir = "images$shortPath";
 
-foreach (scandir($realDir) as $file) if ($file != '.')
+foreach (scandir($realDir) as $file) if ($file != '.' and $file != '..')
 {
 	if ($file == '..')
 	{
@@ -100,17 +100,25 @@ foreach (scandir($realDir) as $file) if ($file != '.')
 	}
 	else
 	{
-		$mime = mime_content_type("$realDir/$file");
-
-		if ($mime == "image/jpeg")
+		$ext = strtolower(substr($file, -4));
+		if ($ext == ".jpg")
 			$imageFiles[] = array( "name" => $file, "url" => getPreview("$realDir/$file", 100), "link" => dirname($scriptUrlPath)."/view/$shortPath/$file" );
 		else
 			$otherFiles[] = array( "name" => $file, "link" => dirname($scriptUrlPath)."/$realDir/$file" );
 	}
 }
 
+if (dirname($shortPath) !== '')
+	$parentLink = $scriptUrlPath.dirname($shortPath);
+else
+	$parentLink = "";
+
 ?>
 
+<?php if ($parentLink !== '') { ?>
+	<div><a href="<?php echo $parentLink ?>">^</a></div>
+<?php } ?>
+
 <?php foreach($folders as $folder) { ?>
 	<div class="folder">
 	<a href="<?php echo $folder["link"] ?>">
-- 
1.7.10.4