--- loncom/interface/lontiny.pm	2021/11/03 01:04:03	1.8
+++ 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.8 2021/11/03 01:04:03 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
 #
@@ -172,32 +172,6 @@ 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 .= '&ltitarget=iframe';
-                                                }
-                                                &do_redirect($r,$destination);
-                                                return OK;
-                                            }
-                                        }
-                                    }
-                                }
                                 if (@allposs == 0) {
                                     &show_roles($r,\%crsenv,\%possroles);
                                 } elsif (@allposs == 1) {
@@ -256,6 +230,18 @@ sub launch_check {
         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'}) {
@@ -317,7 +303,7 @@ sub launch_check {
     }
     if ($deeplink ne '') {
         my $disallow;
-        my ($state,$others,$listed,$scope,$protect) = 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)$/) {
@@ -342,6 +328,9 @@ sub launch_check {
         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) {
@@ -360,6 +349,11 @@ sub launch_check {
                 }
             }
             &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) {
@@ -373,6 +367,9 @@ sub launch_check {
             &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;
 }
@@ -380,9 +377,6 @@ sub launch_check {
 sub do_redirect {
     my ($r,$destination) = @_;
     my $windowname = 'loncapaclient';
-    if ($env{'request.lti.login'}) {
-        $windowname .= 'lti';
-    }
     my $header = '<meta HTTP-EQUIV="Refresh" CONTENT="0; url='.$destination.'" />';
     my $args = {'bread_crumbs' => [{'href' => '','text' => 'Role initialization'},],};
     &Apache::loncommon::content_type($r,'text/html');
@@ -527,15 +521,13 @@ ENDJS
 sub generic_error {
     my ($r) = @_;
     my $continuelink;
-    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='<a href="/adm/roles">'.$linktext.'</a>';
+    my $linktext;
+    if ($env{'user.adv'}) {
+        $linktext = &mt('Continue to your roles page');
+    } else {
+        $linktext = &mt('Continue to your courses page');
     }
+    $continuelink='<a href="/adm/roles">'.$linktext.'</a>';
     my $msg = &mt('The page you requested does not exist.');
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;