Added proper 404 errors on file or directory not found

[bizou.git] / index.php

diff --git a/index.php b/index.php
index b5db265..03989d6 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,15 +1,39 @@
 <?php
+/*
+    Bizou - a (french) KISS php image gallery
+    Copyright (C) 2010  Marc MAURICE
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 define('THUMB_SIZE', 100);
+define('DATA_DIR', 'data');
+define('IMAGES_DIR', 'images');
+define('USE_VIEWER', true); # if set to false, you can delete view.php
 
 function getPreview($imgFile, $maxSize = THUMB_SIZE)
 {
        # example: data/myalbum/100.mypic.jpg
-       $newImgFile = "data/".dirname($imgFile)."/".$maxSize.".".basename($imgFile);
+       $newImgFile = DATA_DIR."/".dirname($imgFile)."/".$maxSize.".".basename($imgFile);
        
        if (! is_file($newImgFile))
        {
-               $img = imagecreatefromjpeg($imgFile);
+               $ext = strtolower(substr($imgFile, -4));
+               if ($ext == ".jpg")
+                       $img = imagecreatefromjpeg($imgFile);
+               else
+                       $img = imagecreatefrompng($imgFile);
 
                $w = imagesx($img);
                $h = imagesy($img);
@@ -34,7 +58,10 @@ function getPreview($imgFile, $maxSize = THUMB_SIZE)
 
                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);
@@ -46,22 +73,40 @@ function getPreview($imgFile, $maxSize = THUMB_SIZE)
 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");
        }
 
        return '';
 }
 
-$shortPath = isset($_SERVER["PATH_INFO"]) ? $_SERVER["PATH_INFO"] : "";
+$scriptUrlPath = $_SERVER["SCRIPT_NAME"];
+
+// if url == http://localhost/photos/index/toto/titi, path_info == /toto/titi
+// if url == http://localhost/photos/index, path_info is not set
+// if url == http://localhost/photos/, path_info is not set
+// if path_info is not set, we are at top level, so we redirect to /photos/index/
+if (! isset($_SERVER["PATH_INFO"])) {
+       header("Location: $scriptUrlPath/");
+       exit();
+}
+
+$shortPath = $_SERVER["PATH_INFO"];
 if ($shortPath == '/') $shortPath = '';
-$scriptUrlPath = substr($_SERVER["SCRIPT_NAME"], 0, -4); // trim .php
+// extra security check to avoid /photos/index/../.. like urls, maybe useless but..
+if (strpos($shortPath, '..') !== false) die(".. found in url");
 
 $folders = array();
 $imageFiles = array();
 $otherFiles = array();
 
-$realDir = "images$shortPath";
+$realDir = IMAGES_DIR.$shortPath;
+
+if (! is_dir($realDir)) {
+       header("HTTP/1.1 404 Not Found");
+       die("Directory Not Found");
+}
 
 foreach (scandir($realDir) as $file) if ($file != '.' and $file != '..')
 {
@@ -72,10 +117,17 @@ foreach (scandir($realDir) as $file) if ($file != '.' and $file != '..')
        else
        {
                $ext = strtolower(substr($file, -4));
-               if ($ext == ".jpg")
-                       $imageFiles[] = array( "name" => $file, "url" => getPreview("$realDir/$file"), "link" => dirname($scriptUrlPath)."/view/$shortPath/$file" );
-               else
+               if ($ext == ".jpg" or $ext == ".png") {
+                       if (USE_VIEWER)
+                               $link = dirname($scriptUrlPath)."/view.php$shortPath/$file";
+                       else
+                               $link = dirname($scriptUrlPath)."/$realDir/$file";
+
+                       $imageFiles[] = array( "name" => $file, "url" => getPreview("$realDir/$file"), "link" => $link );
+
+               } else {
                        $otherFiles[] = array( "name" => $file, "link" => dirname($scriptUrlPath)."/$realDir/$file" );
+               }
        }
 }
 
@@ -93,15 +145,18 @@ header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + 3600));
 <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;
@@ -109,6 +164,18 @@ img {
        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>
@@ -119,12 +186,12 @@ img {
 
 <?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 } ?>