--- loncom/auth/lonlogin.pm 2003/09/17 02:24:14 1.51 +++ loncom/auth/lonlogin.pm 2005/04/28 01:19:20 1.64 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.51 2003/09/17 02:24:14 www Exp $ +# $Id: lonlogin.pm,v 1.64 2005/04/28 01:19:20 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,28 +25,23 @@ # # 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::lonnet; use Apache::loncommon(); use Apache::lonauth(); 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,27 +52,55 @@ 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'}, + ($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; + $env{'form.interface'}=~s/\W//g; my $textbrowsers=$r->dir_config('lonTextBrowsers'); my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; foreach (split(/\:/,$textbrowsers)) { if ($httpbrowser=~/$_/i) { - $ENV{'form.interface'}='textual'; + $env{'form.interface'}='textual'; } } - my $fullgraph=($ENV{'form.interface'} ne 'textual'); + my $fullgraph=($env{'form.interface'} ne 'textual'); my $port_to_use=$r->dir_config('lonhttpdPort'); if (!defined($port_to_use)) { $port_to_use='8080'; @@ -85,9 +108,9 @@ sub handler { my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use. $r->dir_config('lonIconsURL'); my $domain = $r->dir_config('lonDefDomain'); - if (($ENV{'form.domain'}) && - ($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) { - $domain=$ENV{'form.domain'}; + if (($env{'form.domain'}) && + ($Apache::lonnet::domaindescription{$env{'form.domain'}})) { + $domain=$env{'form.domain'}; } my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); @@ -101,8 +124,8 @@ sub handler { # --------------------------------------------- Default values for login fields - my $authusername=($ENV{'form.username'}?$ENV{'form.username'}:''); - my $authdomain=($ENV{'form.domain'}?$ENV{'form.domain'}:$domain); + my $authusername=($env{'form.username'}?$env{'form.username'}:''); + my $authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain); # ---------------------------------------------------------- Determine own load my $loadavg; @@ -111,13 +134,13 @@ 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 my $otherserver='http://'.$ENV{'SERVER_NAME'}; my $firsturl= - ($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'}); + ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'}); # ---------------------------------------- Are we access server and overloaded? if (($role eq 'access') && (($userloadpercent>100.0)||($loadpercent>100.0))) { @@ -156,15 +179,36 @@ 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)'; - } - } + my $last; + foreach my $hostid (sort + { + $Apache::lonnet::hostname{$a} cmp + $Apache::lonnet::hostname{$b}; + } + keys(%Apache::lonnet::spareid)) { + next if ($hostid eq $lonhost); + next if ($last eq $Apache::lonnet::hostname{$hostid}); + $spares.='
'. + $Apache::lonnet::hostname{$hostid}.''. + ' (preferred)'.$/; + $last=$Apache::lonnet::hostname{$hostid}; + } + $spares.= '
'; + foreach my $hostid (sort + { + $Apache::lonnet::hostname{$a} cmp + $Apache::lonnet::hostname{$b}; + } + keys(%Apache::lonnet::hostname)) { + next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid}); + next if ($last eq $Apache::lonnet::hostname{$hostid}); + $spares.='
'. + $Apache::lonnet::hostname{$hostid}.''; + $last=$Apache::lonnet::hostname{$hostid}; } $r->print(< @@ -224,14 +268,17 @@ my %lt=&Apache::lonlocal::texthash( 'pw' => 'Password', 'dom' => 'Domain', 'perc' => 'percent', - 'user' => 'User', - 'load' => 'load', + 'load' => 'Load', + 'userload' => 'User Load', + 'about' => 'aboutlon.gif', + 'access' => 'accessbutton.gif', + 'auth' => 'userauthentication.gif', 'log' => 'Log in', 'help' => 'Help', 'serv' => 'Server', 'servadm' => 'Server Administration', - 'sysadm' => 'System Administration'); - + 'sysadm' => 'System Administration', + 'helpdesk' => 'Contact Helpdesk'); # ---------------------------------------------------------- Serve rest of page $r->print(< - + @@ -298,8 +345,8 @@ ENDSCRIPT - - + + ENDSERVERFORM if ($fullgraph) { $r->print(< - Accessibility Options + Accessibility Options
- About LON-CAPA + About LON-CAPA @@ -389,7 +436,7 @@ ENDNOOPT - + @@ -414,6 +461,8 @@ ENDNOOPT ENDLOGIN if ($fullgraph) { + my $helpdeskscript; + my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript); $r->print(< @@ -450,7 +499,7 @@ ENDLOGIN
User Authentication
User Authentication

   $lt{'un'}:
-    Load:  +    $lt{'load'}:   $loadpercent $lt{'perc'} @@ -458,7 +507,7 @@ ENDLOGIN
-    $lt{'user'} $lt{'load'}:  +    $lt{'userload'}:   $userloadpercent $lt{'perc'} @@ -466,13 +515,7 @@ ENDLOGIN

- -    $lt{'sysadm'}:
-       $sysadm
-    $lt{'servadm'}:
-       $servadm
 
-    $version - + $contactblock @@ -502,16 +545,59 @@ $domainlogo - +$helpdeskscript ENDDOCUMENT } $r->print(''); return OK; -} +} + +sub contactdisplay { + my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_; + my $contactblock; + my $showsysadm = 1; + my $showservadm = 1; + my $showhelpdesk = 0; + my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; + if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { + $showhelpdesk = 1; + } + if ($showsysadm) { + $contactblock .= '   '.$$lt{'sysadm'}.':
'. + '      '.$sysadm.'
'; + } + if ($showservadm) { + $contactblock .= '   '.$$lt{'servadm'}.':
'. + '      '.$servadm.'
 
'; + } + if ($showhelpdesk) { + $contactblock .= '   '.$$lt{'helpdesk'}.'
'; + my $thisurl = &Apache::lonnet::escape('/adm/login'); + $$helpdeskscript = <<"ENDSCRIPT"; + +ENDSCRIPT + } + $contactblock .= <<"ENDBLOCK"; +    $version +ENDBLOCK + return $contactblock; +} + 1; __END__