version 1.130, 2009/12/01 14:23:49
|
version 1.132, 2010/02/08 13:28:40
|
Line 85 sub handler {
|
Line 85 sub handler {
|
if ($env{'form.firsturl'} ne '') { |
if ($env{'form.firsturl'} ne '') { |
$dest = $env{'form.firsturl'}; |
$dest = $env{'form.firsturl'}; |
} |
} |
|
|
|
my $dom = &Apache::lonnet::default_login_domain(); |
|
my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); |
|
|
|
my $loginhelp_page = $helpconfig{'helpsettings'}{'loginhelpurl'}; |
|
if ($loginhelp_page eq '') { |
|
$loginhelp_page = '/adm/loginproblems.html'; |
|
} |
$r->print( |
$r->print( |
$start_page |
$start_page |
.'<h1>'.&mt('You are already logged in!').'</h1>' |
.'<h1>'.&mt('You are already logged in!').'</h1>' |
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', |
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', |
'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>' |
'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>' |
.'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>' |
.'<p><a href="'.$loginhelp_page.'">'.&mt('Login problems?').'</a></p>' |
.$end_page |
.$dom.' '.$end_page |
); |
); |
return OK; |
return OK; |
} |
} |
Line 266 my $alink=&Apache::loncommon::designparm
|
Line 274 my $alink=&Apache::loncommon::designparm
|
my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain); |
my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain); |
my $logo=&Apache::loncommon::designparm('login.logo',$domain); |
my $logo=&Apache::loncommon::designparm('login.logo',$domain); |
my $img=&Apache::loncommon::designparm('login.img',$domain); |
my $img=&Apache::loncommon::designparm('login.img',$domain); |
my $domainlogo=&Apache::loncommon::domainlogo($domain); |
my $domainlogo='<div>'.&Apache::loncommon::domainlogo($domain).'</div>'; |
my $login=&Apache::loncommon::designparm('login.login',$domain); |
my $login=&Apache::loncommon::designparm('login.login',$domain); |
if ($login eq '') { |
if ($login eq '') { |
$login = $iconpath.'/'.&mt('userauthentication.gif'); |
$login = $iconpath.'/'.&mt('userauthentication.gif'); |
Line 353 my %lt=&Apache::lonlocal::texthash(
|
Line 361 my %lt=&Apache::lonlocal::texthash(
|
'newuser' => 'New User?', |
'newuser' => 'New User?', |
); |
); |
# -------------------------------------------------- Change password field name |
# -------------------------------------------------- Change password field name |
|
|
my $forgotpw = &forgotpwdisplay(%lt); |
my $forgotpw = &forgotpwdisplay(%lt); |
|
$forgotpw .= '<br />' if $forgotpw; |
my $loginhelp = &loginhelpdisplay(%lt); |
my $loginhelp = &loginhelpdisplay(%lt); |
|
$loginhelp .= '<br />' if $loginhelp; |
|
|
# ---------------------------------------------------- Serve out DES JavaScript |
# ---------------------------------------------------- Serve out DES JavaScript |
{ |
{ |
Line 386 $r->print(<<ENDSERVERFORM);
|
Line 397 $r->print(<<ENDSERVERFORM);
|
ENDSERVERFORM |
ENDSERVERFORM |
my $coursecatalog; |
my $coursecatalog; |
if (($showcoursecat eq '') || ($showcoursecat)) { |
if (($showcoursecat eq '') || ($showcoursecat)) { |
$coursecatalog = &coursecatalog_link($lt{'catalog'}); |
$coursecatalog = &coursecatalog_link($lt{'catalog'}).'<br />'; |
} |
} |
my $newuserlink; |
my $newuserlink; |
if ($shownewuserlink) { |
if ($shownewuserlink) { |
$newuserlink = &newuser_link($lt{'newuser'}); |
$newuserlink = &newuser_link($lt{'newuser'}).'<br />'; |
} |
} |
my $logintitle; |
my $logintitle; |
if ($loginheader eq 'text') { |
if ($loginheader eq 'text') { |
Line 405 my $noscript_warning='<noscript><span cl
|
Line 416 my $noscript_warning='<noscript><span cl
|
.'</b></span></noscript>'; |
.'</b></span></noscript>'; |
my $helpdeskscript; |
my $helpdeskscript; |
my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, |
my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, |
$version,$authdomain,\$helpdeskscript); |
$authdomain,\$helpdeskscript); |
|
|
my $loginform=(<<LFORM); |
my $loginform=(<<LFORM); |
<form name="client" action="" onsubmit="return(send())"> |
<form name="client" action="" onsubmit="return(send())"> |
Line 424 LFORM
|
Line 435 LFORM
|
if ($showbanner) { |
if ($showbanner) { |
$r->print(<<HEADER); |
$r->print(<<HEADER); |
<!-- The LON-CAPA Header --> |
<!-- The LON-CAPA Header --> |
<table border="0" align="left" width="100%" cellspacing="0" cellpadding="1"> |
<div style="background:$pgbg;margin:0;width:100%;"> |
<tr> |
<img src="$img" border="0" alt="The Learning Online Network with CAPA" /> |
<td align="left" valign="top" bgcolor="$pgbg"> |
</div> |
<img src="$img" border="0" alt="The Learning Online Network with CAPA" /> |
|
</td> |
|
</tr> |
|
</table> |
|
HEADER |
HEADER |
} |
} |
$r->print(<<ENDTOP); |
$r->print(<<ENDTOP); |
Line 449 HEADER
|
Line 456 HEADER
|
</div> |
</div> |
|
|
<div class="LC_loginpage_loginInfo"> |
<div class="LC_loginpage_loginInfo"> |
$loginhelp<br /> |
$loginhelp |
$forgotpw<br /> |
$forgotpw |
<br /> |
$contactblock |
$contactblock<br /> |
$newuserlink |
<br /> |
|
$newuserlink<br /> |
|
$coursecatalog |
$coursecatalog |
</div> |
</div> |
</div> |
</div> |
Line 472 $r->print(<<ENDDOCUMENT);
|
Line 477 $r->print(<<ENDDOCUMENT);
|
<table border="0" cellspacing="0" cellpadding="0"> |
<table border="0" cellspacing="0" cellpadding="0"> |
<tr> |
<tr> |
<td align="left" valign="top"> |
<td align="left" valign="top"> |
<small><b> $lt{'dom'}: </b></small> |
<small><b>$lt{'dom'}: </b></small> |
</td> |
</td> |
<td align="left" valign="top"> |
<td align="left" valign="top"> |
<small><tt> $domain</tt></small> |
<small><tt> $domain</tt></small> |
Line 480 $r->print(<<ENDDOCUMENT);
|
Line 485 $r->print(<<ENDDOCUMENT);
|
</tr> |
</tr> |
<tr> |
<tr> |
<td align="left" valign="top"> |
<td align="left" valign="top"> |
<small><b> $lt{'serv'}: </b></small> |
<small><b>$lt{'serv'}: </b></small> |
</td> |
</td> |
<td align="left" valign="top"> |
<td align="left" valign="top"> |
<small><tt> $lonhost ($role)</tt></small> |
<small><tt> $lonhost ($role)</tt></small> |
Line 488 $r->print(<<ENDDOCUMENT);
|
Line 493 $r->print(<<ENDDOCUMENT);
|
</tr> |
</tr> |
<tr> |
<tr> |
<td align="left" valign="top"> |
<td align="left" valign="top"> |
<small><b> $lt{'load'}: </b></small> |
<small><b>$lt{'load'}: </b></small> |
</td> |
</td> |
<td align="left" valign="top"> |
<td align="left" valign="top"> |
<small><tt> $loadpercent $lt{'perc'}</tt></small> |
<small><tt> $loadpercent $lt{'perc'}</tt></small> |
Line 496 $r->print(<<ENDDOCUMENT);
|
Line 501 $r->print(<<ENDDOCUMENT);
|
</tr> |
</tr> |
<tr> |
<tr> |
<td align="left" valign="top"> |
<td align="left" valign="top"> |
<small><b> $lt{'userload'}: </b></small> |
<small><b>$lt{'userload'}: </b></small> |
</td> |
</td> |
<td align="left" valign="top"> |
<td align="left" valign="top"> |
<small><tt> $userloadpercent $lt{'perc'}</tt></small> |
<small><tt> $userloadpercent $lt{'perc'}</tt></small> |
</td> |
</td> |
</tr> |
</tr> |
|
<tr> |
|
<td colspan="2" align="left"> |
|
<small>$version</small> |
|
</td> |
|
</tr> |
</table> |
</table> |
</div> |
</div> |
|
|
Line 534 sub redirect_page {
|
Line 544 sub redirect_page {
|
} |
} |
|
|
sub contactdisplay { |
sub contactdisplay { |
my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; |
my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_; |
my $contactblock; |
my $contactblock; |
my $showhelpdesk = 0; |
my $showhelpdesk = 0; |
my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
Line 564 function helpdesk() {
|
Line 574 function helpdesk() {
|
</script> |
</script> |
ENDSCRIPT |
ENDSCRIPT |
} |
} |
$contactblock .= $version; |
|
return $contactblock; |
return $contactblock; |
} |
} |
|
|
Line 581 sub loginhelpdisplay {
|
Line 590 sub loginhelpdisplay {
|
my (%lt) = @_; |
my (%lt) = @_; |
my $login_help = 1; |
my $login_help = 1; |
if ($login_help) { |
if ($login_help) { |
return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>'; |
my $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; |
return; |
} |
} |