--- loncom/auth/lonlogin.pm	2012/04/18 18:57:34	1.151
+++ loncom/auth/lonlogin.pm	2013/01/11 17:35:10	1.153
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.151 2012/04/18 18:57:34 raeburn Exp $
+# $Id: lonlogin.pm,v 1.153 2013/01/11 17:35:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -289,11 +289,17 @@ sub handler {
     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 $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 $js = (<<ENDSCRIPT);
 
@@ -374,8 +380,10 @@ ENDSCRIPT
 
     my $forgotpw = &forgotpwdisplay(%lt);
     $forgotpw .= '<br />' if $forgotpw;
-    my $loginhelp = &loginhelpdisplay($authdomain,%lt);
-    $loginhelp .= '<br />' if $loginhelp;
+    my $loginhelp = &Apache::lonauth::loginhelpdisplay($authdomain);
+    if ($loginhelp) {
+        $loginhelp = '<a href="'.$loginhelp.'">'.$lt{'help'}.'</a><br />';
+    }
 
 # ---------------------------------------------------- Serve out DES JavaScript
     {
@@ -422,7 +430,8 @@ ENDSERVERFORM
                         .'</b></span></noscript>';
     my $helpdeskscript;
     my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
-                                       $authdomain,\$helpdeskscript);
+                                       $authdomain,\$helpdeskscript,
+                                       $showhelpdesk,\@possdoms);
 
     my $loginform=(<<LFORM);
 <form name="client" action="" onsubmit="return(send())">
@@ -615,12 +624,22 @@ 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);
+    if ($showhelpdesk) {
+        unless ($requestmail =~ m/[^\@]+\@[^\@]+/) {
+            $showhelpdesk = 0;
+        }
     }
     if ($servadm && $showadminmail) {
         $contactblock .= $$lt{'servadm'}.':<br />'.
@@ -656,25 +675,6 @@ sub forgotpwdisplay {
     }
     return;
 }
-
-sub loginhelpdisplay {
-    my ($authdomain,%lt) = @_;
-    my $login_help = 1;
-    if ($login_help) {
-        my $dom = $authdomain;
-        if ($dom eq '') {
-            $dom = &Apache::lonnet::default_login_domain();
-        }
-        my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom);
-        my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'};
-        if ($loginhelp_url ne '') {
-            return '<a href="'.$loginhelp_url.'">'.$lt{'help'}.'</a>';
-        } else {
-            return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>';
-        }
-    }
-    return;
-}
 
 sub coursecatalog_link {
     my ($linkname) = @_;