--- loncom/auth/lonlogin.pm 2007/03/08 01:58:48 1.89 +++ loncom/auth/lonlogin.pm 2015/03/06 22:36:56 1.158.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.89 2007/03/08 01:58:48 albertel Exp $ +# $Id: lonlogin.pm,v 1.158.2.2 2015/03/06 22:36:56 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,7 +30,6 @@ package Apache::lonlogin; use strict; use Apache::Constants qw(:common); -use CGI::Cookie(); use Apache::File (); use Apache::lonnet; use Apache::loncommon(); @@ -47,7 +46,10 @@ sub handler { (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, $ENV{'REDIRECT_QUERY_STRING'}), ['interface','username','domain','firsturl','localpath','localres', - 'token']); + 'token','role','symb','iptoken']); + if (!defined($env{'form.firsturl'})) { + &Apache::lonacc::get_posted_cgi($r,['firsturl']); + } # -- check if they are a migrating user if (defined($env{'form.token'})) { @@ -62,78 +64,93 @@ sub handler { # 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; } + $env{'form.firsturl'} =~ s/(`)/'/g; # -------------------------------- 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=&LONCAPA::clean_handle($lonid->value); + my $handle = &Apache::lonnet::check_for_valid_session($r); + if ($handle ne '') { my $lonidsdir=$r->dir_config('lonIDsDir'); - if (-e "$lonidsdir/$handle.id") { -# Is there an existing token file? - if ($handle=~/^publicuser\_/) { + 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"); + } else { # 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; - } - } + &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 $textbrowsers=$r->dir_config('lonTextBrowsers'); - my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; - - foreach (split(/\:/,$textbrowsers)) { - if ($httpbrowser=~/$_/i) { - $env{'form.interface'}='textual'; + (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(); + if ($lonhost ne '') { + unless ($sessiondata{'sessionserver'}) { + my $redirect = &check_loginvia($domain,$lonhost); + if ($redirect) { + $r->print($redirect); + return OK; + } } } - 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 = &Apache::lonnet::default_login_domain(); - if (($env{'form.domain'}) && + if (($sessiondata{'domain'}) && + (&Apache::lonnet::domain($env{'form.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 $lonhost = $r->dir_config('lonHostID'); + my $uloadlim= $r->dir_config('lonUserLoadLim'); + my $servadm = $r->dir_config('lonAdmEMail'); my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); my $expire = $r->dir_config('lonExpire'); @@ -141,9 +158,20 @@ ENDFAILED 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; @@ -152,19 +180,17 @@ ENDFAILED $loadavg=<$loadfile>; } $loadavg =~ s/\s.*//g; - my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim); - my $userloadpercent=&Apache::lonnet::userload(); -# ------------------------------------------------------- Do the load balancing - my $otherserver= &Apache::lonnet::absolute_url($host_name); + 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'}); -# ---------------------------------------- Are we access server and overloaded? - if (($role eq 'access') && - (($userloadpercent>100.0)||($loadpercent>100.0))) { - my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent); - if ($unloaded) { $otherserver=$unloaded; } - } # ----------------------------------------------------------- Get announcements my $announcements=&Apache::lonnet::getannounce(); @@ -189,13 +215,33 @@ ENDFAILED if ($uextkey>2147483647) { $uextkey-=4294967296; } # -------------------------------------------------------- Store away log token + my $tokenextras; + if ($env{'form.role'}) { + $tokenextras = '&role='.&escape($env{'form.role'}); + } + if ($env{'form.symb'}) { + if (!$tokenextras) { + $tokenextras = '&'; + } + $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, + '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 @@ -206,418 +252,471 @@ ENDFAILED keys(%Apache::lonnet::spareid)) { next if ($hostid eq $lonhost); my $hostname = &Apache::lonnet::hostname($hostid); - next if ($last eq $hostname); + next if (($last eq $hostname) || ($hostname eq '')); $spares.='
'. $hostname.''. - ' (preferred)'.$/; + ' '.&mt('(preferred)').''.$/; $last=$hostname; } - $spares.= '
'; - my %all_hostnames = &Apache::lonnet::all_hostnames(); + 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)) { + { + &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); + my $hostname = &Apache::lonnet::hostname($hostid); + next if (($last eq $hostname) || ($hostname eq '')); $spares.='
'. - $hostname.''; - $last=$hostname; + $hostname. + '/adm/login?domain='.$authdomain.'">'. + $hostname.''; + $last=$hostname; + } + $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.').'

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

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

