--- rat/lonwrapper.pm 2022/08/30 11:48:33 1.49.2.11.2.2
+++ 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.2.2 2022/08/30 11:48:33 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.52 2016/10/31 12:59:11 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,47 +38,26 @@ use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonextresedit();
use Apache::lonexttool();
-use Apache::lonnavmaps();
-use LONCAPA qw(:DEFAULT :match);
-use HTML::Entities();
-use Digest::MD5();
+use LONCAPA qw(:DEFAULT :match);;
# ================================================================ Main Handler
sub wrapper {
- my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
- $title,$width,$height,$reuse) = @_;
+ 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);
- 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 (($is_ext eq 'tab') || ($is_ext eq 'window')) {
- $uselink = 1;
- }
- unless (($is_pdf && $clientmobile) || $uselink) {
- 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;
}
}
@@ -91,178 +70,48 @@ 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 $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 || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {
- $headjs = '
-'."\n";
- }
-
- 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 || ($exttool eq 'window') || ($exttool eq 'tab') ||
- ($is_ext eq 'tab') || ($is_ext eq 'window')) {
+
+ 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);
- } elsif (($exttool eq 'window') || ($exttool eq 'tab') ||
- ($is_ext eq 'tab') || ($is_ext eq 'window')) {
- my $preamble;
- if ($linktext eq '') {
- if ($exttool) {
- $linktext = &mt('Launch External Tool');
- } else {
- $linktext = &mt('Link to External Resource');
- }
- }
- if ($exttool) {
- $url = &HTML::Entities::encode($url,'"<>&');
- } else {
- $url = &HTML::Entities::encode($url.$anchor,'&<>"');
- }
- if (($exttool eq 'tab') || ($is_ext eq 'tab')) {
- my $target;
- if ($exttool) {
- $target = 'LCExternalToolTab';
- } else {
- if ($reuse) {
- $target = 'LCExternalResTab';
- } else {
- $target = '_blank';
- }
- if ($title ne '') {
- $preamble = ''.$title.'
';
- }
- }
- $output .= '