X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=access%2Flogin.php;h=a390006fbbe9284c876bee571450eea18e4710a3;hb=25379bdc9f10bda4aae4b37f04d16eb1bbe7e4f6;hp=0c77bc807991d6b21bb8da700de122a690e44b37;hpb=953b3605810699962454b624e19bd0779b17e7f7;p=fa-stable.git
diff --git a/access/login.php b/access/login.php
index 0c77bc80..a390006f 100644
--- a/access/login.php
+++ b/access/login.php
@@ -12,51 +12,60 @@
if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
die(_("Restricted access"));
include_once($path_to_root . "/includes/ui.inc");
-
+ include_once($path_to_root . "/includes/page/header.inc");
+
$js = "";
- $js2 = "";
-
- // Display demo user name and password within login form if "$allow_demo_mode" is true
- if ($allow_demo_mode == 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)
{
$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.').'';
+
+ $js .= "";
+ $demo_text = $blocked_msg;
}
+ 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()'" : "";
echo "\n";
echo "\n";
- echo "$title\n";
- echo "\n";
+ echo "$title\n";
+ echo "\n";
echo " \n";
+ echo " \n";
+ send_scripts();
if (!$login_timeout)
{
echo $js;
- }
- echo $js2;
+ }
echo "\n";
echo "\n";
@@ -66,54 +75,64 @@ function set_fullmode() {
div_start('_page_body');
br();br();
start_form(false, false, $_SESSION['timeout']['uri'], "loginform");
- start_table("class='login'");
+ start_table(false, "class='login'");
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 $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);
+ if ($login_timeout) {
+ 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;
- echo "| "._("Company")." | \n";
+ if (!@$SysPrefs->text_company_selection) {
+ echo " |
| "._("Company")." | \n";
+ echo " |
";
+ } else {
+ text_row(_("Company"), "company_login_nickname", "", 20, 50);
+ }
start_row();
- label_cell($demo_text, "colspan=2 align='center'");
+ label_cell($demo_text, "colspan=2 align='center' id='log_msg'");
end_row();
};
end_table(1);
+ echo "\n";
echo "\n";
+ ." onclick='set_fullmode();'".(isset($blocked_msg) ? " 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();");
+
echo "