[Phpgroupware-cvs] phpgroupware login.php logout.php header.inc.ph...

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    phpgroupware
Changes by:     Dave Hall <skwashd>     06/09/09 11:35:16

Modified files:
        .              : login.php logout.php header.inc.php.template 

Log message:
        switch to new sessions classes, rename php4 to php and use object 
facotry

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/login.php?cvsroot=phpgroupware&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/logout.php?cvsroot=phpgroupware&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/header.inc.php.template?cvsroot=phpgroupware&r1=1.48&r2=1.49

Patches:
Index: login.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/login.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- login.php   31 Aug 2006 01:48:31 -0000      1.108
+++ login.php   9 Sep 2006 11:35:15 -0000       1.109
@@ -8,7 +8,7 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgroupware
-       * @version $Id: login.php,v 1.108 2006/08/31 01:48:31 skwashd Exp $
+       * @version $Id: login.php,v 1.109 2006/09/09 11:35:15 skwashd Exp $
        */
 
        $phpgw_info = array();
@@ -98,8 +98,8 @@
                                
$GLOBALS['phpgw']->sessions->phpgw_setcookie('kp3');
                                
$GLOBALS['phpgw']->sessions->phpgw_setcookie('domain');
 
-                               // fix for bug php4 expired sessions bug
-                               
if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php4')
+                               // fix for bug in php expired sessions not 
being cleared
+                               
if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php')
                                {
                                        
$GLOBALS['phpgw']->sessions->phpgw_setcookie(PHPGW_PHPSESSID);
                                }

Index: logout.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/logout.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- logout.php  15 Apr 2005 13:19:15 -0000      1.29
+++ logout.php  9 Sep 2006 11:35:16 -0000       1.30
@@ -7,7 +7,7 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgroupware
-       * @version $Id: logout.php,v 1.29 2005/04/15 13:19:15 powerstat Exp $
+       * @version $Id: logout.php,v 1.30 2006/09/09 11:35:16 skwashd Exp $
        */
 
        $GLOBALS['phpgw_info']        = array();
@@ -60,7 +60,7 @@
        $GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
        $GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
        $GLOBALS['phpgw']->session->phpgw_setcookie('domain');
-       if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php4')
+       if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php')
        {
                $GLOBALS['phpgw']->session->phpgw_setcookie(PHPGW_PHPSESSID);
        }

Index: header.inc.php.template
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/header.inc.php.template,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- header.inc.php.template     15 Apr 2005 13:19:15 -0000      1.48
+++ header.inc.php.template     9 Sep 2006 11:35:16 -0000       1.49
@@ -8,7 +8,7 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgroupware
-       * @version $Id: header.inc.php.template,v 1.48 2005/04/15 13:19:15 
powerstat Exp $
+       * @version $Id: header.inc.php.template,v 1.49 2006/09/09 11:35:16 
skwashd Exp $
        */
 
 
@@ -64,7 +64,7 @@
        * phpGroupWare can handle session management using the database, but if
        * you are using PHP4+ you can usually get better performance by having 
phpGroupWare
        * use the session support built into PHP4. PHP3 users will have to use 
the database.
-       * Your choices are 'db' or 'php4'
+       * Your choices are 'db' or 'php'
        */
        $GLOBALS['phpgw_info']['server']['sessions_type'] = '{SESSIONS_TYPE}';