[Phpgroupware-cvs] CVS: phpgwapi/inc class.sessions.inc.php,1.104.4.2,1.104.4.3 class.sessions_db.inc.php,1.2.2.10.2.4,1.2.2.10.2.5 class.sessions_php4.inc.php,1.6.2.10.2.2,1.6.2.10.2.3

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.sessions.inc.php class.sessions_db.inc.php 
        class.sessions_php4.inc.php 
Log Message:
globals and fix for php4 sessions times out

Index: class.sessions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions.inc.php,v
retrieving revision 1.104.4.2
retrieving revision 1.104.4.3
diff -C2 -r1.104.4.2 -r1.104.4.3
*** class.sessions.inc.php      17 May 2003 23:58:12 -0000      1.104.4.2
--- class.sessions.inc.php      18 May 2003 06:21:53 -0000      1.104.4.3
***************
*** 68,71 ****
--- 68,72 ----
                function sessions()
                {
+ 
                        $this->db = $this->db2 = $GLOBALS['phpgw']->db;
                        $this->sessionid = 
get_var('sessionid',array('GET','COOKIE'));
***************
*** 75,79 ****
                        $GLOBALS['phpgw']->crypto = 
CreateObject('phpgwapi.crypto');
                        $this->phpgw_set_cookiedomain();
!                       
                        // verfiy and if necessary create and save our config 
settings
                        //
--- 76,80 ----
                        $GLOBALS['phpgw']->crypto = 
CreateObject('phpgwapi.crypto');
                        $this->phpgw_set_cookiedomain();
! 
                        // verfiy and if necessary create and save our config 
settings
                        //
***************
*** 128,131 ****
--- 129,139 ----
                                unset($config);
                        }
+ 
+                       //controls the time out for php4 sessions - skwashd 
18-May-2003
+                       if($GLOBALS['phpgw_info']['server']['sessions_type'] == 
'php4')
+                       {
+                               ini_set('session.gc_maxlifetime', 
$GLOBALS['phpgw_info']['server']['sessions_timeout']);
+                               define('PHPGW_PHPSESSID', 
ini_get('session.name'));
+                       }
                }
  
***************
*** 317,335 ****
                function getuser_ip()
                {
!                       global 
$HTTP_SERVER_VARS,$REMOTE_ADDR,$HTTP_X_FORWARDED_FOR;
! 
!                       if ($GLOBALS['HTTP_X_FORWARDED_FOR'] || 
$HTTP_X_FORWARDED_FOR)
!                       {
!                               return $GLOBALS['HTTP_X_FORWARDED_FOR'] ? 
$GLOBALS['HTTP_X_FORWARDED_FOR'] : $HTTP_X_FORWARDED_FOR;
!                       }
!                       else
!                       {
!                               return 
$GLOBALS['HTTP_SERVER_VARS']['REMOTE_ADDR'] ? 
$GLOBALS['HTTP_SERVER_VARS']['REMOTE_ADDR'] : $REMOTE_ADDR;
!                       }
                }
  
                function phpgw_set_cookiedomain()
                {
!                       $dom = $GLOBALS['HTTP_SERVER_VARS']['HTTP_HOST'];
                        if (preg_match("/^(.*):(.*)$/",$dom,$arr))
                        {
--- 325,334 ----
                function getuser_ip()
                {
!                       return (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? 
$_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR']);
                }
  
                function phpgw_set_cookiedomain()
                {
!                       $dom = $_SERVER['HTTP_HOST'];
                        if (preg_match("/^(.*):(.*)$/",$dom,$arr))
                        {

Index: class.sessions_db.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_db.inc.php,v
retrieving revision 1.2.2.10.2.4
retrieving revision 1.2.2.10.2.5
diff -C2 -r1.2.2.10.2.4 -r1.2.2.10.2.5
*** class.sessions_db.inc.php   17 May 2003 23:58:12 -0000      1.2.2.10.2.4
--- class.sessions_db.inc.php   18 May 2003 06:21:53 -0000      1.2.2.10.2.5
***************
*** 64,68 ****
                function update_dla()
                {
-                       global $PHP_SELF;
                        if (@isset($_GET['menuaction']))
                        {
--- 64,67 ----
***************
*** 71,75 ****
                        else
                        {
!                               $action = $PHP_SELF;
                        }
  
--- 70,74 ----
                        else
                        {
!                               $action = $_SERVER['PHP_SELF'];
                        }
  

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.2
retrieving revision 1.6.2.10.2.3
diff -C2 -r1.6.2.10.2.2 -r1.6.2.10.2.3
*** class.sessions_php4.inc.php 17 May 2003 23:58:12 -0000      1.6.2.10.2.2
--- class.sessions_php4.inc.php 18 May 2003 06:21:53 -0000      1.6.2.10.2.3
***************
*** 53,57 ****
                        $GLOBALS['phpgw_session']['session_logintime'] = $now;
                        $GLOBALS['phpgw_session']['session_dla'] = $now;
!                       $GLOBALS['phpgw_session']['session_action'] = 
$GLOBALS['PHP_SELF'];
                        $GLOBALS['phpgw_session']['session_flags'] = 
$session_flags;
                        // we need the install-id to differ between serveral 
installs shareing one tmp-dir
--- 53,57 ----
                        $GLOBALS['phpgw_session']['session_logintime'] = $now;
                        $GLOBALS['phpgw_session']['session_dla'] = $now;
!                       $GLOBALS['phpgw_session']['session_action'] = 
$_SERVER['PHP_SELF'];
                        $GLOBALS['phpgw_session']['session_flags'] = 
$session_flags;
                        // we need the install-id to differ between serveral 
installs shareing one tmp-dir