--- loncom/auth/lonlogin.pm	2000/11/09 19:37:47	1.8
+++ loncom/auth/lonlogin.pm	2002/02/19 21:20:48	1.12
@@ -1,7 +1,33 @@
 # The LearningOnline Network
 # Login Screen
+#
+# $Id: lonlogin.pm,v 1.12 2002/02/19 21:20:48 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer
+# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9,
+# 1/17/01 Gerd Kortemeyer
 #
 package Apache::lonlogin;
 
@@ -9,10 +35,12 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::File ();
 use Apache::lonnet();
+use Apache::loncommon();
 
 sub handler {
     my $r = shift;
     $r->content_type('text/html');
+    &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
 
@@ -34,7 +62,7 @@ sub handler {
     $loadavg =~ s/\s.*//g;
     my $loadpercent=100*$loadavg/$loadlim;
 
-    my $otherserver='';
+    my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=$ENV{'request.firsturl'};
 # ---------------------------------------- Are we access server and overloaded?
     if (($role eq 'access') && ($loadpercent>100.0)) {
@@ -135,7 +163,7 @@ ENDHEADER
 <table border=1 bgcolor="#BBBBBB">
 <tr><td><font size="-1"><b>Domain:</b></font></td>
     <td><font size="-1"><tt>$domain</tt></font></td>
-    <td rowspan=3><font size="-1"><b>LON System Administration:</b><br>
+    <td rowspan=3><font size="-1"><b>System Administration:</b><br>
                   <tt>$sysadm</tt><br>
                   <b>Server Administration:</b><br>
                   <tt>$servadm</tt></font></td></tr>