Login screen company box/input configuration option made backward compatible.

diff --git a/access/login.php b/access/login.php
index ebedcc921aa07c2d09a119e6b25999b9c1d94df2..24a74a1c0ac079287f29c59eb9fa12dd42c53210 100644 (file)
--- a/access/login.php
+++ b/access/login.php
@@ -89,7 +89,7 @@ function defaultCompany()
                        $coy =  $_SESSION['wa_current_user']->company;
                else
                        $coy = $def_coy;
-               if ($AllowCompanySelectionBox) {
+               if (!@$text_company_selection) {
                        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>";

diff --git a/config.default.php b/config.default.php
index cb36c1709dadae49dab87af377df08cc03930063..aed9cd9e5ba7a3ad373c57f92b0dd2ad6cd8a4a2 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -241,11 +241,11 @@ if (!defined('ICON_EDIT'))
 }
 
 /* 
-       Display a dropdown select box for choosing Company to login if true.
-       Show a blank editbox only if false where the Company NickName
+       Display a dropdown select box for choosing Company to login if false.
+       Show a blank editbox only if true where the Company NickName
        will have to be manually entered. This is when privacy is needed.
 */
-       $AllowCompanySelectionBox  = true;
+$text_company_selection  = false;
 
 /*  Should FA hide menu items (Applications, Modules, and Actions) from the user if they don't have access to them? 
     0 for no       1 for yes