[Phpgroupware-cvs] CVS: phpgroupware login.php,1.81,1.82

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/phpgroupware
In directory subversions:/tmp/cvs-serv11806

Modified Files:
        login.php 
Log Message:
do not set cookies if not using cookies

Index: login.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/login.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** login.php   31 May 2002 18:13:07 -0000      1.81
--- login.php   12 Aug 2002 00:57:51 -0000      1.82
***************
*** 68,84 ****
                {
                        case 1:
!                               
$GLOBALS['phpgw_info']['flags']['msgbox_data']['You have been successfully 
logged out']=True;
                                break;
                        case 2:
!                               
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Sorry, your login has 
expired']=False;
                                break;
                        case 5:
!                               
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Bad login or password']=False;
                                break;
                        case 10:
!                               Setcookie('sessionid');
!                               Setcookie('kp3');
!                               Setcookie('domain');
!                               
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Your session could not be 
verified']=False;
                                break;
                }
--- 68,87 ----
                {
                        case 1:
!                               
$GLOBALS['phpgw_info']['flags']['msgbox_data']['You have been successfully 
logged out'] = True;
                                break;
                        case 2:
!                               
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Sorry, your login has expired'] 
= False;
                                break;
                        case 5:
!                               
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Bad login or password'] = False;
                                break;
                        case 10:
!                               
if($GLOBALS['phpgw_info']['server']['usecookies'])
!                               {
!                                       Setcookie('sessionid');
!                                       Setcookie('kp3');
!                                       Setcookie('domain');
!                               }
!                               
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Your session could not be 
verified'] = False;
                                break;
                }
***************
*** 115,119 ****
                        # login will be set here if the user logged out and 
uses a different username with
                        # the same SSL-certificate.
!                       if (!isset($login)&&isset($sslattributes['Email'])) {
                                $login = $sslattributes['Email'];
                                # not checked against the database, but 
delivered to authentication module
--- 118,123 ----
                        # login will be set here if the user logged out and 
uses a different username with
                        # the same SSL-certificate.
!                       if (!isset($login)&&isset($sslattributes['Email']))
!                       {
                                $login = $sslattributes['Email'];
                                # not checked against the database, but 
delivered to authentication module
***************
*** 135,139 ****
                $GLOBALS['sessionid'] = 
$GLOBALS['phpgw']->session->create($GLOBALS['HTTP_POST_VARS']['login'],$GLOBALS['HTTP_POST_VARS']['passwd'],$GLOBALS['HTTP_POST_VARS']['passwd_type']);
  
!               if (! isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
                {
                        
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/login.php?code=5');
--- 139,143 ----
                $GLOBALS['sessionid'] = 
$GLOBALS['phpgw']->session->create($GLOBALS['HTTP_POST_VARS']['login'],$GLOBALS['HTTP_POST_VARS']['passwd'],$GLOBALS['HTTP_POST_VARS']['passwd_type']);
  
!               if(!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid'])
                {
                        
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/login.php?code=5');