X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=access%2Flogin.php;h=df2cc695e6b80eb9c88a559295870683477e427c;hb=92f26ce5c76266a8b6e96a6b086aa919095e7316;hp=b2bad446a0ae408754c1c3f1005c6836b3bb596e;hpb=13367be8aaf5175295f7aab7160370458dad1824;p=fa-stable.git
diff --git a/access/login.php b/access/login.php
index b2bad446..df2cc695 100644
--- a/access/login.php
+++ b/access/login.php
@@ -17,32 +17,36 @@
$js = "";
+
add_js_file('login.js');
- // Display demo user name and password within login form if "$allow_demo_mode" is true
- if ($allow_demo_mode == true)
+ // Display demo user name and password within login form if allow_demo_mode option is true
+ if ($SysPrefs->allow_demo_mode == true)
{
$demo_text = _("Login as user: demouser and password: password");
}
else
{
$demo_text = _("Please login here");
- if (@$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;
+ document.getElementById('log_msg').innerHTML='$demo_text'}, 1000*".$SysPrefs->login_delay.");";
+ $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;
@@ -50,7 +54,7 @@ function defaultCompany()
$login_timeout = $_SESSION["wa_current_user"]->last_act;
- $title = $login_timeout ? _('Authorization timeout') : $app_title." ".$version." - "._("Login");
+ $title = $login_timeout ? _('Authorization timeout') : $SysPrefs->app_title." ".$version." - "._("Login");
$encoding = isset($_SESSION['language']->encoding) ? $_SESSION['language']->encoding : "iso-8859-1";
$rtl = isset($_SESSION['language']->dir) ? $_SESSION['language']->dir : "ltr";
$onload = !$login_timeout ? "onload='defaultCompany()'" : "";
@@ -58,7 +62,7 @@ function defaultCompany()
echo "\n";
echo "\n";
echo "