From 20c284546fb68c4ec1bd50d0463a45b2d660c48e Mon Sep 17 00:00:00 2001
From: rub <rub@piwigo.org>
Date: Tue, 1 May 2007 13:57:52 +0000
Subject: Issue 0000684: History [Search] - Add a thumbnail display   o Display
 choice can be selected   o Display choice is saved on on cookie   o Small
 improvement picture link (hoverbox on all the link, alt&title on classic
 mode)   o New cookie functions and use

Enhance computing method of script_basename function.

http://forum.phpwebgallery.net/viewtopic.php?pid=58258#p58258

Merge BSF 1988:1989 into branch-1_7

git-svn-id: http://piwigo.org/svn/trunk@1992 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/functions_session.inc.php | 62 ++-------------------------------------
 1 file changed, 2 insertions(+), 60 deletions(-)

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

diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
index d02fea3ae..8e49d9b0d 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$
@@ -75,63 +74,6 @@ if (isset($conf['session_save_handler'])
   session_set_cookie_params(0, cookie_path());
 }
 
-// cookie_path returns the path to use for the PhpWebGallery cookie.
-// If PhpWebGallery is installed on :
-// http://domain.org/meeting/gallery/category.php
-// cookie_path will return : "/meeting/gallery"
-function cookie_path()
-{
-  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']) )
-    {
-      $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'];
-    }
-  }
-  else
-  {
-    $scr = $_SERVER['SCRIPT_NAME'];
-  }
-  $scr = substr($scr,0,strrpos( $scr,'/'));
-
-  // add a trailing '/' if needed
-  $scr .= ($scr{strlen($scr)-1} == '/') ? '' : '/';
-  
-  if ( substr(PHPWG_ROOT_PATH,0,3)=='../')
-  { // this is maybe a plugin inside pwg directory
-    // TODO - what if it is an external script outside PWG ?
-    $scr = $scr.PHPWG_ROOT_PATH;
-    while (1)
-    {
-      $new = preg_replace('#[^/]+/\.\.(/|$)#', '', $scr);
-      if ($new==$scr)
-      {
-        break;
-      }
-      $scr=$new;
-    }
-  }
-  return $scr;
-}
-
 /**
  * returns true; used when the session_start() function is called
  *
-- 
cgit v1.2.3