phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: setup/inc class.setup.inc.php,1.19.2.1,1.19.2.2


From: Mark A Peters <address@hidden>
Subject: [Phpgroupware-cvs] CVS: setup/inc class.setup.inc.php,1.19.2.1,1.19.2.2
Date: Tue, 29 Jan 2002 23:42:11 -0500

Update of /cvsroot/phpgroupware/setup/inc
In directory subversions:/tmp/cvs-serv27713/setup/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.setup.inc.php 
Log Message:
This might fix some problems with installation under php 4.0.6 versions.

Index: class.setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/class.setup.inc.php,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -C2 -r1.19.2.1 -r1.19.2.2
*** class.setup.inc.php 14 Jan 2002 12:14:17 -0000      1.19.2.1
--- class.setup.inc.php 30 Jan 2002 04:42:08 -0000      1.19.2.2
***************
*** 74,80 ****
                                        $FormLogout == 'sqltoarray')
                                {
!                                       setcookie('ConfigPW');  /* scrub the 
old one */
!                                       setcookie('ConfigDomain');  /* scrub 
the old one */
!                                       setcookie('ConfigLang');
                                        
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'You have successfully 
logged out';
                                        
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
--- 74,80 ----
                                        $FormLogout == 'sqltoarray')
                                {
!                                       setcookie('ConfigPW','');  /* scrub the 
old one */
!                                       setcookie('ConfigDomain','');  /* scrub 
the old one */
!                                       setcookie('ConfigLang','');
                                        
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'You have successfully 
logged out';
                                        
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
***************
*** 83,87 ****
                                elseif($FormLogout == 'header')
                                {
!                                       setcookie('HeaderPW');  /* scrub the 
old one */
                                        
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'You have successfully 
logged out';
                                        
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
--- 83,87 ----
                                elseif($FormLogout == 'header')
                                {
!                                       setcookie('HeaderPW','');  /* scrub the 
old one */
                                        
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'You have successfully 
logged out';
                                        
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
***************
*** 93,99 ****
                                if ($ConfigPW != 
$GLOBALS['phpgw_domain'][$ConfigDomain]['config_passwd'] && $auth_type == 
'Config')
                                {
!                                       setcookie('ConfigPW');  /* scrub the 
old one */
!                                       setcookie('ConfigDomain');  /* scrub 
the old one */
!                                       setcookie('ConfigLang');
                                        
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid session cookie 
(cookies must be enabled)';
                                        
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
--- 93,99 ----
                                if ($ConfigPW != 
$GLOBALS['phpgw_domain'][$ConfigDomain]['config_passwd'] && $auth_type == 
'Config')
                                {
!                                       setcookie('ConfigPW','');  /* scrub the 
old one */
!                                       setcookie('ConfigDomain','');  /* scrub 
the old one */
!                                       setcookie('ConfigLang','');
                                        
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid session cookie 
(cookies must be enabled)';
                                        
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
***************
*** 111,119 ****
                                        if ($FormPW == 
$GLOBALS['phpgw_domain'][$FormDomain]['config_passwd'] && $auth_type == 
'Config')
                                        {
!                                               setcookie('HeaderPW');  /* 
scrub the old one */
!                                               setcookie('ConfigPW',$FormPW);
!                                               
setcookie('ConfigDomain',$FormDomain);
!                                               
setcookie('ConfigLang',$ConfigLang);
!                                               $ConfigDomain = $FormDomain;
                                                return True;
                                        }
--- 111,119 ----
                                        if ($FormPW == 
$GLOBALS['phpgw_domain'][$FormDomain]['config_passwd'] && $auth_type == 
'Config')
                                        {
!                                               setcookie('HeaderPW','');  /* 
scrub the old one */
!                                               setcookie('ConfigPW',"$FormPW");
!                                               
setcookie('ConfigDomain',"$FormDomain");
!                                               
setcookie('ConfigLang',"$ConfigLang");
!                                               $ConfigDomain = "$FormDomain";
                                                return True;
                                        }
***************
*** 129,133 ****
                                        if ($FormPW == 
$GLOBALS['phpgw_info']['server']['header_admin_password'] && $auth_type == 
'Header')
                                        {
!                                               setcookie('HeaderPW',$FormPW);
                                                return True;
                                        }
--- 129,133 ----
                                        if ($FormPW == 
$GLOBALS['phpgw_info']['server']['header_admin_password'] && $auth_type == 
'Header')
                                        {
!                                               setcookie('HeaderPW',"$FormPW");
                                                return True;
                                        }
***************
*** 144,148 ****
                                if ($HeaderPW != 
$GLOBALS['phpgw_info']['server']['header_admin_password'] && $auth_type == 
'Header')
                                {
!                                       setcookie('HeaderPW');  /* scrub the 
old one */
                                        
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid session cookie 
(cookies must be enabled)';
                                        
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
--- 144,148 ----
                                if ($HeaderPW != 
$GLOBALS['phpgw_info']['server']['header_admin_password'] && $auth_type == 
'Header')
                                {
!                                       setcookie('HeaderPW','');  /* scrub the 
old one */
                                        
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid session cookie 
(cookies must be enabled)';
                                        
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';




reply via email to

[Prev in Thread] Current Thread [Next in Thread]