X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=access%2Flogin.php;h=df2cc695e6b80eb9c88a559295870683477e427c;hb=f3a1386748cd9250419b5ad03b95c56af2bb5f92;hp=dbf90ab9b7af2bfb37236ec1f2b7c8c88070aac5;hpb=bd8f517d30d1edd3261e26e582ddd9e11c555616;p=fa-stable.git
diff --git a/access/login.php b/access/login.php
index dbf90ab9..df2cc695 100644
--- a/access/login.php
+++ b/access/login.php
@@ -20,6 +20,7 @@ function defaultCompany()
document.forms[0].company_login_name.options[".user_company()."].selected = true;
}
";
+
add_js_file('login.js');
// Display demo user name and password within login form if allow_demo_mode option is true
if ($SysPrefs->allow_demo_mode == true)
@@ -29,20 +30,23 @@ function defaultCompany()
else
{
$demo_text = _("Please login here");
- if (@$SysPrefs->allow_password_reset) {
- $demo_text .= " "._("or")." "._("request new password")."";
- }
+ if (@$SysPrefs->allow_password_reset) {
+ $demo_text .= " "._("or")." "._("request new password")."";
+ }
}
if (check_faillog())
{
- $blocked_msg = ''._('Too many failed login attempts.
Please wait a while or try later.').'';
+ $blocked = true;
$js .= "";
- $demo_text = $blocked_msg;
+ $demo_text = ''._('Too many failed login attempts.
Please wait a while or try later.').'';
+ } elseif ($_SESSION["wa_current_user"]->login_attempt > 1) {
+ $demo_text = ''._("Invalid password or username. Please, try again.").'';
}
+
flush_dir(user_js_cache());
if (!isset($def_coy))
$def_coy = 0;
@@ -58,7 +62,7 @@ function defaultCompany()
echo "\n";
echo "\n";
echo "$title\n";
- echo "\n";
+ echo "\n";
echo " \n";
echo " \n";
send_scripts();
@@ -66,6 +70,7 @@ function defaultCompany()
{
echo $js;
}
+
echo "\n";
echo "\n";
@@ -79,16 +84,15 @@ function defaultCompany()
start_row();
echo "";
if (!$login_timeout) { // FA logo
- echo " ";
+ echo "";
} else {
echo ""._('Authorization timeout')."";
}
echo " | \n";
end_row();
-
- echo "\n";
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);
@@ -110,16 +114,16 @@ function defaultCompany()
echo "\n";
echo "";
} else {
-// $coy = $def_coy;
text_row(_("Company"), "company_login_nickname", "", 20, 50);
}
- start_row();
- label_cell($demo_text, "colspan=2 align='center' id='log_msg'");
- end_row();
};
+ start_row();
+ label_cell($demo_text, "colspan=2 align='center' id='log_msg'");
+ end_row();
end_table(1);
+ echo "\n";
echo "\n";
+ ." onclick='".(in_ajax() ? 'retry();': 'set_fullmode();')."'".(isset($blocked) ? " disabled" : '')." >\n";
foreach($_SESSION['timeout']['post'] as $p => $val) {
// add all request variables to be resend together with login data
@@ -132,7 +136,7 @@ function defaultCompany()
echo "";
}
end_form(1);
- $Ajax->addScript(true, "document.forms[0].password.focus();");
+ $Ajax->addScript(true, "if (document.forms.length) document.forms[0].password.focus();");
echo "