aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2007-05-08 10:12:14 +0000
committerrub <rub@piwigo.org>2007-05-08 10:12:14 +0000
commitd9d2a5ad8deb6023100237a1a8f23fdd920ca3f3 (patch)
treead04c57231c513fa383afab6e4731e03072c3d73
parent6c147eda5417f3cce58b4d235b21e15ef73c4fd5 (diff)
Issue 0000619: bad result of cookie_path() function
I removed source code with PATH_INFO because this code generates problem on some environment and because I don't understand this utility (next substr extracts good value) git-svn-id: http://piwigo.org/svn/trunk@2004 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_cookie.inc.php21
1 files changed, 4 insertions, 17 deletions
diff --git a/include/functions_cookie.inc.php b/include/functions_cookie.inc.php
index 28ef5ede9..f4b1a7533 100644
--- a/include/functions_cookie.inc.php
+++ b/include/functions_cookie.inc.php
@@ -36,29 +36,16 @@ function cookie_path()
$scr = $_SERVER['REDIRECT_SCRIPT_NAME'];
}
else if ( isset($_SERVER['REDIRECT_URL']) )
- { // mod_rewrite is activated for upper level directories. we must set the
+ {
+ // mod_rewrite is activated for upper level directories. we must set the
// cookie to the path shown in the browser otherwise it will be discarded.
- if ( isset($_SERVER['PATH_INFO']) and !empty($_SERVER['PATH_INFO']) )
- {
- $idx = strpos( $_SERVER['REDIRECT_URL'], $_SERVER['PATH_INFO'] );
- if ($idx !== false)
- {
- $scr = substr($_SERVER['REDIRECT_URL'], 0, $idx);
- }
- else
- {//this should never happen
- $scr='//';
- }
- }
- else
- {
- $scr = $_SERVER['REDIRECT_URL'];
- }
+ $scr = $_SERVER['REDIRECT_URL'];
}
else
{
$scr = $_SERVER['SCRIPT_NAME'];
}
+
$scr = substr($scr,0,strrpos( $scr,'/'));
// add a trailing '/' if needed