X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=access%2Flogin.php;h=df2cc695e6b80eb9c88a559295870683477e427c;hb=e7fb3a02d86a3bc88387280561d802d4744e8885;hp=e8e28975de06fc62f19b0efd327253aad52f862a;hpb=a498e7ba1a3932bf292c8ce9a1cf12adc01bd6ba;p=fa-stable.git

diff --git a/access/login.php b/access/login.php
index e8e28975..df2cc695 100644
--- a/access/login.php
+++ b/access/login.php
@@ -37,13 +37,16 @@ function defaultCompany()
 
 	if (check_faillog())
 	{
-		$blocked_msg = '<span class="redfg">'._('Too many failed login attempts.<br>Please wait a while or try later.').'</span>';
+		$blocked = true;
 
 	    $js .= "<script>setTimeout(function() {
 	    	document.getElementsByName('SubmitUser')[0].disabled=0;
 	    	document.getElementById('log_msg').innerHTML='$demo_text'}, 1000*".$SysPrefs->login_delay.");</script>";
-	    $demo_text = $blocked_msg;
+	    $demo_text = '<span class="redfg">'._('Too many failed login attempts.<br>Please wait a while or try later.').'</span>';
+	} elseif ($_SESSION["wa_current_user"]->login_attempt > 1) {
+		$demo_text = '<span class="redfg">'._("Invalid password or username. Please, try again.").'</span>';
 	}
+
 	flush_dir(user_js_cache());
 	if (!isset($def_coy))
 		$def_coy = 0;
@@ -89,6 +92,7 @@ function defaultCompany()
 	end_row();
 	if (!$login_timeout)
 		table_section_title(_("Version")." $version   Build ".$SysPrefs->build_version." - "._("Login"));
+
 	$value = $login_timeout ? $_SESSION['wa_current_user']->loginname : ($SysPrefs->allow_demo_mode ? "demouser":"");
 
 	text_row(_("User name"), "user_name_entry_field", $value, 20, 30);
@@ -119,7 +123,7 @@ function defaultCompany()
 	end_table(1);
 	echo "<input type='hidden' id=ui_mode name='ui_mode' value='".!fallback_mode()."' >\n";
 	echo "<center><input type='submit' value='&nbsp;&nbsp;"._("Login -->")."&nbsp;&nbsp;' name='SubmitUser'"
-		." onclick='".(in_ajax() ? 'retry();': 'set_fullmode();')."'".(isset($blocked_msg) ? " disabled" : '')." ></center>\n";
+		." onclick='".(in_ajax() ? 'retry();': 'set_fullmode();')."'".(isset($blocked) ? " disabled" : '')." ></center>\n";
 
 	foreach($_SESSION['timeout']['post'] as $p => $val) {
 		// add all request variables to be resend together with login data