version 1.41, 2018/12/07 23:33:55
|
version 1.42, 2018/12/26 20:10:21
|
Line 672 sub handler {
|
Line 672 sub handler {
|
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); |
|
if ($data{'linkprot'} ne '') { |
|
my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2); |
|
if ($env{'user.linkprotector'}) { |
|
my @protectors = split(/,/,$env{'user.linkprotector'}); |
|
unless (grep(/^\Q$linkprotector\E$/,@protectors)) { |
|
push(@protectors,$linkprotector); |
|
@protectors = sort { $a <=> $b } @protectors; |
|
&Apache::lonnet::appenv({'user.linkprotector' => join(',',@protectors)}); |
|
} |
|
} else { |
|
&Apache::lonnet::appenv({'user.linkprotector' => $linkprotector }); |
|
} |
|
if ($env{'user.linkproturi'}) { |
|
my @proturis = split(/,/,$env{'user.linkproturi'}); |
|
unless(grep(/^\Q$deeplink\E$/,@proturis)) { |
|
push(@proturis,$deeplink); |
|
@proturis = sort @proturis; |
|
&Apache::lonnet::appenv({'user.linkproturi' => join(',',@proturis)}); |
|
} |
|
} else { |
|
&Apache::lonnet::appenv({'user.linkproturi' => $deeplink}); |
|
} |
|
} |
if ($data{'lti.login'}) { |
if ($data{'lti.login'}) { |
my $needslogout; |
my $needslogout; |
if ($env{'request.lti.login'}) { |
if ($env{'request.lti.login'}) { |
Line 765 sub handler {
|
Line 788 sub handler {
|
$desturl .= (($desturl =~/\?/)?'&':'?').'navmap=1'; |
$desturl .= (($desturl =~/\?/)?'&':'?').'navmap=1'; |
} |
} |
} |
} |
|
if ($data{'linkprot'}) { |
|
my ($linkprotector,$linkuri) = split(/:/,$data{'linkprot'},2); |
|
if ($linkprotector) { |
|
if (ref($extra_env) eq 'HASH') { |
|
$extra_env->{'user.linkprotector'} = $linkprotector; |
|
$extra_env->{'user.linkproturi'} = $linkuri; |
|
} else { |
|
$extra_env = {'user.linkprotector' => $linkprotector, |
|
'user.linkproturi' => $linkuri,}; |
|
} |
|
} |
|
} |
} |
} |
my $skipcritical; |
my $skipcritical; |
if (($data{'lti.login'}) && ($data{'lti.reqcrs'}) && |
if (($data{'lti.login'}) && ($data{'lti.reqcrs'}) && |