[Phpgroupware-cvs] CVS: phpgwapi/inc class.sessions_db.inc.php,1.3,1.4

[Mark A Peters <address@hidden>]

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

Modified Files:
        class.sessions_db.inc.php 
Log Message:
Taking advantage of the get_var() function.

Index: class.sessions_db.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_db.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sessions_db.inc.php   16 Jan 2002 02:10:56 -0000      1.3
--- class.sessions_db.inc.php   29 Apr 2002 00:29:12 -0000      1.4
***************
*** 58,63 ****
                        $this->db        = $GLOBALS['phpgw']->db;
                        $this->db2       = $GLOBALS['phpgw']->db;
!                       $this->sessionid = 
(isset($GLOBALS['HTTP_GET_VARS']['sessionid'])?$GLOBALS['HTTP_GET_VARS']['sessionid']:(isset($GLOBALS['HTTP_COOKIE_VARS']['sessionid'])?$GLOBALS['HTTP_COOKIE_VARS']['sessionid']:''));
!                       $this->kp3       = 
(isset($GLOBALS['HTTP_GET_VARS']['kp3'])?$GLOBALS['HTTP_GET_VARS']['kp3']:(isset($GLOBALS['HTTP_COOKIE_VARS']['kp3'])?$GLOBALS['HTTP_COOKIE_VARS']['kp3']:''));
  
                        /* Create the crypto object */
--- 58,63 ----
                        $this->db        = $GLOBALS['phpgw']->db;
                        $this->db2       = $GLOBALS['phpgw']->db;
!                       $this->sessionid = 
get_var('sessionid',Array('COOKIE','GET'));
!                       $this->kp3       = get_var('kp3',Array('COOKIE','GET'));
  
                        /* Create the crypto object */
***************
*** 119,124 ****
                        if(empty($sessionid) || !$sessionid)
                        {
!                               $sessionid = 
$GLOBALS['HTTP_GET_VARS']['sessionid'] ? $GLOBALS['HTTP_GET_VARS']['sessionid'] 
: $GLOBALS['HTTP_COOKIE_VARS']['sessionid'];
!                               $kp3       = $GLOBALS['HTTP_GET_VARS']['kp3']   
    ? $GLOBALS['HTTP_GET_VARS']['kp3']       : 
$GLOBALS['HTTP_COOKIE_VARS']['kp3'];
                        }
  
--- 119,124 ----
                        if(empty($sessionid) || !$sessionid)
                        {
!                               $sessionid = 
get_var('sessionid',Array('COOKIE','GET'));
!                               $kp3       = 
get_var('kp3',Array('COOKIE','GET'));
                        }
  
***************
*** 879,883 ****
                function link($url, $extravars = '')
                {
!                       $kp3 = $GLOBALS['HTTP_GET_VARS']['kp3'] ? 
$GLOBALS['HTTP_GET_VARS']['kp3'] : $GLOBALS['HTTP_COOKIE_VARS']['kp3'];
  
                        if (! $kp3)
--- 879,883 ----
                function link($url, $extravars = '')
                {
!                       $kp3 = get_var('kp3',Array('COOKIE','GET'));
  
                        if (! $kp3)