This might fix some problems with installation under php 4.0.6 versions.

This commit is contained in:
skeeter 2002-01-30 04:41:44 +00:00
parent 30684926fe
commit 539f13e14d

View File

@ -73,16 +73,16 @@
$FormLogout == 'ldapimport' || $FormLogout == 'ldapimport' ||
$FormLogout == 'sqltoarray') $FormLogout == 'sqltoarray')
{ {
setcookie('ConfigPW'); /* scrub the old one */ setcookie('ConfigPW',''); /* scrub the old one */
setcookie('ConfigDomain'); /* scrub the old one */ setcookie('ConfigDomain',''); /* scrub the old one */
setcookie('ConfigLang'); setcookie('ConfigLang','');
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'You have successfully logged out'; $GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'You have successfully logged out';
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = ''; $GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
return False; return False;
} }
elseif($FormLogout == 'header') elseif($FormLogout == 'header')
{ {
setcookie('HeaderPW'); /* scrub the old one */ setcookie('HeaderPW',''); /* scrub the old one */
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'You have successfully logged out'; $GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'You have successfully logged out';
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = ''; $GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
return False; return False;
@ -92,9 +92,9 @@
{ {
if ($ConfigPW != $GLOBALS['phpgw_domain'][$ConfigDomain]['config_passwd'] && $auth_type == 'Config') if ($ConfigPW != $GLOBALS['phpgw_domain'][$ConfigDomain]['config_passwd'] && $auth_type == 'Config')
{ {
setcookie('ConfigPW'); /* scrub the old one */ setcookie('ConfigPW',''); /* scrub the old one */
setcookie('ConfigDomain'); /* scrub the old one */ setcookie('ConfigDomain',''); /* scrub the old one */
setcookie('ConfigLang'); setcookie('ConfigLang','');
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid session cookie (cookies must be enabled)'; $GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid session cookie (cookies must be enabled)';
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = ''; $GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
return False; return False;
@ -110,11 +110,11 @@
{ {
if ($FormPW == $GLOBALS['phpgw_domain'][$FormDomain]['config_passwd'] && $auth_type == 'Config') if ($FormPW == $GLOBALS['phpgw_domain'][$FormDomain]['config_passwd'] && $auth_type == 'Config')
{ {
setcookie('HeaderPW'); /* scrub the old one */ setcookie('HeaderPW',''); /* scrub the old one */
setcookie('ConfigPW',$FormPW); setcookie('ConfigPW',"$FormPW");
setcookie('ConfigDomain',$FormDomain); setcookie('ConfigDomain',"$FormDomain");
setcookie('ConfigLang',$ConfigLang); setcookie('ConfigLang',"$ConfigLang");
$ConfigDomain = $FormDomain; $ConfigDomain = "$FormDomain";
return True; return True;
} }
else else
@ -128,7 +128,7 @@
{ {
if ($FormPW == $GLOBALS['phpgw_info']['server']['header_admin_password'] && $auth_type == 'Header') if ($FormPW == $GLOBALS['phpgw_info']['server']['header_admin_password'] && $auth_type == 'Header')
{ {
setcookie('HeaderPW',$FormPW); setcookie('HeaderPW',"$FormPW");
return True; return True;
} }
else else
@ -143,7 +143,7 @@
{ {
if ($HeaderPW != $GLOBALS['phpgw_info']['server']['header_admin_password'] && $auth_type == 'Header') if ($HeaderPW != $GLOBALS['phpgw_info']['server']['header_admin_password'] && $auth_type == 'Header')
{ {
setcookie('HeaderPW'); /* scrub the old one */ setcookie('HeaderPW',''); /* scrub the old one */
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid session cookie (cookies must be enabled)'; $GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid session cookie (cookies must be enabled)';
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = ''; $GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
return False; return False;