From 93d75f74f5497a4084d62aa292e6f61e80106d75 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Tue, 18 Sep 2001 12:38:26 +0000
Subject: [PATCH] Allow enter to work for setup or header login, if single
 domain; fix setting of invalid password message

---
 setup/inc/class.setup.inc.php                 | 36 ++++++++-----------
 setup/templates/default/login_main.tpl        |  3 +-
 .../templates/default/login_stage_header.tpl  |  3 +-
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php
index c2aab530aa..af0eb276a3 100644
--- a/setup/inc/class.setup.inc.php
+++ b/setup/inc/class.setup.inc.php
@@ -35,21 +35,19 @@
 				/* This is to fix the reading of this value immediately after the cookie was set on login */
 				$ConfigDomain = $HTTP_POST_VARS['FormDomain'];
 			}
-			$phpgw_domain = $GLOBALS['phpgw_domain'];
-			$phpgw_info   = $GLOBALS['phpgw_info'];
 
 			/* 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->Host     = $phpgw_domain[$ConfigDomain]['db_host'];
-			$this->db->Type     = $phpgw_domain[$ConfigDomain]['db_type'];
-			$this->db->Database = $phpgw_domain[$ConfigDomain]['db_name'];
-			$this->db->User     = $phpgw_domain[$ConfigDomain]['db_user'];
-			$this->db->Password = $phpgw_domain[$ConfigDomain]['db_pass'];
+			$this->db->Host     = $GLOBALS['phpgw_domain'][$ConfigDomain]['db_host'];
+			$this->db->Type     = $GLOBALS['phpgw_domain'][$ConfigDomain]['db_type'];
+			$this->db->Database = $GLOBALS['phpgw_domain'][$ConfigDomain]['db_name'];
+			$this->db->User     = $GLOBALS['phpgw_domain'][$ConfigDomain]['db_user'];
+			$this->db->Password = $GLOBALS['phpgw_domain'][$ConfigDomain]['db_pass'];
 		}
 
 		/*!
@@ -61,9 +59,6 @@
 		{
 			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'];
 			$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'];
@@ -97,12 +92,12 @@
 			}
 			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('ConfigDomain');  // scrub the old one
 					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;
 				}
 				else
@@ -114,7 +109,7 @@
 			{
 				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('ConfigPW',$FormPW);
@@ -125,13 +120,13 @@
 					}
 					else
 					{
-						$phpgw_info['setup']['ConfigLoginMSG'] = 'Invalid password';
+						$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid password';
 						return False;
 					}
 				}
 				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);
 						return True;
@@ -145,7 +140,7 @@
 			}
 			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
 					$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid session cookie (cookies must be enabled)';
@@ -374,7 +369,6 @@
 			{
 				return False;
 			}
-			global $phpgw_info,$setup_info;
 
 			if ($this->alessthanb($setup_info['phpgwapi']['currentver'],'0.9.10pre8') && ($setup_info['phpgwapi']['currentver'] != ''))
 			{
@@ -387,7 +381,7 @@
 
 			if ($tableschanged == True)
 			{
-				$phpgw_info['setup']['tableschanged'] = True;
+				$GLOBALS['phpgw_info']['setup']['tableschanged'] = True;
 			}
 			if ($setup_info[$appname]['currentver'])
 			{
diff --git a/setup/templates/default/login_main.tpl b/setup/templates/default/login_main.tpl
index 2183665314..1b15dcb642 100644
--- a/setup/templates/default/login_main.tpl
+++ b/setup/templates/default/login_main.tpl
@@ -18,7 +18,8 @@
 	<td>
 		<form action="manageheader.php" method="POST" name="admin">
 		<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>
 	</td>
 </tr>
diff --git a/setup/templates/default/login_stage_header.tpl b/setup/templates/default/login_stage_header.tpl
index 69cb2d2a58..0f90dd4375 100644
--- a/setup/templates/default/login_stage_header.tpl
+++ b/setup/templates/default/login_stage_header.tpl
@@ -40,7 +40,8 @@
 		<input type="hidden" name="FormDomain" value="{default_domain_zero}">
 		<!-- END B_single_domain -->
 {lang_select}
-		<input type="submit" name="ConfigLogin" value="Login">
+		<input type="hidden" name="ConfigLogin" value="Login">
+		<input type="submit" name="submit" value="Login">
 		</form>
 	</td>
 </tr>