version 1.54, 2021/11/03 01:04:02
|
version 1.60, 2022/05/21 06:28:35
|
Line 703 sub handler {
|
Line 703 sub handler {
|
} |
} |
} |
} |
} else { |
} else { |
my $handle = &Apache::lonnet::check_for_valid_session($r); |
my ($handle,$expirepub); |
|
$handle = &Apache::lonnet::check_for_valid_session($r); |
|
|
|
# For "public user" - remove any existing "public" cookie so actual user is logged in. |
|
if ($handle) { |
|
if ($handle=~/^publicuser\_/) { |
|
my $lonidsdir=$r->dir_config('lonIDsDir'); |
|
if ($lonidsdir ne '') { |
|
unlink("$lonidsdir/$handle.id"); |
|
} |
|
undef($handle); |
|
$expirepub = 1; |
|
} |
|
} |
if ($handle) { |
if ($handle) { |
&Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), |
&Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), |
$handle); |
$handle); |
my $checklaunch; |
my $checklaunch; |
if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { |
if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { |
if ($env{'request.linkprot'} ne '') { |
unless ($env{'request.linkprot'} eq $data{'linkprot'}) { |
unless ($env{'request.linkprot'} eq $data{'linkprot'}) { |
$checklaunch = 1; |
$checklaunch = 1; |
|
} |
|
} |
|
if ($env{'request.linkkey'} ne '') { |
|
unless ($env{'request.linkkey'} eq $data{'linkkey'}) { |
|
$checklaunch = 1; |
|
} |
|
} |
} |
if ($env{'request.deeplink.login'}) { |
unless ($env{'request.linkkey'} eq $data{'linkkey'}) { |
unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) { |
$checklaunch = 1; |
$checklaunch = 1; |
} |
} |
unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) { |
|
$checklaunch = 1; |
} |
} |
} |
} |
if ($data{'linkprot'} ne '') { |
if ($data{'linkprot'} ne '') { |
|
if (($env{'user.name'} ne $data{'username'}) || |
|
($env{'user.domain'} ne $data{'domain'})) { |
|
my %linkprot_env; |
|
foreach my $item ('linkprot','deeplink.login') { |
|
if ($data{$item}) { |
|
$linkprot_env{'request.'.$item} = $data{$item}; |
|
} |
|
} |
|
&logout($r,$ip,$handle,\%data,\%linkprot_env); |
|
return OK; |
|
} |
&Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}}); |
&Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}}); |
if ($env{'request.linkkey'}) { |
if ($env{'request.linkkey'}) { |
&Apache::lonnet::delenv('request.linkkey'); |
&Apache::lonnet::delenv('request.linkkey'); |
Line 945 sub handler {
|
Line 963 sub handler {
|
} |
} |
} |
} |
&Apache::lonauth::success($r,$data{'username'},$data{'domain'}, |
&Apache::lonauth::success($r,$data{'username'},$data{'domain'}, |
$home,$desturl,$extra_env,\%form,$skipcritical); |
$home,$desturl,$extra_env,\%form,$skipcritical,'', |
|
$expirepub); |
} |
} |
return OK; |
return OK; |
} |
} |
Line 980 sub handler {
|
Line 999 sub handler {
|
} elsif ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { |
} elsif ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { |
$next_url=$data{'origurl'}; |
$next_url=$data{'origurl'}; |
} else { |
} else { |
$next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; |
if ($data{'lti.login'}) { |
if ($data{'origurl'} ne '') { |
$next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; |
$next_url .= '&orgurl='.&escape($data{'origurl'}); |
if ($data{'origurl'} ne '') { |
|
$next_url .= '&orgurl='.&escape($data{'origurl'}); |
|
} |
|
} else { |
|
$next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; |
|
if ($data{'origurl'} ne '') { |
|
$next_url .= '&orgurl='.&escape($data{'origurl'}); |
|
} |
} |
} |
} |
} |
if ($data{'lti.login'}) { |
if ($data{'lti.login'}) { |
if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) || |
if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) || |
($data{'origurl'} =~ m{^/res/.+\.sequence$})) { |
($data{'origurl'} =~ m{^/res/.+\.sequence$})) { |
$next_url .= '&navmap=1'; |
if ($reuse_session) { |
|
$next_url .= '&navmap=1'; |
|
} else { |
|
$next_url .= '&navmap=1'; |
|
} |
} |
} |
} |
} |
if ($reuse_session) { |
if ($reuse_session) { |
$r->internal_redirect($next_url); |
$r->internal_redirect($next_url); |
} elsif ($data{'deeplink.login'}) { |
} else { |
if (ref($extra_env) eq 'HASH') { |
if ($data{'deeplink.login'}) { |
$extra_env->{'request.deeplink.login'} = $data{'deeplink.login'}; |
if (ref($extra_env) eq 'HASH') { |
} else { |
$extra_env->{'request.deeplink.login'} = $data{'deeplink.login'}; |
$extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; |
} else { |
} |
$extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; |
if ($data{'linkprot'}) { |
} |
$extra_env->{'request.linkprot'} = $data{'linkprot'}; |
if ($data{'linkprot'}) { |
} elsif ($data{'linkkey'} ne '') { |
$extra_env->{'request.linkprot'} = $data{'linkprot'}; |
$extra_env->{'request.linkkey'} = $data{'linkkey'}; |
} elsif ($data{'linkkey'} ne '') { |
|
$extra_env->{'request.linkkey'} = $data{'linkkey'}; |
|
} |
} |
} |
&Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, |
&Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, |
$next_url,$extra_env,\%form,'',$cid); |
$next_url,$extra_env,\%form,'',$cid); |