From 95ea922f651f6a055dcb83d505262b06af970e42 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Thu, 21 Apr 2011 18:37:00 +0200 Subject: [PATCH] [0000619] Fixed javascript related timeout issues. --- access/login.php | 20 ++++++++------------ access/logout.php | 3 ++- includes/ui/ui_view.inc | 25 ------------------------- js/login.js | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 38 deletions(-) create mode 100644 js/login.js diff --git a/access/login.php b/access/login.php index c60819a..3bbf006 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) { @@ -52,11 +46,11 @@ function set_fullmode() { echo "$title\n"; echo "\n"; echo " \n"; + send_scripts(); if (!$login_timeout) { echo $js; - } - echo $js2; + } echo "\n"; echo "\n"; @@ -88,7 +82,7 @@ function set_fullmode() { password_row(_("Password:"), 'password', $password); - if ($login_timeout) { + if ($login_timeout) { hidden('company_login_name', $_SESSION["wa_current_user"]->company); } else { if (isset($_SESSION['wa_current_user']->company)) @@ -114,6 +108,8 @@ function set_fullmode() { echo ""; } end_form(1); + $Ajax->addScript(true, "document.forms[0].password.focus();"); + echo "