--- loncom/interface/lonexttool.pm	2018/08/14 18:20:17	1.20
+++ loncom/interface/lonexttool.pm	2023/07/05 18:42:48	1.22.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Launch External Tool Provider (LTI)
 #
-# $Id: lonexttool.pm,v 1.20 2018/08/14 18:20:17 raeburn Exp $
+# $Id: lonexttool.pm,v 1.22.2.3 2023/07/05 18:42:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -96,13 +96,20 @@ sub handler {
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
-    my ($idx,$is_tool,%toolhash,%toolsettings);
+    my ($idx,$crstool,$is_tool,%toolhash,%toolsettings);
 
     if ($r->uri eq "/adm/$cdom/$cnum/$marker/$exttool") {
         %toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
         if ($toolsettings{'id'}) {
-            $idx = $toolsettings{'id'};
-            my %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
+            my %ltitools;
+            if ($toolsettings{'id'} =~ /^c(\d+)$/) {
+                $idx = $1;
+                $crstool = 1;
+                %ltitools = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer');
+            } else {
+                $idx = $toolsettings{'id'};
+                %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
+            }
             if (ref($ltitools{$idx}) eq 'HASH') {
                 %toolhash = %{$ltitools{$idx}};
                 $toolhash{'display'} = {
@@ -204,17 +211,19 @@ sub handler {
             }
         }
         my $submittext = &mt('Launch [_1]',$toolhash{'title'});
-        if (($toolhash{'key'} ne '') && ($toolhash{'secret'} ne '') && 
-            ($toolhash{'url'} ne '') && ($launchok)) {
+        if (($toolhash{'url'} ne '') && ($launchok)) {
             my %lti = &lti_params($r,$cnum,$cdom,$idx,$submittext,\%toolhash);
             my $url = $toolhash{'url'};
             if ($toolhash{'crsappend'} ne '') {
                 $url .= $toolhash{'crsappend'};
             }
-            $r->print(&launch_html($url,$toolhash{'key'},$toolhash{'secret'},
-                                   $toolhash{'sigmethod'},$submittext,\%lti));
+            my %info = (
+                         method => $toolhash{'sigmethod'},
+                       );
+            $r->print(&launch_html($cdom,$cnum,$crstool,$url,$idx,
+                                   $toolhash{'cipher'},$submittext,\%lti,\%info));
         } else {
-            $r->print('<div>'.&mt('External Tool Unavailable').'</div>');
+            $r->print('<div class="LC_warning">'.&mt('External Tool Unavailable').'</div>');
         }
     }
     return OK;
@@ -275,7 +284,7 @@ sub lti_params {
         $ltirole = 'Learner';
     }
     my @possdigest;
-    my $digest_user = &Encode::decode_utf8($uname.':'.$udom);
+    my $digest_user = &Encode::decode('UTF-8',$uname.':'.$udom);
     $digest_user = &Digest::SHA::sha1_hex($digest_user);
     push(@possdigest,$digest_user);
     if ($env{'course.'.$env{'request.course.id'}.'.languages'} ne '') {
@@ -298,7 +307,7 @@ sub lti_params {
     my ($title,$digest_symb);
     my ($symb) = &Apache::lonnet::whichuser();
     if ($symb) {
-        $digest_symb = &Encode::decode_utf8($symb);
+        $digest_symb = &Encode::decode('UTF-8',$symb);
         $digest_symb = &Digest::SHA::sha1_hex($digest_symb);
         push(@possdigest,$digest_symb);
         my $navmap = Apache::lonnavmaps::navmap->new();
@@ -312,7 +321,7 @@ sub lti_params {
     my $domdesc = &Apache::lonnet::domain($cdom);
     my $primary_id = &Apache::lonnet::domain($cdom,'primary');
     my $int_dom = &Apache::lonnet::internet_dom($primary_id);
-    my $portal_url = &Apache::lonnet::course_portal_url($cnum,$cdom);
+    my $portal_url = &Apache::lonnet::course_portal_url($cnum,$cdom,$r);
 
     my %ltiparams = (
         lti_version                            => $version,
@@ -427,15 +436,20 @@ sub lti_params {
         }
     }
     foreach my $key (keys(%ltiparams)) {
-        $ltiparams{$key} = &Encode::decode_utf8($ltiparams{$key});
+        $ltiparams{$key} = &Encode::decode('UTF-8',$ltiparams{$key});
     }
     $ltiparams{'basiclti_submit'} = $submittext;
     return %ltiparams;
 }
 
 sub launch_html {
-    my ($url,$key,$secret,$sigmethod,$submittext,$paramsref) = @_;
-    my $hashref = &LONCAPA::ltiutils::sign_params($url,$key,$secret,$sigmethod,$paramsref);
+    my ($cdom,$cnum,$crstool,$url,$idx,$keynum,$submittext,$paramsref,$inforef) = @_;
+    my ($status,$hashref) =
+        &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>';
+    }
     my $action = &HTML::Entities::encode($url,'<>&"');
     my $form = <<"END";
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">