Added proper 404 errors on file or directory not found

[bizou.git] / index.php

diff --git a/index.php b/index.php
index db2a590..03989d6 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,15 +1,35 @@
 <?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))
        {
-               $ext = strtolower(substr($file, -4));
+               $ext = strtolower(substr($imgFile, -4));
                if ($ext == ".jpg")
                        $img = imagecreatefromjpeg($imgFile);
                else
@@ -61,7 +81,7 @@ function getAlbumPreview($dir)
        return '';
 }
 
-$scriptUrlPath = substr($_SERVER["SCRIPT_NAME"], 0, -4); // trim .php
+$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
@@ -81,7 +101,12 @@ $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 != '..')
 {
@@ -92,10 +117,17 @@ foreach (scandir($realDir) as $file) if ($file != '.' and $file != '..')
        else
        {
                $ext = strtolower(substr($file, -4));
-               if ($ext == ".jpg" or $ext == ".png")
-                       $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" );
+               }
        }
 }