version 1.99, 2008/01/24 14:30:28
|
version 1.102, 2008/03/08 02:53:25
|
Line 47 sub handler {
|
Line 47 sub handler {
|
$ENV{'REDIRECT_QUERY_STRING'}), |
$ENV{'REDIRECT_QUERY_STRING'}), |
['interface','username','domain','firsturl','localpath','localres', |
['interface','username','domain','firsturl','localpath','localres', |
'token']); |
'token']); |
|
if (!defined($env{'form.firsturl'})) { |
|
&Apache::lonacc::get_posted_cgi($r,['firsturl']); |
|
} |
|
|
# -- check if they are a migrating user |
# -- check if they are a migrating user |
if (defined($env{'form.token'})) { |
if (defined($env{'form.token'})) { |
Line 78 sub handler {
|
Line 81 sub handler {
|
&Apache::loncommon::start_page('Already logged in'); |
&Apache::loncommon::start_page('Already logged in'); |
my $end_page = |
my $end_page = |
&Apache::loncommon::end_page(); |
&Apache::loncommon::end_page(); |
$r->print(<<ENDFAILED); |
$r->print( |
$start_page |
$start_page |
<h1>You are already logged in</h1> |
.'<h1>'.&mt('You are already logged in').'</h1>' |
<p>Please either <a href="/adm/roles">continue the current session</a> or |
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].', |
<a href="/adm/logout">logout</a>.</p> |
'<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>' |
<p> |
.'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>' |
<a href="/adm/loginproblems.html">Problems?</a></p> |
.$end_page |
$end_page |
); |
ENDFAILED |
|
return OK; |
return OK; |
} |
} |
|
|
Line 264 ENDTROUBLE
|
Line 266 ENDTROUBLE
|
my $showcoursecat = |
my $showcoursecat = |
&Apache::loncommon::designparm('login.coursecatalog',$domain); |
&Apache::loncommon::designparm('login.coursecatalog',$domain); |
my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain); |
my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain); |
|
my $shownewuserlink = |
|
&Apache::loncommon::designparm('login.newuser',$domain); |
my $now=time; |
my $now=time; |
my $js = (<<ENDSCRIPT); |
my $js = (<<ENDSCRIPT); |
|
|
Line 350 my %lt=&Apache::lonlocal::texthash(
|
Line 354 my %lt=&Apache::lonlocal::texthash(
|
'servadm' => 'Server Administration', |
'servadm' => 'Server Administration', |
'helpdesk' => 'Contact Helpdesk', |
'helpdesk' => 'Contact Helpdesk', |
'forgotpw' => 'Forgot password?', |
'forgotpw' => 'Forgot password?', |
|
'newuser' => 'New User?', |
'options_headline' => 'Select Accessibility Options', |
'options_headline' => 'Select Accessibility Options', |
'sprs_img' => 'Suppress rendering of images', |
'sprs_img' => 'Suppress rendering of images', |
'sprs_applet' => 'Suppress Java applets', |
'sprs_applet' => 'Suppress Java applets', |
Line 397 ENDSERVERFORM
|
Line 402 ENDSERVERFORM
|
if (($showcoursecat eq '') || ($showcoursecat)) { |
if (($showcoursecat eq '') || ($showcoursecat)) { |
$coursecatalog = &coursecatalog_link($lt{'catalog'}); |
$coursecatalog = &coursecatalog_link($lt{'catalog'}); |
} |
} |
|
my $newuserlink; |
|
if ($shownewuserlink) { |
|
$newuserlink = &newuser_link($lt{'newuser'}); |
|
} |
if ($fullgraph) { $r->print(<<ENDTOP); |
if ($fullgraph) { $r->print(<<ENDTOP); |
<!-- The LON-CAPA Header --> |
<!-- The LON-CAPA Header --> |
<tr> |
<tr> |
Line 524 ENDNOOPT
|
Line 533 ENDNOOPT
|
<td bgcolor="$mainbg" valign="bottom" align="left" colspan="2"> |
<td bgcolor="$mainbg" valign="bottom" align="left" colspan="2"> |
$loginhelp |
$loginhelp |
$forgotpw |
$forgotpw |
|
$newuserlink |
|
<br /> |
</td> |
</td> |
</tr> |
</tr> |
</table> |
</table> |
Line 668 sub forgotpwdisplay {
|
Line 679 sub forgotpwdisplay {
|
my (%lt) = @_; |
my (%lt) = @_; |
my $prompt_for_resetpw = 1; |
my $prompt_for_resetpw = 1; |
if ($prompt_for_resetpw) { |
if ($prompt_for_resetpw) { |
return '<br /> <a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a></b><br /><br />'; |
return '<br /> <a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a></b><br />'; |
} |
} |
return; |
return; |
} |
} |
Line 692 sub coursecatalog_link {
|
Line 703 sub coursecatalog_link {
|
END |
END |
} |
} |
|
|
|
sub newuser_link { |
|
my ($linkname) = @_; |
|
return ' <a href="/adm/createaccount"><b>'.$linkname.'</b></a><br />'; |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |