--- loncom/interface/lontiny.pm	2018/01/12 13:33:38	1.1
+++ loncom/interface/lontiny.pm	2018/07/01 00:03:44	1.4
@@ -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.1 2018/01/12 13:33:38 raeburn Exp $
+# $Id: lontiny.pm,v 1.4 2018/07/01 00:03:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,8 +86,34 @@ 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)
+                                &show_roles($r,\%crsenv,\%possroles);
                             } elsif (@allposs == 1) {
                                 my $newrole = "$allposs[0]./$cdom/$cnum";
                                 $newrole = "$allposs[0]./$cdom/$cnum";
@@ -132,13 +158,16 @@ sub handler {
 
 sub do_redirect {
     my ($r,$destination) = @_;
-    my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";');
+    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');
     $r->send_http_header;
     $r->print(&Apache::loncommon::start_page('Valid link',$header,$args).
-              &Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";').
+              &Apache::lonhtmlcommon::scripttag('self.name="'.$windowname.'";').
               '<h1>'.&mt('Welcome').'</h1>'.
               '<p>'.&mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>').'</p><p>'.
               '<a href="'.$destination.'">'.&mt('Continue').'</a></p>'.
@@ -273,13 +302,16 @@ ENDJS
 
 sub generic_error {
     my ($r) = @_;
-    my $linktext;
-    if ($env{'user.adv'}) {
-        $linktext = &mt('Continue to your roles page');
-    } else {
-        $linktext = &mt('Continue to your courses page');
+    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 $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;