Diff for /rat/lonwrapper.pm between versions 1.49.2.7.2.3 and 1.77

version 1.49.2.7.2.3, 2020/07/18 20:34:58 version 1.77, 2021/10/19 00:16:32
Line 38  use Apache::loncommon(); Line 38  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::lonextresedit();  use Apache::lonextresedit();
 use Apache::lonexttool();  use Apache::lonexttool();
   use Apache::lonhomework();
 use LONCAPA qw(:DEFAULT :match);  use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities();  use HTML::Entities();
   
Line 50  sub wrapper { Line 51  sub wrapper {
     unless ($env{'form.folderpath'}) {      unless ($env{'form.folderpath'}) {
         $forcereg = 1;          $forcereg = 1;
     }      }
   
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
                                           'noif' => 'No iframe support.',                                            'noif' => 'No iframe support.',
                                           'show' => 'Show content in pop-up window',                                            'show' => 'Show content in pop-up window',
                                         );                                          );
   
       (undef,undef,undef,undef,undef,undef,my $clientmobile) =
           &Apache::loncommon::decode_user_agent($r);
   
     my ($anchor,$uselink);      my ($anchor,$uselink);
     if ($is_ext) {      if ($is_ext) {
         if ($env{'form.symb'}) {          if ($env{'form.symb'}) {
Line 66  sub wrapper { Line 69  sub wrapper {
         } elsif ($env{'form.anchor'} ne '') {          } elsif ($env{'form.anchor'} ne '') {
             $anchor = '#'.$env{'form.anchor'};              $anchor = '#'.$env{'form.anchor'};
         }          }
         unless (($is_pdf) && ($env{'browser.mobile'})) {          unless (($is_pdf) && ($clientmobile)) {
             my $hostname = $r->hostname();              my $hostname = $r->hostname();
             my $lonhost = $r->dir_config('lonHostID');              my $lonhost = $r->dir_config('lonHostID');
             my $ip = &Apache::lonnet::get_host_ip($lonhost);              my $ip = &Apache::lonnet::get_host_ip($lonhost);
Line 89  sub wrapper { Line 92  sub wrapper {
         $args->{'only_body'} = $env{'form.only_body'};          $args->{'only_body'} = $env{'form.only_body'};
     }      }
   
     my $headjs;      my ($countdown,$donemsg,$headjs);
       if (($exttool) && (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i)) {
           $Apache::lonhomework::browse = &Apache::lonnet::allowed('bre',$url);
           if ($env{'form.markaccess'}) {
               my $symb=&Apache::lonnet::symbread($url);
               my @interval=&Apache::lonnet::EXT('resource.0.interval',$symb);
               my ($timelimit) = split(/_/,$interval[0]);
               my $setres = &Apache::lonnet::set_first_access($interval[1],$timelimit);
               if ($setres eq 'ok') {
                   delete($env{'form.markaccess'});
               }
           } elsif ($env{'form.LC_interval_done'} eq 'true') {
               my $symb=&Apache::lonnet::symbread($url);
               if ($symb) {
                   (my $donebuttonresult,$donemsg) = &Apache::lonhomework::zero_timer($symb);
                   undef($env{'form.LC_interval_done'});
                   undef($env{'form.LC_interval_done_proctorpass'});
               }
           }
           my ($status,$result,$resource_due) =
               &Apache::lonexttool::gradabletool_access_check();
           undef($Apache::lonhomework::browse);
           if ($status eq 'CAN_ANSWER') {
               if ($resource_due) {
                   my $time_left = $resource_due - time();
                   if ($resource_due && ($time_left > 0)) {
                       $countdown ='
   <script type="text/javascript">
   // <![CDATA['."\n".
                                &Apache::lonhtmlcommon::countdown().'
   // ]]>
   </script>'."\n".
                       &Apache::lonhtmlcommon::set_due_date($resource_due);
                   }
               }
           } else {
               if ($status eq 'SHOW_ANSWER') {
                   $result = &Apache::lonexttool::display_score().
                             &Apache::lonfeedback::list_discussion('tool','OPEN');
               }
               return &Apache::loncommon::start_page('Menu',undef,$args).
                      $result.
                      &Apache::loncommon::end_page();
           }
       }
   
 #  #
 # Where iframe is in use, if window.onload() executes before the custom resize function  # Where iframe is in use, if window.onload() executes before the custom resize function
Line 98  sub wrapper { Line 145  sub wrapper {
 # do not obscure the Functions menu.  # do not obscure the Functions menu.
 #  #
   
     unless (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {      unless ($clientmobile || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {
         $headjs = '          $headjs = '
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
Line 108  var LCresizedef = 0; Line 155  var LCresizedef = 0;
 </script>'."\n";  </script>'."\n";
     }      }
   
     my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args);      my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args).$countdown.$donemsg;
     my $endpage = &Apache::loncommon::end_page();      my $endpage = &Apache::loncommon::end_page();
   
     if (($uselink) && ($title eq '')) {      if (($uselink) && ($title eq '')) {
Line 121  var LCresizedef = 0; Line 168  var LCresizedef = 0;
             }              }
         }          }
     }      }
     if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {      if ($clientmobile || ($exttool eq 'window') || ($exttool eq 'tab')) {
         my $output = $startpage;          my $output = $startpage;
         if ($is_pdf) {          if ($is_pdf) {
             $linktext = &mt('Link to PDF (for mobile devices)');              $linktext = &mt('Link to PDF (for mobile devices)');
Line 167  ENDLINK Line 214  ENDLINK
             if ($explanation ne '') {              if ($explanation ne '') {
                 $output .= '<div>'.$explanation.'</div>';                  $output .= '<div>'.$explanation.'</div>';
             }              }
               if (&Apache::lonnet::EXT('resource.0.gradable')) {
                   $output .= &Apache::lonfeedback::list_discussion('tool','OPEN');
               }
         } else {          } else {
             if ($uselink) {              if ($uselink) {
                 $linktext = &mt('Link to resource');                  $linktext = &mt('Link to resource');
Line 220  ENDLINK Line 270  ENDLINK
             }              }
         });          });
         window.onload = function(){          window.onload = function(){
             if (LCresizedef) {               if (LCresizedef) {
                 LCnotready = 0;                   LCnotready = 0;
                 \$(window).trigger('resize');                   \$(window).trigger('resize');
             } else {               } else {
                 LCnotready = 1;                   LCnotready = 1;
             }               }
         };          };
 SCRIPT  SCRIPT
         # javascript will position the iframe if window was resized (or zoomed)          # javascript will position the iframe if window was resized (or zoomed)
Line 419  request object Line 469  request object
   
 =item $url  =item $url
   
 url to display by including in an iframe within a  url to display either by including in an iframe within a
 LON-CAPA page which has a standard LON-CAPA inline menu.  LON-CAPA page which has a standard LON-CAPA inline menu,
   or in some cases launched in a separate tab or window,
   launched via a link in a LON-CAPA page with standard inline
   menu.
   
 =item $brcrum  =item $brcrum
   
Line 455  true if URL is for an external resource. Line 508  true if URL is for an external resource.
   
 true if URL is for a PDF (based on file extension).  true if URL is for a PDF (based on file extension).
   
   =item $exttool
   
   If URL is for an External Tool, will contain the target type: iframe, window or tab.
   
   =item $linktext
   
   optional. If URL is for an External Tool, and target type is window or tab, 
   then the link text may be an option set in the course for each tool instance,
   or may be a default defined in the domain for all instances of the tool.
   
   =item $explanation
   
   optional. If URL is for an External Tool, and target type is window or tab, 
   then the explanation is an option set in the course for each tool instance,
   or may be a default defined in the domain for all instances of the tool.
   
 =item $title  =item $title
   
 optional. If wrapped item is a PDF, and $env{'browser.mobile'}   optional. If wrapped item is a PDF, and $clientmobile is true,
 is true, a link to a PDF is shown. The "title" will be displayed  a link to a PDF is shown. The "title" will be displayed
 above the link, but if not provided as an arg, $env{'form.title'}  above the link, but if not provided as an arg, $env{'form.title'}
 will be used, otherwise, the filename will be displayed (unless  will be used, otherwise, the filename will be displayed (unless
 hidden URL set for the resource).  hidden URL set for the resource).
   
   =item $width
   
   optional. If URL is for an External Tool, and target type is window,
   then a default width may have been defined in the domain for all instances of 
   the tool.  If so, that width will be used for the window opened (via a link)
   to launch the external tool.
   
   =item $height
   
   optional. If URL is for an External Tool, and target type is window,
   then a default height may have been defined in the domain for all instances of 
   the tool.  If so, that height will be used for the window opened (via a link)
   to launch the external tool.
   
 =back  =back
   
 Returns markup for the entire page.  Returns markup for the entire page.
   
 =item handler()  =item handler()
   
   Content handler for requests for: /adm/wrapper/...
   used for content to be displayed in an iframe, or launched in a separate tab
   or window via a link.  The target URL is extracted from the requested URL, by
   removing the /adm/wrapper prefix. 
   
   The target URL will typically be a PDF served from the current server, an 
   external resource URL served from a different server, or an external tool
   (from an LTI Provider) launched from LON-CAPA (as LTI Consumer) and launched
   via a link.
   
   If the request included forceedit in the query string, and the requester has
   rights to modify course content, then the editor will be didplayed to allow
   changes to be made to the resource (e.g., change the URL of the external resource,
   or change the setting for the external tool instance.
   
   If not in edit mode, then the wrapper() subroutine will be called to generate the
   standard LON-CAPA inline menu, and then either a link to launch a separate tab or
   window, or an iframe to display the content inline. 
   
 =back  =back
   
 =cut  =cut

Removed from v.1.49.2.7.2.3  
changed lines
  Added in v.1.77


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