--- loncom/auth/lonlogin.pm	2006/08/18 20:24:53	1.78
+++ loncom/auth/lonlogin.pm	2006/11/01 21:27:50	1.82
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.78 2006/08/18 20:24:53 albertel Exp $
+# $Id: lonlogin.pm,v 1.82 2006/11/01 21:27:50 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,11 +41,22 @@ use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
 
+sub additional_machine_domains {
+    my @domains;
+    open(my $fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/expected_domains.tab');
+    while( my $line = <$fh>) {
+	$line =~ s/\s//g;
+	push(@domains,$line);
+    }
+    return @domains;
+}
+
 sub handler {
     my $r = shift;
 
     &Apache::loncommon::get_unprocessed_cgi
-	($ENV{'QUERY_STRING'}.'&'.$env{'request.querystring'},
+	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
+	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
 	  'token']);
 
@@ -129,7 +140,8 @@ ENDFAILED
                   $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');
     my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
-    foreach my $posdom (&Apache::lonnet::current_machine_domains()) {
+    foreach my $posdom (&Apache::lonnet::current_machine_domains(),
+			&additional_machine_domains()) {
 	if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; }
     }
     if (($env{'form.domain'}) && 
@@ -138,8 +150,6 @@ ENDFAILED
     }
     my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
-    my $servadm = $r->dir_config('lonAdmEMail');
-    my $sysadm  = $r->dir_config('lonSysEMail');
     my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');
@@ -163,7 +173,7 @@ ENDFAILED
     my $userloadpercent=&Apache::lonnet::userload();
 
 # ------------------------------------------------------- Do the load balancing
-    my $otherserver= &Apache::loncommon::absolute_url($host_name);
+    my $otherserver= &Apache::lonnet::absolute_url($host_name);
     my $firsturl=
     ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
 # ---------------------------------------- Are we access server and overloaded?
@@ -242,7 +252,6 @@ ENDFAILED
 <img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />
 <h3>This LON-CAPA server is temporarily not available for login</h3>
 <p>Please attempt to login to one of the following servers:</p>$spares
-<p>If the problem persists, please contact <tt>$servadm</tt>.</p>
 </body>
 </html>
 ENDTROUBLE
@@ -252,8 +261,6 @@ ENDTROUBLE
 # ----------------------------------------------- Apparently we are in business
 
     my $domainlogo=&Apache::loncommon::domainlogo($domain);
-    $servadm=~s/\,/\<br \/\>/g;
-    $sysadm=~s/\,/\<br \/\>/g;
 
 # --------------------------------------------------- Print login screen header
     $r->print(<<ENDHEADER);
@@ -301,8 +308,6 @@ my %lt=&Apache::lonlocal::texthash(
 		  'log' => 'Log in',
 		  'help' => 'Help',
 		  'serv' => 'Server',
-                  'servadm' => 'Server Administration',
-                  'sysadm' => 'System Administration',
                   'helpdesk' => 'Contact Helpdesk');
 # -------------------------------------------------- Change password field name
     my $now=time;
@@ -450,9 +455,6 @@ ENDTOP
 <label><input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia</label><br />
 <label><input type="checkbox" name="fontenhance" /> Increase font size</label><br />
 <label><input type="checkbox" name="blackwhite" /> Switch to black and white mode</label><br />
-<p>If you have accessibility needs that are not addressed by this interface, 
-please
-contact the system administrator at <tt>$sysadm</tt>.</p><br />
 <input type="checkbox" name="remember" /> Remember these settings for next login<hr />
 ENDACCESSOPTIONS
 } else {
@@ -497,7 +499,7 @@ ENDNOOPT
 ENDLOGIN
     if ($fullgraph) {
         my $helpdeskscript;
-        my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript);
+        my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript);
 	$r->print(<<ENDDOCUMENT);
    </td>
 
@@ -593,23 +595,13 @@ ENDDOCUMENT
 }
 
 sub contactdisplay {
-    my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_;
+    my ($lt,$version,$authdomain,$helpdeskscript) = @_;
     my $contactblock;
-    my $showsysadm = 1;
-    my $showservadm = 1;
     my $showhelpdesk = 0;
     my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $showhelpdesk = 1;
     }
-    if ($showsysadm) {
-        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'sysadm'}.':</b><br />'.
-                         '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$sysadm.'</tt><br />';
-    }
-    if ($showservadm) {
-        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'servadm'}.':</b><br />'.
-                         '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';
-    }
     if ($showhelpdesk) {
         $contactblock .= '<b>&nbsp;&nbsp;&nbsp;<a href="javascript:helpdesk()">'.$$lt{'helpdesk'}.'</a></b><br />';
         my $thisurl = &escape('/adm/login');