--- loncom/auth/lonlogin.pm 2003/08/25 15:24:43 1.46 +++ loncom/auth/lonlogin.pm 2006/04/05 22:39:55 1.74 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.46 2003/08/25 15:24:43 www Exp $ +# $Id: lonlogin.pm,v 1.74 2006/04/05 22:39:55 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,47 +25,99 @@ # # 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; +use Apache::migrateuser(); sub handler { my $r = shift; - $r->content_type('text/html'); + + &Apache::loncommon::get_unprocessed_cgi + ($ENV{'QUERY_STRING'}.'&'.$env{'request.querystring'}, + ['interface','username','domain','firsturl','localpath','localres', + 'token']); + +# -- check if they are a migrating user + if (defined($env{'form.token'})) { + return &Apache::migrateuser::handler($r); + } + &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; - &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'}, - ['interface','username','domain','firsturl','localpath','localres']); - +# Are we re-routing? + if (-e '/home/httpd/html/lon-status/reroute.txt') { + &Apache::lonauth::reroute($r); + 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") { +# Is there an existing token file? + if ($handle=~/^publicuser\_/) { +# For "public user" - remove it, we apparently really want to login + unlink("$lonidsdir/$handle.id"); + } elsif ($handle ne '') { +# Indeed, a valid token is found + my $start_page = + &Apache::loncommon::start_page('Already logged in'); + my $end_page = + &Apache::loncommon::end_page(); + $r->print(<You are already logged in +

Please either continue the current session or +logout.

+

+Problems?

+$end_page +ENDFAILED + return OK; + } + } + } + +# ---------------------------------------------------- No valid token, continue + + # ---------------------------- Not possible to really login to domain "public" + if ($env{'form.domain'} eq 'public') { + $env{'form.domain'}=''; + $env{'form.username'}=''; + } # ----------------------------------------------------------- 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'; @@ -73,9 +125,13 @@ 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'}; + my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0]; + foreach my $posdom (&Apache::lonnet::current_machine_domains()) { + if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; } + } + 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'); @@ -89,8 +145,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; @@ -99,17 +155,18 @@ 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))) { - $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent); + my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent); + if ($unloaded) { $otherserver=$unloaded; } } # ----------------------------------------------------------- Get announcements @@ -143,15 +200,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(< @@ -169,7 +247,7 @@ ENDTROUBLE # ----------------------------------------------- Apparently we are in business - my $domainlogo=&Apache::loncommon::domainlogo(); + my $domainlogo=&Apache::loncommon::domainlogo($domain); $servadm=~s/\,/\
/g; $sysadm=~s/\,/\
/g; @@ -204,7 +282,26 @@ ENDHEADER my $logo=&Apache::loncommon::designparm('login.logo',$domain); my $img=&Apache::loncommon::designparm('login.img',$domain); +# ----------------------------------------------------------------------- Texts +my %lt=&Apache::lonlocal::texthash( + 'un' => 'Username', + 'pw' => 'Password', + 'dom' => 'Domain', + 'perc' => 'percent', + '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', + 'helpdesk' => 'Contact Helpdesk'); +# -------------------------------------------------- Change password field name + my $now=time; # ---------------------------------------------------------- Serve rest of page $r->print(< - + - + + + @@ -270,8 +376,8 @@ ENDSCRIPT - - + + ENDSERVERFORM if ($fullgraph) { $r->print(< - Accessibility Options + Accessibility Options
- About LON-CAPA + About LON-CAPA @@ -335,11 +441,11 @@ ENDTOP unless ($fullgraph) { $r->print(<Select Accessibility Options - Suppress rendering of images
- Suppress Java applets
- Suppress rendering of embedded multimedia
- Increase font size
- Switch to black and white mode
+
+
+
+
+

If you have accessibility needs that are not addressed by this interface, please contact the system administrator at $sysadm.


@@ -361,24 +467,24 @@ ENDNOOPT - + - + - - + + - + - +
User Authentication
User Authentication

   User Name:
   $lt{'un'}:
   Password:   $lt{'pw'}:
   Domain:   $lt{'dom'}:
   Help   $lt{'help'}
- +
@@ -386,6 +492,8 @@ ENDNOOPT ENDLOGIN if ($fullgraph) { + my $helpdeskscript; + my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript); $r->print(< @@ -406,7 +514,7 @@ ENDLOGIN
-    Domain:  +    $lt{'dom'}:   $domain @@ -414,7 +522,7 @@ ENDLOGIN
-    Server:  +    $lt{'serv'}:   $lonhost ($role) @@ -422,29 +530,23 @@ ENDLOGIN
-    Load:  +    $lt{'load'}:  -  $loadpercent percent +  $loadpercent $lt{'perc'}
-    User Load:  +    $lt{'userload'}:  -  $userloadpercent percent +  $userloadpercent $lt{'perc'}

- -    System Administration:
-       $sysadm
-    Server Administration:
-       $servadm
 
-    $version - + $contactblock @@ -474,16 +576,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__