--- loncom/interface/lontiny.pm	2023/01/21 21:16:25	1.8.2.4
+++ loncom/interface/lontiny.pm	2022/07/08 03:05:18	1.16
@@ -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.16 2022/07/08 03:05:18 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 .= '&ltitarget=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,'&<>"');
@@ -443,6 +459,9 @@ sub launch_check {
 sub do_redirect {
     my ($r,$destination,$linkprot) = @_;
     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'},],};
     if ($linkprot) {
@@ -643,13 +662,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='<a href="/adm/roles">'.$linktext.'</a>';
     }
-    $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;