projects
/
bizou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3892fed
)
Replaced mimetype check by extension check, and displayed parent directory properly
author
Marc MAURICE
<dooblempub@positon.org>
Thu, 7 Oct 2010 20:27:18 +0000
(22:27 +0200)
committer
Marc MAURICE
<dooblempub@positon.org>
Thu, 7 Oct 2010 20:27:18 +0000
(22:27 +0200)
index.php
patch
|
blob
|
history
diff --git
a/index.php
b/index.php
index
489e7b1
..
2d503c7
100644
(file)
--- 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 != '..') {
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);
}
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");
-
- 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" );
}
}
$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"] ?>">
<?php foreach($folders as $folder) { ?>
<div class="folder">
<a href="<?php echo $folder["link"] ?>">