--- rat/lonwrapper.pm 2008/12/19 14:30:51 1.32 +++ rat/lonwrapper.pm 2016/10/31 21:31:42 1.49.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.32 2008/12/19 14:30:51 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.49.2.2 2016/10/31 21:31:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,80 +31,115 @@ package Apache::lonwrapper; use strict; use Apache::Constants qw(:common); -use Apache::lonnet; -use Apache::lonxml(); use Apache::lonenc(); -use Apache::lonmenu(); +use Apache::lonnet; +use Apache::lonlocal; +use Apache::loncommon(); +use Apache::lonhtmlcommon(); +use Apache::lonextresedit(); # ================================================================ Main Handler +sub wrapper { + my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_; -sub simple_menu { -# -# Producing the menu buttons -# - return &Apache::loncommon::start_page('Menu',undef, - {'only_body' => 1, - 'bgcolor' => '#FFFFFF',}). - &Apache::lonmenu::menubuttons(1,'web',1). - &Apache::loncommon::end_page(); -} - + my $forcereg; + unless ($env{'form.folderpath'}) { + $forcereg = 1; + } -sub wrapper { - my ($topurl,$bottomurl) = @_; + 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'}; + } + } - if ($env{'browser.interface'} eq 'textual') { -# -# ssi-based rendering for text-based interface -# - return - &Apache::loncommon::start_page('Menu',undef, - {'bgcolor' => '#FFFFFF', - 'force_register' => 1, - }). - &Apache::lonnet::ssi_body($bottomurl). - &Apache::loncommon::end_page(); + 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(); - my %layout = ('border' => 0); - if ($env{'environment.remote'} eq 'off') { - if ($env{'environment.icons'} eq 'iconsonly') { - $layout{'rows'} = "100,*"; + if ($env{'browser.mobile'}) { + 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)').''; } else { - $layout{'rows'} = "200,*"; + $output .= '
'."\n". + '\n". + "
\n"; } + $output .= $endpage; + return $output; } else { - $layout{'rows'} = "1,*"; - $topurl = "/adm/rat/empty.html"; + my $script = &Apache::lonhtmlcommon::scripttag(< + + + $endpage +ENDFRAME } - - my $start_page = - &Apache::loncommon::start_page(undef,undef, - {'force_register' => 1, - 'frameset' => 1, - 'add_entries' => \%layout, }); - - my $end_page = - &Apache::loncommon::end_page({'frameset' => 1}); - - foreach my $url ($topurl,$bottomurl) { - if ($url !~ /^https?\:/) { - $url = &Apache::lonenc::check_encrypt($url); - } - } -# -# frame-based rendering for graphical interface -# - my $result =< - -$end_page -ENDDOCUMENT - - return $result; } sub handler { @@ -114,42 +149,83 @@ sub handler { return OK if $r->header_only; - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['wrapperdisplay']); - if ($env{'form.wrapperdisplay'} eq 'menu') { - $r->print(&simple_menu()); - return OK; - } - - my $orgurl=$r->uri; - my $url=$orgurl; - $orgurl.=(($orgurl=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; - $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu'; - $url=~s/^\/adm\/wrapper//; - my $is_ext = $url =~ m|^/ext/|; - $url=~s{^/ext/}{http://}; - $url=~s|http://https://|https://|; - $url=~s|:|:|g; + my $url = $r->uri; + my ($is_ext,$brcrum,$absolute,$is_pdf); + + for ($url){ + s|^/adm/wrapper||; + $is_ext = $_ =~ s|^/ext/|http://|; + s|http://https://|https://|; + 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'}; + } + } + $r->print( + &Apache::lonextresedit::display_editor($url,$env{'form.folderpath'}, + $env{'form.symb'}, + $env{'form.idx'})); + 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); + } + } + # # Actual URL # - if ($url=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { + if ($url=~/$LONCAPA::assess_re/) { # # This is uploaded homework # - $env{'request.state'}='uploaded'; - &Apache::lonhomework::renderpage($r,$url); + $env{'request.state'}='uploaded'; + &Apache::lonhomework::renderpage($r,$url); } else { # # This is not homework # - if ($is_ext) { - $ENV{'QUERY_STRING'}=~s/(^|\&)symb=[^\&]*/$1/; - } - $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; - # reappend the query arguments - $r->print(&wrapper($orgurl,$url)); + if ($is_ext) { + $absolute = $env{'request.use_absolute'}; + $ENV{'QUERY_STRING'} =~ s/(^|\&)symb=[^\&]*/$1/; + $ENV{'QUERY_STRING'} =~ s/\&$//; + } + + unless ($ENV{'QUERY_STRING'} eq '') { + $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; + } + + # encrypt url if not external + &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ; + + $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf) ); + } # not just the menu + return OK; } # handler @@ -173,19 +249,63 @@ described at http://www.lon-capa.org. =over -=item simple_menu() +=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$title)) -=item wrapper() +=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