--- loncom/auth/lonlogin.pm 2010/08/25 16:34:32 1.140 +++ 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.140 2010/08/25 16:34:32 raeburn Exp $ +# $Id: lonlogin.pm,v 1.145 2010/09/02 09:24:42 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,6 +69,7 @@ sub handler { return OK; } + $env{'form.firsturl'} =~ s/(`)/'/g; # -------------------------------- Prevent users from attempting to login twice my $handle = &Apache::lonnet::check_for_valid_session($r); @@ -130,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'); @@ -150,10 +152,13 @@ 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'}); + # ----------------------------------------------------------- Get announcements my $announcements=&Apache::lonnet::getannounce(); # -------------------------------------------------------- Set login parameters @@ -261,7 +266,7 @@ my $loginbox_header_bgcol=&Apache::lonco my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain); my $logo=&Apache::loncommon::designparm('login.logo',$domain); my $img=&Apache::loncommon::designparm('login.img',$domain); -my $domainlogo='
'.&Apache::loncommon::domainlogo($domain).'
'; +my $domainlogo=&Apache::loncommon::domainlogo($domain); my $showbanner = 1; my $showmainlogo = 1; if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) { @@ -307,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; } @@ -456,12 +461,12 @@ ENDTOP } $r->print(<
ENDTOP $r->print(<
@@ -501,6 +506,11 @@ $r->print(<
+ +
+ $domainlogo +
+