--- loncom/auth/lonlogin.pm 2010/08/26 14:16:23 1.144 +++ loncom/auth/lonlogin.pm 2011/02/11 10:41:59 1.146 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.144 2010/08/26 14:16:23 bisitz Exp $ +# $Id: lonlogin.pm,v 1.146 2011/02/11 10:41:59 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -131,6 +131,7 @@ sub handler { } my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); + my $uloadlim= $r->dir_config('lonUserLoadLim'); my $servadm = $r->dir_config('lonAdmEMail'); my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); @@ -151,7 +152,9 @@ sub handler { } $loadavg =~ s/\s.*//g; my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim); + unless ($loadlim) { $loadpercent='---'; } my $userloadpercent=&Apache::lonnet::userload(); + unless ($uloadlim) { $userloadpercent='---'; } my $firsturl= ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'}); @@ -435,7 +438,7 @@ LFORM HEADER } $r->print(< +
$logintitle $loginform