From 52e5efc8c33ec292ead2d109090d348aacbd6cb6 Mon Sep 17 00:00:00 2001
From: Steve Beaver <sbeaver@netgate.com>
Date: Wed, 30 Aug 2017 08:21:40 -0400
Subject: Restore bad login message

(cherry picked from commit 7d7c65c2ffa4bcabccc10d0e3e319afbd979192b)
---
 src/etc/inc/auth.inc    |  2 +-
 src/etc/inc/authgui.inc | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc
index 3195304..0cbca4c 100644
--- a/src/etc/inc/auth.inc
+++ b/src/etc/inc/auth.inc
@@ -1771,7 +1771,7 @@ function session_auth() {
 			exit;
 		} else {
 			/* give the user an error message */
-			$_SESSION['Login_Error'] = "Username or Password incorrect";
+			$_SESSION['Login_Error'] = gettext("Username or Password incorrect");
 			log_auth("webConfigurator authentication error for '{$_POST['usernamefld']}' from {$_SERVER['REMOTE_ADDR']}");
 			if (isAjax()) {
 				echo "showajaxmessage('{$_SESSION['Login_Error']}');";
diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc
index 81992c9..80e7b3b 100644
--- a/src/etc/inc/authgui.inc
+++ b/src/etc/inc/authgui.inc
@@ -359,7 +359,18 @@ if (is_ipaddr($http_host) && !$local_ip && !isset($config['system']['webgui']['n
 								</svg>
 							</div>
 						</div>
-						<div class="col-sm-8 nowarning msgbox text-center">
+
+						<!-- Header center message box -->
+						<div class="col-sm-4 nowarning msgbox text-center text-danger">
+<?php
+						if (!empty($_POST['usernamefld'])) {
+							print("<h4>" . $_SESSION['Login_Error'] . "</h4>");
+						}
+?>
+						</div>
+
+						<!-- Header right message box (hostname or msg) -->
+						<div class="col-sm-4 nowarning msgbox text-center">
 							<span id="hostspan">
 								<a><h4><?=$loginbannerstr?></h4></a>
 							</span>
-- 
cgit v1.1