Added configuration constants for data and images directories

This commit is contained in:
Marc MAURICE 2010-10-24 23:59:35 +02:00
parent cb1e3285e4
commit d7db66cc2d
2 changed files with 9 additions and 5 deletions

View file

@ -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 != '..')
{

View file

@ -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 = '';