version 1.130, 2009/12/01 14:23:49
|
version 1.131, 2009/12/04 13:50:48
|
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 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); |
my $loginhelp = &loginhelpdisplay(%lt); |
my $loginhelp = &loginhelpdisplay(%lt); |
|
|
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; |
} |
} |