projects / fa-stable.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Credit This Option for Supplier Invoice Doesn't Show Quantity Invoiced. Fixed by...
[fa-stable.git] / access / login.php
diff --git a/access/login.php b/access/login.php
index b7f802f17caca91c711c8de5e988cebaa1209e2b..df2cc695e6b80eb9c88a559295870683477e427c 100644 (file)
--- 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;
 }
 </script>";
+
        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")." <a href='$path_to_root/index.php?reset=1'>"._("request new password")."</a>";
-    }
+       if (@$SysPrefs->allow_password_reset) {
+               $demo_text .= " "._("or")." <a href='$path_to_root/index.php?reset=1'>"._("request new password")."</a>";
+       }
        }
 
        if (check_faillog())
        {
-               $blocked_msg = '<span class="redfg">'._('Too many failed login attempts.<br>Please wait a while or try later.').'</span>';
+               $blocked = true;
 
            $js .= "<script>setTimeout(function() {
                document.getElementsByName('SubmitUser')[0].disabled=0;
                document.getElementById('log_msg').innerHTML='$demo_text'}, 1000*".$SysPrefs->login_delay.");</script>";
-           $demo_text = $blocked_msg;
+           $demo_text = '<span class="redfg">'._('Too many failed login attempts.<br>Please wait a while or try later.').'</span>';
+       } elseif ($_SESSION["wa_current_user"]->login_attempt > 1) {
+               $demo_text = '<span class="redfg">'._("Invalid password or username. Please, try again.").'</span>';
        }
+
        flush_dir(user_js_cache());
        if (!isset($def_coy))
                $def_coy = 0;
@@ -66,6 +70,7 @@ function defaultCompany()
        {
                echo $js;
        }
+
        echo "</head>\n";
 
        echo "<body id='loginscreen' $onload>\n";
@@ -85,10 +90,9 @@ function defaultCompany()
        } 
        echo "</td>\n";
        end_row();
-
-       echo "<input type='hidden' id=ui_mode name='ui_mode' value='".fallback_mode()."' >\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 "</select>\n";
                        echo "</td></tr>";
                } 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 "<input type='hidden' id=ui_mode name='ui_mode' value='".!fallback_mode()."' >\n";
        echo "<center><input type='submit' value='&nbsp;&nbsp;"._("Login -->")."&nbsp;&nbsp;' name='SubmitUser'"
-               .($login_timeout ? '':" onclick='set_fullmode();'").(isset($blocked_msg) ? " disabled" : '')." ></center>\n";
+               ." onclick='".(in_ajax() ? 'retry();': 'set_fullmode();')."'".(isset($blocked) ? " disabled" : '')." ></center>\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 "<input type='hidden' name='{$p}[$i]' value='$v'>";
        }
        end_form(1);
-       $Ajax->addScript(true, "document.forms[0].password.focus();");
+       $Ajax->addScript(true, "if (document.forms.length) document.forms[0].password.focus();");
 
     echo "<script language='JavaScript' type='text/javascript'>
     //<![CDATA[
FrontAccounting stable branch