--- loncom/auth/lonlogin.pm	2003/08/26 19:48:41	1.44.2.2
+++ loncom/auth/lonlogin.pm	2003/09/16 18:15:43	1.50
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.44.2.2 2003/08/26 19:48:41 albertel Exp $
+# $Id: lonlogin.pm,v 1.50 2003/09/16 18:15:43 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;
 
@@ -113,6 +125,8 @@ sub handler {
 	if ($unloaded) { $otherserver=$unloaded; }
     }
 
+# ----------------------------------------------------------- Get announcements
+    my $announcements=&Apache::lonnet::getannounce();
 # -------------------------------------------------------- Set login parameters
 
     my @hexstr=('0','1','2','3','4','5','6','7',
@@ -168,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;
 
@@ -312,7 +326,7 @@ ENDSERVERFORM
 
    <!-- 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="$mainbg">
+   <td align="center" valign="top" width="100%" height="100%" bgcolor="$mainbg">
     <center>
      <img src="$logo" alt="" />
     </center>
@@ -328,7 +342,7 @@ ENDSERVERFORM
    <td align="center" valign="middle" bgcolor="$sidebg">
 ENDTOP
 } else {
-    $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>');
+    $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>'.$announcements);
 }
     $r->print('<form name="client" onsubmit="return(send())">');
     unless ($fullgraph) {
@@ -391,6 +405,9 @@ ENDLOGIN
    <!-- Row 4 Column 2 -->
    <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
 
+   <!-- Row 4 Column 3 -->
+<td bgcolor="$mainbg">$announcements</td>
+
    <!-- Row 4 Column 4 -->
    <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
   </tr>