--- loncom/auth/lonlogin.pm 2006/02/28 16:42:42 1.72 +++ loncom/auth/lonlogin.pm 2007/01/13 20:39:57 1.86 @@ -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.86 2007/01/13 20:39:57 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,12 +37,26 @@ use Apache::loncommon(); use Apache::lonauth(); use Apache::lonlocal; use Apache::migrateuser(); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + + +sub additional_machine_domains { + my @domains; + open(my $fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/expected_domains.tab'); + while( my $line = <$fh>) { + $line =~ s/\s//g; + push(@domains,$line); + } + return @domains; +} 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']); @@ -70,8 +84,7 @@ sub handler { 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") { # Is there an existing token file? @@ -80,20 +93,18 @@ sub handler { unlink("$lonidsdir/$handle.id"); } elsif ($handle ne '') { # Indeed, a valid token is found - my $bodytag=&Apache::loncommon::bodytag('Already logged in'); + my $start_page = + &Apache::loncommon::start_page('Already logged in'); + my $end_page = + &Apache::loncommon::end_page(); $r->print(< - -Already logged in - -$bodytag +$start_page

You are already logged in

Please either continue the current session or logout.

Problems?

- - +$end_page ENDFAILED return OK; } @@ -128,8 +139,9 @@ ENDFAILED $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; } + foreach my $posdom (&Apache::lonnet::current_machine_domains(), + &additional_machine_domains()) { + if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; } } if (($env{'form.domain'}) && ($Apache::lonnet::domaindescription{$env{'form.domain'}})) { @@ -137,13 +149,12 @@ ENDFAILED } 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,7 +172,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? @@ -240,7 +251,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 @@ -250,8 +260,6 @@ 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(< - + - - Accessibility Options -
- About LON-CAPA + + + + + + + + + + + + + + + + + +
 $lt{'access'}
 $lt{'about'}
 $lt{'catalog'}
 
- @@ -448,9 +471,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 { @@ -483,19 +503,25 @@ ENDNOOPT -    $lt{'help'} +  
+ + + $loginhelp + $forgotpw + + ENDLOGIN if ($fullgraph) { my $helpdeskscript; - my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript); + my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript); $r->print(< @@ -591,26 +617,16 @@ ENDDOCUMENT } sub contactdisplay { - my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_; + my ($lt,$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'); + $contactblock .= '   '.$lt->{'helpdesk'}.'
'; + my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT";