0001768: Login Company Select Box to EditBox Switch Flag + Fix

[fa-stable.git] / access / login.php
diff --git a/access/login.php b/access/login.php

index 0c77bc807991d6b21bb8da700de122a690e44b37..ebedcc921aa07c2d09a119e6b25999b9c1d94df2 100644 (file)
--- 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 = "<script language='JavaScript' type='text/javascript'>
  function defaultCompany()
  {
         document.forms[0].company_login_name.options[".$_SESSION["wa_current_user"]->company."].selected = true;
  }
-".get_js_png_fix()."</script>";
-       $js2 = "<script language='JavaScript' type='text/javascript'>
-function set_fullmode() {
-       document.getElementById('ui_mode').value = 1;
-       document.loginform.submit();
-       return true;
-}
  </script>";
-
+       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 "<head><title>$title</title>\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";
+       send_scripts();
         if (!$login_timeout)
         {
                 echo $js;
-       }       
-       echo $js2;
+       }
         echo "</head>\n";
  
         echo "<body id='loginscreen' $onload>\n";
@@ -66,7 +60,7 @@ function set_fullmode() {
         div_start('_page_body');
         br();br();
         start_form(false, false, $_SESSION['timeout']['uri'], "loginform");
-       start_table("class='login'");
+       start_table(false, "class='login'");
         start_row();
         echo "<td align='center' colspan=2>";
         if (!$login_timeout) { // FA logo
@@ -88,17 +82,23 @@ 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))
                         $coy =  $_SESSION['wa_current_user']->company;
                 else
                         $coy = $def_coy;
-               echo "<tr><td>"._("Company")."</td><td><select name='company_login_name'>\n";
-               for ($i = 0; $i < count($db_connections); $i++)
-                       echo "<option value=$i ".($i==$coy ? 'selected':'') .">" . $db_connections[$i]["name"] . "</option>";
-               echo "</select>\n";
+               if ($AllowCompanySelectionBox) {
+                       echo "<tr><td>"._("Company")."</td><td><select name='company_login_name'>\n";
+                       for ($i = 0; $i < count($db_connections); $i++)
+                               echo "<option value=$i ".($i==$coy ? 'selected':'') .">" . $db_connections[$i]["name"] . "</option>";
+                       echo "</select>\n";
+                       echo "</td></tr>";
+               } else {
+//                     $coy = $def_coy;
+                       text_row(_("Company"), "company_login_nickname", "", 20, 30);
+               }
                 start_row();
                 label_cell($demo_text, "colspan=2 align='center'");
                 end_row();
@@ -114,6 +114,8 @@ function set_fullmode() {
                         echo "<input type='hidden' name='$p' value='$val'>";
         }
         end_form(1);
+       $Ajax->addScript(true, "document.forms[0].password.focus();");
+
      echo "<script language='JavaScript' type='text/javascript'>
      //<![CDATA[
              <!--