[Phpgroupware-cvs] CVS: phpgwapi/inc class.sessions.inc.php,1.104.4.3,1.104.4.4 class.sessions_db.inc.php,1.2.2.10.2.5,1.2.2.10.2.6 class.sessions_php4.inc.php,1.6.2.10.2.3,1.6.2.10.2.4

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.sessions.inc.php class.sessions_db.inc.php 
        class.sessions_php4.inc.php 
Log Message:
moved the php4-specific initialising to the constructor of the sessions_php4 
class
removed the "not for php4 sessions" text from the config


Index: class.sessions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions.inc.php,v
retrieving revision 1.104.4.3
retrieving revision 1.104.4.4
diff -C2 -r1.104.4.3 -r1.104.4.4
*** class.sessions.inc.php      18 May 2003 06:21:53 -0000      1.104.4.3
--- class.sessions.inc.php      18 May 2003 08:37:42 -0000      1.104.4.4
***************
*** 52,56 ****
                var $data;
                var $db;
-               var $db2;
                var $public_functions = array(
                        'list_methods' => True,
--- 52,55 ----
***************
*** 69,73 ****
                {
  
!                       $this->db = $this->db2 = $GLOBALS['phpgw']->db;
                        $this->sessionid = 
get_var('sessionid',array('GET','COOKIE'));
                        $this->kp3       = get_var('kp3',array('GET','COOKIE'));
--- 68,72 ----
                {
  
!                       $this->db = $GLOBALS['phpgw']->db;
                        $this->sessionid = 
get_var('sessionid',array('GET','COOKIE'));
                        $this->kp3       = get_var('kp3',array('GET','COOKIE'));
***************
*** 130,139 ****
                        }
  
!                       //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'));
!                       }
                }
  
--- 129,134 ----
                        }
  
!                       // call the constructor of the extended class
!                       $this->sessions_();
                }
  

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.5
retrieving revision 1.2.2.10.2.6
diff -C2 -r1.2.2.10.2.5 -r1.2.2.10.2.6
*** class.sessions_db.inc.php   18 May 2003 06:21:53 -0000      1.2.2.10.2.5
--- class.sessions_db.inc.php   18 May 2003 08:37:42 -0000      1.2.2.10.2.6
***************
*** 26,29 ****
--- 26,34 ----
        class sessions_
        {
+               function sessions_()
+               {
+                       // empty for now, but needed
+               }
+               
                function read_session($sessionid)
                {

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.3
retrieving revision 1.6.2.10.2.4
diff -C2 -r1.6.2.10.2.3 -r1.6.2.10.2.4
*** class.sessions_php4.inc.php 18 May 2003 06:21:53 -0000      1.6.2.10.2.3
--- class.sessions_php4.inc.php 18 May 2003 08:37:42 -0000      1.6.2.10.2.4
***************
*** 27,30 ****
--- 27,37 ----
        class sessions_
        {
+               function sessions_()
+               {
+                       //controls the time out for php4 sessions - skwashd 
18-May-2003
+                       ini_set('session.gc_maxlifetime', 
$GLOBALS['phpgw_info']['server']['sessions_timeout']);
+                       define('PHPGW_PHPSESSID', ini_get('session.name'));
+               }
+               
                function read_session($sessionid)
                {