--- rat/lonwrapper.pm 2011/11/07 20:06:29 1.41 +++ rat/lonwrapper.pm 2020/02/16 23:52:03 1.49.2.8 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.41 2011/11/07 20:06:29 www Exp $ +# $Id: lonwrapper.pm,v 1.49.2.8 2020/02/16 23:52:03 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,36 +33,185 @@ 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(); # ================================================================ Main Handler sub wrapper { - my $url = shift; + my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_; - my $startpage = Apache::loncommon::start_page('Menu',undef, - { 'force_register' =>1, 'bgcolor' => '#FFFFFF',}) ; - my $endpage = Apache::loncommon::end_page(); - - my $script = Apache::lonhtmlcommon::scripttag(<'."\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); + } + } + } + if ($env{'browser.mobile'}) { + 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); + } 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']); + if ($env{'form.inhibitmenu'} eq 'yes') { + $offset = 0; + } + my $script = &Apache::lonhtmlcommon::scripttag(< - - - $endpage + # javascript will position the iframe if window was resized (or zoomed) + 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 { @@ -73,13 +222,55 @@ sub handler { return OK if $r->header_only; my $url = $r->uri; - my $is_ext; + my ($is_ext,$brcrum,$absolute,$is_pdf,$cdom,$cnum,$hostname); for ($url){ s|^/adm/wrapper||; - $is_ext = $_ =~ s|^/ext/|http://|; - s|http://https://|https://|; - s|:|:|g; + $is_ext = $_ =~ s|^/ext/|http://|; + s|http://https://?|https://| if ($is_ext); + s|:|:|g; + } + + if ($url =~ /\.pdf$/i) { + $is_pdf = 1; + } + + if ($is_ext) { + &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'}; + } + } + if (($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'}, + $env{'form.idx'},$type,$cdom, + $cnum,$hostname)); + return OK; + } elsif ($env{'form.folderpath'} =~ /^supplemental/) { + my $crstype = &Apache::loncommon::course_type(); + my $title = $env{'form.title'}; + if ($title eq '') { + $title = &mt('External Resource'); + } + $brcrum = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + } } # @@ -96,8 +287,9 @@ sub handler { # This is not homework # if ($is_ext) { + $absolute = $env{'request.use_absolute'}; $ENV{'QUERY_STRING'} =~ s/(^|\&)symb=[^\&]*/$1/; - $ENV{'QUERY_STRING'} =~ s/\&$//; + $ENV{'QUERY_STRING'} =~ s/\&$//; } unless ($ENV{'QUERY_STRING'} eq '') { @@ -107,7 +299,7 @@ sub handler { # encrypt url if not external &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ; - $r->print( wrapper($url) ); + $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf) ); } # not just the menu @@ -134,20 +326,67 @@ described at http://www.lon-capa.org. =over -=item wrapper($url) +=item wrapper($r,$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 $r -=back +request object -=cut +=item $url + +url to display by including in an iframe within a +LON-CAPA page which has a standard LON-CAPA inline menu. + +=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