version 1.151, 2012/04/18 18:57:34
|
version 1.153, 2013/01/11 17:35:10
|
Line 289 sub handler {
|
Line 289 sub handler {
|
if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) { |
if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) { |
$showmainlogo = &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 = |
my $showcoursecat = |
&Apache::loncommon::designparm('login.coursecatalog',$domain); |
&Apache::loncommon::designparm('login.coursecatalog',$domain); |
my $shownewuserlink = |
my $shownewuserlink = |
&Apache::loncommon::designparm('login.newuser',$domain); |
&Apache::loncommon::designparm('login.newuser',$domain); |
|
my $showhelpdesk = |
|
&Apache::loncommon::designparm('login.helpdesk',$domain); |
my $now=time; |
my $now=time; |
my $js = (<<ENDSCRIPT); |
my $js = (<<ENDSCRIPT); |
|
|
Line 374 ENDSCRIPT
|
Line 380 ENDSCRIPT
|
|
|
my $forgotpw = &forgotpwdisplay(%lt); |
my $forgotpw = &forgotpwdisplay(%lt); |
$forgotpw .= '<br />' if $forgotpw; |
$forgotpw .= '<br />' if $forgotpw; |
my $loginhelp = &loginhelpdisplay($authdomain,%lt); |
my $loginhelp = &Apache::lonauth::loginhelpdisplay($authdomain); |
$loginhelp .= '<br />' if $loginhelp; |
if ($loginhelp) { |
|
$loginhelp = '<a href="'.$loginhelp.'">'.$lt{'help'}.'</a><br />'; |
|
} |
|
|
# ---------------------------------------------------- Serve out DES JavaScript |
# ---------------------------------------------------- Serve out DES JavaScript |
{ |
{ |
Line 422 ENDSERVERFORM
|
Line 430 ENDSERVERFORM
|
.'</b></span></noscript>'; |
.'</b></span></noscript>'; |
my $helpdeskscript; |
my $helpdeskscript; |
my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, |
my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, |
$authdomain,\$helpdeskscript); |
$authdomain,\$helpdeskscript, |
|
$showhelpdesk,\@possdoms); |
|
|
my $loginform=(<<LFORM); |
my $loginform=(<<LFORM); |
<form name="client" action="" onsubmit="return(send())"> |
<form name="client" action="" onsubmit="return(send())"> |
Line 615 sub redirect_page {
|
Line 624 sub redirect_page {
|
} |
} |
|
|
sub contactdisplay { |
sub contactdisplay { |
my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_; |
my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript,$showhelpdesk, |
|
$possdoms) = @_; |
my $contactblock; |
my $contactblock; |
my $showhelpdesk = 0; |
my $origmail; |
my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
if (ref($possdoms) eq 'ARRAY') { |
if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { |
if (grep(/^\Q$authdomain\E$/,@{$possdoms})) { |
$showhelpdesk = 1; |
$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) { |
if ($servadm && $showadminmail) { |
$contactblock .= $$lt{'servadm'}.':<br />'. |
$contactblock .= $$lt{'servadm'}.':<br />'. |
Line 656 sub forgotpwdisplay {
|
Line 675 sub forgotpwdisplay {
|
} |
} |
return; |
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 { |
sub coursecatalog_link { |
my ($linkname) = @_; |
my ($linkname) = @_; |