--- loncom/auth/lonlogin.pm 2010/09/02 09:24:42 1.145 +++ loncom/auth/lonlogin.pm 2021/01/04 12:50:06 1.158.2.9.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.145 2010/09/02 09:24:42 www Exp $ +# $Id: lonlogin.pm,v 1.158.2.9.2.3 2021/01/04 12:50:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,7 +37,8 @@ use Apache::lonauth(); use Apache::lonlocal; use Apache::migrateuser(); use lib '/home/httpd/lib/perl/'; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); +use CGI::Cookie(); sub handler { my $r = shift; @@ -46,89 +47,196 @@ sub handler { (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, $ENV{'REDIRECT_QUERY_STRING'}), ['interface','username','domain','firsturl','localpath','localres', - 'token','role','symb']); + 'token','role','symb','iptoken','btoken']); if (!defined($env{'form.firsturl'})) { &Apache::lonacc::get_posted_cgi($r,['firsturl']); } + if (!defined($env{'form.firsturl'})) { + if ($ENV{'REDIRECT_URL'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) { + $env{'form.firsturl'} = $ENV{'REDIRECT_URL'}; + } + } # -- check if they are a migrating user if (defined($env{'form.token'})) { return &Apache::migrateuser::handler($r); } +# For "public user" - remove any exising "public" cookie, as user really wants to log-in + my ($handle,$lonidsdir,$expirepub,$userdom); + $lonidsdir=$r->dir_config('lonIDsDir'); + unless ($r->header_only) { + $handle = &Apache::lonnet::check_for_valid_session($r,'lonID',undef,\$userdom); + if ($handle ne '') { + if ($handle=~/^publicuser\_/) { + unlink($r->dir_config('lonIDsDir')."/$handle.id"); + undef($handle); + undef($userdom); + $expirepub = 1; + } + } + } + &Apache::loncommon::no_cache($r); &Apache::lonlocal::get_language_handle($r); &Apache::loncommon::content_type($r,'text/html'); + if ($expirepub) { + my $c = new CGI::Cookie(-name => 'lonPubID', + -value => '', + -expires => '-10y',); + $r->header_out('Set-cookie' => $c); + } elsif (($handle eq '') && ($userdom ne '')) { + my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); + foreach my $name (keys(%cookies)) { + next unless ($name =~ /^lon(|S|Link|Pub)ID$/); + my $c = new CGI::Cookie(-name => $name, + -value => '', + -expires => '-10y',); + $r->headers_out->add('Set-cookie' => $c); + } + } $r->send_http_header; return OK if $r->header_only; # Are we re-routing? - if (-e '/home/httpd/html/lon-status/reroute.txt') { + my $londocroot = $r->dir_config('lonDocRoot'); + if (-e "$londocroot/lon-status/reroute.txt") { &Apache::lonauth::reroute($r); return OK; } + my $lonhost = $r->dir_config('lonHostID'); $env{'form.firsturl'} =~ s/(`)/'/g; -# -------------------------------- Prevent users from attempting to login twice - my $handle = &Apache::lonnet::check_for_valid_session($r); - if ($handle ne '') { - my $lonidsdir=$r->dir_config('lonIDsDir'); - if ($handle=~/^publicuser\_/) { -# For "public user" - remove it, we apparently really want to login - unlink($r->dir_config('lonIDsDir')."/$handle.id"); - } else { -# Indeed, a valid token is found - &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); - my $start_page = - &Apache::loncommon::start_page('Already logged in'); - my $end_page = - &Apache::loncommon::end_page(); +# Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer) + + my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r,1); + if ($found_server) { + my $hostname = &Apache::lonnet::hostname($found_server); + if ($hostname ne '') { + my $protocol = $Apache::lonnet::protocol{$found_server}; + $protocol = 'http' if ($protocol ne 'https'); my $dest = '/adm/roles'; if ($env{'form.firsturl'} ne '') { - $dest = $env{'form.firsturl'}; + $dest = $env{'form.firsturl'}; } - $r->print( - $start_page - .'

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

' - .'

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

