--- loncom/auth/lonlogin.pm	2005/04/28 01:19:20	1.64
+++ 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.64 2005/04/28 01:19:20 albertel Exp $
+# $Id: lonlogin.pm,v 1.68 2005/08/30 21:14:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -108,6 +108,10 @@ ENDFAILED
     my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
                   $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()) {
+	if ($posdom eq $testdomain) { $domain=$testdomain; }
+    }
     if (($env{'form.domain'}) && 
 	 ($Apache::lonnet::domaindescription{$env{'form.domain'}})) {
 	$domain=$env{'form.domain'};
@@ -279,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);
 
@@ -317,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;
@@ -337,7 +349,9 @@ ENDSCRIPT
    <input type="hidden" name="serverid" value="$lonhost" />
    <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="" />
@@ -410,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 />
@@ -443,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>