--- rat/lonwrapper.pm 2020/02/17 00:58:49 1.49.2.9 +++ rat/lonwrapper.pm 2017/12/18 23:23:14 1.66 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.49.2.9 2020/02/17 00:58:49 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.66 2017/12/18 23:23:14 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,22 +37,25 @@ use Apache::lonlocal; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonextresedit(); +use Apache::lonexttool(); +use LONCAPA qw(:DEFAULT :match); +use HTML::Entities(); # ================================================================ Main Handler sub wrapper { - my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_; + my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation, + $title,$width,$height) = @_; my $forcereg; unless ($env{'form.folderpath'}) { $forcereg = 1; } - my %lt = &Apache::lonlocal::texthash( 'noif' => 'No iframe support.', 'show' => 'Show content in pop-up window', ); - my ($anchor,$uselink,$linktext); + my $anchor; if ($is_ext) { if ($env{'form.symb'}) { (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'}); @@ -62,12 +65,6 @@ sub wrapper { } elsif ($env{'form.anchor'} ne '') { $anchor = '#'.$env{'form.anchor'}; } - unless (($is_pdf) && ($env{'browser.mobile'})) { - my $hostname = $r->hostname(); - my $lonhost = $r->dir_config('lonHostID'); - my $ip = &Apache::lonnet::get_host_ip($lonhost); - $uselink = &Apache::loncommon::is_nonframeable($url,$absolute,$hostname,$ip); - } } my $noiframe = &Apache::loncommon::modal_link($url.$anchor,$lt{'show'},500,400); @@ -85,61 +82,95 @@ sub wrapper { $args->{'only_body'} = $env{'form.only_body'}; } - my $headjs; - -# -# Where iframe is in use, if window.onload() executes before the custom resize function -# has been defined (jQuery), two global javascript vars (LCnotready and LCresizedef) -# are used to ensure document.ready() triggers a call to resize, so the iframe contents -# do not obscure the Functions menu. -# + my $startpage = &Apache::loncommon::start_page('Menu',undef,$args); + my $endpage = &Apache::loncommon::end_page(); - unless (($env{'browser.mobile'}) || $uselink) { - $headjs = ' + if (($exttool) && (&Apache::lonnet::EXT('resource.0.gradable'))) { + my $resource_due = &Apache::lonhomework::due_date(0, $env{'request.symb'}); + if ($resource_due) { + my $time_left = $resource_due - time(); + if ($resource_due && ($time_left > 0)) { + $startpage .=' '."\n"; - } - - my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args); - my $endpage = &Apache::loncommon::end_page(); - - if (($uselink) && ($title eq '')) { - if ($env{'form.symb'}) { - $title=&Apache::lonnet::gettitle($env{'form.symb'}); - } else { - my $symb=&Apache::lonnet::symbread($r->uri); - if ($symb) { - $title=&Apache::lonnet::gettitle($symb); +'."\n". + &Apache::lonhtmlcommon::set_due_date($resource_due); } } } - if ($env{'browser.mobile'}) { + + if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) { my $output = $startpage; if ($is_pdf) { - $linktext = &mt('Link to PDF (for mobile devices)'); - $output .= &create_link($url,$anchor,$title,$linktext); - } else { - if ($uselink) { - $linktext = &mt('Link to resource'); - $output .= &create_link($url,$anchor,$title,$linktext); + if ($title eq '') { + $title = $env{'form.title'}; + if ($title eq '') { + unless ($env{'request.enc'}) { + ($title) = ($url =~ m{/([^/]+)$}); + $title =~ s/(\?[^\?]+)$//; + } + } + } + unless ($title eq '') { + $output .= $title.'
'; + } + $output .= ''.&mt('Link to PDF (for mobile devices)').''; + } elsif (($exttool eq 'window') || ($exttool eq 'tab')) { + if ($linktext eq '') { + $linktext = &mt('Launch External Tool'); + } + $url = &HTML::Entities::encode($url,'"<>&'); + if ($exttool eq 'tab') { + $output .= '
'. + ''. + $linktext.''. + '
'; } else { - my $dest = &HTML::Entities::encode($url.$anchor,'&<>"'); - $output .= '
'."\n". - '\n". - "
\n"; + $output .= <<"ENDLINK"; + +
+ +$linktext +
+ENDLINK + } + if ($explanation ne '') { + $output .= '
'.$explanation.'
'; } + if (&Apache::lonnet::EXT('resource.0.gradable')) { + $output .= &Apache::lonfeedback::list_discussion('tool','OPEN'); + } + } else { + my $dest = &HTML::Entities::encode($url.$anchor,'&<>"'); + $output .= '
'."\n". + '\n". + "
\n"; } $output .= $endpage; return $output; - } elsif ($uselink) { - $linktext = &mt('Link to resource'); - return $startpage.&create_link($url,$anchor,$title,$linktext).$endpage; } else { my $offset = 5; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']); @@ -168,53 +199,22 @@ var LCresizedef = 0; var pos = height + hdrtop + offset; \$('.LC_iframecontainer').css('top', pos); }); - LCresizedef = 1; - if (LCnotready == 1) { - LCnotready = 0; - \$(window).trigger('resize'); - } }); - window.onload = function(){ - if (LCresizedef) { - LCnotready = 0; - \$(window).trigger('resize'); - } else { - LCnotready = 1; - } - }; + window.onload = function(){ \$(window).trigger('resize') }; SCRIPT # javascript will position the iframe if window was resized (or zoomed) + my $dest = &HTML::Entities::encode($url.$anchor,'&<>"'); return < - + $endpage ENDFRAME } } -sub create_link { - my ($url,$anchor,$title,$linktext) = @_; - my $shownlink; - if ($title eq '') { - $title = $env{'form.title'}; - if ($title eq '') { - unless ($env{'request.enc'}) { - ($title) = ($url =~ m{/([^/]+)$}); - $title =~ s/(\?[^\?]+)$//; - } - } - } - unless ($title eq '') { - $shownlink = ''.$title.'
'; - } - my $dest = &HTML::Entities::encode($url.$anchor,'&<>"'); - $shownlink .= ''.$linktext.''; - return $shownlink; -} - sub handler { my $r=shift; &Apache::loncommon::content_type($r,'text/html'); @@ -223,20 +223,48 @@ sub handler { return OK if $r->header_only; my $url = $r->uri; - my ($is_ext,$brcrum,$absolute,$is_pdf,$cdom,$cnum,$hostname); + my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname, + $linktext,$explanation,$width,$height); for ($url){ s|^/adm/wrapper||; - $is_ext = $_ =~ s|^/ext/|http://|; - s|http://https://?|https://| if ($is_ext); - s|:|:|g; + $is_ext = $_ =~ s|^/ext/|http://|; + s|http://https://|https://|; + s|:|:|g; } + if ($url =~ /\.pdf$/i) { $is_pdf = 1; + } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { + $cdom = $1; + $cnum = $2; + my $marker = $3; + $exttool = 'iframe'; + my $exttoolremote; + my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'], + $cdom,$cnum); + if ($toolhash{'id'}) { + my %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); + if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') { + $exttoolremote = $ltitools{$toolhash{'id'}}{'url'}; + } + } + if ($toolhash{'target'} eq 'window') { + $exttool = 'window'; + $width = $toolhash{'width'}; + $height = $toolhash{'height'}; + } elsif ($toolhash{'target'} eq 'tab') { + $exttool = 'tab'; + } + if (($exttool eq 'window') || ($exttool eq 'tab')) { + $linktext = $toolhash{'linktext'}; + $explanation = $toolhash{'explanation'}; + } elsif (($exttoolremote =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) { + $exttool = 'tab'; + } } - - if ($is_ext) { + if (($is_ext) || ($exttool)) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['forceedit','register','folderpath','symb','idx','title','anchor']); if (($env{'form.forceedit'}) && @@ -253,10 +281,12 @@ sub handler { $url .= '#'.$env{'form.anchor'}; } } - if (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) { + my $type = 'ext'; + if ($exttool) { + $type = 'tool'; + } elsif (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) { $hostname = $r->hostname(); } - my $type = 'ext'; $r->print( &Apache::lonextresedit::display_editor($url,$env{'form.folderpath'}, $env{'form.symb'}, @@ -267,7 +297,11 @@ sub handler { my $crstype = &Apache::loncommon::course_type(); my $title = $env{'form.title'}; if ($title eq '') { - $title = &mt('External Resource'); + if ($is_ext) { + $title = &mt('External Resource'); + } else { + $title = &mt('External Tool'); + } } $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); @@ -277,7 +311,7 @@ sub handler { # # Actual URL # - if ($url=~/$LONCAPA::assess_re/) { + if (($url=~/$LONCAPA::assess_re/) && (!$exttool)) { # # This is uploaded homework # @@ -287,7 +321,7 @@ sub handler { # # This is not homework # - if ($is_ext) { + if (($is_ext) || ($exttool)) { $absolute = $env{'request.use_absolute'}; $ENV{'QUERY_STRING'} =~ s/(^|\&)symb=[^\&]*/$1/; $ENV{'QUERY_STRING'} =~ s/\&$//; @@ -298,9 +332,12 @@ sub handler { } # encrypt url if not external - &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ; + unless ($is_ext) { + &Apache::lonenc::check_encrypt(\$url); + } - $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf) ); + $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool, + $linktext,$explanation,undef,$width,$height) ); } # not just the menu @@ -327,14 +364,10 @@ described at http://www.lon-capa.org. =over -=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title)) +=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$linktext,$explanation,$title,$width,$height) =over -=item $r - -request object - =item $url url to display by including in an iframe within a