--- loncom/auth/lonlogin.pm	2002/05/23 20:00:11	1.16
+++ loncom/auth/lonlogin.pm	2002/09/17 20:05:39	1.19.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.16 2002/05/23 20:00:11 www Exp $
+# $Id: lonlogin.pm,v 1.19.2.1 2002/09/17 20:05:39 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,8 @@
 # 1/17/01 Gerd Kortemeyer
 #
 # 2/7/02,2/8,2/12,2/14,2/15,2/19 Josh Brunskole
+# 
+# 7/10/02 Jeremy Bowers
 
 package Apache::lonlogin;
 
@@ -50,6 +52,8 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi
                          ($ENV{'QUERY_STRING'},['interface']);
 
+    $ENV{'form.interface'}=~s/\W//g;
+
     my $fullgraph=($ENV{'form.interface'} ne 'textual');
 
     my $iconpath= $r->dir_config('lonIconsURL');
@@ -74,7 +78,7 @@ sub handler {
     my $firsturl=$ENV{'request.firsturl'};
 # ---------------------------------------- Are we access server and overloaded?
     if (($role eq 'access') && ($loadpercent>100.0)) {
-        $otherserver=Apache::lonnet::spareserver();
+        $otherserver=Apache::lonnet::spareserver($loadpercent);
     }
 
 # -------------------------------------------------------- Set login parameters
@@ -136,6 +140,7 @@ ENDHEADER
 	    =crypted(this.document.client.elements.upass.value);
 
         this.document.server.submit();
+	return false;
     }
  </script>
 ENDSCRIPT
@@ -149,6 +154,7 @@ 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=uname value="">
    <input type=hidden name=upass value="">
    <input type=hidden name=udom value="">
@@ -159,7 +165,7 @@ ENDSERVERFORM
   <tr>
 
    <!-- Row 1 Columns 2-4 -->
-   <td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="#006600"><img src="$iconpath/header.gif" border=0 /></td>
+   <td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="#006600"><img src="$iconpath/header.gif" border=0 alt="The Learning Online Network with CAPA" /></td>
   </tr>
 
   <!-- The gray bar that starts the two table frames -->
@@ -169,38 +175,38 @@ ENDSERVERFORM
    <td width=182 height=27 bgcolor="#cccccc">&nbsp;</td>
 
    <!-- Row 2 Column 2 -->
-   <td width=27 height=27 align="left" background="$iconpath/filltop.gif"><img src="$iconpath/upperleft.gif" border=0 /></td>
+   <td width=27 height=27 align="left" background="$iconpath/filltop.gif"><img src="$iconpath/upperleft.gif" border=0 alt="" /></td>
 
    <!-- Row 2 Column 3 -->
-   <td height=27 background="$iconpath/filltop.gif"><img src="$iconpath/filltop.gif" /></td>
+   <td height=27 background="$iconpath/filltop.gif"><img src="$iconpath/filltop.gif" alt="" /></td>
 
    <!-- Row 2 Column 4 -->
-   <td width=27 height=27 align="right" background="$iconpath/filltop.gif"><img src="$iconpath/upperright.gif" border=0 /></td>
+   <td width=27 height=27 align="right" background="$iconpath/filltop.gif"><img src="$iconpath/upperright.gif" border=0 alt="" /></td>
   </tr>
   <tr>
    
    <!-- A cell that will hold the 'access' and 'about' buttons -->
    <!-- Row 3 Column 1 -->
    <td valign="top" height=60 align="center" bgcolor="#cccccc">
-    <a href="/adm/login?interface=textual"><img src="$iconpath/accessbutton.gif" border=0 /></a>
+    <a href="/adm/login?interface=textual"><img src="$iconpath/accessbutton.gif" border=0 alt="Accessibility Options" /></a>
     <br />
-    <a href="/adm/about.html"><img src="$iconpath/aboutlon.gif" border=0 /></a>
+    <a href="/adm/about.html"><img src="$iconpath/aboutlon.gif" border=0 alt="About LON-CAPA" /></a>
    </td>
 
    <!-- The shaded space between the two main columns -->
    <!-- Row 3 Column 2 -->
