--- loncom/auth/lonlogin.pm	2007/04/06 22:06:02	1.91
+++ loncom/auth/lonlogin.pm	2007/10/09 16:48:51	1.94.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.91 2007/04/06 22:06:02 raeburn Exp $
+# $Id: lonlogin.pm,v 1.94.2.1 2007/10/09 16:48:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -120,12 +120,10 @@ ENDFAILED
     }
 
     my $fullgraph=($env{'form.interface'} ne 'textual');
-    my $port_to_use=$r->dir_config('lonhttpdPort');
-    if (!defined($port_to_use)) {
-	$port_to_use='8080';
-    }
-    my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
-                  $r->dir_config('lonIconsURL');
+
+    my $iconpath= 
+	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+
     my $domain = &Apache::lonnet::default_login_domain();
     if (($env{'form.domain'}) && 
 	(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
@@ -160,9 +158,8 @@ ENDFAILED
     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?
-    if (($role eq 'access') &&
-	(($userloadpercent>100.0)||($loadpercent>100.0))) {
+# ---------------------------------------------------------- Are we overloaded?
+    if ((($userloadpercent>100.0)||($loadpercent>100.0))) {
         my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
 	if ($unloaded) { $otherserver=$unloaded; }
     }
@@ -386,7 +383,7 @@ ENDSCRIPT
   </form>
 ENDSERVERFORM
     my $coursecatalog;
-    if ($showcoursecat eq '' || $showcoursecat)) {
+    if (($showcoursecat eq '') || ($showcoursecat)) {
         $coursecatalog = &coursecatalog_link($lt{'catalog'});
     }
     if ($fullgraph) { $r->print(<<ENDTOP);
@@ -484,15 +481,15 @@ ENDNOOPT
      <table border=0 cellspacing=0 cellpadding=0>
       <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/$lt{'auth'}" alt="User Authentication" /></td></tr>
       <tr>
-       <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;$lt{'un'}:</b></font></td>
+       <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="uname">$lt{'un'}</label>:</b></font></td>
        <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>
       </tr>
       <tr>
-       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;$lt{'pw'}:</b></font></td>
+       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="upass$now">$lt{'pw'}</label>:</b></font></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>
+       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="udom">$lt{'dom'}</label>:</b></font></td>
        <td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>
       </tr>
       <tr>