--- loncom/auth/lonlogin.pm 2003/09/16 18:15:43 1.50 +++ loncom/auth/lonlogin.pm 2008/01/16 20:42:44 1.98 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.50 2003/09/16 18:15:43 www Exp $ +# $Id: lonlogin.pm,v 1.98 2008/01/16 20:42:44 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,28 +25,37 @@ # # 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 Apache::File (); -use Apache::lonnet(); +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; - $r->content_type('text/html'); + + &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'); $r->send_http_header; return OK if $r->header_only; @@ -57,52 +66,73 @@ sub handler { return OK; } - &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'}, - ['interface','username','domain','firsturl','localpath','localres']); - -# -------------------------------------------------------------------- Language - &Apache::lonlocal::get_language_handle(); +# -------------------------------- Prevent users from attempting to login twice + my $handle = &Apache::lonnet::check_for_valid_session($r); + if ($handle=~/^publicuser\_/) { +# For "public user" - remove it, we apparently really want to login + unlink($r->dir_config('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 $port_to_use=$r->dir_config('lonhttpdPort'); - if (!defined($port_to_use)) { - $port_to_use='8080'; - } - 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 $fullgraph=($env{'form.interface'} ne 'textual'); + + my $iconpath= + &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); + + my $domain = &Apache::lonnet::default_login_domain(); + if (($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 - 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,16 +141,15 @@ 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 $otherserver= &Apache::lonnet::absolute_url($host_name); my $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))) { + ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'}); +# ---------------------------------------------------------- Are we overloaded? + if ((($userloadpercent>100.0)||($loadpercent>100.0))) { my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent); if ($unloaded) { $otherserver=$unloaded; } } @@ -156,15 +185,39 @@ 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); + my $hostname = &Apache::lonnet::hostname($hostid); + next if ($last eq $hostname); + $spares.='
'. + $hostname.''. + ' (preferred)'.$/; + $last=$hostname; + } + $spares.= '
'; + my %all_hostnames = &Apache::lonnet::all_hostnames(); + foreach my $hostid (sort + { + &Apache::lonnet::hostname($a) cmp + &Apache::lonnet::hostname($b); + } + keys(%all_hostnames)) { + next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid}); + my $hostname = &Apache::lonnet::hostname($hostid); + next if ($last eq $hostname); + $spares.='
'. + $hostname.''; + $last=$hostname; } $r->print(< @@ -173,7 +226,6 @@ sub handler {

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 @@ -181,24 +233,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(< - - -The LearningOnline Network with CAPA Login - -ENDHEADER -# ---------------------------------------------------- Serve out DES JavaScript - { - my $jsh=Apache::File->new($include."/londes.js"); - $r->print(<$jsh>); - } # ----------------------------------------------------------- Front page design my $pgbg= @@ -214,20 +249,28 @@ ENDHEADER ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF'); my $sidebg= ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF'); + my $textcol = + ($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000'); + my $bgcol = + ($fullgraph?&Apache::loncommon::designparm('login.bgcol',$domain):'#FFFFFF'); my $logo=&Apache::loncommon::designparm('login.logo',$domain); my $img=&Apache::loncommon::designparm('login.img',$domain); - - -# ---------------------------------------------------------- Serve rest of page - $r->print(< + my $domainlogo=&Apache::loncommon::domainlogo($domain); + my $login=&Apache::loncommon::designparm('login.login',$domain); + if ($login eq '') { + $login = $iconpath.'/'.&mt('userauthentication.gif'); + } + my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain); + my $showcoursecat = + &Apache::loncommon::designparm('login.coursecatalog',$domain); + my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain); + my $now=time; + my $js = (< function send() { - this.document.server.elements.uname.value + this.document.server.elements.uname.value =this.document.client.elements.uname.value; this.document.server.elements.udom.value @@ -255,15 +298,69 @@ ENDHEADER lextkey=this.document.client.elements.lextkey.value; initkeys(); - this.document.server.elements.upass.value - =crypted(this.document.client.elements.upass.value); + this.document.server.elements.upass0.value + =crypted(this.document.client.elements.upass$now.value.substr(0,15)); + this.document.server.elements.upass1.value + =crypted(this.document.client.elements.upass$now.value.substr(15,15)); + this.document.server.elements.upass2.value + =crypted(this.document.client.elements.upass$now.value.substr(30,15)); + + this.document.client.elements.uname.value=''; + this.document.client.elements.upass$now.value=''; this.document.server.submit(); - return false; + return false; } + ENDSCRIPT +# --------------------------------------------------- Print login screen header + + my %add_entries = (topmargin => "0", + leftmargin => "0", + marginheight => "0", + marginwidth => "0", + bgcolor => "$pgbg", + text => "$font", + link => "$link", + vlink => "$vlink", + alink => "$alink",); + + $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, + { 'redirect' => [$expire,'/adm/roles'], + 'add_entries' => \%add_entries, + 'only_body' => 1,})); + +# ----------------------------------------------------------------------- Texts + +my %lt=&Apache::lonlocal::texthash( + 'un' => 'Username', + 'pw' => 'Password', + 'dom' => 'Domain', + 'perc' => 'percent', + 'load' => 'Load', + 'userload' => 'User Load', + 'about' => 'About LON-CAPA', + 'access' => 'Accessibility Options', + 'catalog' => 'Course Catalog', + 'log' => 'Log in', + 'help' => 'Log-in Help', + 'serv' => 'Server', + 'servadm' => 'Server Administration', + 'helpdesk' => 'Contact Helpdesk', + 'forgotpw' => 'Forgot password?'); +# -------------------------------------------------- Change password field name + my $forgotpw = &forgotpwdisplay(%lt); + my $loginhelp = &loginhelpdisplay(%lt); + +# ---------------------------------------------------- Serve out DES JavaScript + { + my $jsh=Apache::File->new($include."/londes.js"); + $r->print(<$jsh>); + } +# ---------------------------------------------------------- Serve rest of page + if ($fullgraph) { $r->print( ''); @@ -273,9 +370,11 @@ ENDSCRIPT - + - + + + @@ -283,10 +382,14 @@ ENDSCRIPT - - + + ENDSERVERFORM + my $coursecatalog; + if (($showcoursecat eq '') || ($showcoursecat)) { + $coursecatalog = &coursecatalog_link($lt{'catalog'}); + } if ($fullgraph) { $r->print(< @@ -312,14 +415,23 @@ ENDSERVERFORM - + - - @@ -348,14 +460,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.


+
+
+
+
+
Remember these settings for next login
ENDACCESSOPTIONS } else { @@ -368,30 +477,43 @@ ENDACCESSOPTIONS ENDNOOPT } + my $logintitle; + if ($loginheader eq 'text') { + $logintitle = ''; + } else { + $logintitle = ''; + } $r->print(<
- Accessibility Options -
- About LON-CAPA + 		+ + + + + + + + + $coursecatalog + + + +
 $lt{'access'}
 $lt{'about'}
 
    '.$lt{'log'}.''. + &mt('User Authentication').'
- + $logintitle - + - - + + - + - + + + +
User Authentication

   User Name:
   :
   Password:   :
   Domain:   :
   Help 
- + +
+ $loginhelp + $forgotpw
@@ -399,6 +521,9 @@ ENDNOOPT ENDLOGIN if ($fullgraph) { + my $helpdeskscript; + my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, + $version,$authdomain,\$helpdeskscript); $r->print(< @@ -419,7 +544,7 @@ ENDLOGIN
-    Domain:  +    $lt{'dom'}:   $domain @@ -427,7 +552,7 @@ ENDLOGIN
-    Server:  +    $lt{'serv'}:   $lonhost ($role) @@ -435,29 +560,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 @@ -487,16 +606,81 @@ $domainlogo - +$helpdeskscript ENDDOCUMENT } - $r->print(''); + my %endargs = ( 'noredirectlink' => 1, ); + $r->print(&Apache::loncommon::end_page(\%endargs)); return OK; -} +} + +sub contactdisplay { + my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; + my $contactblock; + my $showhelpdesk = 0; + my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; + if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { + $showhelpdesk = 1; + } + if ($servadm && $showadminmail) { + $contactblock .= '   '.$$lt{'servadm'}.':
'. + '      '.$servadm.'
 
'; + } + if ($showhelpdesk) { + $contactblock .= '   '.$lt->{'helpdesk'}.'
'; + my $thisurl = &escape('/adm/login'); + $$helpdeskscript = <<"ENDSCRIPT"; + +ENDSCRIPT + } + $contactblock .= <<"ENDBLOCK"; +    $version +ENDBLOCK + return $contactblock; +} + +sub forgotpwdisplay { + my (%lt) = @_; + my $prompt_for_resetpw = 1; + if ($prompt_for_resetpw) { + return '
   '.$lt{'forgotpw'}.'

'; + } + return; +} + +sub loginhelpdisplay { + my (%lt) = @_; + my $login_help = 1; + if ($login_help) { + return '   '.$lt{'help'}.''; + } + return; +} + +sub coursecatalog_link { + my ($linkname) = @_; + return <<"END"; + +   + $linkname + +END +} 1; __END__