--- loncom/interface/lonexttool.pm	2023/05/22 21:10:55	1.24
+++ loncom/interface/lonexttool.pm	2025/03/15 17:28:14	1.27
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Launch External Tool Provider (LTI)
 #
-# $Id: lonexttool.pm,v 1.24 2023/05/22 21:10:55 raeburn Exp $
+# $Id: lonexttool.pm,v 1.27 2025/03/15 17:28:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -120,6 +120,22 @@ sub handler {
                 foreach my $item (qw(crslabel crstitle crsappend gradable)) {
                     $toolhash{$item} = $toolsettings{$item};
                 }
+                if ($toolhash{'returnurl'}) {
+                    my $gotreturnurl;
+                    if (ref($toolhash{'crsconf'}) eq 'HASH') {
+                        if ($toolhash{'crsconf'}{'returnurl'}) {
+                            foreach my $item (qw(returnurl backtourl)) {
+                                $toolhash{$item} = $toolsettings{$item};
+                            }
+                            $gotreturnurl = 1;
+                        }
+                    }
+                    unless ($gotreturnurl) {
+                        $toolhash{'returnurl'} = 'default';
+                    }
+                } else {
+                    $toolhash{'returnurl'} = 'none';
+                }
                 $is_tool = 1;
             }
         }
@@ -212,7 +228,7 @@ sub handler {
         }
         my $submittext = &mt('Launch [_1]',$toolhash{'title'});
         if (($toolhash{'url'} ne '') && ($launchok)) {
-            my %lti = &lti_params($r,$cnum,$cdom,$idx,$submittext,\%toolhash);
+            my %lti = &lti_params($r,$cnum,$cdom,$marker,$exttool,$idx,$submittext,\%toolhash);
             my $url = $toolhash{'url'};
             if ($toolhash{'crsappend'} ne '') {
                 $url .= $toolhash{'crsappend'};
@@ -230,10 +246,10 @@ sub handler {
 }
 
 sub lti_params {
-    my ($r,$cnum,$cdom,$idx,$submittext,$toolsref) = @_;
+    my ($r,$cnum,$cdom,$marker,$exttool,$idx,$submittext,$toolsref) = @_;
     my ($version,$context_type,$msgtype,$toolname,$passback,$roster,$locale,
         $crslabel,$crstitle,$gradesecret,$rostersecret,%fields,%rolesmap,
-        %display,%custom,@userlangs,$incdom);
+        %display,%custom,@userlangs,$incdom,$returnurl,$backtourl);
     if (ref($toolsref) eq 'HASH') {
         $version = $toolsref->{'version'};
         $toolname = $toolsref->{'title'};
@@ -257,6 +273,8 @@ sub lti_params {
         }
         $crslabel = $toolsref->{'crslabel'};
         $crstitle = $toolsref->{'crstitle'};
+        $returnurl = $toolsref->{'returnurl'};
+        $backtourl = $toolsref->{'backtourl'};
     }
     if ($version eq '') {
         $version = 'LTI-1p0';
@@ -304,11 +322,13 @@ sub lti_params {
     if (scalar(@userlangs) == 1) {
         $locale = $userlangs[0];
     }
-    my ($title,$digest_symb);
+    my ($title,$digest_symb,$digest_suppurl,$resource_link_id);
     my ($symb) = &Apache::lonnet::whichuser();
+    my $uri = "/adm/$cdom/$cnum/$marker/$exttool";
     if ($symb) {
         $digest_symb = &Encode::decode('UTF-8',$symb);
         $digest_symb = &Digest::SHA::sha1_hex($digest_symb);
+        $resource_link_id = $digest_symb;
         push(@possdigest,$digest_symb);
         my $navmap = Apache::lonnavmaps::navmap->new();
         if (ref($navmap)) {
@@ -317,6 +337,10 @@ sub lti_params {
                 $title = $res->compTitle();
             }
         }
+    } elsif ($env{'httpref.'.$uri} eq '/adm/coursedoc') {
+        $digest_suppurl = &Encode::decode('UTF-8',$uri);
+        $digest_suppurl = &Digest::SHA::sha1_hex($digest_suppurl);
+        $resource_link_id = $digest_suppurl;
     }
     my $domdesc = &Apache::lonnet::domain($cdom);
     my $primary_id = &Apache::lonnet::domain($cdom,'primary');
@@ -327,7 +351,7 @@ sub lti_params {
         lti_version                            => $version,
         lti_message_type                       => $msgtype,
         resource_link_title                    => $title,
-        resource_link_id                       => $digest_symb,
+        resource_link_id                       => $resource_link_id,
         tool_consumer_instance_guid            => $lonhost,
         tool_consumer_instance_description     => $domdesc,
         tool_consumer_info_product_family_code => 'loncapa',
@@ -439,14 +463,59 @@ sub lti_params {
         $ltiparams{$key} = &Encode::decode('UTF-8',$ltiparams{$key});
     }
     $ltiparams{'basiclti_submit'} = $submittext;
+    if ($returnurl eq 'default') {
+        my $hostname = &Apache::lonnet::hostname($r->dir_config('lonHostID'));
+        my $protocol = 'http';
+        my $port = $r->get_server_port();
+        if ($port eq '443') {
+            $protocol = 'https';
+        }
+        if (&Apache::lonnet::get_proxy_alias()) {
+            my $hdrhost = $r->headers_in->get('Host');
+            if ($hdrhost ne '') {
+                $hostname = $r->headers_in->get('Host');
+            }
+        }
+        my $location = $protocol.'://'.$hostname;
+        if ($display{'target'} eq 'iframe') {
+            my $return_url;
+            if ($symb) {
+                my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
+                my $mapurl = &Apache::lonnet::clutter($map);
+                my $mapsymb = &Apache::lonnet::symbread($map);
+                if ((&Apache::lonnet::EXT('resource.0.encrypturl',$mapsymb) =~ /^yes$/i) &&
+                    (!$env{'request.role.adv'})) {
+                    $return_url = &Apache::lonenc::encrypted($mapurl);
+                } else {
+                    $return_url = $mapurl;
+                }
+                $return_url .= '?navmap=1';
+            } elsif ($env{'httpref.'.$uri} eq '/adm/coursedoc') {
+                $return_url = '/adm/supplemental';
+            } else {
+                $return_url = '/adm/navmaps';
+            }
+            $ltiparams{'launch_presentation_return_url'} = $location.$return_url;
+        } else {
+            $uri = '/adm/wrapper'.$uri;
+            if ($env{'request.enc'}) {
+                $uri = &Apache::lonenc::encrypted($uri);
+            }
+            $ltiparams{'launch_presentation_return_url'} = $location.$uri;
+        }
+    } elsif ($returnurl eq 'custom') {
+        if ($backtourl ne '') {
+            $ltiparams{'launch_presentation_return_url'} = $backtourl;
+        }
+    }
     return %ltiparams;
 }
 
 sub launch_html {
     my ($cdom,$cnum,$crstool,$url,$idx,$keynum,$submittext,$paramsref,$inforef) = @_;
     my ($status,$hashref) =
-        &Apache::lonnet::sign_lti($cdom,$cnum,$crstool,$url,$idx,$keynum,
-                                  '',$paramsref,$inforef);
+        &Apache::lonnet::sign_lti($cdom,$cnum,$crstool,'tools','launch',$url,$idx,$keynum,
+                                  $paramsref,$inforef);
     unless ($status eq 'ok') {
         return '<div class="LC_warning">'.&mt('External Tool Unavailable').'</div>';
     }