--- loncom/interface/lonexttool.pm 2020/04/09 21:11:36 1.20.2.1 +++ loncom/interface/lonexttool.pm 2023/01/23 18:38:26 1.22.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Launch External Tool Provider (LTI) # -# $Id: lonexttool.pm,v 1.20.2.1 2020/04/09 21:11:36 raeburn Exp $ +# $Id: lonexttool.pm,v 1.22.2.2 2023/01/23 18:38:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -49,6 +49,8 @@ use HTML::Entities; use Apache::lonlocal; use Apache::lonnet; use Apache::loncommon; +use Apache::londatecheck; +use Apache::lonipcheck; use LONCAPA::ltiutils; sub handler { @@ -221,7 +223,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 '') { @@ -244,7 +246,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(); @@ -258,7 +260,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, @@ -336,7 +338,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; @@ -344,7 +346,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";