-   <td width=27 height=60 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" /></td>
+   <td width=27 height=60 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
 
    <!-- The right main column holding the large LON-CAPA logo-->
    <!-- Rows 3-4 Column 3 -->
    <td align="center" valign="top" width="100%" height="100%" rowspan=2 bgcolor="#ffffff">
     <center>
-     <img src="$iconpath/loncapalogo.gif" />
+     <img src="$iconpath/loncapalogo.gif" alt="" />
     </center>
    </td>
 
    <!-- Row 3 Column 4 -->
-   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" /></td>
+   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
   </tr>
   <tr>
 
@@ -210,13 +216,13 @@ ENDSERVERFORM
 ENDTOP
 }
     $r->print(<<ENDLOGIN);
-    <form name="client">
+    <form name="client" onsubmit="return(send())">
      <input type="hidden" name="lextkey" value="$lextkey">
      <input type="hidden" name="uextkey" value="$uextkey">
 
      <!-- Start the sub-table for text and input alignment -->
      <table border=0 cellspacing=0 cellpadding=0>
-      <tr><td bgcolor="#cccccc" colspan=2><img src="$iconpath/userauthentication.gif" /></td></tr>
+      <tr><td bgcolor="#cccccc" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>
       <tr>
        <td bgcolor="#ffffff"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;User Name:</b></font></td>
        <td bgcolor="#ffffff"><br /><input type="text" name="uname" size="10" /></td>
@@ -232,7 +238,7 @@ ENDTOP
       <tr>
        <td bgcolor="#ffffff" valign="bottom" align="center" colspan=2>
         <br />
-        <input type="button" value="Log In" onClick="send();" />
+        <input type="submit" value="Log In" />
        </td>
       </tr>
      </table>
@@ -244,10 +250,10 @@ ENDLOGIN
    </td>
 
    <!-- Row 4 Column 2 -->
-   <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" /></td>
+   <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
 
    <!-- Row 4 Column 4 -->
-   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" /></td>
+   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
   </tr>
   <tr>
 
@@ -285,18 +291,18 @@ ENDLOGIN
      <b>&nbsp;&nbsp;&nbsp;System Administration:</b><br />
      <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$sysadm</tt><br />
      <b>&nbsp;&nbsp;&nbsp;Server Administration:</b><br />
-     <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$servadm</tt>
+     <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$servadm<br />&nbsp;</tt>
     </small>
    </td>
 
    <!-- Row 5 Column 2 -->
-   <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" /></td>
+   <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
 
    <!-- Row 5 Column 3 -->
-   <td width="100%" valign="bottom" bgcolor="#ffffff"><img src="$iconpath/litetext.gif" /><img src="$iconpath/lite.gif" /></td>
+   <td width="100%" valign="bottom" bgcolor="#ffffff"><img src="$iconpath/litetext.gif" alt="Laboratory for Instructional Technology in Education" /><img src="$iconpath/lite.gif" alt="" /></td>
 
    <!-- Row 5 Column 4 -->
-   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" /></td>
+   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
   </tr>
   <tr>
 
@@ -304,13 +310,13 @@ ENDLOGIN
    <td bgcolor="#cccccc">&nbsp;</td>
 
    <!-- Row 6 Column 2 -->
-   <td align="left" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerleft.gif" /></td>
+   <td align="left" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerleft.gif" alt="" /></td>
 
    <!-- Row 6 Column 3 -->
-   <td background="$iconpath/fillbottom.gif"><img src="$iconpath/fillbottom.gif" /></td>
+   <td background="$iconpath/fillbottom.gif"><img src="$iconpath/fillbottom.gif" alt="" /></td>
 
    <!-- Row 6 Column 4 -->
-   <td align="right" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerright.gif" /></td>
+   <td align="right" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerright.gif" alt="" /></td>
   </tr>
  </table>