--- loncom/auth/lonlogin.pm 2005/06/14 20:09:13 1.67 +++ loncom/auth/lonlogin.pm 2007/04/17 15:44:58 1.93 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.67 2005/06/14 20:09:13 albertel Exp $ +# $Id: lonlogin.pm,v 1.93 2007/04/17 15:44:58 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,9 +36,24 @@ use Apache::lonnet; use Apache::loncommon(); use Apache::lonauth(); use Apache::lonlocal; - +use Apache::migrateuser(); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + sub handler { my $r = shift; + + &Apache::loncommon::get_unprocessed_cgi + (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, + $ENV{'REDIRECT_QUERY_STRING'}), + ['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'); @@ -52,42 +67,46 @@ 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 $handle=&LONCAPA::clean_handle($lonid->value); my $lonidsdir=$r->dir_config('lonIDsDir'); - if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) { + 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 $bodytag=&Apache::loncommon::bodytag('Already logged in'); - $r->print(< - -Already logged in - -$bodytag + 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; + return OK; + } } } # ---------------------------------------------------- No valid token, continue - &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'}.'&'.$env{'request.querystring'}, - ['interface','username','domain','firsturl','localpath','localres']); - - + # ---------------------------- 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; @@ -107,20 +126,20 @@ ENDFAILED } my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use. $r->dir_config('lonIconsURL'); - my $domain = $r->dir_config('lonDefDomain'); + my $domain = &Apache::lonnet::default_login_domain(); if (($env{'form.domain'}) && - ($Apache::lonnet::domaindescription{$env{'form.domain'}})) { + (&Apache::lonnet::domain($env{'form.domain'},'description'))) { $domain=$env{'form.domain'}; } my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); my $servadm = $r->dir_config('lonAdmEMail'); - my $sysadm = $r->dir_config('lonSysEMail'); my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); my $expire = $r->dir_config('lonExpire'); my $version = $r->dir_config('lonVersion'); + my $host_name = &Apache::lonnet::hostname($lonhost); # --------------------------------------------- Default values for login fields @@ -138,7 +157,7 @@ ENDFAILED my $userloadpercent=&Apache::lonnet::userload(); # ------------------------------------------------------- Do the load balancing - my $otherserver='http://'.$ENV{'SERVER_NAME'}; + my $otherserver= &Apache::lonnet::absolute_url($host_name); my $firsturl= ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'}); # ---------------------------------------- Are we access server and overloaded? @@ -182,33 +201,36 @@ ENDFAILED my $last; foreach my $hostid (sort { - $Apache::lonnet::hostname{$a} cmp - $Apache::lonnet::hostname{$b}; + &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}); + my $hostname = &Apache::lonnet::hostname($hostid); + next if ($last eq $hostname); $spares.='
'. - $Apache::lonnet::hostname{$hostid}.''. + $hostname.''. ' (preferred)'.$/; - $last=$Apache::lonnet::hostname{$hostid}; + $last=$hostname; } $spares.= '
'; + my %all_hostnames = &Apache::lonnet::all_hostnames(); foreach my $hostid (sort { - $Apache::lonnet::hostname{$a} cmp - $Apache::lonnet::hostname{$b}; + &Apache::lonnet::hostname($a) cmp + &Apache::lonnet::hostname($b); } - keys(%Apache::lonnet::hostname)) { + keys(%all_hostnames)) { next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid}); - next if ($last eq $Apache::lonnet::hostname{$hostid}); + my $hostname = &Apache::lonnet::hostname($hostid); + next if ($last eq $hostname); $spares.='
'. - $Apache::lonnet::hostname{$hostid}.''; - $last=$Apache::lonnet::hostname{$hostid}; + $hostname.''; + $last=$hostname; } $r->print(< @@ -217,7 +239,6 @@ ENDFAILED

This LON-CAPA server is temporarily not available for login

Please attempt to login to one of the following servers:

$spares -

If the problem persists, please contact $servadm.

ENDTROUBLE @@ -225,10 +246,7 @@ ENDTROUBLE } # ----------------------------------------------- Apparently we are in business - - my $domainlogo=&Apache::loncommon::domainlogo($domain); $servadm=~s/\,/\
/g; - $sysadm=~s/\,/\
/g; # --------------------------------------------------- Print login screen header $r->print(< 'percent', 'load' => 'Load', 'userload' => 'User Load', - 'about' => 'aboutlon.gif', - 'access' => 'accessbutton.gif', + 'about' => 'About LON-CAPA', + 'access' => 'Accessibility Options', + 'catalog' => 'Course Catalog', 'auth' => 'userauthentication.gif', 'log' => 'Log in', - 'help' => 'Help', + 'help' => 'Log-in Help', 'serv' => 'Server', 'servadm' => 'Server Administration', - 'sysadm' => 'System Administration', - 'helpdesk' => 'Contact Helpdesk'); + 'helpdesk' => 'Contact Helpdesk', + 'forgotpw' => 'Forgot password?'); # -------------------------------------------------- Change password field name my $now=time; + my $forgotpw = &forgotpwdisplay(%lt); + my $loginhelp = &loginhelpdisplay(%lt); # ---------------------------------------------------------- Serve rest of page $r->print(< ENDSERVERFORM + my $coursecatalog; + if (($showcoursecat eq '') || ($showcoursecat)) { + $coursecatalog = &coursecatalog_link($lt{'catalog'}); + } if ($fullgraph) { $r->print(< @@ -384,14 +414,23 @@ ENDSERVERFORM - + - - Accessibility Options -
- About LON-CAPA + + + + + + + + + + $coursecatalog + + + +
 $lt{'access'}
 $lt{'about'}
 
- @@ -425,9 +464,6 @@ ENDTOP


-

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


Remember these settings for next login
ENDACCESSOPTIONS } else { @@ -448,31 +484,38 @@ ENDNOOPT - + - + - + - + + + +
User Authentication

   $lt{'un'}:
   :
   $lt{'pw'}:   :
   $lt{'dom'}:   :
   $lt{'help'} 
+ $loginhelp + $forgotpw +
ENDLOGIN if ($fullgraph) { my $helpdeskscript; - my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript); + my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, + $version,$authdomain,\$helpdeskscript); $r->print(< @@ -568,26 +611,20 @@ ENDDOCUMENT } sub contactdisplay { - my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_; + my ($lt,$servadm,$showadminmail,$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) { + if ($servadm && $showadminmail) { $contactblock .= '   '.$$lt{'servadm'}.':
'. '      '.$servadm.'
 
'; } if ($showhelpdesk) { - $contactblock .= '   '.$$lt{'helpdesk'}.'
'; - my $thisurl = &Apache::lonnet::escape('/adm/login'); + $contactblock .= '   '.$lt->{'helpdesk'}.'
'; + my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT";