--- loncom/interface/lonexttool.pm 2018/05/23 16:36:14 1.19 +++ loncom/interface/lonexttool.pm 2022/03/29 20:12:46 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Launch External Tool Provider (LTI) # -# $Id: lonexttool.pm,v 1.19 2018/05/23 16:36:14 raeburn Exp $ +# $Id: lonexttool.pm,v 1.23 2022/03/29 20:12:46 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -259,10 +259,10 @@ sub lti_params { $msgtype = 'basic-lti-launch-request'; } if ($crslabel eq '') { - $crslabel = $env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}, + $crslabel = $env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}; } if ($crstitle eq '') { - $crstitle = $env{'course.'.$env{'request.course.id'}.'.description'},; + $crstitle = $env{'course.'.$env{'request.course.id'}.'.description'}; } my $lonhost = $r->dir_config('lonHostID'); my $loncaparev = $r->dir_config('lonVersion'); @@ -275,7 +275,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 +298,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 +312,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, @@ -322,7 +322,7 @@ sub lti_params { tool_consumer_instance_guid => $lonhost, tool_consumer_instance_description => $domdesc, tool_consumer_info_product_family_code => 'loncapa', - tool_consumer_instance_name => $int_dom, + tool_consumer_instance_name => $int_dom, tool_consumer_instance_url => $portal_url, tool_consumer_info_version => $loncaparev, user_id => $digest_user, @@ -351,7 +351,7 @@ sub lti_params { $ltiparams{'ext_ims_lis_basic_outcome_url'} = $ltiparams{'lis_outcome_service_url'}; if ($gradesecret) { my $uniqid = $digest_symb.':::'.$digest_user.':::'.$env{'request.course.id'}; - $ltiparams{'lis_result_sourcedid'} = &LONCAPA::ltiutils::get_service_id($gradesecret,$uniqid); + $ltiparams{'lis_result_sourcedid'} = &LONCAPA::ltiutils::get_service_id($gradesecret,$uniqid); } } if ($roster) { @@ -427,7 +427,7 @@ 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; @@ -435,7 +435,7 @@ sub lti_params { sub launch_html { my ($url,$key,$secret,$sigmethod,$submittext,$paramsref) = @_; - my $hashref = &LONCAPA::ltiutils::sign_params($url,$key,$secret,$sigmethod,$paramsref); + my $hashref = &LONCAPA::ltiutils::sign_params($url,$key,$secret,$paramsref,$sigmethod); my $action = &HTML::Entities::encode($url,'<>&"'); my $form = <<"END";