--- loncom/auth/lonlogin.pm	2004/12/30 16:04:37	1.62
+++ loncom/auth/lonlogin.pm	2005/08/30 21:14:20	1.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.62 2004/12/30 16:04:37 raeburn Exp $
+# $Id: lonlogin.pm,v 1.68 2005/08/30 21:14:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,7 +32,7 @@ use strict;
 use Apache::Constants qw(:common);
 use CGI::Cookie();
 use Apache::File ();
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonauth();
 use Apache::lonlocal;
@@ -84,23 +84,23 @@ ENDFAILED
 # ---------------------------------------------------- No valid token, continue
 
     &Apache::loncommon::get_unprocessed_cgi
-     ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
+     ($ENV{'QUERY_STRING'}.'&'.$env{'request.querystring'},
       ['interface','username','domain','firsturl','localpath','localres']);
  
 
 # ----------------------------------------------------------- Process Interface
-    $ENV{'form.interface'}=~s/\W//g;
+    $env{'form.interface'}=~s/\W//g;
 
     my $textbrowsers=$r->dir_config('lonTextBrowsers');
     my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
     
     foreach (split(/\:/,$textbrowsers)) {
 	if ($httpbrowser=~/$_/i) {
-	    $ENV{'form.interface'}='textual';
+	    $env{'form.interface'}='textual';
         }
     }
 
