[Phpgroupware-cvs] CVS: phpgwapi/inc class.sessions_db.inc.php,1.6,1.7 class.sessions_php4.inc.php,1.9,1.10

[Miles Lott <address@hidden>]

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

Modified Files:
        class.sessions_db.inc.php class.sessions_php4.inc.php 
Log Message:
verify that get_var did not return an empty cookie var (breaks noncookie 
sessions)



Index: class.sessions_db.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_db.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.sessions_db.inc.php   30 May 2002 09:44:38 -0000      1.6
--- class.sessions_db.inc.php   12 Aug 2002 00:59:34 -0000      1.7
***************
*** 119,124 ****
                        if(empty($sessionid) || !$sessionid)
                        {
!                               $sessionid = 
get_var('sessionid',Array('COOKIE','GET'));
!                               $kp3       = 
get_var('kp3',Array('COOKIE','GET'));
                        }
  
--- 119,132 ----
                        if(empty($sessionid) || !$sessionid)
                        {
!                               $sessionid = 
get_var('sessionid',array('COOKIE'));
!                               if(@empty($sessionid))
!                               {
!                                       $sessionid = 
get_var('sessionid',array('GET'));
!                               }
!                               $kp3 = get_var('kp3',array('COOKIE'));
!                               if(@empty($kp3))
!                               {
!                                       $kp3 = get_var('kp3',array('GET'));
!                               }
                        }
  

Index: class.sessions_php4.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_php4.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.sessions_php4.inc.php 30 May 2002 09:44:38 -0000      1.9
--- class.sessions_php4.inc.php 12 Aug 2002 00:59:34 -0000      1.10
***************
*** 114,124 ****
                        if(empty($sessionid) || !$sessionid)
                        {
!                               $sessionid = 
get_var('sessionid',Array('COOKIE','GET'));
!                               $kp3       = 
get_var('kp3',Array('COOKIE','GET'));
                        }
  
                        $this->sessionid = $sessionid;
                        $this->kp3       = $kp3;
-                       
  
                        session_start();
--- 114,131 ----
                        if(empty($sessionid) || !$sessionid)
                        {
!                               $sessionid = 
get_var('sessionid',array('COOKIE'));
!                               if(@empty($sessionid))
!                               {
!                                       $sessionid = 
get_var('sessionid',array('GET'));
!                               }
!                               $kp3 = get_var('kp3',array('COOKIE'));
!                               if(@empty($kp3))
!                               {
!                                       $kp3 = get_var('kp3',array('GET'));
!                               }
                        }
  
                        $this->sessionid = $sessionid;
                        $this->kp3       = $kp3;
  
                        session_start();
***************
*** 390,394 ****
                        $GLOBALS['phpgw_session']['session_action'] = 
$GLOBALS['PHP_SELF'];
                        $GLOBALS['phpgw_session']['session_flags'] = 
$session_flags;
!               
                        session_register('phpgw_session');
                        $GLOBALS['HTTP_SESSION_VARS']['phpgw_session'] = 
$GLOBALS['phpgw_session'];
--- 397,401 ----
                        $GLOBALS['phpgw_session']['session_action'] = 
$GLOBALS['PHP_SELF'];
                        $GLOBALS['phpgw_session']['session_flags'] = 
$session_flags;
! 
                        session_register('phpgw_session');
                        $GLOBALS['HTTP_SESSION_VARS']['phpgw_session'] = 
$GLOBALS['phpgw_session'];
***************
*** 603,607 ****
                        $GLOBALS['phpgw_session']['session_action'] = 
$GLOBALS['PHP_SELF'];
                        $GLOBALS['phpgw_session']['session_flags'] = 
$session_flags;
!               
                        session_register('phpgw_session');
                        $GLOBALS['HTTP_SESSION_VARS']['phpgw_session'] = 
$GLOBALS['phpgw_session'];
--- 610,614 ----
                        $GLOBALS['phpgw_session']['session_action'] = 
$GLOBALS['PHP_SELF'];
                        $GLOBALS['phpgw_session']['session_flags'] = 
$session_flags;
! 
                        session_register('phpgw_session');
                        $GLOBALS['HTTP_SESSION_VARS']['phpgw_session'] = 
$GLOBALS['phpgw_session'];
***************
*** 631,635 ****
                        $GLOBALS['phpgw_session']['session_dla'] = time();
                        $GLOBALS['phpgw_session']['session_action'] = $action;
!               
                        session_register('phpgw_session');
                        $GLOBALS['HTTP_SESSION_VARS']['phpgw_session'] = 
$GLOBALS['phpgw_session'];
--- 638,642 ----
                        $GLOBALS['phpgw_session']['session_dla'] = time();
                        $GLOBALS['phpgw_session']['session_action'] = $action;
! 
                        session_register('phpgw_session');
                        $GLOBALS['HTTP_SESSION_VARS']['phpgw_session'] = 
$GLOBALS['phpgw_session'];
***************
*** 743,747 ****
                        }
                }
!       
                function appsession($location = 'default', $appname = '', $data 
= '##NOTHING##')
                {
--- 750,754 ----
                        }
                }
! 
                function appsession($location = 'default', $appname = '', $data 
= '##NOTHING##')
                {
***************
*** 859,863 ****
                                }
                        }
!                       
                        if($full_scriptname)
                        {
--- 866,870 ----
                                }
                        }
! 
                        if($full_scriptname)
                        {