version 1.50, 2021/05/04 18:47:37
|
version 1.52, 2021/08/16 15:25:44
|
Line 710 sub handler {
|
Line 710 sub handler {
|
&Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), |
&Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), |
$handle); |
$handle); |
if ($data{'linkprot'} ne '') { |
if ($data{'linkprot'} ne '') { |
|
&Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}}); |
my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2); |
my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2); |
if ($deeplink ne '') { |
|
&Apache::lonnet::appenv({'request.deeplink.login' => $deeplink}); |
|
} |
|
if ($env{'user.linkprotector'}) { |
if ($env{'user.linkprotector'}) { |
my @protectors = split(/,/,$env{'user.linkprotector'}); |
my @protectors = split(/,/,$env{'user.linkprotector'}); |
unless (grep(/^\Q$linkprotector\E$/,@protectors)) { |
unless (grep(/^\Q$linkprotector\E$/,@protectors)) { |
Line 734 sub handler {
|
Line 732 sub handler {
|
} else { |
} else { |
&Apache::lonnet::appenv({'user.linkproturi' => $deeplink}); |
&Apache::lonnet::appenv({'user.linkproturi' => $deeplink}); |
} |
} |
} elsif ($data{'deeplink.login'}) { |
} elsif ($data{'linkkey'}) { |
|
&Apache::lonnet::appenv({'request.linkkey' => $data{'linkkey'}}); |
my $deeplink = $data{'deeplink.login'}; |
my $deeplink = $data{'deeplink.login'}; |
if ($data{'linkkey'}) { |
my $linkkey = $data{'linkkey'}; |
my $linkkey = $data{'linkkey'}; |
if ($env{'user.deeplinkkey'}) { |
if ($env{'user.deeplinkkey'}) { |
my @linkkeys = split(/,/,$env{'user.deeplinkkey'}); |
my @linkkeys = split(/,/,$env{'user.deeplinkkey'}); |
unless (grep(/^\Q$linkkey\E$/,@linkkeys)) { |
unless (grep(/^\Q$linkkey\E$/,@linkkeys)) { |
push(@linkkeys,$linkkey); |
push(@linkkeys,$linkkey); |
&Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))}); |
&Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))}); |
|
} |
|
} else { |
|
&Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey}); |
|
} |
} |
|
} else { |
|
&Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey}); |
|
} |
|
if ($deeplink) { |
if ($env{'user.keyedlinkuri'}) { |
if ($env{'user.keyedlinkuri'}) { |
my @keyeduris = split(/,/,$env{'user.keyedlinkuri'}); |
my @keyeduris = split(/,/,$env{'user.keyedlinkuri'}); |
unless (grep(/^\Q$deeplink\E$/,@keyeduris)) { |
unless (grep(/^\Q$deeplink\E$/,@keyeduris)) { |
Line 757 sub handler {
|
Line 756 sub handler {
|
&Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink}); |
&Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink}); |
} |
} |
} |
} |
|
} |
|
if ($data{'deeplink.login'}) { |
&Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}}); |
&Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}}); |
} |
} |
if ($data{'lti.login'}) { |
if ($data{'lti.login'}) { |
Line 844 sub handler {
|
Line 845 sub handler {
|
} |
} |
} else { |
} else { |
my $desturl = '/adm/roles'; |
my $desturl = '/adm/roles'; |
if ($data{'lti.login'}) { |
if ($data{'lti.login'}) { |
if ($data{'lti.selfenrollrole'}) { |
if ($data{'lti.selfenrollrole'}) { |
$desturl .= '?selectrole=1&'. |
$desturl .= '?selectrole=1&'. |
&escape($data{'lti.selfenrollrole'}).'=1'; |
&escape($data{'lti.selfenrollrole'}).'=1'; |
Line 868 sub handler {
|
Line 869 sub handler {
|
if (ref($extra_env) eq 'HASH') { |
if (ref($extra_env) eq 'HASH') { |
$extra_env->{'user.linkprotector'} = $linkprotector; |
$extra_env->{'user.linkprotector'} = $linkprotector; |
$extra_env->{'user.linkproturi'} = $linkuri; |
$extra_env->{'user.linkproturi'} = $linkuri; |
|
$extra_env->{'request.linkprot'} = $data{'linkprot'}; |
} else { |
} else { |
$extra_env = {'user.linkprotector' => $linkprotector, |
$extra_env = {'user.linkprotector' => $linkprotector, |
'user.linkproturi' => $linkuri,}; |
'user.linkproturi' => $linkuri, |
} |
'request.linkprot' => $data{'linkprot'}}; |
} |
|
} elsif ($data{'deeplink.login'}) { |
|
if ($data{'linkkey'}) { |
|
if (ref($extra_env) eq 'HASH') { |
|
$extra_env->{'user.deeplinkkey'} = $data{'linkkey'}; |
|
$extra_env->{'user.keyedlinkuri'} = $data{'deeplink.login'}, |
|
} else { |
|
$extra_env = {'user.deeplinkkey' => $data{'linkkey'}, |
|
'user.keyedlinkuri' => $data{'deeplink.login'}}; |
|
} |
} |
} |
} |
|
} elsif ($data{'linkkey'}) { |
if (ref($extra_env) eq 'HASH') { |
if (ref($extra_env) eq 'HASH') { |
|
$extra_env->{'user.deeplinkkey'} = $data{'linkkey'}; |
|
$extra_env->{'user.keyedlinkuri'} = $data{'deeplink.login'}; |
|
$extra_env->{'request.linkkey'} = $data{'linkkey'}; |
|
} else { |
|
$extra_env = {'user.deeplinkkey' => $data{'linkkey'}, |
|
'user.keyedlinkuri' => $data{'deeplink.login'}, |
|
'request.linkkey' => $data{'linkkey'}}; |
|
} |
|
} |
|
if ($data{'deeplink.login'}) { |
|
if (ref($extra_env) eq 'HASH') { |
$extra_env->{'request.deeplink.login' => $data{'deeplink.login'}}; |
$extra_env->{'request.deeplink.login' => $data{'deeplink.login'}}; |
} else { |
} else { |
$extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; |
$extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; |
Line 931 sub handler {
|
Line 936 sub handler {
|
($env{'request.role'} eq $data{'role'}) && ($data{'origurl'} ne '')) { |
($env{'request.role'} eq $data{'role'}) && ($data{'origurl'} ne '')) { |
$next_url = $data{'origurl'}; |
$next_url = $data{'origurl'}; |
$reuse_session = 1; |
$reuse_session = 1; |
|
} elsif ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { |
|
$next_url=$data{'origurl'}; |
} else { |
} else { |
$next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; |
$next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; |
if ($data{'origurl'} ne '') { |
if ($data{'origurl'} ne '') { |
Line 945 sub handler {
|
Line 952 sub handler {
|
} |
} |
if ($reuse_session) { |
if ($reuse_session) { |
$r->internal_redirect($next_url); |
$r->internal_redirect($next_url); |
} else { |
} elsif ($data{'deeplink.login'}) { |
|
if (ref($extra_env) eq 'HASH') { |
|
$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'}; |
|
} 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); |
} |
} |