-    my $fullgraph=($ENV{'form.interface'} ne 'textual');
+    my $fullgraph=($env{'form.interface'} ne 'textual');
     my $port_to_use=$r->dir_config('lonhttpdPort');
     if (!defined($port_to_use)) {
 	$port_to_use='8080';
@@ -108,9 +108,13 @@ ENDFAILED
     my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
                   $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');
-    if (($ENV{'form.domain'}) && 
-	 ($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) {
-	$domain=$ENV{'form.domain'};
+    my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
+    foreach my $posdom (&Apache::lonnet::current_machine_domains()) {
+	if ($posdom eq $testdomain) { $domain=$testdomain; }
+    }
+    if (($env{'form.domain'}) && 
+	 ($Apache::lonnet::domaindescription{$env{'form.domain'}})) {
+	$domain=$env{'form.domain'};
     }
     my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
@@ -124,8 +128,8 @@ ENDFAILED
 
 # --------------------------------------------- Default values for login fields
 
-    my $authusername=($ENV{'form.username'}?$ENV{'form.username'}:'');
-    my $authdomain=($ENV{'form.domain'}?$ENV{'form.domain'}:$domain);
+    my $authusername=($env{'form.username'}?$env{'form.username'}:'');
+    my $authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain);
 
 # ---------------------------------------------------------- Determine own load
     my $loadavg;
@@ -140,7 +144,7 @@ ENDFAILED
 # ------------------------------------------------------- Do the load balancing
     my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=
-    ($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
+    ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
 # ---------------------------------------- Are we access server and overloaded?
     if (($role eq 'access') &&
 	(($userloadpercent>100.0)||($loadpercent>100.0))) {
@@ -179,22 +183,36 @@ ENDFAILED
 
     if ($logtoken eq 'con_lost') {
         my $spares='';
-
-        foreach my $hostid (keys(%Apache::lonnet::spareid)) {
+	my $last;
+        foreach my $hostid (sort
+			    {
+				$Apache::lonnet::hostname{$a} cmp
+				    $Apache::lonnet::hostname{$b};
+			    }
+			    keys(%Apache::lonnet::spareid)) {
             next if ($hostid eq $lonhost);
+            next if ($last eq $Apache::lonnet::hostname{$hostid});
             $spares.='<br /><font size="+1"><a href="http://'.
                 $Apache::lonnet::hostname{$hostid}.
                 '/adm/login?domain='.$authdomain.'">'.
                 $Apache::lonnet::hostname{$hostid}.'</a>'.
                 ' (preferred)</font>'.$/;
+	    $last=$Apache::lonnet::hostname{$hostid};
         }
         $spares.= '<br />';
-        foreach my $hostid (keys(%Apache::lonnet::hostname)) {
+        foreach my $hostid (sort
+			    {
+				$Apache::lonnet::hostname{$a} cmp
+				    $Apache::lonnet::hostname{$b};
+			    }
+			    keys(%Apache::lonnet::hostname)) {
             next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
+            next if ($last eq $Apache::lonnet::hostname{$hostid});
             $spares.='<br /><a href="http://'.
                 $Apache::lonnet::hostname{$hostid}.
                 '/adm/login?domain='.$authdomain.'">'.
                 $Apache::lonnet::hostname{$hostid}.'</a>';
+	    $last=$Apache::lonnet::hostname{$hostid};
         }
 	$r->print(<<ENDTROUBLE);
 <html>
@@ -265,7 +283,8 @@ my %lt=&Apache::lonlocal::texthash(
                   'servadm' => 'Server Administration',
                   'sysadm' => 'System Administration',
                   'helpdesk' => 'Contact Helpdesk');
-
+# -------------------------------------------------- Change password field name
+    my $now=time;
 # ---------------------------------------------------------- Serve rest of page
     $r->print(<<ENDSCRIPT);
 
@@ -303,8 +322,15 @@ my %lt=&Apache::lonlocal::texthash(
         lextkey=this.document.client.elements.lextkey.value;
         initkeys();
 
-        this.document.server.elements.upass.value
-	    =crypted(this.document.client.elements.upass.value);
+        this.document.server.elements.upass0.value
+	    =crypted(this.document.client.elements.upass$now.value.substr(0,15));
+	this.document.server.elements.upass1.value
+	    =crypted(this.document.client.elements.upass$now.value.substr(15,15));
+	this.document.server.elements.upass2.value
+	    =crypted(this.document.client.elements.upass$now.value.substr(30,15));
+
+        this.document.client.elements.uname.value='';
+        this.document.client.elements.upass$now.value='';
 
         this.document.server.submit();
 	return false;
@@ -321,9 +347,11 @@ ENDSCRIPT
   <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />
-   <input type="hidden" name="interface" value="$ENV{'form.interface'}" />
+   <input type="hidden" name="interface" value="$env{'form.interface'}" />
    <input type="hidden" name="uname" value="" />
-   <input type="hidden" name="upass" value="" />
+   <input type="hidden" name="upass0" value="" />
+   <input type="hidden" name="upass1" value="" />
+   <input type="hidden" name="upass2" value="" />
    <input type="hidden" name="udom" value="" />
    <input type="hidden" name="imagesuppress"  value="" />
    <input type="hidden" name="appletsuppress"  value="" />
@@ -331,8 +359,8 @@ ENDSCRIPT
    <input type="hidden" name="fontenhance"  value="" />
    <input type="hidden" name="blackwhite"  value="" />
    <input type="hidden" name="remember"  value="" />
-   <input type="hidden" name="localpath" value="$ENV{'form.localpath'}" />
-   <input type="hidden" name="localres" value="$ENV{'form.localres'}" />
+   <input type="hidden" name="localpath" value="$env{'form.localpath'}" />
+   <input type="hidden" name="localres" value="$env{'form.localres'}" />
   </form>
 ENDSERVERFORM
     if ($fullgraph) { $r->print(<<ENDTOP);
@@ -396,11 +424,11 @@ ENDTOP
     unless ($fullgraph) {
         $r->print(<<ENDACCESSOPTIONS);
 <h3>Select Accessibility Options</h3>
-<input type="checkbox" name="imagesuppress" /> Suppress rendering of images<br />
-<input type="checkbox" name="appletsuppress" /> Suppress Java applets<br />
-<input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia<br />
-<input type="checkbox" name="fontenhance" /> Increase font size<br />
-<input type="checkbox" name="blackwhite" /> Switch to black and white mode<br />
+<label><input type="checkbox" name="imagesuppress" /> Suppress rendering of images</label><br />
+<label><input type="checkbox" name="appletsuppress" /> Suppress Java applets</label><br />
+<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 />
@@ -429,7 +457,7 @@ ENDNOOPT
       </tr>
       <tr>
        <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;$lt{'pw'}:</b></font></td>
-       <td bgcolor="$mainbg"><input type="password" name="upass" size="10" /></td>
+       <td bgcolor="$mainbg"><input type="password" name="upass$now" size="10" /></td>
       </tr>
       <tr>
        <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:</b></font></td>