From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 20 Apr 2015 17:17:06 +0000 (+0200)
Subject: After timeout UI was always switched into fallback mode.
X-Git-Tag: v2.4.2~19^2~190
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=550efc38d739a75612350ac3efc4fdfade630317

After timeout UI was always switched into fallback mode.
---

diff --git a/access/login.php b/access/login.php
index b7f802f1..593f4992 100644
--- a/access/login.php
+++ b/access/login.php
@@ -86,7 +86,6 @@ 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":"");
@@ -118,8 +117,9 @@ function defaultCompany()
 		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='set_fullmode();'".(isset($blocked_msg) ? " disabled" : '')." ></center>\n";
 
 	foreach($_SESSION['timeout']['post'] as $p => $val) {
 		// add all request variables to be resend together with login data
diff --git a/js/inserts.js b/js/inserts.js
index dacb8289..7da83993 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -29,6 +29,12 @@ function validate(e) {
 	return true;
 }
 
+function set_fullmode() {
+	document.getElementById('ui_mode').value = 1;
+	document.loginform.submit();
+	return true;
+}
+
 function save_focus(e) {
   _focus = e.name||e.id;
   var h = document.getElementById('hints');