--- loncom/interface/lonexttool.pm 2025/06/06 21:21:53 1.22.2.6 +++ 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.22.2.6 2025/06/06 21:21:53 raeburn Exp $ +# $Id: lonexttool.pm,v 1.27 2025/03/15 17:28:14 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'; @@ -322,9 +322,8 @@ sub lti_params { if (scalar(@userlangs) == 1) { $locale = $userlangs[0]; } - my ($title,$digest_symb,$resource_link_id); - my $ignorecachednull = 1; - my ($symb) = &Apache::lonnet::whichuser('',$ignorecachednull); + 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); @@ -339,15 +338,9 @@ sub lti_params { } } } elsif ($env{'httpref.'.$uri} eq '/adm/coursedoc') { - my $digest_suppurl = &Encode::decode('UTF-8',$uri); + $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'); @@ -491,14 +484,14 @@ 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.'.$uri} eq '/adm/coursedoc') { - $return_url = '/adm/supplemental'; + $return_url = '/adm/supplemental'; } else { $return_url = '/adm/navmaps'; }