' - .$end_page - ); + my %info = ( + balcookie => $lonhost.':'.$balancer_cookie, + ); + my $balancer_token = &Apache::lonnet::tmpput(\%info,$found_server); + if ($balancer_token) { + $dest .= (($dest=~/\?/)?'&;':'?') . 'btoken='.$balancer_token; + } + my $url = $protocol.'://'.$hostname.$dest; + my $start_page = + &Apache::loncommon::start_page('Switching Server ...',undef, + {'redirect' => [0,$url],}); + my $end_page = &Apache::loncommon::end_page(); + $r->print($start_page.$end_page); + return OK; + } + } + +# +# Check if a LON-CAPA load balancer sent user here because user's browser sent +# it a balancer cookie for an active session on this server. +# + + my $balcookie; + if ($env{'form.btoken'}) { + my %info = &Apache::lonnet::tmpget($env{'form.btoken'}); + $balcookie = $info{'balcookie'}; + &Apache::lonnet::tmpdel($env{'form.btoken'}); + delete($env{'form.btoken'}); + } + +# +# If browser sent an old cookie for which the session file had been removed +# check if configuration for user's domain has a portal URL set. If so +# switch user's log-in to the portal. +# + + if (($handle eq '') && ($userdom ne '')) { + my %domdefaults = &Apache::lonnet::get_domain_defaults($userdom); + if ($domdefaults{'portal_def'} =~ /^https?\:/) { + my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef, + {'redirect' => [0,$domdefaults{'portal_def'}],}); + my $end_page = &Apache::loncommon::end_page(); + $r->print($start_page.$end_page); return OK; } } + $env{'form.firsturl'} =~ s/(`)/'/g; + +# -------------------------------- Prevent users from attempting to login twice + if ($handle ne '') { + &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); + my $start_page = + &Apache::loncommon::start_page('Already logged in'); + my $end_page = + &Apache::loncommon::end_page(); + my $dest = '/adm/roles'; + if ($env{'form.firsturl'} ne '') { + $dest = $env{'form.firsturl'}; + } + $r->print( + $start_page + .'

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

' + .'

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

