Added proper 404 errors on file or directory not found

[bizou.git] / view.php

diff --git a/view.php b/view.php
index 1b38962..1f98767 100644 (file)
--- a/view.php
+++ b/view.php
@@ -1,15 +1,40 @@
 <?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('IMAGES_DIR', 'images');
+
+$shortPath = $_SERVER["PATH_INFO"];
+if ($shortPath == '/') $shortPath = '';
+// extra security check to avoid /photos/index/../.. like urls, maybe useless but..
+if (strpos($shortPath, '..') !== false) die(".. found in url");
+
+if (! is_file(IMAGES_DIR.$shortPath)) {
+       header("HTTP/1.1 404 Not Found");
+       die("File Not Found");
+}
 
-$quickPath = isset($_SERVER["PATH_INFO"])?$_SERVER["PATH_INFO"]:"";
 $scriptPath = $_SERVER["SCRIPT_NAME"];
 
-$quickDir = dirname($quickPath);
-$realDir = "images$quickDir";
-
 // get all images in an array
 $images = array();
 
-$files = scandir($realDir);
+$files = scandir(IMAGES_DIR.dirname($shortPath));
 foreach ($files as $file) {
        $ext = strtolower(substr($file, -4));
        if ($ext == ".jpg" or $ext == ".png")
@@ -17,7 +42,7 @@ foreach ($files as $file) {
 }
 
 // find the image position
-$pos = array_search(basename($quickPath), $images);
+$pos = array_search(basename($shortPath), $images);
 if ($pos === false) die("Image not found");
 
 // get prev and next images
@@ -25,22 +50,23 @@ $prevImage = '';
 $nextImage = '';
 if ($pos > 0)
        $prevImage = $images[$pos-1];
-if ($pos < sizeof($images))
+if ($pos < sizeof($images)-1)
        $nextImage = $images[$pos+1];
 
-$imageUrl = dirname($scriptPath)."/images$quickPath";
+// template variables
+$imageUrl = dirname($scriptPath)."/".IMAGES_DIR.$shortPath;
 
 if ($nextImage === '') {
        $nextImageUrl = '';
        $nextPageUrl = '';
 } else {
-       $nextImageUrl = dirname($scriptPath)."/images".dirname($quickPath)."/$nextImage";
+       $nextImageUrl = dirname($scriptPath)."/".IMAGES_DIR.dirname($shortPath)."/$nextImage";
        $nextPageUrl = dirname($_SERVER["REQUEST_URI"])."/$nextImage";
 }
 if ($prevImage === '') $prevPageUrl = '';
 else $prevPageUrl = dirname($_SERVER["REQUEST_URI"])."/$prevImage";
 
-$directoryUrl = dirname($_SERVER["SCRIPT_NAME"])."/index".dirname($quickPath);
+$directoryUrl = dirname($_SERVER["SCRIPT_NAME"])."/index.php".dirname($shortPath);
 
 header('Content-Type: text/html; charset=utf-8');
 header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + 3600));
@@ -91,8 +117,21 @@ img {
 </style>
 
 <?php if ($nextImageUrl !== '') { ?>
+ <?php if (strpos($_SERVER['HTTP_USER_AGENT'], 'Firefox') !== false) { ?>
 <link rel="prefetch" href="<?php echo $nextImageUrl ?>" />
 <link rel="prefetch" href="<?php echo $nextPageUrl ?>" />
+
+ <?php } else { ?>
+<script type="text/javascript">
+window.onload = function() {
+       var im = new Image();
+       im.src = '<?php echo $nextImageUrl ?>';
+       var req = new XMLHttpRequest();
+       req.open('GET', '<?php echo $nextPageUrl ?>', false);
+       req.send(null);
+};
+</script>
+ <?php } ?>
 <?php } ?>
 
 </head>
@@ -112,7 +151,7 @@ img {
 
 <?php if ($prevPageUrl !== '') { ?>
 <div id="previous">
-<a href="<?php echo $nextPageUrl ?>" title="Previous image">&lt;</a>
+<a href="<?php echo $prevPageUrl ?>" title="Previous image">&lt;</a>
 </div>
 <?php } ?>