--- loncom/auth/lonlogin.pm 2010/08/25 22:03:51 1.142 +++ loncom/auth/lonlogin.pm 2010/09/02 09:24:42 1.145 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.142 2010/08/25 22:03:51 raeburn Exp $ +# $Id: lonlogin.pm,v 1.145 2010/09/02 09:24:42 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,7 +69,7 @@ sub handler { return OK; } - $env{'form.firsturl'} =~ =~ s/(`)/'/g; + $env{'form.firsturl'} =~ s/(`)/'/g; # -------------------------------- Prevent users from attempting to login twice my $handle = &Apache::lonnet::check_for_valid_session($r); @@ -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'}); @@ -309,9 +312,9 @@ return false; } function enableInput() { - this.document.client.elements.upass$now.removeAttribute("readonly"); - this.document.client.elements.uname.removeAttribute("readonly"); - this.document.client.elements.udom.removeAttribute("readonly"); + this.document.client.elements.upass$now.removeAttribute("readOnly"); + this.document.client.elements.uname.removeAttribute("readOnly"); + this.document.client.elements.udom.removeAttribute("readOnly"); return; }