From 4c7e1533e440cb6c88756a5677bf70f9a058e724 Mon Sep 17 00:00:00 2001
From: Marc MAURICE <dooblempub@positon.org>
Date: Sat, 6 Nov 2010 14:40:46 +0100
Subject: [PATCH] Added proper 404 errors on file or directory not found

---
 index.php |    5 +++++
 view.php  |    5 +++++
 2 files changed, 10 insertions(+)

diff --git a/index.php b/index.php
index a05287d..03989d6 100644
--- a/index.php
+++ b/index.php
@@ -103,6 +103,11 @@ $otherFiles = array();
 
 $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 != '..')
 {
 	if (is_dir("$realDir/$file"))
diff --git a/view.php b/view.php
index 33b935f..1f98767 100644
--- a/view.php
+++ b/view.php
@@ -24,6 +24,11 @@ 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");
+}
+
 $scriptPath = $_SERVER["SCRIPT_NAME"];
 
 // get all images in an array
-- 
1.7.10.4