projects / bizou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 276926e)
Fixed a bug when bizou was operating at the top root of a site v1.4
authorMarc MAURICE <dooblempub@positon.org>
Thu, 27 Jan 2011 00:13:05 +0000 (01:13 +0100)
committerMarc MAURICE <dooblempub@positon.org>
Thu, 27 Jan 2011 00:13:05 +0000 (01:13 +0100)
Thanks to pilau who detected it

index.php patch | blob | history
plugins/viewer/functions.php patch | blob | history
plugins/viewer/view.php patch | blob | history

diff --git a/index.php b/index.php
index 9653b31..828b06c 100644 (file)
--- a/index.php
+++ b/index.php
@@ -19,6 +19,13 @@
 
 require 'config.php';
 
+// global variables, globals should remain contant
+$scriptUrl = $_SERVER["SCRIPT_NAME"];
+$rootUrl = dirname($scriptUrl);
+if (substr($rootUrl, -1) !== '/') $rootUrl.='/';  // add a trailing / to rootUrl
+// $scriptUrl =  "/path/to/bizou/index.php"
+// $rootUrl =  "/path/to/bizou/"
+
 // load plugins
 $plugins = array();
 if (is_dir("plugins")) {
@@ -37,7 +44,7 @@ function plugins_include($phpFile)
 if (! function_exists('getImageLink')) {
 function getImageLink($imageSimplePath)
 {
-       return dirname($_SERVER["SCRIPT_NAME"]).'/'.IMAGES_DIR.$imageSimplePath;
+       return $GLOBALS['rootUrl'].IMAGES_DIR.$imageSimplePath;
 }
 }
 
@@ -86,7 +93,7 @@ function getPreview($imgFile, $maxSize = THUMB_SIZE)
                imagedestroy($newImg);
        }
 
-       return dirname($_SERVER["SCRIPT_NAME"])."/".$newImgFile;
+       return $GLOBALS['rootUrl'].$newImgFile;
 }
 
 function getAlbumPreview($dir)
@@ -100,11 +107,6 @@ function getAlbumPreview($dir)
        return '';
 }
 
-$scriptUrl = $_SERVER["SCRIPT_NAME"];
-$rootUrl = dirname($scriptUrl);
-// $scriptUrl =  "/path/to/bizou/index.php"
-// $rootUrl =  "/path/to/bizou"
-
 // if url == http://localhost/photos/index.php/toto/titi, path_info == /toto/titi
 // if url == http://localhost/photos/index.php, path_info is not set
 // if url == http://localhost/photos/, path_info is not set
@@ -146,7 +148,7 @@ foreach (scandir($realDir) as $file) if ($file != '.' and $file != '..')
                if ($ext == ".jpg" or $ext == ".png") {
                        $imageFiles[] = array( "name" => $file, "url" => getPreview("$realDir/$file"), "link" => getImageLink("$simplePath/$file") );
                } else {
-                       $otherFiles[] = array( "name" => $file, "link" => "$rootUrl/$realDir/$file" );
+                       $otherFiles[] = array( "name" => $file, "link" => "$rootUrl$realDir/$file" );
                }
        }
 }
@@ -205,7 +207,7 @@ a {
 }
 </style>
 <?php foreach ($plugins as $p) if (is_file("plugins/$p/style.css")) { ?>
-       <link rel="stylesheet" type="text/css" href="<?php echo "$rootUrl/plugins/$p/style.css" ?>" />
+       <link rel="stylesheet" type="text/css" href="<?php echo $rootUrl."plugins/$p/style.css" ?>" />
 <?php } ?>
 </head>
 <body>
diff --git a/plugins/viewer/functions.php b/plugins/viewer/functions.php
index 71ec3f0..2ac59ac 100644 (file)
--- a/plugins/viewer/functions.php
+++ b/plugins/viewer/functions.php
@@ -1,6 +1,6 @@
 <?php
 function getImageLink($imageSimplePath)
 {
-       return dirname($_SERVER["SCRIPT_NAME"])."/plugins/viewer/view.php$imageSimplePath";
+       return $GLOBALS['rootUrl']."plugins/viewer/view.php$imageSimplePath";
 }
 ?>
diff --git a/plugins/viewer/view.php b/plugins/viewer/view.php
index 2e68338..e8400cd 100644 (file)
--- a/plugins/viewer/view.php
+++ b/plugins/viewer/view.php
@@ -55,23 +55,24 @@ if ($pos < sizeof($images)-1)
 
 $scriptUrl = $_SERVER["SCRIPT_NAME"];
 $bizouRootUrl = dirname(dirname(dirname($scriptUrl)));
+if (substr($bizouRootUrl, -1) !== '/') $bizouRootUrl.='/';  // add a trailing / to rootUrl
 // scriptUrl = /path/to/bizou/plugins/viewer/view.php
-// bizouRootUrl = /path/to/bizou
+// bizouRootUrl = /path/to/bizou/
 
 // template variables
-$imageUrl = "$bizouRootUrl/".IMAGES_DIR.$simpleImagePath;
+$imageUrl = $bizouRootUrl.IMAGES_DIR.$simpleImagePath;
 
 if ($nextImage === '') {
        $nextImageUrl = '';
        $nextPageUrl = '';
 } else {
-       $nextImageUrl = "$bizouRootUrl/".IMAGES_DIR.dirname($simpleImagePath)."/$nextImage";
+       $nextImageUrl = $bizouRootUrl.IMAGES_DIR.dirname($simpleImagePath)."/$nextImage";
        $nextPageUrl = dirname($_SERVER["REQUEST_URI"])."/$nextImage";
 }
 if ($prevImage === '') $prevPageUrl = '';
 else $prevPageUrl = dirname($_SERVER["REQUEST_URI"])."/$prevImage";
 
-$directoryUrl = "$bizouRootUrl/index.php".dirname($simpleImagePath);
+$directoryUrl = $bizouRootUrl."index.php".dirname($simpleImagePath);
 
 $firefox = strpos($_SERVER['HTTP_USER_AGENT'], 'Firefox') !== false;
 
Unnamed repository; edit this file 'description' to name the repository.