--- rat/lonwrapper.pm 2021/12/15 00:41:48 1.49.2.11 +++ rat/lonwrapper.pm 2016/10/31 12:59:11 1.52 @@ -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.11 2021/12/15 00:41:48 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.52 2016/10/31 12:59:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,39 +37,27 @@ 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 ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_; + my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$title) = @_; my $forcereg; unless ($env{'form.folderpath'}) { $forcereg = 1; } - my %lt = &Apache::lonlocal::texthash( 'noif' => 'No iframe support.', 'show' => 'Show content in pop-up window', ); - (undef,undef,undef,undef,undef,undef,my $clientmobile) = - &Apache::loncommon::decode_user_agent($r); - - my ($anchor,$uselink,$linktext); - 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'}; - } - unless (($is_pdf) && ($clientmobile)) { - 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 $anchor; + if (($is_ext) && ($env{'form.symb'})) { + (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'}); + if ($res =~ /(#[^#]+)$/) { + $anchor = $1; } } @@ -82,78 +70,48 @@ sub wrapper { $args->{'bread_crumbs'} = $brcrum; } if ($absolute) { - $args->{'use_absolute'} = $absolute; - } - if ($env{'form.only_body'}) { - $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. -# - - unless ($clientmobile || $uselink) { - $headjs = ' -'."\n"; + $args->{'use_absolute'} = $absolute; } - my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args); + my $startpage = &Apache::loncommon::start_page('Menu',undef,$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 ($clientmobile) { + + if (($env{'browser.mobile'}) || ($exttool eq 'window')) { 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 .= '