--- rat/lonwrapper.pm 2019/07/31 00:36:10 1.49.2.6
+++ rat/lonwrapper.pm 2017/02/07 02:07:28 1.56
@@ -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.6 2019/07/31 00:36:10 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.56 2017/02/07 02:07:28 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,22 +37,23 @@ 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',
);
- my ($anchor,$uselink);
+ my $anchor;
if ($is_ext) {
if ($env{'form.symb'}) {
(undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
@@ -62,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);
@@ -79,7 +74,7 @@ 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'};
@@ -87,40 +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'}) {
+
+ 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 .= '
'."\n".
- '\n".
- "
\n";
+ 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)').'';
+ } elsif ($exttool eq 'window') {
+ $output .= '';
+ } else {
+ $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']);
@@ -164,26 +156,6 @@ 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');
@@ -192,7 +164,7 @@ sub handler {
return OK if $r->header_only;
my $url = $r->uri;
- my ($is_ext,$brcrum,$absolute,$is_pdf,$cdom,$cnum,$hostname);
+ my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum);
for ($url){
s|^/adm/wrapper||;
@@ -201,11 +173,20 @@ sub handler {
s|:|:|g;
}
+
if ($url =~ /\.pdf$/i) {
$is_pdf = 1;
+ } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/exttools?$}) {
+ $cdom = $1;
+ $cnum = $2;
+ my $marker = $3;
+ $exttool = 'iframe';
+ my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target'],$cdom,$cnum);
+ if ($toolhash{'target'} eq 'window') {
+ $exttool = 'window';
+ }
}
-
- if ($is_ext) {
+ if (($is_ext) || ($exttool)) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['forceedit','register','folderpath','symb','idx','title','anchor']);
if (($env{'form.forceedit'}) &&
@@ -222,21 +203,27 @@ sub handler {
$url .= '#'.$env{'form.anchor'};
}
}
- if (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
- $hostname = $r->hostname();
- }
my $type = 'ext';
+ my %ltitools;
+ if ($exttool) {
+ $type = 'tool';
+ %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();
my $title = $env{'form.title'};
if ($title eq '') {
- $title = &mt('External Resource');
+ if ($is_ext) {
+ $title = &mt('External Resource');
+ } else {
+ $title = &mt('External Tool');
+ }
}
$brcrum =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
@@ -256,7 +243,7 @@ sub handler {
#
# This is not homework
#
- if ($is_ext) {
+ if (($is_ext) || ($exttool)) {
$absolute = $env{'request.use_absolute'};
$ENV{'QUERY_STRING'} =~ s/(^|\&)symb=[^\&]*/$1/;
$ENV{'QUERY_STRING'} =~ s/\&$//;
@@ -267,9 +254,11 @@ sub handler {
}
# encrypt url if not external
- &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ;
+ unless ($is_ext || $exttool) {
+ &Apache::lonenc::check_encrypt(\$url);
+ }
- $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf) );
+ $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool) );
} # not just the menu
@@ -296,14 +285,10 @@ described at http://www.lon-capa.org.
=over
-=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title))
+=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