X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=access%2Flogin.php;h=df2cc695e6b80eb9c88a559295870683477e427c;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=fbabe47ef317ca7ce1c3efa48e6223fba2df687a;hpb=d90c082fc6dc6c5a5343c7ebc90c76442817523d;p=fa-stable.git diff --git a/access/login.php b/access/login.php index fbabe47e..df2cc695 100644 --- a/access/login.php +++ b/access/login.php @@ -17,36 +17,44 @@ $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 (@$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; $def_theme = "default"; $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()'" : ""; @@ -54,7 +62,7 @@ function defaultCompany() echo "\n"; echo "\n"; echo "$title\n"; - echo "\n"; + echo "\n"; echo " \n"; echo " \n"; send_scripts(); @@ -62,6 +70,7 @@ function defaultCompany() { echo $js; } + echo "\n"; echo "\n"; @@ -75,57 +84,59 @@ function defaultCompany() start_row(); echo ""; if (!$login_timeout) { // FA logo - echo "FrontAccounting"; + echo "FrontAccounting"; } else { echo ""._('Authorization timeout').""; } echo "\n"; end_row(); - - echo "\n"; if (!$login_timeout) - table_section_title(_("Version")." $version Build $build_version - "._("Login")); - $value = $login_timeout ? $_SESSION['wa_current_user']->loginname : ($allow_demo_mode ? "demouser":""); + 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); - $password = $allow_demo_mode ? "password":""; + $password = $SysPrefs->allow_demo_mode ? "password":""; password_row(_("Password:"), 'password', $password); if ($login_timeout) { - hidden('company_login_name', $_SESSION["wa_current_user"]->company); + hidden('company_login_name', user_company()); } else { - if (isset($_SESSION['wa_current_user']->company)) - $coy = $_SESSION['wa_current_user']->company; - else + $coy = user_company(); + if (!isset($coy)) $coy = $def_coy; - if (!@$text_company_selection) { + if (!@$SysPrefs->text_company_selection) { echo ""._("Company")."\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 if (!in_array($p, array('ui_mode', 'user_name_entry_field', 'password', 'SubmitUser', 'company_login_name'))) - echo ""; + if (!is_array($val)) + echo ""; + else + foreach($val as $i => $v) + 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 "