Changeset 2005

Timestamp:

May 8, 2007, 12:16:26 PM (17 years ago)

Author:

rub

Message:

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)

Manual merge BSF 2004-2004 into branch_1.7

File:

• branches/branch-1_7/include/functions_session.inc.php (modified) (3 diffs)

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

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -88 +87 @@
   }
   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
@@ -111 +96 @@
     $scr = $_SERVER['SCRIPT_NAME'];
   }
+
   $scr = substr($scr,0,strrpos( $scr,'/'));