--- loncom/interface/lonexttool.pm	2025/03/15 03:34:21	1.22.2.4
+++ loncom/interface/lonexttool.pm	2025/06/06 20:36:58	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Launch External Tool Provider (LTI)
 #
-# $Id: lonexttool.pm,v 1.22.2.4 2025/03/15 03:34:21 raeburn Exp $
+# $Id: lonexttool.pm,v 1.28 2025/06/06 20:36:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -131,7 +131,7 @@ sub handler {
                         }
                     }
                     unless ($gotreturnurl) {
-                        $toolhash{'returnurl'} = 'default';     
+                        $toolhash{'returnurl'} = 'default';
                     }
                 } else {
                     $toolhash{'returnurl'} = 'none';
@@ -228,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'};
@@ -246,7 +246,7 @@ 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,$returnurl,$backtourl);
@@ -322,8 +322,10 @@ sub lti_params {
     if (scalar(@userlangs) == 1) {
         $locale = $userlangs[0];
     }
-    my ($title,$digest_symb,$digest_suppurl,$resource_link_id);
-    my ($symb) = &Apache::lonnet::whichuser();
+    my ($title,$digest_symb,$resource_link_id);
+    my $ignorecachednull = 1;
+    my ($symb) = &Apache::lonnet::whichuser('',$ignorecachednull);
+    my $uri = "/adm/$cdom/$cnum/$marker/$exttool";
     if ($symb) {
         $digest_symb = &Encode::decode('UTF-8',$symb);
         $digest_symb = &Digest::SHA::sha1_hex($digest_symb);
@@ -336,10 +338,16 @@ sub lti_params {
                 $title = $res->compTitle();
             }
         }
-    } elsif ($env{'httpref.'.$env{'request.noversionuri'}} eq '/adm/coursedoc') {
-        $digest_suppurl = &Encode::decode('UTF-8',$env{'request.noversionuri'});
+    } elsif ($env{'httpref.'.$uri} eq '/adm/coursedoc') {
+        my $digest_suppurl = &Encode::decode('UTF-8',$uri);
         $digest_suppurl = &Digest::SHA::sha1_hex($digest_suppurl);
         $resource_link_id = $digest_suppurl;
+        $title = &mt('Supplemental Content').': '.$marker.'_'.$exttool;
+    } else {
+        my $digest_url = &Encode::decode('UTF-8',$uri);
+        $digest_url = &Digest::SHA::sha1_hex($digest_url);
+        $resource_link_id = $digest_url;
+        $title = &mt('External Tool').': '.$marker.'_'.$exttool;
     }
     my $domdesc = &Apache::lonnet::domain($cdom);
     my $primary_id = &Apache::lonnet::domain($cdom,'primary');
@@ -483,20 +491,20 @@ sub lti_params {
                 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'})) { 
+                    (!$env{'request.role.adv'})) {
                     $return_url = &Apache::lonenc::encrypted($mapurl);
                 } else {
                     $return_url = $mapurl;
                 }
                 $return_url .= '?navmap=1';
-            } elsif ($env{'httpref.'.$env{'request.noversionuri'}} eq '/adm/coursedoc') {
-                $return_url = '/adm/supplemental';        
+            } 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 {
-            my $uri = $env{'request.noversionuri'};
+            $uri = '/adm/wrapper'.$uri;
             if ($env{'request.enc'}) {
                 $uri = &Apache::lonenc::encrypted($uri);
             }