[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.setup.inc.php,1.1,1.2
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.setup.inc.php,1.1,1.2 |
|
Date: |
Sun, 03 Mar 2002 21:55:56 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv20015/phpgwapi/inc
Modified Files:
class.setup.inc.php
Log Message:
Hopefully better logic for login/logout of the two setup logins
Index: class.setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.setup.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.setup.inc.php 3 Mar 2002 21:47:30 -0000 1.1
--- class.setup.inc.php 4 Mar 2002 02:55:52 -0000 1.2
***************
*** 70,172 ****
{
$FormLogout = get_var('FormLogout',
array('GET','POST'));
! $ConfigLogin = get_var('ConfigLogin',
array('POST','COOKIE'));
! $HeaderLogin = get_var('HeaderLogin',
array('POST','COOKIE'));
$FormDomain = get_var('FormDomain', array('POST'));
$FormPW = get_var('FormPW', array('POST'));
$ConfigDomain =
get_var('ConfigDomain',array('POST','COOKIE'));
$ConfigPW = get_var('ConfigPW',
array('POST','COOKIE'));
! $HeaderPW = get_var('HeaderPW',
array('COOKIE','POST'));
$ConfigLang = get_var('ConfigLang',
array('POST','COOKIE'));
! if(isset($FormLogout) && !empty($FormLogout))
{
! if($FormLogout == 'config' ||
! $FormLogout == 'ldap' ||
! $FormLogout == 'ldapexport' ||
! $FormLogout == 'ldapimport' ||
! $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'] = '';
return False;
}
elseif($FormLogout == 'header')
{
! setcookie('HeaderPW',''); /* scrub the
old one */
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'You have successfully
logged out';
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
return False;
}
}
! elseif(isset($ConfigPW) && !empty($ConfigPW))
{
! 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'] = '';
! return False;
}
else
{
! return True;
}
}
! elseif(isset($FormPW) && !empty($FormPW))
{
! if(isset($ConfigLogin))
{
! 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;
! }
! else
! {
!
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid password';
!
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
! return False;
! }
! }
! elseif(isset($HeaderLogin) &&
!empty($HeaderLogin))
! {
! if($FormPW ==
$GLOBALS['phpgw_info']['server']['header_admin_password'] && $auth_type ==
'Header')
! {
! setcookie('HeaderPW',"$FormPW");
! return True;
! }
! else
! {
!
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid password';
!
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
! return False;
! }
}
! }
! elseif(isset($HeaderPW) && !empty($HeaderPW))
! {
! 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'] = '';
return False;
}
- else
- {
- return True;
- }
}
else
{
return False;
}
--- 70,180 ----
{
$FormLogout = get_var('FormLogout',
array('GET','POST'));
! $ConfigLogin = get_var('ConfigLogin', array('POST'));
! $HeaderLogin = get_var('HeaderLogin', array('POST'));
$FormDomain = get_var('FormDomain', array('POST'));
$FormPW = get_var('FormPW', array('POST'));
+
$ConfigDomain =
get_var('ConfigDomain',array('POST','COOKIE'));
$ConfigPW = get_var('ConfigPW',
array('POST','COOKIE'));
! $HeaderPW = get_var('HeaderPW',
array('POST','COOKIE'));
$ConfigLang = get_var('ConfigLang',
array('POST','COOKIE'));
! /* 6 cases:
! 1. Logging into header admin
! 2. Logging into config admin
! 3. Logging out of config admin
! 4. Logging out of header admin
! 5. Return visit to config OR header
! 6. None of the above
! */
!
! if(!empty($HeaderLogin) && $auth_type == 'Header')
! {
! /* header admin login */
! if($FormPW ==
$GLOBALS['phpgw_info']['server']['header_admin_password'])
! {
! setcookie('HeaderPW',"$FormPW");
! return True;
! }
! else
! {
!
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid password';
!
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
! return False;
! }
! }
! elseif(!empty($ConfigLogin) && $auth_type == 'Config')
{
! /* config login */
! if($FormPW ==
$GLOBALS['phpgw_domain'][$FormDomain]['config_passwd'])
! {
! setcookie('ConfigPW',"$FormPW");
! setcookie('ConfigDomain',"$FormDomain");
! setcookie('ConfigLang',"$ConfigLang");
! return True;
! }
! else
{
!
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid password';
!
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
! return False;
! }
! }
! elseif(!empty($FormLogout))
! {
! /* logout */
! if($FormLogout == 'config')
! {
! /* config logout */
! setcookie('ConfigPW','');
! setcookie('ConfigDomain','');
setcookie('ConfigLang','');
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'You have successfully
logged out';
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
+
return False;
}
elseif($FormLogout == 'header')
{
! /* header admin logout */
! setcookie('HeaderPW','');
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'You have successfully
logged out';
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
+
return False;
}
}
! elseif(!empty($ConfigPW) && $auth_type == 'Config')
{
! /* Returning after login to config */
! if($ConfigPW ==
$GLOBALS['phpgw_domain'][$ConfigDomain]['config_passwd'])
{
! return True;
}
else
{
!
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid password';
!
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
! return False;
}
}
! elseif(!empty($HeaderPW) && $auth_type == 'Header')
{
! /* Returning after login to header admin */
! if($HeaderPW ==
$GLOBALS['phpgw_info']['server']['header_admin_password'])
{
! return True;
}
! else
{
!
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid password';
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
return False;
}
}
else
{
+
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
+
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
return False;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.setup.inc.php,1.1,1.2,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: setup ldap.php,1.51,1.52 ldapexport.php,1.4,1.5 ldapimport.php,1.6,1.7 ldapmodify.php,1.6,1.7 manageheader.php,1.32,1.33
- Next by Date:
[Phpgroupware-cvs] CVS: setup/lang phpgw_en.lang,1.15,1.16
- Previous by thread:
[Phpgroupware-cvs] CVS: setup ldap.php,1.51,1.52 ldapexport.php,1.4,1.5 ldapimport.php,1.6,1.7 ldapmodify.php,1.6,1.7 manageheader.php,1.32,1.33
- Next by thread:
[Phpgroupware-cvs] CVS: setup/lang phpgw_en.lang,1.15,1.16
- Index(es):