[BACK]Return to lonwrapper.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / rat

Diff for /rat/lonwrapper.pm between versions 1.49.2.4.2.1 and 1.49.2.4.4.2

version 1.49.2.4.2.1, 2017/06/22 02:11:30 version 1.49.2.4.4.2, 2020/05/22 23:54:42
Line 37  use Apache::lonlocal; Line 37  use Apache::lonlocal;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::lonextresedit();  use Apache::lonextresedit();
 use Apache::lonexttool();  
 use LONCAPA qw(:DEFAULT :match);  use LONCAPA qw(:DEFAULT :match);
   
 # ================================================================ Main Handler  # ================================================================ Main Handler
Line 202  sub handler { Line 201  sub handler {
   
     my $url = $r->uri;      my $url = $r->uri;
     my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,      my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,
         $linktext,$explanation,$width,$height);           $linktext,$explanation,$width,$height);
   
     for ($url){      for ($url){
         s|^/adm/wrapper||;          s|^/adm/wrapper||;
Line 222  sub handler { Line 221  sub handler {
         my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'],          my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'],
                                             $cdom,$cnum);                                              $cdom,$cnum);
         if ($toolhash{'id'}) {          if ($toolhash{'id'}) {
             my %ltitools = &Apache::lonnet::get_domain_ltitools($cdom);              my %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
             if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') {              if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') {
                 $exttoolremote = $ltitools{$toolhash{'id'}}{'url'};                  $exttoolremote = $ltitools{$toolhash{'id'}}{'url'};
             }              }
Line 241  sub handler { Line 240  sub handler {
             $exttool = 'tab';              $exttool = 'tab';
         }          }
     }      }
   
     if (($is_ext) || ($exttool)) {      if (($is_ext) || ($exttool)) {
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},          &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
             ['forceedit','register','folderpath','symb','idx','title','anchor']);              ['forceedit','register','folderpath','symb','idx','title','anchor']);
Line 336  described at http://www.lon-capa.org. Line 334  described at http://www.lon-capa.org.
   
 =over  =over
   
 =item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$title))  =item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height)
   
 =over  =over
   
Line 378  true if URL is for an external resource. Line 376  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 $env{'browser.mobile'} 
Line 386  above the link, but if not provided as a Line 400  above the link, but if not provided as a
 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.
Removed from v.1.49.2.4.2.1  
changed lines
  Added in v.1.49.2.4.4.2

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