--- rat/lonwrapper.pm 2014/06/17 23:01:21 1.48 +++ rat/lonwrapper.pm 2017/03/14 04:12:10 1.49.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.48 2014/06/17 23:01:21 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.49.2.4 2017/03/14 04:12:10 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,7 +40,7 @@ use Apache::lonextresedit(); # ================================================================ Main Handler sub wrapper { - my ($url,$brcrum,$absolute,$is_ext,$is_pdf) = @_; + my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_; my $forcereg; unless ($env{'form.folderpath'}) { @@ -52,7 +52,19 @@ sub wrapper { 'show' => 'Show content in pop-up window', ); - my $noiframe = &Apache::loncommon::modal_link($url,$lt{'show'},500,400); + 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; @@ -61,7 +73,10 @@ sub wrapper { $args->{'bread_crumbs'} = $brcrum; } if ($absolute) { - $args->{'use_absolute'} = $absolute; + $args->{'use_absolute'} = $absolute; + } + if ($env{'form.only_body'}) { + $args->{'only_body'} = $env{'form.only_body'}; } my $startpage = &Apache::loncommon::start_page('Menu',undef,$args); @@ -70,11 +85,13 @@ sub wrapper { if ($env{'browser.mobile'}) { my $output = $startpage; if ($is_pdf) { - my $title = $env{'form.title'}; if ($title eq '') { - unless ($env{'request.enc'}) { - ($title) = ($url =~ m{/([^/]+)$}); - $title =~ s/(\?[^\?]+)$//; + $title = $env{'form.title'}; + if ($title eq '') { + unless ($env{'request.enc'}) { + ($title) = ($url =~ m{/([^/]+)$}); + $title =~ s/(\?[^\?]+)$//; + } } } unless ($title eq '') { @@ -83,7 +100,7 @@ sub wrapper { $output .= ''.&mt('Link to PDF (for mobile devices)').''; } else { $output .= '
'."\n". - '\n". "
\n"; @@ -91,11 +108,16 @@ sub wrapper { $output .= $endpage; return $output; } 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 ENDFRAME @@ -150,21 +172,22 @@ sub handler { } if ($is_ext) { - my $hostname = $r->hostname(); - my $lonhost = &Apache::lonnet::host_from_dns($hostname); - if ($lonhost) { - my $actual = &Apache::lonnet::absolute_url($hostname); - my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; - unless ($actual eq $expected) { - $absolute = $expected; - } - } &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['forceedit','register','folderpath','symb','idx','title']); + ['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'}, @@ -195,6 +218,7 @@ sub handler { # This is not homework # if ($is_ext) { + $absolute = $env{'request.use_absolute'}; $ENV{'QUERY_STRING'} =~ s/(^|\&)symb=[^\&]*/$1/; $ENV{'QUERY_STRING'} =~ s/\&$//; } @@ -233,7 +257,7 @@ described at http://www.lon-capa.org. =over -=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf)) +=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$title)) =over @@ -258,7 +282,9 @@ 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 +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://. @@ -273,6 +299,14 @@ true if URL is for an external resource. 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.