Changeset 1443 for branches/branch-1_6

Timestamp:

Jul 8, 2006, 11:31:09 AM (18 years ago)

Author:

chrisaga

Message:

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

File:

• branches/branch-1_6/include/functions_session.inc.php (modified) (2 diffs)

branches/branch-1_6/include/functions_session.inc.php

@@ -85 +85 @@
 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.
@@ -109 +114 @@
     $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 . '/';
 }