X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=access%2Flogin.php;h=d3154b5240bb3adcbac6c3a3a367fb3af283a940;hb=0d191c7bff92b9a9bbc44dab48855477edb99ebf;hp=759a732755cad0458024568c5f5d86c1315da0cf;hpb=d03e05776f61d2bff8ee3c1e31e78f98716bf099;p=fa-stable.git
diff --git a/access/login.php b/access/login.php
index 759a7327..d3154b52 100644
--- a/access/login.php
+++ b/access/login.php
@@ -11,7 +11,16 @@
***********************************************************************/
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/ui_view.inc");
+ include_once($path_to_root . "/includes/ui.inc");
+ include_once($path_to_root . "/includes/page/header.inc");
+
+ $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)
{
@@ -20,178 +29,136 @@
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 = $path_to_root . '/themes/default';
+ $def_theme = "default";
-$login_timeout = $_SESSION["wa_current_user"]->last_act;
+ $login_timeout = $_SESSION["wa_current_user"]->last_act;
- echo "
-
";
-if (!$login_timeout) { // page header
- echo ''; ?>
-
-
-
-
-
+ $title = $login_timeout ? _('Authorization timeout') : $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 " \n";
+ echo " \n";
+ send_scripts();
+ if (!$login_timeout)
+ {
+ echo $js;
+ }
+ echo "\n";
+
+ echo "\n";
+
+ echo "\n";
+
+ div_start('_page_body');
+ br();br();
+ start_form(false, false, $_SESSION['timeout']['uri'], "loginform");
+ start_table(false, "class='login'");
+ start_row();
+ echo "";
+ if (!$login_timeout) { // FA logo
+ 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":"");
+
+ text_row(_("User name"), "user_name_entry_field", $value, 20, 30);
+
+ $password = $allow_demo_mode ? "password":"";
+
+ password_row(_("Password:"), 'password', $password);
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
|
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
+ end_form(1);
+ $Ajax->addScript(true, "document.forms[0].password.focus();");
- |
-
-
-
-
-
+ ";
+ div_end();
+ echo "\n";
+ echo "";
+ if (isset($_SESSION['wa_current_user']))
+ $date = Today() . " | " . Now();
+ else
+ $date = date("m/d/Y") . " | " . date("h.i am");
+ echo "$date | \n";
+ echo "
\n";
+ echo "
\n";
+ echo "\n";
+