tobast/bizou
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed file paths as we moved view.php

Browse source
This commit is contained in:
Marc MAURICE 2010-12-12 23:02:43 +01:00
parent b29ad1d86c
commit dee4e81d5b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/viewer/view.php
View file

@ -17,14 +17,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
define('IMAGES_DIR', 'images'); require '../../config.php';
$shortPath = $_SERVER["PATH_INFO"]; $shortPath = $_SERVER["PATH_INFO"];
if ($shortPath == '/') $shortPath = ''; if ($shortPath == '/') $shortPath = '';
// extra security check to avoid /photos/index/../.. like urls, maybe useless but.. // extra security check to avoid /photos/index/../.. like urls, maybe useless but..
if (strpos($shortPath, '..') !== false) die(".. found in url"); if (strpos($shortPath, '..') !== false) die(".. found in url");
if (! is_file(IMAGES_DIR.$shortPath)) { if (! is_file('../../'.IMAGES_DIR.$shortPath)) {
header("HTTP/1.1 404 Not Found"); header("HTTP/1.1 404 Not Found");
die("File Not Found"); die("File Not Found");
} }
@ -34,7 +34,7 @@ $scriptPath = $_SERVER["SCRIPT_NAME"];
// get all images in an array // get all images in an array
$images = array(); $images = array();
$files = scandir(IMAGES_DIR.dirname($shortPath)); $files = scandir('../../'.IMAGES_DIR.dirname($shortPath));
foreach ($files as $file) { foreach ($files as $file) {
$ext = strtolower(substr($file, -4)); $ext = strtolower(substr($file, -4));
if ($ext == ".jpg" or $ext == ".png") if ($ext == ".jpg" or $ext == ".png")
@ -54,7 +54,7 @@ if ($pos < sizeof($images)-1)
$nextImage = $images[$pos+1]; $nextImage = $images[$pos+1];
// template variables // template variables
$imageUrl = dirname($scriptPath)."/".IMAGES_DIR.$shortPath; $imageUrl = dirname($scriptPath)."/../../".IMAGES_DIR.$shortPath;
if ($nextImage === '') { if ($nextImage === '') {
$nextImageUrl = ''; $nextImageUrl = '';
@ -66,7 +66,7 @@ if ($nextImage === '') {
if ($prevImage === '') $prevPageUrl = ''; if ($prevImage === '') $prevPageUrl = '';
else $prevPageUrl = dirname($_SERVER["REQUEST_URI"])."/$prevImage"; else $prevPageUrl = dirname($_SERVER["REQUEST_URI"])."/$prevImage";
$directoryUrl = dirname($_SERVER["SCRIPT_NAME"])."/index.php".dirname($shortPath); $directoryUrl = dirname($scriptPath)."/../../index.php".dirname($shortPath);
header('Content-Type: text/html; charset=utf-8'); header('Content-Type: text/html; charset=utf-8');
header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + 3600)); header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + 3600));