From 3a089b809c344067abc7ca15ed754ab5c09c8f39 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 14 Dec 2020 09:32:52 +0100 Subject: [PATCH] [0005266] Fixed timeouts in ajax contexts. --- access/login.php | 13 +++++++------ includes/session.inc | 15 +++++++++------ js/inserts.js | 2 +- js/login.js | 6 ++++++ js/reports.js | 6 ------ 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/access/login.php b/access/login.php index a390006f..e8e28975 100644 --- 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; } "; + 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) @@ -66,6 +67,7 @@ function defaultCompany() { echo $js; } + echo "\n"; echo "\n"; @@ -85,7 +87,6 @@ function defaultCompany() } echo "\n"; end_row(); - 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":""); @@ -111,14 +112,14 @@ function defaultCompany() } else { 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 "\n"; echo "
\n"; + ." onclick='".(in_ajax() ? 'retry();': '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 @@ -131,7 +132,7 @@ function defaultCompany() echo ""; } end_form(1); - $Ajax->addScript(true, "document.forms[0].password.focus();"); + $Ajax->addScript(true, "if (document.forms.length) document.forms[0].password.focus();"); echo "