[Phpgroupware-cvs] [19052] Fix a notice (does this code still needed ?), fix a '' to '

[Caeies]

Revision: 19052
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19052
Author:   Caeies
Date:     2009-02-04 18:07:09 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
Fix a notice (does this code still needed ?), fix a '' to '

Modified Paths:
--------------
    core/trunk/logout.php
    core/trunk/phpgwapi/inc/sso/include_login.inc.php

Modified: core/trunk/logout.php
===================================================================
--- core/trunk/logout.php       2009-02-04 18:03:06 UTC (rev 19051)
+++ core/trunk/logout.php       2009-02-04 18:07:09 UTC (rev 19052)
@@ -64,7 +64,7 @@
        $GLOBALS['phpgw']->session->phpgw_setcookie('domain');
        if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php')
        {
-               $GLOBALS['phpgw']->session->phpgw_setcookie(PHPGW_PHPSESSID);
+               $GLOBALS['phpgw']->session->phpgw_setcookie('PHPGW_PHPSESSID');
        }
 
        
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'].'/login.php?cd=1');

Modified: core/trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/sso/include_login.inc.php   2009-02-04 18:03:06 UTC 
(rev 19051)
+++ core/trunk/phpgwapi/inc/sso/include_login.inc.php   2009-02-04 18:07:09 UTC 
(rev 19052)
@@ -44,7 +44,7 @@
        $GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT
                        . 
"/phpgwapi/templates/{$GLOBALS['phpgw_info']['server']['template_set']}";
 
-       $tmpl = CreateObject('phpgwapi.Template', 
$GLOBALS["phpgw_info"]['server']['template_dir']);
+       $tmpl = CreateObject('phpgwapi.Template', 
$GLOBALS['phpgw_info']['server']['template_dir']);
 
        /*
         * Generic include for mapping / remoteuser mode
@@ -123,9 +123,9 @@
                                        
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
 
                                        // fix for bug php4 expired sessions bug
-                                       
if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php4')
+                                       
if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php')
                                        {
-                                               
$GLOBALS['phpgw']->session->phpgw_setcookie(PHPGW_PHPSESSID);
+                                               
$GLOBALS['phpgw']->session->phpgw_setcookie('PHPGW_PHPSESSID');
                                        }
 
                                        return lang('Your session could not be 
verified.');