--- loncom/interface/lontiny.pm 2023/01/21 21:16:25 1.8.2.4 +++ loncom/interface/lontiny.pm 2022/07/02 17:23:02 1.14 @@ -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.8.2.4 2023/01/21 21:16:25 raeburn Exp $ +# $Id: lontiny.pm,v 1.14 2022/07/02 17:23:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -118,14 +118,14 @@ sub handler { $realuri .= '?symb='.$symb; } } - my ($update,$reinitresult); + my $update; # Check if course needs to be re-initialized if ($newlauncher) { $update = 1; } else { my $loncaparev = $r->dir_config('lonVersion'); - ($reinitresult,my @reinit) = &Apache::loncommon::needs_coursereinit($loncaparev); - if (($reinitresult eq 'main') || ($reinitresult eq 'both')) { + my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev); + if ($result eq 'update') { $update = 1; } elsif (!-e $env{'request.course.fn'}.'.db') { $update = 1; @@ -155,16 +155,6 @@ sub handler { return HTTP_NOT_ACCEPTABLE; } } - if (($reinitresult eq 'both') || ($reinitresult eq 'supp')) { - my $possdel; - if ($reinitresult eq 'supp') { - $possdel = 1; - } - my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel); - unless ($refs_updated) { - &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel); - } - } my $host = $r->headers_in->get('Host'); if (!$host) { $r->internal_redirect($realuri); @@ -220,13 +210,39 @@ sub handler { } } my @allposs = keys(%active); + 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,\%active,'','',\%future,\%expired,$linkprot,$linkprotuser,$linkprotexit,$ltoken); } elsif (@allposs == 1) { my $newrole = "$allposs[0]./$cdom/$cnum"; $newrole = "$allposs[0]./$cdom/$cnum"; if ($possroles{$allposs[0]} ne '') { - $newrole .= "/$possroles{$allposs[0]}"; + $newrole .= "/$possroles{$allposs[0]}"; } my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'. '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"'); @@ -234,7 +250,7 @@ sub handler { $destination .= '&ttoken='.$env{'form.ttoken'}; } &do_redirect($r,$destination,$linkprot); - } elsif (@allposs > 1) { + } elsif (keys(%possroles) > 1) { if (grep(/^(cc|co)$/,@allposs)) { my $newrole; if (exists($possroles{'cc'})) { @@ -254,7 +270,7 @@ sub handler { if (grep(/^cr\//,@allposs)) { $hascustom = 1; } - &show_roles($r,\%crsenv,\%active,$hassection,$hascustom); + &show_roles($r,\%crsenv,\%possroles,$hassection,$hascustom); } } return OK; @@ -273,7 +289,7 @@ sub handler { sub launch_check { my ($linkuri,$symb) = @_; - my ($linkprotector,$linkproturi,$linkprotexit,$linkkey,$newlauncher); + my ($linkprotector,$linkproturi,$linkkey,$newlauncher); if ($env{'form.ttoken'}) { my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'}); &Apache::lonnet::tmpdel($env{'form.ttoken'}); @@ -311,9 +327,6 @@ sub launch_check { } else { &Apache::lonnet::appenv({'user.linkproturi' => $linkproturi}); } - if ($link_info{'linkprotexit'}) { - $linkprotexit = $link_info{'linkprotexit'}; - } } elsif ($link_info{'linkkey'} ne '') { $linkkey = $link_info{'linkkey'}; my $keyedlinkuri = $linkuri; @@ -353,7 +366,7 @@ sub launch_check { } if ($deeplink ne '') { my $disallow; - my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink); + 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)$/) { @@ -381,12 +394,6 @@ sub launch_check { if ($env{'request.deeplink.target'} ne '') { &Apache::lonnet::delenv('request.deeplink.target'); } - if ($env{'request.linkprot'} ne '') { - &Apache::lonnet::delenv('request.linkprot'); - } - if ($env{'request.linkprotexit'} ne '') { - &Apache::lonnet::delenv('request.linkprotexit'); - } } } else { unless ($currdeeplinklogin eq $linkuri) { @@ -396,11 +403,6 @@ sub launch_check { } elsif ($env{'request.linkprot'}) { &Apache::lonnet::delenv('request.linkprot'); } - if ($linkprotexit) { - &Apache::lonnet::appenv({'request.linkprotexit' => $linkprotexit}); - } elsif ($env{'request.linkprotexit'}) { - &Apache::lonnet::delenv('request.linkprotexit'); - } if ($linkkey ne '') { &Apache::lonnet::appenv({'request.linkkey' => $linkkey}); } elsif ($env{'request.linkkey'} ne '') { @@ -422,11 +424,6 @@ sub launch_check { } elsif ($env{'request.linkprot'}) { &Apache::lonnet::delenv('request.linkprot'); } - if ($linkprotexit) { - &Apache::lonnet::appenv({'request.linkprotexit' => $linkprotexit}); - } elsif ($env{'request.linkprotexit'}) { - &Apache::lonnet::delenv('request.linkprotexit'); - } if ($linkkey ne '') { &Apache::lonnet::appenv({'request.linkkey' => $linkkey}); } else { @@ -443,6 +440,9 @@ sub launch_check { sub do_redirect { my ($r,$destination,$linkprot) = @_; my $windowname = 'loncapaclient'; + if ($env{'request.lti.login'}) { + $windowname .= 'lti'; + } my $header = ''; my $args = {'bread_crumbs' => [{'href' => '','text' => 'Role initialization'},],}; if ($linkprot) { @@ -643,13 +643,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;