[Phpgroupware-cvs] phpgwapi/inc class.phpgw.inc.php, 1.42.4.3, 1.42.4.4 class.sessions.inc.php, 1.104.4.16, 1.104.4.17 class.sessions_php4.inc.php, 1.6.2.10.2.8, 1.6.2.10.2.9

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv27739

Modified Files:
      Tag: Version-0_9_16-branch
        class.phpgw.inc.php class.sessions.inc.php 
        class.sessions_php4.inc.php 
Log Message:
try to fix php4 sessions without cookies bug


Index: class.sessions_php4.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_php4.inc.php,v
retrieving revision 1.6.2.10.2.8
retrieving revision 1.6.2.10.2.9
diff -C2 -d -r1.6.2.10.2.8 -r1.6.2.10.2.9
*** class.sessions_php4.inc.php 29 Sep 2003 00:13:15 -0000      1.6.2.10.2.8
--- class.sessions_php4.inc.php 29 Sep 2003 23:02:42 -0000      1.6.2.10.2.9
***************
*** 5,9 ****
    * and Joseph Engo <address@hidden>                                 *
    * and Ralf Becker <address@hidden>                         *
!   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
    * -------------------------------------------------------------------------*
    * This library is part of the phpGroupWare API                             *
--- 5,9 ----
    * and Joseph Engo <address@hidden>                                 *
    * and Ralf Becker <address@hidden>                         *
!   * Copyright (C) 2000 - 2003 Free Software Foundation Inc.                *
    * -------------------------------------------------------------------------*
    * This library is part of the phpGroupWare API                             *
***************
*** 33,37 ****
                        
                        //respect the config option for cookies
!                       
ini_set('session.use_cookies',$GLOBALS['phpgw_info']['server']['usecookies']);
                        
                        //controls the time out for php4 sessions - skwashd 
18-May-2003
--- 33,42 ----
                        
                        //respect the config option for cookies
!                       
ini_set('session.use_cookies',address@hidden'phpgw_info']['server']['usecookies']);
!                       //don't rewrite URL, as we have to do it in link - why? 
cos it is buggy otherwise
!                       if(address@hidden'phpgw_info']['server']['usecookies'])
!                       {
!                               ini_set('url_rewriter.tags', '');
!                       }
                        
                        //controls the time out for php4 sessions - skwashd 
18-May-2003

Index: class.sessions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions.inc.php,v
retrieving revision 1.104.4.16
retrieving revision 1.104.4.17
diff -C2 -d -r1.104.4.16 -r1.104.4.17
*** class.sessions.inc.php      28 Sep 2003 04:15:50 -0000      1.104.4.16
--- class.sessions.inc.php      29 Sep 2003 23:02:42 -0000      1.104.4.17
***************
*** 32,48 ****
  
        /**
!        * Session Management Libabray
!        * 
!        * This allows phpGroupWare to use php4 or database sessions 
!        *
!        * @package phpgwapi
!        * @subpackage sessions
!        * @abstract
!        * @author NetUSE AG Boris Erdmann, Kristian Koehntopp <br> hacked on 
by phpGW
!        * @copyright &copy; 1998-2000 NetUSE AG Boris Erdmann, Kristian 
Koehntopp <br> &copy; 2003 FreeSoftware Foundation
!        * @license LGPL
!        * @link http://www.sanisoft.com/phplib/manual/DB_sql.php
!        * @uses db
!        */
  
        class sessions_
--- 32,48 ----
  
        /**
!       * Session Management Libabray
!       * 
!       * This allows phpGroupWare to use php4 or database sessions 
!       *
!       * @package phpgwapi
!       * @subpackage sessions
!       * @abstract
!       * @author NetUSE AG Boris Erdmann, Kristian Koehntopp <br> hacked on by 
phpGW
!       * @copyright &copy; 1998-2000 NetUSE AG Boris Erdmann, Kristian 
Koehntopp <br> &copy; 2003 FreeSoftware Foundation
!       * @license LGPL
!       * @link http://www.sanisoft.com/phplib/manual/DB_sql.php
!       * @uses db
!       */
  
        class sessions_
***************
*** 1180,1183 ****
--- 1180,1184 ----
                                $extravars['kp3'] = $this->kp3;
                                $extravars['domain'] = $this->account_domain;
+                               $extravars[PHPGW_PHPSESSID] = @session_id();
                        }
                        

Index: class.phpgw.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.phpgw.inc.php,v
retrieving revision 1.42.4.3
retrieving revision 1.42.4.4
diff -C2 -d -r1.42.4.3 -r1.42.4.4
*** class.phpgw.inc.php 28 Sep 2003 04:50:21 -0000      1.42.4.3
--- class.phpgw.inc.php 29 Sep 2003 23:02:42 -0000      1.42.4.4
***************
*** 51,56 ****
--- 51,58 ----
                var $categories;
                var $common;
+               var $contacts;
                var $datetime;
                var $hooks;
+               var $js;
                var $network;
                var $nextmatchs;
***************
*** 108,131 ****
                function redirect_link($url = '',$extravars='')
                {
-                       if(@defined('PHPGW_PHPSESSID') && @defined('SID'))//add 
support for non cookie based php4 sessions
-                       {
-                               if(is_array($extravars))
-                               {
-                                       list($ignore, $id) = explode('=',SID);
-                                       $extravars[PHPGW_PHPSESSID] = $id;
-                               }
-                               else
-                               {
-                                       if($extravars)
-                                       {
-                                               $extravars .= SID; 
-                                       }
-                                       else
-                                       {
-                                               $extravars = SID;
-                                       }
-                               }
-                       }
- 
                        $this->redirect($this->session->link($url, $extravars));
                }
--- 110,113 ----