--- loncom/auth/lonlogin.pm 2003/08/26 19:48:41 1.44.2.2
+++ loncom/auth/lonlogin.pm 2003/09/11 20:54:11 1.49
@@ -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.49 2003/09/11 20:54:11 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,6 +40,7 @@ use Apache::Constants qw(:common);
use Apache::File ();
use Apache::lonnet();
use Apache::loncommon();
+use Apache::lonauth();
sub handler {
my $r = shift;
@@ -49,6 +50,12 @@ 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']);
@@ -113,6 +120,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 +177,7 @@ ENDTROUBLE
# ----------------------------------------------- Apparently we are in business
- my $domainlogo=&Apache::loncommon::domainlogo();
+ my $domainlogo=&Apache::loncommon::domainlogo($domain);
$servadm=~s/\,/\
/g;
$sysadm=~s/\,/\
/g;
@@ -312,7 +321,7 @@ ENDSERVERFORM
-