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

Diff for /loncom/interface/lonexttool.pm between versions 1.12 and 1.14

version 1.12, 2017/12/22 02:00:46 version 1.14, 2017/12/30 14:03:53
Line 127  sub handler { Line 127  sub handler {
         return OK;          return OK;
     }      }
   
     my ($status,$open,$close,$msg);      my ($status,$open,$close,$msg,$donebuttonresult,$donemsg);
     if ($toolhash{'gradable'}) {      if ($toolhash{'gradable'}) {
         $Apache::lonhomework::browse = &Apache::lonnet::allowed('bre',$r->uri);          $Apache::lonhomework::browse = &Apache::lonnet::allowed('bre',$r->uri);
           my ($symb) = &Apache::lonnet::whichuser();
         if ($env{'form.markaccess'}) {          if ($env{'form.markaccess'}) {
             my @interval=&Apache::lonnet::EXT("resource.0.interval");              my @interval=&Apache::lonnet::EXT('resource.0.interval',$symb);
             my ($timelimit) = split(/_/,$interval[0]);              my ($timelimit) = split(/_/,$interval[0]);
             &Apache::lonnet::set_first_access($interval[1],$timelimit);              &Apache::lonnet::set_first_access($interval[1],$timelimit);
           } elsif ($symb && $env{'form.LC_interval_done'} eq 'true') {
               # Set the event timer to zero if the "done button" was clicked.  The button is
               # part of the doneButton form created in lonmenu.pm
               ($donebuttonresult,$donemsg) = &Apache::lonhomework::zero_timer($symb);
               undef($env{'form.LC_interval_done'});
               undef($env{'form.LC_interval_done_proctorpass'});
         }          }
         ($status,$msg) = &gradabletool_access_check();          ($status,$msg) = &gradabletool_access_check();
         undef($Apache::lonhomework::browse);          undef($Apache::lonhomework::browse);
Line 193  sub handler { Line 200  sub handler {
                 $url .= $toolhash{'crsappend'};                  $url .= $toolhash{'crsappend'};
             }              }
             $r->print(&launch_html($url,$toolhash{'key'},$toolhash{'secret'},              $r->print(&launch_html($url,$toolhash{'key'},$toolhash{'secret'},
                                    $submittext,\%lti));                                     $toolhash{'sigmethod'},$submittext,\%lti));
         } else {          } else {
             $r->print('<div>'.&mt('External Tool Unavailable').'</div>');              $r->print('<div>'.&mt('External Tool Unavailable').'</div>');
         }          }
Line 405  sub lti_params { Line 412  sub lti_params {
 }  }
   
 sub launch_html {  sub launch_html {
     my ($url,$key,$secret,$submittext,$paramsref) = @_;      my ($url,$key,$secret,$sigmethod,$submittext,$paramsref) = @_;
     my $hashref = &LONCAPA::ltiutils::sign_params($url,$key,$secret,$paramsref);      my $hashref = &LONCAPA::ltiutils::sign_params($url,$key,$secret,$sigmethod,$paramsref);
     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.12  
changed lines
  Added in v.1.14

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