adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-06 01:42:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge from trunk r14441:1442 into branch 1.6 (fix bug 458 : wrong path in sesion cookie)

Browse Source 
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1443 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
chrisaga
2006-07-08 09:31:09 +00:00
parent 5dcc4de9f3
commit 6653314edc
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_session.inc.php
+9 -2
View File
@@ -84,7 +84,12 @@ if (isset($conf['session_save_handler'])
// cookie_path will return : "/meeting/gallery"
function cookie_path()
{
if ( isset($_SERVER['REDIRECT_URL']) )
if ( isset($_SERVER['REDIRECT_SCRIPT_NAME']) and
!empty($_SERVER['REDIRECT_SCRIPT_NAME']) )
{
$scr = $_SERVER['REDIRECT_SCRIPT_NAME'];
}
else if ( isset($_SERVER['REDIRECT_URL']) )
{ // 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']) )
@@ -108,7 +113,9 @@ function cookie_path()
{
$scr = $_SERVER['SCRIPT_NAME'];
}
return substr($scr,0,strrpos( $scr,'/'));
$scr = substr($scr,0,strrpos( $scr,'/'));
// add a trailing '/' if needed
return ($scr{strlen($scr)-1} == '/') ? $scr : $scr . '/';
}
/**