Replaced mimetype check by extension check, and displayed parent directory properly
This commit is contained in:
parent
3892fed828
commit
bfc7c4e9c7
1 changed files with 13 additions and 5 deletions
18
index.php
18
index.php
|
@ -71,7 +71,7 @@ function getPreview($imgFile, $maxSize)
|
||||||
function getAlbumPreview($dir)
|
function getAlbumPreview($dir)
|
||||||
{
|
{
|
||||||
foreach (scandir($dir) as $file) if ($file != '.' and $file != '..') {
|
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);
|
return getPreview("$dir/$file", 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@ $otherFiles = array();
|
||||||
|
|
||||||
$realDir = "images$shortPath";
|
$realDir = "images$shortPath";
|
||||||
|
|
||||||
foreach (scandir($realDir) as $file) if ($file != '.')
|
foreach (scandir($realDir) as $file) if ($file != '.' and $file != '..')
|
||||||
{
|
{
|
||||||
if ($file == '..')
|
if ($file == '..')
|
||||||
{
|
{
|
||||||
|
@ -100,17 +100,25 @@ foreach (scandir($realDir) as $file) if ($file != '.')
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$mime = mime_content_type("$realDir/$file");
|
$ext = strtolower(substr($file, -4));
|
||||||
|
if ($ext == ".jpg")
|
||||||
if ($mime == "image/jpeg")
|
|
||||||
$imageFiles[] = array( "name" => $file, "url" => getPreview("$realDir/$file", 100), "link" => dirname($scriptUrlPath)."/view/$shortPath/$file" );
|
$imageFiles[] = array( "name" => $file, "url" => getPreview("$realDir/$file", 100), "link" => dirname($scriptUrlPath)."/view/$shortPath/$file" );
|
||||||
else
|
else
|
||||||
$otherFiles[] = array( "name" => $file, "link" => dirname($scriptUrlPath)."/$realDir/$file" );
|
$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) { ?>
|
<?php foreach($folders as $folder) { ?>
|
||||||
<div class="folder">
|
<div class="folder">
|
||||||
<a href="<?php echo $folder["link"] ?>">
|
<a href="<?php echo $folder["link"] ?>">
|
||||||
|
|
Loading…
Reference in a new issue