version 1.158.2.6.2.1, 2017/10/14 20:59:35
|
version 1.158.2.6.2.3, 2019/02/06 17:32:59
|
Line 51 sub handler {
|
Line 51 sub handler {
|
if (!defined($env{'form.firsturl'})) { |
if (!defined($env{'form.firsturl'})) { |
&Apache::lonacc::get_posted_cgi($r,['firsturl']); |
&Apache::lonacc::get_posted_cgi($r,['firsturl']); |
} |
} |
|
if (!defined($env{'form.firsturl'})) { |
|
if ($ENV{'REDIRECT_URL'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) { |
|
$env{'form.firsturl'} = $ENV{'REDIRECT_URL'}; |
|
} |
|
} |
|
|
# -- 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 117 sub handler {
|
Line 122 sub handler {
|
$env{'form.firsturl'} =~ s/(`)/'/g; |
$env{'form.firsturl'} =~ s/(`)/'/g; |
|
|
# -------------------------------- Prevent users from attempting to login twice |
# -------------------------------- Prevent users from attempting to login twice |
my $handle = &Apache::lonnet::check_for_valid_session($r); |
|
if ($handle ne '') { |
if ($handle ne '') { |
my $lonidsdir=$r->dir_config('lonIDsDir'); |
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); |
if ($handle=~/^publicuser\_/) { |
my $start_page = |
# For "public user" - remove it, we apparently really want to login |
&Apache::loncommon::start_page('Already logged in'); |
unlink($r->dir_config('lonIDsDir')."/$handle.id"); |
my $end_page = |
} else { |
&Apache::loncommon::end_page(); |
# Indeed, a valid token is found |
my $dest = '/adm/roles'; |
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); |
if ($env{'form.firsturl'} ne '') { |
my $start_page = |
$dest = $env{'form.firsturl'}; |
&Apache::loncommon::start_page('Already logged in'); |
|
my $end_page = |
|
&Apache::loncommon::end_page(); |
|
my $dest = '/adm/roles'; |
|
if ($env{'form.firsturl'} ne '') { |
|
$dest = $env{'form.firsturl'}; |
|
} |
|
$r->print( |
|
$start_page |
|
.'<p class="LC_warning">'.&mt('You are already logged in!').'</p>' |
|
.'<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>' |
|
.$end_page |
|
); |
|
return OK; |
|
} |
} |
|
$r->print( |
|
$start_page |
|
.'<p class="LC_warning">'.&mt('You are already logged in!').'</p>' |
|
.'<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>' |
|
.$end_page |
|
); |
|
return OK; |
} |
} |
|
|
# ---------------------------------------------------- No valid token, continue |
# ---------------------------------------------------- No valid token, continue |