--- loncom/interface/lontiny.pm 2019/02/07 14:56:05 1.6.2.1 +++ loncom/interface/lontiny.pm 2022/05/27 18:10:44 1.8.2.2 @@ -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.8.2.2 2022/05/27 18:10:44 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -67,7 +67,10 @@ sub handler { if ($cnum =~ /^$match_courseid$/) { my $chome = &Apache::lonnet::homeserver($cnum,$cdom); if ($chome ne 'no_host') { + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['ttoken']); if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { + # Check for ttoken + my $newlauncher = &launch_check($r->uri,$symb); my ($map,$resid,$url) = &Apache::lonnet::decode_symb($symb); if (&Apache::lonnet::is_on_map($url)) { my $realuri; @@ -96,24 +99,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; + } } } } @@ -175,6 +182,9 @@ sub handler { } my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'. '&destinationurl='.&HTML::Entities::encode($r->uri); + if ($env{'form.ttoken'}) { + $destination .= '&ttoken='.$env{'form.ttoken'}; + } &do_redirect($r,$destination); } elsif (keys(%possroles) > 1) { if (grep(/^(cc|co)$/,@allposs)) { @@ -187,6 +197,9 @@ sub handler { $newrole .= "./$cdom/$cnum"; my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'. '&destinationurl='.&HTML::Entities::encode($r->uri); + if ($env{'form.ttoken'}) { + $destination .= '&ttoken='.$env{'form.ttoken'}; + } &do_redirect($r,$destination); } else { my $hascustom; @@ -210,6 +223,157 @@ sub handler { } } +sub launch_check { + my ($linkuri,$symb) = @_; + my ($linkprotector,$linkproturi,$linkkey,$newlauncher); + if ($env{'form.ttoken'}) { + my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'}); + &Apache::lonnet::tmpdel($env{'form.ttoken'}); + delete($env{'form.ttoken'}); + if ($link_info{'ltoken'}) { + unless (($link_info{'linkprot'}) || ($link_info{'linkkey'} ne '')) { + my %ltoken_info = &Apache::lonnet::tmpget($link_info{'ltoken'}); + if ($ltoken_info{'linkprot'}) { + $link_info{'linkprot'} = $ltoken_info{'linkprot'}; + } elsif ($ltoken_info{'linkkey'} ne '') { + $link_info{'linkkey'} = $ltoken_info{'linkkey'}; + } + } + &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 ($link_info{'linkkey'} ne '') { + $linkkey = $link_info{'linkkey'}; + my $keyedlinkuri = $linkuri; + if ($env{'user.deeplinkkey'} ne '') { + 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}); + } + } + if ($link_info{'checklaunch'}) { + $newlauncher = 1; + } + } + my $currdeeplinklogin = $env{'request.deeplink.login'}; + 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,$display,$target) = split(/,/,$deeplink); + if (($protect ne 'none') && ($protect ne '')) { + my ($acctype,$item) = split(/:/,$protect); + if ($acctype =~ /lti(c|d)$/) { + my $ltitype = $1; + if ($linkprotector) { + unless ($linkprotector.':'.$linkproturi eq $item.$ltitype.':'.$linkuri) { + $disallow = 1; + } + } else { + $disallow = 1; + } + } elsif ($acctype eq 'key') { + if ($linkkey ne '') { + unless ($linkkey eq $item) { + $disallow = 1; + } + } else { + $disallow = 1; + } + } + } + if ($disallow) { + if ($currdeeplinklogin eq $linkuri) { + &Apache::lonnet::delenv('request.deeplink.login'); + if ($env{'request.deeplink.target'} ne '') { + &Apache::lonnet::delenv('request.deeplink.target'); + } + } + } else { + unless ($currdeeplinklogin eq $linkuri) { + if (($linkprotector) || ($linkkey ne '')) { + if ($linkprotector) { + &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi}); + } elsif ($env{'request.linkprot'}) { + &Apache::lonnet::delenv({'request.linkprot'}); + } + if ($linkkey ne '') { + &Apache::lonnet::appenv({'request.linkkey' => $linkkey}); + } elsif ($env{'request.linkkey'} ne '') { + &Apache::lonnet::delenv({'request.linkkey'}); + } + $newlauncher = 1; + } + } + &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri}); + if ($target ne '') { + &Apache::lonnet::appenv({'request.deeplink.target' => $target}); + } elsif ($env{'request.deeplink.target'} ne '') { + &Apache::lonnet::delenv('request.deeplink.target'); + } + } + } else { + if ($linkprotector) { + &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi}); + } elsif ($env{'request.linkprot'}) { + &Apache::lonnet::delenv({'request.linkprot'}); + } + if ($linkkey ne '') { + &Apache::lonnet::appenv({'request.linkkey' => $linkkey}); + } else { + &Apache::lonnet::delenv({'request.linkkey'}); + } + &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri}); + if ($env{'request.deeplink.target'} ne '') { + &Apache::lonnet::delenv('request.deeplink.target'); + } + } + return $newlauncher; +} + sub do_redirect { my ($r,$destination) = @_; my $windowname = 'loncapaclient'; @@ -255,12 +419,15 @@ sub show_roles { $preamble = &mt('You have the following active roles in this course:'); } $datatable = '
'. - ''. - ''. - ''. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - ''.&mt('User role').''; + ''."\n". + ''."\n". + ''."\n"; + if ($env{'form.ttoken'}) { + $datatable .= ''."\n"; + } + $datatable .= &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''.&mt('User role').''; if ($hassection) { $datatable .= ''.&mt('Section').''; }