--- loncom/auth/lonlogin.pm	2003/08/12 19:46:04	1.45
+++ loncom/auth/lonlogin.pm	2003/09/17 02:24:14	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.45 2003/08/12 19:46:04 www Exp $
+# $Id: lonlogin.pm,v 1.51 2003/09/17 02:24:14 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,8 @@ use Apache::Constants qw(:common);
 use Apache::File ();
 use Apache::lonnet();
 use Apache::loncommon();
+use Apache::lonauth();
+use Apache::lonlocal;
 
 sub handler {
     my $r = shift;
@@ -49,10 +51,20 @@ sub handler {
     return OK if $r->header_only;
 
 
+# Are we re-routing?
+    if (-e '/home/httpd/html/lon-status/reroute.txt') {
+	&Apache::lonauth::reroute($r);
+	return OK;
+    }
+
     &Apache::loncommon::get_unprocessed_cgi
      ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
       ['interface','username','domain','firsturl','localpath','localres']);
  
+# -------------------------------------------------------------------- Language
+
+    &Apache::lonlocal::get_language_handle();
+
 # ----------------------------------------------------------- Process Interface
     $ENV{'form.interface'}=~s/\W//g;
 
@@ -73,6 +85,10 @@ sub handler {
     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 $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
     my $servadm = $r->dir_config('lonAdmEMail');
@@ -105,7 +121,8 @@ sub handler {
 # ---------------------------------------- Are we access server and overloaded?
     if (($role eq 'access') &&
 	(($userloadpercent>100.0)||($loadpercent>100.0))) {
-        $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
+        my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
+	if ($unloaded) { $otherserver=$unloaded; }
     }
 
 # ----------------------------------------------------------- Get announcements
@@ -165,7 +182,7 @@ ENDTROUBLE
 
 # ----------------------------------------------- Apparently we are in business
 
-    my $domainlogo=&Apache::loncommon::domainlogo();
+    my $domainlogo=&Apache::loncommon::domainlogo($domain);
     $servadm=~s/\,/\<br \/\>/g;
     $sysadm=~s/\,/\<br \/\>/g;
 
@@ -185,20 +202,35 @@ ENDHEADER
 
 # ----------------------------------------------------------- Front page design
     my $pgbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF');
+      ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
     my $font=
-      ($fullgraph?&Apache::loncommon::designparm('login.font'):'#000000');
+      ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
     my $link=
-      ($fullgraph?&Apache::loncommon::designparm('login.link'):'#0000FF');
+      ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
     my $vlink=
-      ($fullgraph?&Apache::loncommon::designparm('login.vlink'):'#0000FF');
-    my $alink=&Apache::loncommon::designparm('login.alink');
+      ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
+    my $alink=&Apache::loncommon::designparm('login.alink',$domain);
     my $mainbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF');
+      ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
     my $sidebg=
-      ($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF');
-    my $logo=&Apache::loncommon::designparm('login.logo');
-    my $img=&Apache::loncommon::designparm('login.img');
+      ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
+    my $logo=&Apache::loncommon::designparm('login.logo',$domain);
+    my $img=&Apache::loncommon::designparm('login.img',$domain);
+
+# ----------------------------------------------------------------------- Texts
+
+my %lt=&Apache::lonlocal::texthash(
+		  'un'  => 'Username',
+		  'pw'  => 'Password',
+		  'dom' => 'Domain',
+		  'perc' => 'percent',
+		  'user' => 'User',
+		  'load' => 'load',
+		  'log' => 'Log in',
+		  'help' => 'Help',
+		  'serv' => 'Server',
+                  'servadm' => 'Server Administration',
+                  'sysadm' => 'System Administration');
 
 
 # ---------------------------------------------------------- Serve rest of page
@@ -359,22 +391,22 @@ ENDNOOPT
      <table border=0 cellspacing=0 cellpadding=0>
       <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>
       <tr>
-       <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;User Name:</b></font></td>
+       <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;$lt{'un'}:</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;Password:</b></font></td>
+       <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>
       </tr>
       <tr>
-       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;Domain:</b></font></td>
+       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:</b></font></td>
        <td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>
       </tr>
       <tr>
-       <td bgcolor="$mainbg">&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">Help</a></td>
+       <td bgcolor="$mainbg">&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">$lt{'help'}</a></td>
        <td bgcolor="$mainbg" valign="bottom" align="center">
         <br />
-        <input type="submit" value="Log In" />
+        <input type="submit" value="$lt{'log'}" />
        </td>
       </tr>
      </table>
@@ -402,7 +434,7 @@ ENDLOGIN
      <table border=0 cellspacing=0 cellpadding=0>
       <tr>
        <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;Domain:&nbsp;</b></small>
+        <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
        </td>
        <td bgcolor="$sidebg" align="left" valign="top">
         <small><tt>&nbsp;$domain</tt></small>
@@ -410,7 +442,7 @@ ENDLOGIN
       </tr>
       <tr>
        <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;Server:&nbsp;</b></small>
+        <small><b>&nbsp;&nbsp;&nbsp;$lt{'serv'}:&nbsp;</b></small>
        </td>
        <td bgcolor="$sidebg" align="left" valign="top">
         <small><tt>&nbsp;$lonhost ($role)</tt></small>
@@ -421,23 +453,23 @@ ENDLOGIN
         <small><b>&nbsp;&nbsp;&nbsp;Load:&nbsp;</b></small>
        </td>
        <td bgcolor="$sidebg" align="left" valign="top">
-        <small><tt>&nbsp;$loadpercent percent</tt></small>
+        <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
        </td>
       </tr>
       <tr>
        <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;User&nbsp;Load:&nbsp;</b></small>
+        <small><b>&nbsp;&nbsp;&nbsp;$lt{'user'}&nbsp;$lt{'load'}:&nbsp;</b></small>
        </td>
        <td bgcolor="$sidebg" align="left" valign="top">
-        <small><tt>&nbsp;$userloadpercent percent</tt></small>
+        <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
        </td>
       </tr>
      </table>
      <br />
     <small>
-     <b>&nbsp;&nbsp;&nbsp;System Administration:</b><br />
+     <b>&nbsp;&nbsp;&nbsp;$lt{'sysadm'}:</b><br />
      <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$sysadm</tt><br />
-     <b>&nbsp;&nbsp;&nbsp;Server Administration:</b><br />
+     <b>&nbsp;&nbsp;&nbsp;$lt{'servadm'}:</b><br />
      <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$servadm</tt><br />&nbsp;<br />
      &nbsp;&nbsp;&nbsp;$version
     </small>