X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=access%2Flogin.php;h=593f499279934942c9f9f524ff3651e92610fff4;hb=9145a040396e901eda3fa154dcfaaa66004e568c;hp=9c58933d48b264a383d1834007c1b4951618f6ba;hpb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git

diff --git a/access/login.php b/access/login.php
index 9c58933d..593f4992 100644
--- a/access/login.php
+++ b/access/login.php
@@ -17,7 +17,7 @@
 	$js = "<script language='JavaScript' type='text/javascript'>
 function defaultCompany()
 {
-	document.forms[0].company_login_name.options[".$_SESSION["wa_current_user"]->company."].selected = true;
+	document.forms[0].company_login_name.options[".user_company()."].selected = true;
 }
 </script>";
 	add_js_file('login.js');
@@ -36,7 +36,7 @@ function defaultCompany()
 
 	if (check_faillog())
 	{
-		$blocked_msg = '<span class=redfg>'._('Too many failed login attempts.<br>Please wait a while or try later.').'</span>';
+		$blocked_msg = '<span class="redfg">'._('Too many failed login attempts.<br>Please wait a while or try later.').'</span>';
 
 	    $js .= "<script>setTimeout(function() {
 	    	document.getElementsByName('SubmitUser')[0].disabled=0;
@@ -58,7 +58,7 @@ function defaultCompany()
 	echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n";
 	echo "<html dir='$rtl' >\n";
 	echo "<head profile=\"http://www.w3.org/2005/10/profile\"><title>$title</title>\n";
-   	echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' />\n";
+   	echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' >\n";
 	echo "<link href='$path_to_root/themes/$def_theme/default.css' rel='stylesheet' type='text/css'> \n";
  	echo "<link href='$path_to_root/themes/default/images/favicon.ico' rel='icon' type='image/x-icon'> \n";
 	send_scripts();
@@ -79,14 +79,13 @@ function defaultCompany()
 	start_row();
 	echo "<td align='center' colspan=2>";
 	if (!$login_timeout) { // FA logo
-    	echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
+    	echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' ></a>";
 	} else { 
 		echo "<font size=5>"._('Authorization timeout')."</font>";
 	} 
 	echo "</td>\n";
 	end_row();
 
-	echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_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":"");
@@ -98,11 +97,10 @@ function defaultCompany()
 	password_row(_("Password:"), 'password', $password);
 
 	if ($login_timeout) {
-		hidden('company_login_name', $_SESSION["wa_current_user"]->company);
+		hidden('company_login_name', user_company());
 	} else {
-		if (isset($_SESSION['wa_current_user']->company))
-			$coy =  $_SESSION['wa_current_user']->company;
-		else
+		$coy =  user_company();
+		if (!isset($coy))
 			$coy = $def_coy;
 		if (!@$SysPrefs->text_company_selection) {
 			echo "<tr><td>"._("Company")."</td><td><select name='company_login_name'>\n";
@@ -119,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
