--- loncom/auth/lonlogin.pm 2003/11/12 16:55:40 1.55 +++ loncom/auth/lonlogin.pm 2005/02/21 18:29:25 1.62.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.55 2003/11/12 16:55:40 www Exp $ +# $Id: lonlogin.pm,v 1.62.2.1 2005/02/21 18:29:25 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,7 +68,6 @@ sub handler {
Please either continue the current session or
@@ -135,13 +134,14 @@ ENDFAILED
$loadavg=<$loadfile>;
}
$loadavg =~ s/\s.*//g;
- my $loadpercent=100*$loadavg/$loadlim;
+ my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
my $userloadpercent=&Apache::lonnet::userload();
# ------------------------------------------------------- Do the load balancing
my $otherserver='http://'.$ENV{'SERVER_NAME'};
my $firsturl=
($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
+ my $escfirsturl=&Apache::lonnet::escape($firsturl);
# ---------------------------------------- Are we access server and overloaded?
if (($role eq 'access') &&
(($userloadpercent>100.0)||($loadpercent>100.0))) {
@@ -180,15 +180,22 @@ ENDFAILED
if ($logtoken eq 'con_lost') {
my $spares='';
- foreach (keys %Apache::lonnet::hostname) {
- if ($_ ne $lonhost) {
- $spares.='
'.
- $Apache::lonnet::hostname{$_}.'';
- if ($Apache::lonnet::spareid{$_}) {
- $spares.=' (preferred)';
- }
- }
+
+ foreach my $hostid (keys(%Apache::lonnet::spareid)) {
+ next if ($hostid eq $lonhost);
+ $spares.='
'.
+ $Apache::lonnet::hostname{$hostid}.''.
+ ' (preferred)'.$/;
+ }
+ $spares.= '
';
+ foreach my $hostid (keys(%Apache::lonnet::hostname)) {
+ next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
+ $spares.='
'.
+ $Apache::lonnet::hostname{$hostid}.'';
}
$r->print(<
+
@@ -441,6 +448,8 @@ ENDNOOPT
ENDLOGIN
if ($fullgraph) {
+ my $helpdeskscript;
+ my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript);
$r->print(<Welcome to the LON-CAPA NSDL Gateway
Sign up for a Guest Login
-
- $lt{'sysadm'}:
- $sysadm
- $lt{'servadm'}:
- $servadm
- $version
-
+ $contactblock
@@ -529,16 +532,59 @@ $domainlogo
-
+$helpdeskscript
ENDDOCUMENT
}
$r->print('