From d7db66cc2dc4da43e4c996ebc5656f309b822131 Mon Sep 17 00:00:00 2001
From: Marc MAURICE <dooblempub@positon.org>
Date: Sun, 24 Oct 2010 23:59:35 +0200
Subject: [PATCH] Added configuration constants for data and images
 directories

---
 index.php |    6 ++++--
 view.php  |    8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index 2265857..09ba285 100644
--- a/index.php
+++ b/index.php
@@ -1,11 +1,13 @@
 <?php
 
 define('THUMB_SIZE', 100);
+define('DATA_DIR', 'data');
+define('IMAGES_DIR', 'images');
 
 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))
 	{
@@ -81,7 +83,7 @@ $folders = array();
 $imageFiles = array();
 $otherFiles = array();
 
-$realDir = "images$shortPath";
+$realDir = IMAGES_DIR.$shortPath;
 
 foreach (scandir($realDir) as $file) if ($file != '.' and $file != '..')
 {
diff --git a/view.php b/view.php
index 803a164..e60cc25 100644
--- a/view.php
+++ b/view.php
@@ -1,5 +1,7 @@
 <?php
 
+define('IMAGES_DIR', 'images');
+
 $shortPath = $_SERVER["PATH_INFO"];
 if ($shortPath == '/') $shortPath = '';
 // extra security check to avoid /photos/index/../.. like urls, maybe useless but..
@@ -10,7 +12,7 @@ $scriptPath = $_SERVER["SCRIPT_NAME"];
 // get all images in an array
 $images = array();
 
-$files = scandir("images".dirname($shortPath));
+$files = scandir(IMAGES_DIR.dirname($shortPath));
 foreach ($files as $file) {
 	$ext = strtolower(substr($file, -4));
 	if ($ext == ".jpg" or $ext == ".png")
@@ -30,13 +32,13 @@ if ($pos < sizeof($images)-1)
 	$nextImage = $images[$pos+1];
 
 // template variables
-$imageUrl = dirname($scriptPath)."/images$shortPath";
+$imageUrl = dirname($scriptPath)."/".IMAGES_DIR.$shortPath;
 
 if ($nextImage === '') {
 	$nextImageUrl = '';
 	$nextPageUrl = '';
 } else {
-	$nextImageUrl = dirname($scriptPath)."/images".dirname($shortPath)."/$nextImage";
+	$nextImageUrl = dirname($scriptPath)."/".IMAGES_DIR.dirname($shortPath)."/$nextImage";
 	$nextPageUrl = dirname($_SERVER["REQUEST_URI"])."/$nextImage";
 }
 if ($prevImage === '') $prevPageUrl = '';
-- 
1.7.10.4