' + .$end_page + ); + return OK; + } + # ---------------------------------------------------- No valid token, continue - # ---------------------------- Not possible to really login to domain "public" +# ---------------------------- Not possible to really login to domain "public" if ($env{'form.domain'} eq 'public') { $env{'form.domain'}=''; $env{'form.username'}=''; } + +# ------ Is this page requested because /adm/migrateuser detected an IP change? + my %sessiondata; + if ($env{'form.iptoken'}) { + %sessiondata = &Apache::lonnet::tmpget($env{'form.iptoken'}); + unless ($sessiondata{'sessionserver'}) { + my $delete = &Apache::lonnet::tmpdel($env{'form.iptoken'}); + delete($env{'form.iptoken'}); + } + } # ----------------------------------------------------------- Process Interface $env{'form.interface'}=~s/\W//g; - my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; + (undef,undef,undef,undef,undef,undef,my $clientmobile) = + &Apache::loncommon::decode_user_agent(); my $iconpath= &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); - my $lonhost = $r->dir_config('lonHostID'); my $domain = &Apache::lonnet::default_login_domain(); + my $defdom = $domain; if ($lonhost ne '') { - my $redirect = &check_loginvia($domain,$lonhost); - if ($redirect) { - $r->print($redirect); - return OK; - } + unless ($sessiondata{'sessionserver'}) { + my $redirect = &check_loginvia($domain,$lonhost,$lonidsdir,$balcookie); + if ($redirect) { + $r->print($redirect); + return OK; + } + } } - if (($env{'form.domain'}) && + if (($sessiondata{'domain'}) && + (&Apache::lonnet::domain($sessiondata{'domain'},'description'))) { + $domain=$sessiondata{'domain'}; + } elsif (($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 $uloadlim= $r->dir_config('lonUserLoadLim'); @@ -140,9 +248,20 @@ sub handler { 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,$authdomain); + if ($sessiondata{'username'}) { + $authusername=$sessiondata{'username'}; + } else { + $env{'form.username'} = &Apache::loncommon::cleanup_html($env{'form.username'}); + $authusername=($env{'form.username'}?$env{'form.username'}:''); + } + if ($sessiondata{'domain'}) { + $authdomain=$sessiondata{'domain'}; + } else { + $env{'form.domain'} = &Apache::loncommon::cleanup_html($env{'form.domain'}); + $authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain); + } # ---------------------------------------------------------- Determine own load my $loadavg; @@ -151,10 +270,14 @@ sub handler { $loadavg=<$loadfile>; } $loadavg =~ s/\s.*//g; - my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim); - unless ($loadlim) { $loadpercent='---'; } - my $userloadpercent=&Apache::lonnet::userload(); - unless ($uloadlim) { $userloadpercent='---'; } + + my ($loadpercent,$userloadpercent); + if ($loadlim) { + $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim); + } + if ($uloadlim) { + $userloadpercent=&Apache::lonnet::userload(); + } my $firsturl= ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'}); @@ -192,96 +315,134 @@ sub handler { } $tokenextras .= '&symb='.&escape($env{'form.symb'}); } + if ($env{'form.iptoken'}) { + if (!$tokenextras) { + $tokenextras = '&&'; + } + $tokenextras .= '&iptoken='.&escape($env{'form.iptoken'}); + } my $logtoken=Apache::lonnet::reply( 'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, $lonhost); -# ------------------- If we cannot talk to ourselves, we are in serious trouble +# -- If we cannot talk to ourselves, or hostID does not map to a hostname +# we are in serious trouble - if ($logtoken eq 'con_lost') { + if (($logtoken eq 'con_lost') || ($logtoken eq 'no_such_host')) { + if ($logtoken eq 'no_such_host') { + &Apache::lonnet::logthis('No valid logtoken for log-in page -- unable to determine hostname for hostID: '.$lonhost.'. Check entry in hosts.tab'); + } my $spares=''; - my $last; - foreach my $hostid (sort - { - &Apache::lonnet::hostname($a) cmp - &Apache::lonnet::hostname($b); - } - keys(%Apache::lonnet::spareid)) { + my (@sparehosts,%spareservers); + my $sparesref = &Apache::lonnet::this_host_spares($defdom); + if (ref($sparesref) eq 'HASH') { + foreach my $key (keys(%{$sparesref})) { + if (ref($sparesref->{$key}) eq 'ARRAY') { + my @sorted = sort { &Apache::lonnet::hostname($a) cmp + &Apache::lonnet::hostname($b); + } @{$sparesref->{$key}}; + if (@sorted) { + if ($key eq 'primary') { + unshift(@sparehosts,@sorted); + } elsif ($key eq 'default') { + push(@sparehosts,@sorted); + } + } + } + } + } + foreach my $hostid (@sparehosts) { next if ($hostid eq $lonhost); my $hostname = &Apache::lonnet::hostname($hostid); - next if ($last eq $hostname); - $spares.='
'. $hostname.''. - ' '.&mt('(preferred)').''.$/; - $last=$hostname; + ' '.&mt('(preferred)').''.$/; } -$spares.= '
'; -my %all_hostnames = &Apache::lonnet::all_hostnames(); -foreach my $hostid (sort + if ($spares) { + $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( - '' - .'' + next if ($hostid eq $lonhost); + my $hostname = &Apache::lonnet::hostname($hostid); + next if (($hostname eq '') || ($spareservers{$hostname})); + $spareservers{$hostname} = 1; + my $protocol = $Apache::lonnet::protocol{$hostid}; + $protocol = 'http' if ($protocol ne 'https'); + $spares.='<br /><a href="'.$protocol.'://'. + $hostname. + '/adm/login?domain='.$authdomain.'">'. + $hostname.'</a>'; + } + $r->print( + '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' + .'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">' + .'<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><title>' .&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; -} + .'broken icon' + .'

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

'); + if ($spares) { + $r->print('

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

' + .$spares); + } + $r->print('' + .'' + ); + return OK; + } # ----------------------------------------------- Apparently we are in business -$servadm=~s/\,/\
/g; + $servadm=~s/\,/\
/g; # ----------------------------------------------------------- Front page design -my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain); -my $font=&Apache::loncommon::designparm('login.font',$domain); -my $link=&Apache::loncommon::designparm('login.link',$domain); -my $vlink=&Apache::loncommon::designparm('login.vlink',$domain); -my $alink=&Apache::loncommon::designparm('login.alink',$domain); -my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain); -my $loginbox_bg=&Apache::loncommon::designparm('login.sidebg',$domain); -my $loginbox_header_bgcol=&Apache::loncommon::designparm('login.bgcol',$domain); -my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain); -my $logo=&Apache::loncommon::designparm('login.logo',$domain); -my $img=&Apache::loncommon::designparm('login.img',$domain); -my $domainlogo=&Apache::loncommon::domainlogo($domain); -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 $shownewuserlink = -&Apache::loncommon::designparm('login.newuser',$domain); -my $now=time; -my $js = (< // "$mainbg", text => "$font", link => "$link", @@ -333,14 +490,48 @@ my %add_entries = ( alink => "$alink", onload => 'javascript:enableInput();',); -$r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, + my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf); + @hosts = &Apache::lonnet::current_machine_ids(); + $lonhost_in_use = $lonhost; + if (@hosts > 1) { + foreach my $hostid (@hosts) { + if (&Apache::lonnet::host_domain($hostid) eq $defdom) { + $lonhost_in_use = $hostid; + last; + } + } + } + %defaultdomconf = &Apache::loncommon::get_domainconf($defdom); + $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use}; + $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost_in_use}; + if ($headextra) { + my $omitextra; + if ($headextra_exempt ne '') { + my @exempt = split(',',$headextra_exempt); + my $ip = &Apache::lonnet::get_requestor_ip(); + if (grep(/^\Q$ip\E$/,@exempt)) { + $omitextra = 1; + } + } + unless ($omitextra) { + my $confname = $defdom.'-domainconfig'; + if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost_in_use/\E}) { + my $extra = &Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$headextra)); + unless ($extra eq '-1') { + $js .= "\n".$extra."\n"; + } + } + } + } + + $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( + my %lt=&Apache::lonlocal::texthash( 'un' => 'Username', 'pw' => 'Password', 'dom' => 'Domain', @@ -358,73 +549,73 @@ my %lt=&Apache::lonlocal::texthash( ); # -------------------------------------------------- Change password field name -my $forgotpw = &forgotpwdisplay(%lt); -$forgotpw .= '
' if $forgotpw; -my $loginhelp = &loginhelpdisplay($authdomain,%lt); -$loginhelp .= '
' if $loginhelp; + my $forgotpw = &forgotpwdisplay(%lt); + $forgotpw .= '
' if $forgotpw; + my $loginhelp = &Apache::lonauth::loginhelpdisplay($authdomain); + if ($loginhelp) { + $loginhelp = ''.$lt{'help'}.'
'; + } # ---------------------------------------------------- Serve out DES JavaScript -{ -my $jsh=Apache::File->new($include."/londes.js"); -$r->print(<$jsh>); -} + { + my $jsh=Apache::File->new($include."/londes.js"); + $r->print(<$jsh>); + } # ---------------------------------------------------------- Serve rest of page -$r->print( + $r->print( '
' ); -# -# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing? -# then just us a relative link to authenticate: -# - -$r->print(<print(< - - ENDSERVERFORM -my $coursecatalog; -if (($showcoursecat eq '') || ($showcoursecat)) { - $coursecatalog = &coursecatalog_link($lt{'catalog'}).'
'; -} -my $newuserlink; -if ($shownewuserlink) { - $newuserlink = &newuser_link($lt{'newuser'}).'
'; -} -my $logintitle = - '

' - .$lt{'log'} - .'

'; - -my $noscript_warning=''; -my $helpdeskscript; -my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $authdomain,\$helpdeskscript); - -my $loginform=(<'; + } + my $newuserlink; + if ($shownewuserlink) { + $newuserlink = &newuser_link($lt{'newuser'}).'
'; + } + my $logintitle = + '

' + .$lt{'log'} + .'

'; + + my $noscript_warning=''; + my $helpdeskscript; + my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, + $authdomain,\$helpdeskscript, + $showhelpdesk,\@possdoms); + + my $mobileargs; + if ($clientmobile) { + $mobileargs = 'autocapitalize="off" autocorrect="off"'; + } + my $loginform=(< :
-
+
:

:
-
+
LFORM @@ -433,12 +624,12 @@ LFORM $r->print(<
- The Learning Online Network with CAPA + The Learning Online Network with CAPA
HEADER } $r->print(< +
$logintitle $loginform @@ -457,17 +648,15 @@ HEADER
ENDTOP if ($showmainlogo) { - $r->print(' '."\n"); + $r->print(' '."\n"); } $r->print(<
ENDTOP - -$r->print(< - + my ($domainrow,$serverrow,$loadrow,$userloadrow,$versionrow); + $domainrow = <<"END"; +END + $serverrow = <<"END"; +END + if ($loadlim) { + $loadrow = <<"END"; +END + } + if ($uloadlim) { + $userloadrow = <<"END"; +END + } + if (($version ne '') && ($version ne '')) { + $versionrow = <<"END"; +END + } + + $r->print(< +
$lt{'dom'}:  @@ -476,6 +665,8 @@ $r->print(< $domain
$lt{'serv'}:  @@ -484,6 +675,9 @@ $r->print(< $lonhost ($role)
$lt{'load'}:  @@ -492,6 +686,10 @@ $r->print(< $loadpercent $lt{'perc'}
$lt{'userload'}:  @@ -500,11 +698,26 @@ $r->print(< $userloadpercent $lt{'perc'}
$version
+$domainrow +$serverrow +$loadrow +$userloadrow +$versionrow
@@ -528,8 +741,8 @@ ENDDOCUMENT } sub check_loginvia { - my ($domain,$lonhost) = @_; - if ($domain eq '' || $lonhost eq '') { + my ($domain,$lonhost,$lonidsdir,$balcookie) = @_; + if ($domain eq '' || $lonhost eq '' || $lonidsdir eq '') { return; } my %domconfhash = &Apache::loncommon::get_domainconf($domain); @@ -538,7 +751,7 @@ sub check_loginvia { my $output; if ($loginvia ne '') { my $noredirect; - my $ip = $ENV{'REMOTE_ADDR'}; + my $ip = &Apache::lonnet::get_requestor_ip(); if ($ip eq '127.0.0.1') { $noredirect = 1; } else { @@ -558,6 +771,36 @@ sub check_loginvia { } if ($newhost ne $lonhost) { if (&Apache::lonnet::hostname($newhost) ne '') { + if ($balcookie) { + my ($balancer,$cookie) = split(/:/,$balcookie); + if ($cookie =~ /^($match_domain)_($match_username)_([a-f0-9]+)$/) { + my ($udom,$uname,$cookieid) = ($1,$2,$3); + unless (&Apache::lonnet::delbalcookie($cookie,$balancer) eq 'ok') { + if ((-d $lonidsdir) && (opendir(my $dh,$lonidsdir))) { + while (my $filename=readdir($dh)) { + if ($filename=~/^(\Q$uname\E_\d+_\Q$udom\E_$match_lonid)\.id$/) { + my $handle = $1; + my %hash = + &Apache::lonnet::get_sessionfile_vars($handle,$lonidsdir, + ['request.balancercookie', + 'user.linkedenv']); + if ($hash{'request.balancercookie'} eq "$balancer:$cookieid") { + if (unlink("$lonidsdir/$filename")) { + if (($hash{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) && + (-l "$lonidsdir/$hash{'user.linkedenv'}.id") && + (readlink("$lonidsdir/$hash{'user.linkedenv'}.id") eq "$lonidsdir/$filename")) { + unlink("$lonidsdir/$hash{'user.linkedenv'}.id"); + } + } + } + last; + } + } + closedir($dh); + } + } + } + } $output = &redirect_page($newhost,$path); } } @@ -568,12 +811,13 @@ sub check_loginvia { sub redirect_page { my ($desthost,$path) = @_; + my $hostname = &Apache::lonnet::hostname($desthost); my $protocol = $Apache::lonnet::protocol{$desthost}; $protocol = 'http' if ($protocol ne 'https'); unless ($path =~ m{^/}) { $path = '/'.$path; } - my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).$path; + my $url = $protocol.'://'.$hostname.$path; if ($env{'form.firsturl'} ne '') { $url .='?firsturl='.$env{'form.firsturl'}; } @@ -584,12 +828,24 @@ sub redirect_page { } sub contactdisplay { - my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_; + my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript,$showhelpdesk, + $possdoms) = @_; my $contactblock; - my $showhelpdesk = 0; - my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; - if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { - $showhelpdesk = 1; + my $origmail; + if (ref($possdoms) eq 'ARRAY') { + if (grep(/^\Q$authdomain\E$/,@{$possdoms})) { + $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; + } + } + my $requestmail = + &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', + $authdomain,$origmail); + unless ($showhelpdesk eq '0') { + if ($requestmail =~ m/[^\@]+\@[^\@]+/) { + $showhelpdesk = 1; + } else { + $showhelpdesk = 0; + } } if ($servadm && $showadminmail) { $contactblock .= $$lt{'servadm'}.':
'. @@ -602,7 +858,8 @@ sub contactdisplay {