' + .$spares); } - $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 - - -ENDTROUBLE + $r->print('' + .'' + ); return OK; } # ----------------------------------------------- Apparently we are in business - - my $domainlogo=&Apache::loncommon::domainlogo($domain); - -# --------------------------------------------------- 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>); - } + $servadm=~s/\,/\
/g; # ----------------------------------------------------------- Front page design - my $pgbg= - ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF'); - my $font= - ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000'); - my $link= - ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF'); - my $vlink= - ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF'); + 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= - ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF'); - my $sidebg= - ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF'); + 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); - -# ----------------------------------------------------------------------- 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', - 'auth' => 'userauthentication.gif', - 'log' => 'Log in', - 'help' => 'Log-in Help', - 'serv' => 'Server', - 'helpdesk' => 'Contact Helpdesk', - 'forgotpw' => 'Forgot password?'); -# -------------------------------------------------- Change password field name + 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; + my @possdoms = &Apache::lonnet::current_machine_domains(); + if (grep(/^\Q$domain\E$/,@possdoms)) { + $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain); + } + my $showcoursecat = + &Apache::loncommon::designparm('login.coursecatalog',$domain); + my $shownewuserlink = + &Apache::loncommon::designparm('login.newuser',$domain); + my $showhelpdesk = + &Apache::loncommon::designparm('login.helpdesk',$domain); my $now=time; - my $forgotpw = &forgotpwdisplay(%lt); - my $loginhelp = &loginhelpdisplay(%lt); -# ---------------------------------------------------------- Serve rest of page - $r->print(< - - - this.document.server.elements.fontenhance.value - =this.document.client.elements.fontenhance.checked; +ENDSCRIPT - this.document.server.elements.blackwhite.value - =this.document.client.elements.blackwhite.checked; +# --------------------------------------------------- Print login screen header - this.document.server.elements.remember.value - =this.document.client.elements.remember.checked; + my %add_entries = ( + bgcolor => "$mainbg", + text => "$font", + link => "$link", + vlink => "$vlink", + alink => "$alink", + onload => 'javascript:enableInput();',); + + my %defaultdomconf = &Apache::loncommon::get_domainconf($defdom); + my $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost}; + my $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost}; + if ($headextra) { + my $omitextra; + if ($headextra_exempt ne '') { + my @exempt = split(',',$headextra_exempt); + my $ip = $ENV{'REMOTE_ADDR'}; + if (grep(/^\Q$ip\E$/,@exempt)) { + $omitextra = 1; + } + } + unless ($omitextra) { + my $confname = $defdom.'-domainconfig'; + if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost/\E}) { + my $extra = &Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$headextra)); + unless ($extra eq '-1') { + $js .= "\n".$extra."\n"; + } + } + } + } - uextkey=this.document.client.elements.uextkey.value; - lextkey=this.document.client.elements.lextkey.value; - initkeys(); + $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, + { 'redirect' => [$expire,'/adm/roles'], + 'add_entries' => \%add_entries, + 'only_body' => 1,})); - 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)); +# ----------------------------------------------------------------------- Texts - this.document.client.elements.uname.value=''; - this.document.client.elements.upass$now.value=''; + my %lt=&Apache::lonlocal::texthash( + 'un' => 'Username', + 'pw' => 'Password', + 'dom' => 'Domain', + 'perc' => 'percent', + 'load' => 'Server Load', + 'userload' => 'User Load', + 'catalog' => 'Course/Community Catalog', + 'log' => 'Log in', + 'help' => 'Log-in Help', + 'serv' => 'Server', + 'servadm' => 'Server Administration', + 'helpdesk' => 'Contact Helpdesk', + 'forgotpw' => 'Forgot password?', + 'newuser' => 'New User?', + ); +# -------------------------------------------------- Change password field name - this.document.server.submit(); - return false; + my $forgotpw = &forgotpwdisplay(%lt); + $forgotpw .= '
' if $forgotpw; + my $loginhelp = &Apache::lonauth::loginhelpdisplay($authdomain); + if ($loginhelp) { + $loginhelp = ''.$lt{'help'}.'
'; } - -ENDSCRIPT - if ($fullgraph) { - $r->print( - ''); +# ---------------------------------------------------- Serve out DES JavaScript + { + my $jsh=Apache::File->new($include."/londes.js"); + $r->print(<$jsh>); } +# ---------------------------------------------------------- Serve rest of page + + $r->print( + '
' +); $r->print(< +
- - - - - - - ENDSERVERFORM - if ($fullgraph) { $r->print(< -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
The Learning Online Network with CAPA
 
- - - - - - - - - - - - - - - - -
 $lt{'access'}
 $lt{'about'}
 $lt{'catalog'}
 
- 		-
- -
-
+ 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, + $showhelpdesk,\@possdoms); + + my $mobileargs; + if ($clientmobile) { + $mobileargs = 'autocapitalize="off" autocorrect="off"'; + } + my $loginform=(< + + + :
+
+ :
+
+ :
+
+ + +LFORM + + if ($showbanner) { + $r->print(< +
+ The Learning Online Network with CAPA +
+HEADER + } + $r->print(< +
+ $logintitle + $loginform + $noscript_warning +
+ +
+ $loginhelp + $forgotpw + $contactblock + $newuserlink + $coursecatalog +
+ + +
ENDTOP -} else { - $r->print('

The LearningOnline Network with CAPA

Text-based Interface Login

'.$announcements); -} - $r->print('
'); - unless ($fullgraph) { - $r->print(<Select Accessibility Options -
-
-
-
-
- Remember these settings for next login
-ENDACCESSOPTIONS -} else { - $r->print(< - - - - - -ENDNOOPT -} - $r->print(< - - - - - - - - - - - - - - - - - - - - - - - - -
User Authentication

   $lt{'un'}:
   $lt{'pw'}:
   $lt{'dom'}:
  -
- -
- $loginhelp - $forgotpw -
- - -ENDLOGIN - if ($fullgraph) { - my $helpdeskscript; - my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript); - $r->print(< - - -
$announcements
-
- + if ($showmainlogo) { + $r->print(' '."\n"); + } +$r->print(< +
+ENDTOP + 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'}:  + + $lt{'dom'}:  +  $domain
-    $lt{'serv'}:  + + $lt{'serv'}:  +  $lonhost ($role)
-    $lt{'load'}:  + + $lt{'load'}:  +  $loadpercent $lt{'perc'}
-    $lt{'userload'}:  + + $lt{'userload'}:  +  $userloadpercent $lt{'perc'}
+ $version +
+$domainrow +$serverrow +$loadrow +$userloadrow +$versionrow
-
- $contactblock - 		-$domainlogo -
 
+ +
+ $domainlogo +
+
+ $helpdeskscript ENDDOCUMENT -} - $r->print(''); + my %endargs = ( 'noredirectlink' => 1, ); + $r->print(&Apache::loncommon::end_page(\%endargs)); return OK; } +sub check_loginvia { + my ($domain,$lonhost) = @_; + if ($domain eq '' || $lonhost eq '') { + return; + } + my %domconfhash = &Apache::loncommon::get_domainconf($domain); + my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost}; + my $loginvia_exempt = $domconfhash{$domain.'.login.loginvia_exempt_'.$lonhost}; + my $output; + if ($loginvia ne '') { + my $noredirect; + my $ip = $ENV{'REMOTE_ADDR'}; + if ($ip eq '127.0.0.1') { + $noredirect = 1; + } else { + if ($loginvia_exempt ne '') { + my @exempt = split(',',$loginvia_exempt); + if (grep(/^\Q$ip\E$/,@exempt)) { + $noredirect = 1; + } + } + } + unless ($noredirect) { + my ($newhost,$path); + if ($loginvia =~ /:/) { + ($newhost,$path) = split(':',$loginvia); + } else { + $newhost = $loginvia; + } + if ($newhost ne $lonhost) { + if (&Apache::lonnet::hostname($newhost) ne '') { + $output = &redirect_page($newhost,$path); + } + } + } + } + return $output; +} + +sub redirect_page { + my ($desthost,$path) = @_; + 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; + if ($env{'form.firsturl'} ne '') { + $url .='?firsturl='.$env{'form.firsturl'}; + } + my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef, + {'redirect' => [0,$url],}); + my $end_page = &Apache::loncommon::end_page(); + return $start_page.$end_page; +} + sub contactdisplay { - my ($lt,$version,$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'}.':
'. + ''.$servadm.'
'; } if ($showhelpdesk) { - $contactblock .= '   '.$lt->{'helpdesk'}.'
'; + $contactblock .= ''.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT } - $contactblock .= <<"ENDBLOCK"; -    $version -ENDBLOCK return $contactblock; } @@ -638,18 +735,21 @@ sub forgotpwdisplay { my (%lt) = @_; my $prompt_for_resetpw = 1; if ($prompt_for_resetpw) { - return '
   '.$lt{'forgotpw'}.'

'; + 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 +} + +sub newuser_link { + my ($linkname) = @_; + return ''.$linkname.''; } 1;