--- rat/lonwrapper.pm 2010/03/03 21:33:20 1.38 +++ rat/lonwrapper.pm 2016/11/29 19:53:58 1.54 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.38 2010/03/03 21:33:20 droeschl Exp $ +# $Id: lonwrapper.pm,v 1.54 2016/11/29 19:53:58 damieng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,34 +33,119 @@ use strict; use Apache::Constants qw(:common); use Apache::lonenc(); use Apache::lonnet; +use Apache::lonlocal; +use Apache::loncommon(); +use Apache::lonhtmlcommon(); +use Apache::lonextresedit(); +use Apache::lonexttool(); +use LONCAPA qw(:DEFAULT :match);; # ================================================================ Main Handler sub wrapper { - my $url = shift; + my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$title) = @_; - my $startpage = Apache::loncommon::start_page('Menu',undef, - { 'force_register' =>1, 'bgcolor' => '#FFFFFF',}) ; - my $endpage = Apache::loncommon::end_page(); - - # javascript will position the iframe if window was resized (or zoomed) - return < - \$(document).ready( function() { - \$(window).unbind('resize').resize(function(){ - var header = \$('#LC_head_subbox')[0] ? \$('#LC_head_subbox') : \$('#LC_breadcrumbs'); - var pos = header.height() + header.position().top + 5; - \$('.iframecontainer').css('top', pos); + 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; + if ($is_ext) { + if ($env{'form.symb'}) { + (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'}); + if ($res =~ /(#[^#]+)$/) { + $anchor = $1; + } + } elsif ($env{'form.anchor'} ne '') { + $anchor = '#'.$env{'form.anchor'}; + } + } + + my $noiframe = &Apache::loncommon::modal_link($url.$anchor,$lt{'show'},500,400); + my $args = {'bgcolor' => '#FFFFFF'}; + if ($forcereg) { + $args->{'force_register'} = $forcereg; + } + if (ref($brcrum) eq 'ARRAY') { + $args->{'bread_crumbs'} = $brcrum; + } + if ($absolute) { + $args->{'use_absolute'} = $absolute; + } + + my $startpage = &Apache::loncommon::start_page('Menu',undef,$args); + my $endpage = &Apache::loncommon::end_page(); + + if (($env{'browser.mobile'}) || ($exttool eq 'window')) { + my $output = $startpage; + if ($is_pdf) { + 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') { + $output .= '
'. + ''. + &mt('Launch External Tool').''. + '
'; + } else { + $output .= '
'."\n". + '\n". + "
\n"; + } + $output .= $endpage; + return $output; + } else { + my $script = &Apache::lonhtmlcommon::scripttag(< - -
- -
- $endpage + window.onload = function(){ \$(window).trigger('resize') }; +SCRIPT + # javascript will position the iframe if window was resized (or zoomed) + return < + + + $endpage ENDFRAME + } } sub handler { @@ -71,7 +156,7 @@ sub handler { return OK if $r->header_only; my $url = $r->uri; - my $is_ext; + my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum); for ($url){ s|^/adm/wrapper||; @@ -80,10 +165,67 @@ sub handler { s|:|:|g; } + + if ($url =~ /\.pdf$/i) { + $is_pdf = 1; + } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/exttools?$}) { + $cdom = $1; + $cnum = $2; + my $marker = $3; + $exttool = 'iframe'; + my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target'],$cdom,$cnum); + if ($toolhash{'target'} eq 'window') { + $exttool = 'window'; + } + } + if (($is_ext) || ($exttool)) { + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['forceedit','register','folderpath','symb','idx','title','anchor']); + if (($env{'form.forceedit'}) && + (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) && + (($env{'form.folderpath'} =~ /^supplemental/) || + ($env{'form.symb'} =~ /^uploaded/))) { + if ($env{'form.symb'}) { + (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'}); + if ($res =~ /(#[^#]+)$/) { + $url .= $1; + } + } elsif ($env{'form.folderpath'} =~ /^supplemental/) { + if ($env{'form.anchor'} ne '') { + $url .= '#'.$env{'form.anchor'}; + } + } + my $type = 'ext'; + my %ltitools; + if ($exttool) { + $type = 'tool'; + %ltitools = &Apache::lonnet::get_domain_ltitools($cdom); + } + $r->print( + &Apache::lonextresedit::display_editor($url,$env{'form.folderpath'}, + $env{'form.symb'}, + $env{'form.idx'},$type,$cdom, + $cnum,\%ltitools)); + return OK; + } elsif ($env{'form.folderpath'} =~ /^supplemental/) { + my $crstype = &Apache::loncommon::course_type(); + my $title = $env{'form.title'}; + if ($title eq '') { + if ($is_ext) { + $title = &mt('External Resource'); + } else { + $title = &mt('External Tool'); + } + } + $brcrum = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + } + } + # # Actual URL # - if ($url=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { + if ($url=~/$LONCAPA::assess_re/) { # # This is uploaded homework # @@ -93,9 +235,10 @@ 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/\&$//; + $ENV{'QUERY_STRING'} =~ s/\&$//; } unless ($ENV{'QUERY_STRING'} eq '') { @@ -103,9 +246,11 @@ sub handler { } # encrypt url if not external - &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ; + unless ($is_ext || $exttool) { + &Apache::lonenc::check_encrypt(\$url); + } - $r->print( wrapper($url) ); + $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool) ); } # not just the menu @@ -132,20 +277,63 @@ described at http://www.lon-capa.org. =over -=item wrapper($url) +=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$title)) -Wraps $url in an iframe and generates a page for it. -Returns markup for the entire page. +=over -=item handler() +=item $url -=back +url to display by including in an iframe within a +LON-CAPA page which has a standard LON-CAPA inline menu. -=cut +=item $brcrum + +breadcrumbs for unregistered urls +(i.e., external resources in Supplemental Content). + +=item $absolute + +contains protocol (http or https) followed by +the hostname, if menu items in the standard LON-CAPA +interface created by the call to loncommon::start_page() +within &wrapper() need to use absolute URLs rather than +relative URLs. + +That will be the case where an external resource has been +served from port 80, when the server customarily serves +requests using Apache/SSL (i.e., port 443). mod_rewrite +is used to switch requests for external resources and +the syllabus: /public///syllabus +(which might also point at an external resource) +from https:// to http:// where the the URL of the remote site +specified in the resource itself is http://. + +This is done to avoid default mixed content blocking +in Firefox 23 and later, when serving from Apache/SSL. + +=item $is_ext +true if URL is for an external resource. +=item $is_pdf +true if URL is for a PDF (based on file extension). +=item $title +optional. If wrapped item is a PDF, and $env{'browser.mobile'} +is true, 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'} +will be used, otherwise, the filename will be displayed (unless +hidden URL set for the resource). +=back + +Returns markup for the entire page. + +=item handler() + +=back + +=cut