From 1e8220d083ffebf0b109050fb258235723234dc1 Mon Sep 17 00:00:00 2001
From: rub <rub@piwigo.org>
Date: Tue, 8 May 2007 10:16:26 +0000
Subject: 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

git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2005 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/functions_session.inc.php | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'include/functions_session.inc.php')

diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
index d02fea3ae..a4a0bd8a1 100644
--- a/include/functions_session.inc.php
+++ b/include/functions_session.inc.php
@@ -2,10 +2,9 @@
 // +-----------------------------------------------------------------------+
 // | 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 |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
 // | revision      : $Revision$
@@ -87,29 +86,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
-- 
cgit v1.2.3