[BACK]Return to lonexttool.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonexttool.pm between versions 1.20.2.1 and 1.22.2.2

version 1.20.2.1, 2020/04/09 21:11:36 version 1.22.2.2, 2023/01/23 18:38:26
Line 49  use HTML::Entities; Line 49  use HTML::Entities;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::loncommon;  use Apache::loncommon;
   use Apache::londatecheck;
   use Apache::lonipcheck;
 use LONCAPA::ltiutils;  use LONCAPA::ltiutils;
   
 sub handler {  sub handler {
Line 221  sub lti_params { Line 223  sub lti_params {
         $ltirole = 'Learner';          $ltirole = 'Learner';
     }      }
     my @possdigest;      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);      $digest_user = &Digest::SHA::sha1_hex($digest_user);
     push(@possdigest,$digest_user);      push(@possdigest,$digest_user);
     if ($env{'course.'.$env{'request.course.id'}.'.languages'} ne '') {      if ($env{'course.'.$env{'request.course.id'}.'.languages'} ne '') {
Line 244  sub lti_params { Line 246  sub lti_params {
     my ($title,$digest_symb);      my ($title,$digest_symb);
     my ($symb) = &Apache::lonnet::whichuser();      my ($symb) = &Apache::lonnet::whichuser();
     if ($symb) {      if ($symb) {
         $digest_symb = &Encode::decode_utf8($symb);          $digest_symb = &Encode::decode('UTF-8',$symb);
         $digest_symb = &Digest::SHA::sha1_hex($digest_symb);          $digest_symb = &Digest::SHA::sha1_hex($digest_symb);
         push(@possdigest,$digest_symb);          push(@possdigest,$digest_symb);
         my $navmap = Apache::lonnavmaps::navmap->new();          my $navmap = Apache::lonnavmaps::navmap->new();
Line 258  sub lti_params { Line 260  sub lti_params {
     my $domdesc = &Apache::lonnet::domain($cdom);      my $domdesc = &Apache::lonnet::domain($cdom);
     my $primary_id = &Apache::lonnet::domain($cdom,'primary');      my $primary_id = &Apache::lonnet::domain($cdom,'primary');
     my $int_dom = &Apache::lonnet::internet_dom($primary_id);      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 = (      my %ltiparams = (
         lti_version                            => $version,          lti_version                            => $version,
Line 336  sub lti_params { Line 338  sub lti_params {
         }          }
     }      }
     foreach my $key (keys(%ltiparams)) {      foreach my $key (keys(%ltiparams)) {
         $ltiparams{$key} = &Encode::decode_utf8($ltiparams{$key});          $ltiparams{$key} = &Encode::decode('UTF-8',$ltiparams{$key});
     }      }
     $ltiparams{'basiclti_submit'} = $submittext;      $ltiparams{'basiclti_submit'} = $submittext;
     return %ltiparams;      return %ltiparams;
Line 344  sub lti_params { Line 346  sub lti_params {
   
 sub launch_html {  sub launch_html {
     my ($url,$key,$secret,$sigmethod,$submittext,$paramsref) = @_;      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 $action = &HTML::Entities::encode($url,'<>&"');
     my $form = <<"END";      my $form = <<"END";
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
Removed from v.1.20.2.1  
changed lines
  Added in v.1.22.2.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>