--- rat/lonwrapper.pm 2020/01/14 17:14:11 1.49.2.7.2.1
+++ rat/lonwrapper.pm 2017/02/25 19:39:10 1.57
@@ -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.7.2.1 2020/01/14 17:14:11 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.57 2017/02/25 19:39:10 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,25 +38,22 @@ use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonextresedit();
use Apache::lonexttool();
-use LONCAPA qw(:DEFAULT :match);
-use HTML::Entities();
+use LONCAPA qw(:DEFAULT :match);;
# ================================================================ Main Handler
sub wrapper {
- my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
- $title,$width,$height) = @_;
+ 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',
);
- my ($anchor,$uselink);
+ my $anchor;
if ($is_ext) {
if ($env{'form.symb'}) {
(undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
@@ -66,12 +63,6 @@ sub wrapper {
} elsif ($env{'form.anchor'} ne '') {
$anchor = '#'.$env{'form.anchor'};
}
- unless (($is_pdf) && ($env{'browser.mobile'})) {
- 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 $noiframe = &Apache::loncommon::modal_link($url.$anchor,$lt{'show'},500,400);
@@ -91,81 +82,37 @@ sub wrapper {
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 (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
+
+ 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')) {
- if ($linktext eq '') {
- $linktext = &mt('Launch External Tool');
- }
- $url = &HTML::Entities::encode($url,'"<>&');
- if ($exttool eq 'tab') {
- $output .= '
';
- } else {
- $output .= <<"ENDLINK";
-
-
-ENDLINK
+ if ($title eq '') {
+ $title = $env{'form.title'};
+ if ($title eq '') {
+ unless ($env{'request.enc'}) {
+ ($title) = ($url =~ m{/([^/]+)$});
+ $title =~ s/(\?[^\?]+)$//;
+ }
+ }
}
- if ($explanation ne '') {
- $output .= ''.$explanation.'
';
+ unless ($title eq '') {
+ $output .= $title.'
';
}
+ $output .= ''.&mt('Link to PDF (for mobile devices)').'';
+ } elsif ($exttool eq 'window') {
+ $output .= '';
} 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 .= ''."\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']);
@@ -198,38 +145,17 @@ ENDLINK
window.onload = function(){ \$(window).trigger('resize') };
SCRIPT
# javascript will position the iframe if window was resized (or zoomed)
- my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
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 {
my $r=shift;
&Apache::loncommon::content_type($r,'text/html');
@@ -238,44 +164,26 @@ sub handler {
return OK if $r->header_only;
my $url = $r->uri;
- my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname,
- $linktext,$explanation,$width,$height);
+ my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum);
for ($url){
s|^/adm/wrapper||;
$is_ext = $_ =~ s|^/ext/|http://|;
s|http://https://|https://|;
- s|:|:|g;
+ s|:|:|g;
}
+
if ($url =~ /\.pdf$/i) {
$is_pdf = 1;
- } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
+ } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/exttools?$}) {
$cdom = $1;
$cnum = $2;
my $marker = $3;
$exttool = 'iframe';
- my $exttoolremote;
- my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'],
- $cdom,$cnum);
- if ($toolhash{'id'}) {
- my %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
- if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') {
- $exttoolremote = $ltitools{$toolhash{'id'}}{'url'};
- }
- }
+ my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target'],$cdom,$cnum);
if ($toolhash{'target'} eq 'window') {
- $exttool = 'window';
- $width = $toolhash{'width'};
- $height = $toolhash{'height'};
- } elsif ($toolhash{'target'} eq 'tab') {
- $exttool = 'tab';
- }
- if (($exttool eq 'window') || ($exttool eq 'tab')) {
- $linktext = $toolhash{'linktext'};
- $explanation = $toolhash{'explanation'};
- } elsif (($exttoolremote =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
- $exttool = 'tab';
+ $exttool = 'window';
}
}
if (($is_ext) || ($exttool)) {
@@ -296,16 +204,16 @@ sub handler {
}
}
my $type = 'ext';
+ my %ltitools;
if ($exttool) {
$type = 'tool';
- } elsif (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
- $hostname = $r->hostname();
+ %ltitools = &Apache::lonnet::get_domain_ltitools($cdom);
}
$r->print(
&Apache::lonextresedit::display_editor($url,$env{'form.folderpath'},
$env{'form.symb'},
$env{'form.idx'},$type,$cdom,
- $cnum,$hostname));
+ $cnum,\%ltitools));
return OK;
} elsif ($env{'form.folderpath'} =~ /^supplemental/) {
my $crstype = &Apache::loncommon::course_type();
@@ -325,7 +233,7 @@ sub handler {
#
# Actual URL
#
- if (($url=~/$LONCAPA::assess_re/) && (!$exttool)) {
+ if ($url=~/$LONCAPA::assess_re/) {
#
# This is uploaded homework
#
@@ -346,12 +254,11 @@ sub handler {
}
# encrypt url if not external
- unless ($is_ext) {
+ unless ($is_ext || $exttool) {
&Apache::lonenc::check_encrypt(\$url);
}
- $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,
- $linktext,$explanation,undef,$width,$height) );
+ $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool) );
} # not just the menu
@@ -378,14 +285,10 @@ described at http://www.lon-capa.org.
=over
-=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height)
+=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$title))
=over
-=item $r
-
-request object
-
=item $url
url to display by including in an iframe within a