--- loncom/auth/lonlogin.pm 2010/08/26 08:10:47 1.143 +++ loncom/auth/lonlogin.pm 2012/04/11 11:40:07 1.150 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.143 2010/08/26 08:10:47 raeburn Exp $ +# $Id: lonlogin.pm,v 1.150 2012/04/11 11:40:07 goltermann Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,7 +64,8 @@ sub handler { # Are we re-routing? - if (-e '/home/httpd/html/lon-status/reroute.txt') { + my $londocroot = $r->dir_config('lonDocRoot'); + if (-e "$londocroot/lon-status/reroute.txt") { &Apache::lonauth::reroute($r); return OK; } @@ -91,7 +92,7 @@ sub handler { } $r->print( $start_page - .'

'.&mt('You are already logged in!').'

' + .'

'.&mt('You are already logged in!').'

' .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', '','','','').'

' .$end_page @@ -131,6 +132,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,8 +152,14 @@ sub handler { $loadavg=<$loadfile>; } $loadavg =~ s/\s.*//g; - my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim); - my $userloadpercent=&Apache::lonnet::userload(); + + my ($loadpercent,$userloadpercent); + if ($loadlim) { + $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim); + } + if ($uloadlim) { + $userloadpercent=&Apache::lonnet::userload(); + } my $firsturl= ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'}); @@ -193,9 +201,13 @@ sub handler { 'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, $lonhost); -# ------------------- If we cannot talk to ourselves, we are in serious trouble +# -- If we cannot talk to ourselves, or hostID does not map to a hostname +# we are in serious trouble - if ($logtoken eq 'con_lost') { + if (($logtoken eq 'con_lost') || ($logtoken eq 'no_such_host')) { + if ($logtoken eq 'no_such_host') { + &Apache::lonnet::logthis('No valid logtoken for log-in page -- unable to determine hostname for hostID: '.$lonhost.'. Check entry in hosts.tab'); + } my $spares=''; my $last; foreach my $hostid (sort @@ -206,7 +218,7 @@ sub handler { keys(%Apache::lonnet::spareid)) { next if ($hostid eq $lonhost); my $hostname = &Apache::lonnet::hostname($hostid); - next if ($last eq $hostname); + next if (($last eq $hostname) || ($hostname eq '')); $spares.='
'. @@ -214,7 +226,9 @@ sub handler { ' '.&mt('(preferred)').''.$/; $last=$hostname; } -$spares.= '
'; + if ($spares) { + $spares.= '
'; + } my %all_hostnames = &Apache::lonnet::all_hostnames(); foreach my $hostid (sort { @@ -224,7 +238,7 @@ foreach my $hostid (sort keys(%all_hostnames)) { next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid}); my $hostname = &Apache::lonnet::hostname($hostid); - next if ($last eq $hostname); + next if (($last eq $hostname) || ($hostname eq '')); $spares.='
'. @@ -239,12 +253,15 @@ $r->print( .'' .'

'.&mt('The LearningOnline Network with CAPA').'

' .'' - .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

' - .'

'.&mt('Please attempt to login to one of the following servers:').'

' - .$spares - .'' + .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

'); + if ($spares) { + $r->print('

'.&mt('Please attempt to login to one of the following servers:') + .'

' + .$spares); + } + $r->print('' .'' -); + ); return OK; } @@ -309,9 +326,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; } @@ -435,7 +452,7 @@ LFORM HEADER } $r->print(< +
$logintitle $loginform @@ -461,10 +478,8 @@ $announcements
ENDTOP - -$r->print(< - + my ($domainrow,$serverrow,$loadrow,$userloadrow,$versionrow); + $domainrow = <<"END"; +END + $serverrow = <<"END"; +END + if ($loadlim) { + $loadrow = <<"END"; +END + } + if ($uloadlim) { + $userloadrow = <<"END"; +END + } + if (($version ne '') && ($version ne '')) { + $versionrow = <<"END"; +END + } + +$r->print(< +
$lt{'dom'}:  @@ -473,6 +488,8 @@ $r->print(< $domain
$lt{'serv'}:  @@ -481,6 +498,9 @@ $r->print(< $lonhost ($role)
$lt{'load'}:  @@ -489,6 +509,10 @@ $r->print(< $loadpercent $lt{'perc'}
$lt{'userload'}:  @@ -497,11 +521,26 @@ $r->print(< $userloadpercent $lt{'perc'}
$version
+$domainrow +$serverrow +$loadrow +$userloadrow +$versionrow