summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Beaver <sbeaver@netgate.com>2017-08-30 08:21:40 -0400
committerSteve Beaver <sbeaver@netgate.com>2017-08-30 08:21:40 -0400
commit7d7c65c2ffa4bcabccc10d0e3e319afbd979192b (patch)
tree73958ea09e62ebd3c5c47635dfee67a0e6ae46db
parent19b24bccc69b9266f2f77b30668b55041655a0fa (diff)
downloadpfsense-7d7c65c2ffa4bcabccc10d0e3e319afbd979192b.zip
pfsense-7d7c65c2ffa4bcabccc10d0e3e319afbd979192b.tar.gz
Restore bad login message
-rw-r--r--src/etc/inc/auth.inc2
-rw-r--r--src/etc/inc/authgui.inc13
2 files changed, 13 insertions, 2 deletions
diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc
index 2c9bee6..cc77f29 100644
--- a/src/etc/inc/auth.inc
+++ b/src/etc/inc/auth.inc
@@ -1773,7 +1773,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>
OpenPOWER on IntegriCloud