[Phpgroupware-cvs] CVS: phpgwapi/inc class.sessions.inc.php,1.104.4.4,1.104.4.5

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.sessions.inc.php 
Log Message:
another fix

Index: class.sessions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions.inc.php,v
retrieving revision 1.104.4.4
retrieving revision 1.104.4.5
diff -C2 -r1.104.4.4 -r1.104.4.5
*** class.sessions.inc.php      18 May 2003 08:37:42 -0000      1.104.4.4
--- class.sessions.inc.php      18 May 2003 11:32:47 -0000      1.104.4.5
***************
*** 933,937 ****
                        }
  
!                       
if(@isset($GLOBALS['phpgw_info']['server']['enforce_ssl']) && 
$GLOBALS['phpgw_info']['server']['enforce_ssl'] && 
!$GLOBALS['HTTP_SERVER_VARS']['HTTPS'])
                        {
                                if(substr($url ,0,4) != 'http')
--- 933,937 ----
                        }
  
!                       
if(@isset($GLOBALS['phpgw_info']['server']['enforce_ssl']) && 
$GLOBALS['phpgw_info']['server']['enforce_ssl'] && !$_SERVER['HTTPS'])
                        {
                                if(substr($url ,0,4) != 'http')
***************
*** 972,976 ****
                        
                        /* add session params if not using cookies */
!                       if (@!$GLOBALS['phpgw_info']['server']['usecookies'])
                        {
                                $kp3 = get_var('kp3',Array('GET','COOKIE'));
--- 972,976 ----
                        
                        /* add session params if not using cookies */
!                       if (address@hidden'phpgw_info']['server']['usecookies'])
                        {
                                $kp3 = get_var('kp3',Array('GET','COOKIE'));
***************
*** 979,984 ****
                                        $kp3 = 
$GLOBALS['phpgw_info']['user']['kp3'];
                                }
  
!                               $extravars['sessionid'] = 
@$GLOBALS['phpgw_info']['user']['sessionid'];
                                $extravars['kp3'] = $kp3;
                                $extravars['domain'] = 
@$GLOBALS['phpgw_info']['user']['domain'];
--- 979,990 ----
                                        $kp3 = 
$GLOBALS['phpgw_info']['user']['kp3'];
                                }
+                               
+                               $sessionid = get_var('sessionid', array('GET', 
'COOKIE'));
+                               if(!$sessionid)
+                               {
+                                       $sessionid = 
$GLOBALS['phpgw_info']['user']['sessionid'];
+                               }
  
!                               $extravars['sessionid'] = $sessionid;
                                $extravars['kp3'] = $kp3;
                                $extravars['domain'] = 
@$GLOBALS['phpgw_info']['user']['domain'];