version 1.134, 2010/03/03 17:05:49
|
version 1.136, 2010/03/31 23:11:48
|
Line 72 sub handler {
|
Line 72 sub handler {
|
|
|
# -------------------------------- Prevent users from attempting to login twice |
# -------------------------------- Prevent users from attempting to login twice |
my $handle = &Apache::lonnet::check_for_valid_session($r); |
my $handle = &Apache::lonnet::check_for_valid_session($r); |
if ($handle=~/^publicuser\_/) { |
if ($handle ne '') { |
|
my $lonidsdir=$r->dir_config('lonIDsDir'); |
|
if ($handle=~/^publicuser\_/) { |
# For "public user" - remove it, we apparently really want to login |
# For "public user" - remove it, we apparently really want to login |
unlink($r->dir_config('lonIDsDir')."/$handle.id"); |
unlink($r->dir_config('lonIDsDir')."/$handle.id"); |
} elsif ($handle ne '') { |
} else { |
# Indeed, a valid token is found |
# Indeed, a valid token is found |
my $start_page = |
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); |
&Apache::loncommon::start_page('Already logged in'); |
my $start_page = |
my $end_page = |
&Apache::loncommon::start_page('Already logged in'); |
&Apache::loncommon::end_page(); |
my $end_page = |
my $dest = '/adm/roles'; |
&Apache::loncommon::end_page(); |
if ($env{'form.firsturl'} ne '') { |
my $dest = '/adm/roles'; |
$dest = $env{'form.firsturl'}; |
if ($env{'form.firsturl'} ne '') { |
} |
$dest = $env{'form.firsturl'}; |
|
} |
my $dom = &Apache::lonnet::default_login_domain(); |
$r->print( |
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( |
|
$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="'.$loginhelp_page.'">'.&mt('Login problems?').'</a></p>' |
.$end_page |
.$dom.' '.$end_page |
|
); |
); |
return OK; |
return OK; |
|
} |
} |
} |
|
|
# ---------------------------------------------------- No valid token, continue |
# ---------------------------------------------------- No valid token, continue |
Line 361 my %lt=&Apache::lonlocal::texthash(
|
Line 356 my %lt=&Apache::lonlocal::texthash(
|
|
|
my $forgotpw = &forgotpwdisplay(%lt); |
my $forgotpw = &forgotpwdisplay(%lt); |
$forgotpw .= '<br />' if $forgotpw; |
$forgotpw .= '<br />' if $forgotpw; |
my $loginhelp = &loginhelpdisplay(%lt); |
my $loginhelp = &loginhelpdisplay($authdomain,%lt); |
$loginhelp .= '<br />' if $loginhelp; |
$loginhelp .= '<br />' if $loginhelp; |
|
|
# ---------------------------------------------------- Serve out DES JavaScript |
# ---------------------------------------------------- Serve out DES JavaScript |
Line 576 sub redirect_page {
|
Line 571 sub redirect_page {
|
if ($env{'form.firsturl'} ne '') { |
if ($env{'form.firsturl'} ne '') { |
$url .='?firsturl='.$env{'form.firsturl'}; |
$url .='?firsturl='.$env{'form.firsturl'}; |
} |
} |
my $start_page = &Apache::loncommon::start_page('Switching Server',undef, |
my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef, |
{'redirect' => [0,$url],}); |
{'redirect' => [0,$url],}); |
my $end_page = &Apache::loncommon::end_page(); |
my $end_page = &Apache::loncommon::end_page(); |
return $start_page.$end_page; |
return $start_page.$end_page; |
Line 626 sub forgotpwdisplay {
|
Line 621 sub forgotpwdisplay {
|
} |
} |
|
|
sub loginhelpdisplay { |
sub loginhelpdisplay { |
my (%lt) = @_; |
my ($authdomain,%lt) = @_; |
my $login_help = 1; |
my $login_help = 1; |
if ($login_help) { |
if ($login_help) { |
my $dom = &Apache::lonnet::default_login_domain(); |
my $dom = $authdomain; |
my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); |
if ($dom eq '') { |
my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'}; |
$dom = &Apache::lonnet::default_login_domain(); |
if ($loginhelp_url ne '') { |
} |
return '<a href="'.$loginhelp_url.'">'.$lt{'help'}.'</a>'; |
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 { |
} else { |
return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>'; |
return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>'; |
} |
} |
} |
} |
return; |
return; |
} |
} |