--- loncom/auth/lonlogin.pm 2012/04/18 18:57:34 1.151 +++ loncom/auth/lonlogin.pm 2012/08/27 00:52:45 1.152 @@ -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.152 2012/08/27 00:52:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -374,8 +374,10 @@ ENDSCRIPT my $forgotpw = &forgotpwdisplay(%lt); $forgotpw .= '
' if $forgotpw; - my $loginhelp = &loginhelpdisplay($authdomain,%lt); - $loginhelp .= '
' if $loginhelp; + my $loginhelp = &Apache::lonauth::loginhelpdisplay($authdomain); + if ($loginhelp) { + $loginhelp = ''.$lt{'help'}.'
'; + } # ---------------------------------------------------- Serve out DES JavaScript { @@ -656,25 +658,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 ''.$lt{'help'}.''; - } else { - return ''.$lt{'help'}.''; - } - } - return; -} sub coursecatalog_link { my ($linkname) = @_;