--- loncom/auth/lonlogin.pm 2003/09/17 13:47:55 1.52 +++ loncom/auth/lonlogin.pm 2004/11/02 23:20:17 1.59 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.52 2003/09/17 13:47:55 www Exp $ +# $Id: lonlogin.pm,v 1.59 2004/11/02 23:20:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,18 +25,12 @@ # # http://www.lon-capa.org/ # -# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14, -# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9, -# 1/17/01 Gerd Kortemeyer -# -# 2/7/02,2/8,2/12,2/14,2/15,2/19 Josh Brunskole -# -# 7/10/02 Jeremy Bowers package Apache::lonlogin; use strict; use Apache::Constants qw(:common); +use CGI::Cookie(); use Apache::File (); use Apache::lonnet(); use Apache::loncommon(); @@ -45,8 +39,9 @@ use Apache::lonlocal; sub handler { my $r = shift; - $r->content_type('text/html'); &Apache::loncommon::no_cache($r); + &Apache::lonlocal::get_language_handle($r); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -57,13 +52,41 @@ sub handler { return OK; } +# -------------------------------- Prevent users from attempting to login twice + my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); + my $lonid=$cookies{'lonID'}; + my $cookie; + if ($lonid) { + my $handle=$lonid->value; + $handle=~s/\W//g; + my $lonidsdir=$r->dir_config('lonIDsDir'); + if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) { +# Indeed, a valid token is found + my $bodytag=&Apache::loncommon::bodytag('Already logged in'); + $r->print(< + +Already logged in + +$bodytag +

You are already logged in

+

Please either continue the current session or +logout.

+

+Problems?

+ + +ENDFAILED + return OK; + } + } + +# ---------------------------------------------------- No valid token, continue + &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'}, ['interface','username','domain','firsturl','localpath','localres']); -# -------------------------------------------------------------------- Language - - &Apache::lonlocal::get_language_handle(); # ----------------------------------------------------------- Process Interface $ENV{'form.interface'}=~s/\W//g; @@ -111,7 +134,7 @@ sub handler { $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 @@ -156,15 +179,22 @@ sub handler { 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(< @@ -505,8 +535,8 @@ $domainlogo -