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

Diff for /loncom/interface/lonexttool.pm between versions 1.19 and 1.23

version 1.19, 2018/05/23 16:36:14 version 1.23, 2022/03/29 20:12:46
Line 259  sub lti_params { Line 259  sub lti_params {
         $msgtype = 'basic-lti-launch-request';          $msgtype = 'basic-lti-launch-request';
     }      }
     if ($crslabel eq '') {      if ($crslabel eq '') {
         $crslabel = $env{'course.'.$env{'request.course.id'}.'.internal.coursecode'},          $crslabel = $env{'course.'.$env{'request.course.id'}.'.internal.coursecode'};
     }      }
     if ($crstitle eq '') {      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 $lonhost = $r->dir_config('lonHostID');
     my $loncaparev = $r->dir_config('lonVersion');      my $loncaparev = $r->dir_config('lonVersion');
Line 275  sub lti_params { Line 275  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 298  sub lti_params { Line 298  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 312  sub lti_params { Line 312  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 322  sub lti_params { Line 322  sub lti_params {
         tool_consumer_instance_guid            => $lonhost,          tool_consumer_instance_guid            => $lonhost,
         tool_consumer_instance_description     => $domdesc,          tool_consumer_instance_description     => $domdesc,
         tool_consumer_info_product_family_code => 'loncapa',          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_instance_url             => $portal_url,
         tool_consumer_info_version             => $loncaparev,          tool_consumer_info_version             => $loncaparev,
         user_id                                => $digest_user,          user_id                                => $digest_user,
Line 351  sub lti_params { Line 351  sub lti_params {
                 $ltiparams{'ext_ims_lis_basic_outcome_url'} = $ltiparams{'lis_outcome_service_url'};                  $ltiparams{'ext_ims_lis_basic_outcome_url'} = $ltiparams{'lis_outcome_service_url'};
                 if ($gradesecret) {                  if ($gradesecret) {
                     my $uniqid = $digest_symb.':::'.$digest_user.':::'.$env{'request.course.id'};                      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) {              if ($roster) {
Line 427  sub lti_params { Line 427  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 435  sub lti_params { Line 435  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.19  
changed lines
  Added in v.1.23

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