--- loncom/interface/lontiny.pm 2019/02/07 14:56:05 1.6.2.1
+++ loncom/interface/lontiny.pm 2021/08/10 15:28:14 1.7
@@ -2,7 +2,7 @@
# Extract domain, courseID, and symb from a shortened URL,
# and switch role to a role in designated course.
#
-# $Id: lontiny.pm,v 1.6.2.1 2019/02/07 14:56:05 raeburn Exp $
+# $Id: lontiny.pm,v 1.7 2021/08/10 15:28:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -67,6 +67,8 @@ sub handler {
if ($cnum =~ /^$match_courseid$/) {
my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
if ($chome ne 'no_host') {
+ # Check for ltoken or linkkey
+ my $newlauncher = &launch_check($r->uri,$symb,$cnum,$cdom);
if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
my ($map,$resid,$url) = &Apache::lonnet::decode_symb($symb);
if (&Apache::lonnet::is_on_map($url)) {
@@ -96,24 +98,28 @@ sub handler {
}
my $update;
# Check if course needs to be re-initialized
- my $loncaparev = $r->dir_config('lonVersion');
- my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
- if ($result eq 'update') {
+ if ($newlauncher) {
$update = 1;
- } elsif (!-e $env{'request.course.fn'}.'.db') {
- $update = 1;
- } elsif (!$env{'request.role.adv'}) {
- my $navmap = Apache::lonnavmaps::navmap->new();
- if (ref($navmap)) {
- my $res = $navmap->getBySymb($symb);
- if (ref($res)) {
- my ($enc_in_bighash,$enc_in_parm);
- $enc_in_bighash = $res->encrypted();
- if (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i) {
- $enc_in_parm = 1;
- }
- if ($enc_in_bighash ne $enc_in_parm) {
- $update = 1;
+ } else {
+ my $loncaparev = $r->dir_config('lonVersion');
+ my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
+ if ($result eq 'update') {
+ $update = 1;
+ } elsif (!-e $env{'request.course.fn'}.'.db') {
+ $update = 1;
+ } elsif (!$env{'request.role.adv'}) {
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ if (ref($navmap)) {
+ my $res = $navmap->getBySymb($symb);
+ if (ref($res)) {
+ my ($enc_in_bighash,$enc_in_parm);
+ $enc_in_bighash = $res->encrypted();
+ if (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i) {
+ $enc_in_parm = 1;
+ }
+ if ($enc_in_bighash ne $enc_in_parm) {
+ $update = 1;
+ }
}
}
}
@@ -165,6 +171,32 @@ sub handler {
}
}
my @allposs = keys(%possroles);
+ if ($env{'request.lti.login'}) {
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+ if ($env{'request.lti.target'} eq '') {
+ if ($env{'form.ltitarget'} eq 'iframe') {
+ &Apache::lonnet::appenv({'request.lti.target' => 'iframe'});
+ delete($env{'form.ltitarget'});
+ }
+ }
+ if ($env{'form.selectrole'}) {
+ foreach my $role (@allposs) {
+ my $newrole = "$role./$cdom/$cnum";
+ if ($possroles{$allposs[0]} ne '') {
+ $newrole .= "/$possroles{$role}";
+ }
+ if ($env{"form.$newrole"}) {
+ my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'.
+ '&destinationurl='.&HTML::Entities::encode($r->uri);
+ if ($env{'form.ltitarget'} eq 'iframe') {
+ $destination .= '<itarget=iframe';
+ }
+ &do_redirect($r,$destination);
+ return OK;
+ }
+ }
+ }
+ }
if (@allposs == 0) {
&show_roles($r,\%crsenv,\%possroles);
} elsif (@allposs == 1) {
@@ -210,9 +242,124 @@ sub handler {
}
}
+sub launch_check {
+ my ($linkuri,$symb,$cnum,$cdom) = @_;
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['ltoken','linkkey']);
+ my ($linkprotector,$linkproturi,$linkkey,$newlauncher);
+ if ($env{'form.ltoken'}) {
+ my %link_info = &Apache::lonnet::tmpget($env{'form.ltoken'});
+ &Apache::lonnet::tmpdel($env{'form.ltoken'});
+ delete($env{'form.ltoken'});
+ if ($link_info{'linkprot'}) {
+ ($linkprotector,$linkproturi) = split(/:/,$link_info{'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$linkproturi\E$/,@proturis)) {
+ push(@proturis,$linkproturi);
+ @proturis = sort(@proturis);
+ &Apache::lonnet::appenv({'user.linkproturi' => join(',',@proturis)});
+ }
+ } else {
+ &Apache::lonnet::appenv({'user.linkproturi' => $linkproturi});
+ }
+ }
+ } elsif ($env{'form.linkkey'}) {
+ $linkkey = $env{'form.linkkey'};
+ my $keyedlinkuri = $linkuri;
+ if ($env{'user.deeplinkkey'}) {
+ my @linkkeys = split(/,/,$env{'user.deeplinkkey'});
+ unless (grep(/^\Q$linkkey\E$/,@linkkeys)) {
+ push(@linkkeys,$linkkey);
+ &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))});
+ }
+ } else {
+ &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey});
+ }
+ if ($env{'user.keyedlinkuri'}) {
+ my @keyeduris = split(/,/,$env{'user.keyedlinkuri'});
+ unless (grep(/^\Q$keyedlinkuri\E$/,@keyeduris)) {
+ push(@keyeduris,$keyedlinkuri);
+ &Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))});
+ }
+ } else {
+ &Apache::lonnet::appenv({'user.keyedlinkuri' => $keyedlinkuri});
+ }
+ delete($env{'form.linkkey'});
+ }
+ if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
+ my $currdeeplinklogin = $env{'request.deeplink.login'};
+ if ($linkprotector || $linkkey) {
+ my $deeplink;
+ if ($symb =~ /\.(page|sequence)$/) {
+ my $mapname = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($symb))[2]);
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ if (ref($navmap)) {
+ $deeplink = $navmap->get_mapparam(undef,$mapname,'0.deeplink');
+ }
+ } else {
+ $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$symb);
+ }
+ if ($deeplink ne '') {
+ my $disallow;
+ my ($state,$others,$listed,$scope,$protect) = split(/,/,$deeplink);
+ if (($protect ne 'none') && ($protect ne '')) {
+ my ($acctype,$item) = split(/:/,$protect);
+ if ($acctype =~ /lti(c|d)$/) {
+ unless ($linkprotector.':'.$linkproturi eq $item.$1.':'.$linkuri) {
+ $disallow = 1;
+ }
+ } elsif ($acctype eq 'key') {
+ unless ($linkkey eq $item) {
+ $disallow = 1;
+ }
+ }
+ }
+ if ($disallow) {
+ if ($currdeeplinklogin eq $linkuri) {
+ &Apache::lonnet::delenv('request.deeplink.login');
+ }
+ } else {
+ unless ($currdeeplinklogin eq $linkuri) {
+ if ($linkprotector) {
+ &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi});
+ } elsif ($linkkey) {
+ &Apache::lonnet::appenv({'request.linkkey' => $linkkey});
+ }
+ $newlauncher = 1;
+ }
+ &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri});
+ }
+ }
+ } else {
+ &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri});
+ }
+ } else {
+ &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri});
+ if ($linkprotector) {
+ &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi});
+ } elsif ($linkkey) {
+ &Apache::lonnet::appenv({'request.linkkey' => $linkkey});
+ }
+ }
+ return $newlauncher;
+}
+
sub do_redirect {
my ($r,$destination) = @_;
my $windowname = 'loncapaclient';
+ if ($env{'request.lti.login'}) {
+ $windowname .= 'lti';
+ }
my $header = '';
my $args = {'bread_crumbs' => [{'href' => '','text' => 'Role initialization'},],};
&Apache::loncommon::content_type($r,'text/html');
@@ -354,13 +501,15 @@ ENDJS
sub generic_error {
my ($r) = @_;
my $continuelink;
- my $linktext;
- if ($env{'user.adv'}) {
- $linktext = &mt('Continue to your roles page');
- } else {
- $linktext = &mt('Continue to your courses page');
+ unless ($env{'request.lti.login'}) {
+ my $linktext;
+ if ($env{'user.adv'}) {
+ $linktext = &mt('Continue to your roles page');
+ } else {
+ $linktext = &mt('Continue to your courses page');
+ }
+ $continuelink=''.$linktext.'';
}
- $continuelink=''.$linktext.'';
my $msg = &mt('The page you requested does not exist.');
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;