--- loncom/auth/lonlogin.pm 2006/02/28 16:42:42 1.72 +++ loncom/auth/lonlogin.pm 2008/12/25 05:53:17 1.106.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.72 2006/02/28 16:42:42 albertel Exp $ +# $Id: lonlogin.pm,v 1.106.2.2 2008/12/25 05:53:17 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,21 +30,26 @@ package Apache::lonlogin; use strict; use Apache::Constants qw(:common); -use CGI::Cookie(); use Apache::File (); 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 - ($ENV{'QUERY_STRING'}.'&'.$env{'request.querystring'}, + (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, + $ENV{'REDIRECT_QUERY_STRING'}), ['interface','username','domain','firsturl','localpath','localres', 'token']); + if (!defined($env{'form.firsturl'})) { + &Apache::lonacc::get_posted_cgi($r,['firsturl']); + } # -- check if they are a migrating user if (defined($env{'form.token'})) { @@ -66,38 +71,25 @@ sub handler { # -------------------------------- 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\_/) { + my $handle = &Apache::lonnet::check_for_valid_session($r); + if ($handle=~/^publicuser\_/) { # For "public user" - remove it, we apparently really want to login - unlink("$lonidsdir/$handle.id"); - } elsif ($handle ne '') { + unlink($r->dir_config('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 -

You are already logged in

-

Please either continue the current session or -logout.

-

-Problems?

- - -ENDFAILED - return OK; - } - } + my $start_page = + &Apache::loncommon::start_page('Already logged in'); + my $end_page = + &Apache::loncommon::end_page(); + $r->print( + $start_page + .'

'.&mt('You are already logged in!').'

' + .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].', + '','','','').'

' + .'

'.&mt('Login problems?').'

' + .$end_page + ); + return OK; } # ---------------------------------------------------- No valid token, continue @@ -120,30 +112,24 @@ ENDFAILED } 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'); - my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0]; - foreach my $posdom (&Apache::lonnet::current_machine_domains()) { - if (lc($posdom) eq lc($testdomain)) { $domain=$posdomain; } - } + + my $iconpath= + &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); + + 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 @@ -161,12 +147,11 @@ 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? - if (($role eq 'access') && - (($userloadpercent>100.0)||($loadpercent>100.0))) { +# ---------------------------------------------------------- Are we overloaded? + if ((($userloadpercent>100.0)||($loadpercent>100.0))) { my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent); if ($unloaded) { $otherserver=$unloaded; } } @@ -205,67 +190,56 @@ 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}.''. - ' (preferred)'.$/; - $last=$Apache::lonnet::hostname{$hostid}; + $hostname.''. + ' '.&mt('(preferred)').''.$/; + $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(< -The LearningOnline Network with CAPA - - -

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 + $r->print( + '' + .'' + .&mt('The LearningOnline Network with CAPA') + .'' + .'' + .'

'.&mt('The LearningOnline Network with CAPA').'

' + .'' + .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

' + .'

'.&mt('Please attempt to login to one of the following servers:').'

' + .$spares + .'' + .'' + ); return OK; } # ----------------------------------------------- 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= @@ -281,39 +255,38 @@ 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); - -# ----------------------------------------------------------------------- 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 $domainlogo=&Apache::loncommon::domainlogo($domain); + my $login=&Apache::loncommon::designparm('login.login',$domain); + if ($login eq '') { + $login = $iconpath.'/'.&mt('userauthentication.gif'); + } + my $showbanner = 1; + my $showmainlogo = 1; + if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) { + $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain); + } + if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) { + $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain); + } + 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 $shownewuserlink = + &Apache::loncommon::designparm('login.newuser',$domain); my $now=time; -# ---------------------------------------------------------- Serve rest of page - $r->print(< + 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 @@ -342,21 +315,76 @@ my %lt=&Apache::lonlocal::texthash( initkeys(); 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)); + =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' => 'Server 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?', + 'newuser' => 'New User?', + 'options_headline' => 'Select Accessibility Options', + 'sprs_img' => 'Suppress rendering of images', + 'sprs_applet' => 'Suppress Java applets', + 'sprs_embed' => 'Suppress rendering of embedded multimedia', + 'sprs_font' => 'Increase font size', + 'sprs_blackwhite' => 'Switch to black and white mode', + 'remember' => 'Remember these settings for next login'); +# -------------------------------------------------- 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( ''); @@ -382,12 +410,29 @@ ENDSCRIPT ENDSERVERFORM - if ($fullgraph) { $r->print(<print(< - + @@ -407,14 +452,23 @@ ENDSERVERFORM - + - - @@ -422,9 +476,15 @@ ENDSERVERFORM '; + } else { + $logintitle = ''; + } + my $noscript_warning=''; $r->print(<
The Learning Online Network with CAPA +HEADER + if ($showbanner) { + $r->print(< +ENDBANNER + } + $r->print(<
- Accessibility Options -
- About LON-CAPA + 		+ + + + + + + + + $coursecatalog + + + +
 $lt{'access'}
 $lt{'about'}
 
 +ENDSTART + if ($showmainlogo) { + $r->print(< +ENDLOGO + } + $r->print(< @@ -436,25 +496,25 @@ ENDSERVERFORM ENDTOP -} else { - $r->print('

The LearningOnline Network with CAPA

Text-based Interface Login

'.$announcements); -} + } else { + $r->print('

The LearningOnline Network with CAPA

' + .'

'.&mt('Text-based Interface Login').'

' + .$announcements); + } $r->print('
'); unless ($fullgraph) { $r->print(<Select Accessibility Options -
-
-
-
-
-

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
+

$lt{'options_headline'}

+
+
+
+
+
+
+ $lt{'remember'}
ENDACCESSOPTIONS -} else { - $r->print(<print(< @@ -462,40 +522,61 @@ ENDACCESSOPTIONS ENDNOOPT -} + } + my $logintitle; + if ($loginheader eq 'text') { + $logintitle = '
   '.$lt{'log'}.''. + &mt('User Authentication').'' + .'
- + $logintitle + $noscript_warning - + - + - + - + + + +
User Authentication

   $lt{'un'}:
   :
   $lt{'pw'}:   :
   $lt{'dom'}:   :
   $lt{'help'} 
+ $loginhelp + $forgotpw + $newuserlink +
+
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(< @@ -531,16 +612,16 @@ ENDLOGIN - -    $lt{'load'}:  + +    $lt{'load'}:   $loadpercent $lt{'perc'} - -    $lt{'userload'}:  + +    $lt{'userload'}:   $userloadpercent $lt{'perc'} @@ -586,31 +667,26 @@ $helpdeskscript ENDDOCUMENT } - $r->print(''); + my %endargs = ( 'noredirectlink' => 1, ); + $r->print(&Apache::loncommon::end_page(\%endargs)); return OK; } 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";