extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 11:23:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow enter to work for setup or header login, if single domain; fix setting of invalid password message

Browse Source
This commit is contained in:
Miles Lott 2001-09-18 12:38:26 +00:00
parent e007771652
commit 93d75f74f5
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
setup/inc/class.setup.inc.php
View File

@ -35,21 +35,19 @@
/* This is to fix the reading of this value immediately after the cookie was set on login */ /* This is to fix the reading of this value immediately after the cookie was set on login */
$ConfigDomain = $HTTP_POST_VARS['FormDomain']; $ConfigDomain = $HTTP_POST_VARS['FormDomain'];
} }
$phpgw_domain = $GLOBALS['phpgw_domain'];
$phpgw_info = $GLOBALS['phpgw_info'];
/* Database setup */ /* Database setup */
if (!isset($phpgw_info['server']['api_inc'])) if (!isset($GLOBALS['phpgw_info']['server']['api_inc']))
{ {
$phpgw_info['server']['api_inc'] = PHPGW_SERVER_ROOT . '/phpgwapi/inc'; $GLOBALS['phpgw_info']['server']['api_inc'] = PHPGW_SERVER_ROOT . '/phpgwapi/inc';
} }
include($phpgw_info['server']['api_inc'] . '/class.db_'.$phpgw_domain[$ConfigDomain]['db_type'].'.inc.php'); include($GLOBALS['phpgw_info']['server']['api_inc'] . '/class.db_'.$GLOBALS['phpgw_domain'][$ConfigDomain]['db_type'].'.inc.php');
$this->db = new db; $this->db = new db;
$this->db->Host = $phpgw_domain[$ConfigDomain]['db_host']; $this->db->Host = $GLOBALS['phpgw_domain'][$ConfigDomain]['db_host'];
$this->db->Type = $phpgw_domain[$ConfigDomain]['db_type']; $this->db->Type = $GLOBALS['phpgw_domain'][$ConfigDomain]['db_type'];
$this->db->Database = $phpgw_domain[$ConfigDomain]['db_name']; $this->db->Database = $GLOBALS['phpgw_domain'][$ConfigDomain]['db_name'];
$this->db->User = $phpgw_domain[$ConfigDomain]['db_user']; $this->db->User = $GLOBALS['phpgw_domain'][$ConfigDomain]['db_user'];
$this->db->Password = $phpgw_domain[$ConfigDomain]['db_pass']; $this->db->Password = $GLOBALS['phpgw_domain'][$ConfigDomain]['db_pass'];
} }
/*! /*!
@ -61,9 +59,6 @@
{ {
global $HTTP_POST_VARS, $HTTP_GET_VARS, $HTTP_COOKIE_VARS; global $HTTP_POST_VARS, $HTTP_GET_VARS, $HTTP_COOKIE_VARS;
$phpgw_domain = $GLOBALS['phpgw_domain'];
$phpgw_info = $GLOBALS['phpgw_info'];
$FormLogout = $HTTP_GET_VARS['FormLogout'] ? $HTTP_GET_VARS['FormLogout'] : $HTTP_POST_VARS['FormLogout']; $FormLogout = $HTTP_GET_VARS['FormLogout'] ? $HTTP_GET_VARS['FormLogout'] : $HTTP_POST_VARS['FormLogout'];
$ConfigLogin = $HTTP_POST_VARS['ConfigLogin'] ? $HTTP_POST_VARS['ConfigLogin'] : $HTTP_COOKIE_VARS['ConfigLogin']; $ConfigLogin = $HTTP_POST_VARS['ConfigLogin'] ? $HTTP_POST_VARS['ConfigLogin'] : $HTTP_COOKIE_VARS['ConfigLogin'];
$HeaderLogin = $HTTP_POST_VARS['HeaderLogin'] ? $HTTP_POST_VARS['HeaderLogin'] : $HTTP_COOKIE_VARS['HeaderLogin']; $HeaderLogin = $HTTP_POST_VARS['HeaderLogin'] ? $HTTP_POST_VARS['HeaderLogin'] : $HTTP_COOKIE_VARS['HeaderLogin'];
@ -97,12 +92,12 @@
} }
elseif (isset($ConfigPW)) elseif (isset($ConfigPW))
{ {
if ($ConfigPW != $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');
$phpgw_info['setup']['ConfigLoginMSG'] = 'Invalid session cookie (cookies must be enabled)'; $GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid session cookie (cookies must be enabled)';
return False; return False;
} }
else else
@ -114,7 +109,7 @@
{ {
if (isset($ConfigLogin)) if (isset($ConfigLogin))
{ {
if ($FormPW == $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);
@ -125,13 +120,13 @@
} }
else else
{ {
$phpgw_info['setup']['ConfigLoginMSG'] = 'Invalid password'; $GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid password';
return False; return False;
} }
} }
elseif (isset($HeaderLogin)) elseif (isset($HeaderLogin))
{ {
if ($FormPW == $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;
@ -145,7 +140,7 @@
} }
elseif (isset($HeaderPW)) elseif (isset($HeaderPW))
{ {
if ($HeaderPW != $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)';
@ -374,7 +369,6 @@
{ {
return False; return False;
} }
global $phpgw_info,$setup_info;
if ($this->alessthanb($setup_info['phpgwapi']['currentver'],'0.9.10pre8') && ($setup_info['phpgwapi']['currentver'] != '')) if ($this->alessthanb($setup_info['phpgwapi']['currentver'],'0.9.10pre8') && ($setup_info['phpgwapi']['currentver'] != ''))
{ {
@ -387,7 +381,7 @@
if ($tableschanged == True) if ($tableschanged == True)
{ {
$phpgw_info['setup']['tableschanged'] = True; $GLOBALS['phpgw_info']['setup']['tableschanged'] = True;
} }
if ($setup_info[$appname]['currentver']) if ($setup_info[$appname]['currentver'])
{ {

3
setup/templates/default/login_main.tpl
View File

@ -18,7 +18,8 @@
<td> <td>
<form action="manageheader.php" method="POST" name="admin"> <form action="manageheader.php" method="POST" name="admin">
<input type="password" name="FormPW" value=""> <input type="password" name="FormPW" value="">
<input type="submit" name="HeaderLogin" value="Login"> <input type="hidden" name="HeaderLogin" value="Login">
<input type="submit" name="Submit" value="Login">
</form> </form>
</td> </td>
</tr> </tr>

3
setup/templates/default/login_stage_header.tpl
View File

@ -40,7 +40,8 @@
<input type="hidden" name="FormDomain" value="{default_domain_zero}"> <input type="hidden" name="FormDomain" value="{default_domain_zero}">
<!-- END B_single_domain --> <!-- END B_single_domain -->
{lang_select} {lang_select}
<input type="submit" name="ConfigLogin" value="Login"> <input type="hidden" name="ConfigLogin" value="Login">
<input type="submit" name="submit" value="Login">
</form> </form>
</td> </td>
</tr> </tr>