X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=access%2Flogin.php;h=d3154b5240bb3adcbac6c3a3a367fb3af283a940;hb=0d191c7bff92b9a9bbc44dab48855477edb99ebf;hp=e8a9e9dcbca22cde8c26790eaa933e58140c7a00;hpb=0f1287436e6b7e6e407027736a7e06985dbb474e;p=fa-stable.git
diff --git a/access/login.php b/access/login.php
index e8a9e9dc..d3154b52 100644
--- a/access/login.php
+++ b/access/login.php
@@ -12,21 +12,15 @@
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 = "";
-
+ 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)
{
@@ -35,7 +29,21 @@ function set_fullmode() {
else
{
$demo_text = _("Please login here");
+ if (@$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";
@@ -49,24 +57,27 @@ function set_fullmode() {
echo "\n";
echo "\n";
- echo "$title\n";
+ echo "$title\n";
echo "\n";
- echo " \n";
- echo $js2;
+ echo " \n";
+ echo " \n";
+ send_scripts();
if (!$login_timeout)
{
echo $js;
- }
+ }
echo "\n";
- echo "\n";
+ echo "\n";
echo "\n";
+ div_start('_page_body');
br();br();
- start_table($table_style2);
+ start_form(false, false, $_SESSION['timeout']['uri'], "loginform");
+ start_table(false, "class='login'");
start_row();
- echo "";
+ echo " | ";
if (!$login_timeout) { // FA logo
echo " ";
} else {
@@ -75,9 +86,6 @@ function set_fullmode() {
echo " | \n";
end_row();
- br();
- start_form(false, false, $_SESSION['timeout']['uri'], "loginform");
- start_table($table_style2);
echo "\n";
if (!$login_timeout)
table_section_title(_("Version")." $version Build $build_version - "._("Login"));
@@ -87,7 +95,7 @@ function set_fullmode() {
$password = $allow_demo_mode ? "password":"";
- echo "| "._("Password")." | |
\n";
+ password_row(_("Password:"), 'password', $password);
if ($login_timeout) {
hidden('company_login_name', $_SESSION["wa_current_user"]->company);
@@ -96,25 +104,37 @@ function set_fullmode() {
$coy = $_SESSION['wa_current_user']->company;
else
$coy = $def_coy;
- echo "| "._("Company")." | \n";
+ if (!@$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'");
+ label_cell($demo_text, "colspan=2 align='center' id='log_msg'");
end_row();
};
end_table(1);
- echo "\n";
- end_form(1);
+ echo "\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_table();
+ end_form(1);
+ $Ajax->addScript(true, "document.forms[0].password.focus();");
+
echo "";
+ div_end();
echo "\n";
echo "";
if (isset($_SESSION['wa_current_user']))
@@ -141,4 +162,3 @@ function set_fullmode() {
echo "
\n";
echo "\n";
-?>
\ No newline at end of file