--- rat/lonwrapper.pm 2020/03/05 22:05:50 1.49.2.10
+++ rat/lonwrapper.pm 2022/01/02 15:37:30 1.49.2.11.2.1
@@ -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.10 2020/03/05 22:05:50 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.49.2.11.2.1 2022/01/02 15:37:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,10 +37,14 @@ use Apache::lonlocal;
use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonextresedit();
+use Apache::lonexttool();
+use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities();
# ================================================================ Main Handler
sub wrapper {
- my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_;
+ my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
+ $title,$width,$height) = @_;
my $forcereg;
unless ($env{'form.folderpath'}) {
@@ -52,7 +56,10 @@ sub wrapper {
'show' => 'Show content in pop-up window',
);
- my ($anchor,$uselink,$linktext);
+ (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'});
@@ -62,7 +69,7 @@ sub wrapper {
} elsif ($env{'form.anchor'} ne '') {
$anchor = '#'.$env{'form.anchor'};
}
- unless (($is_pdf) && ($env{'browser.mobile'})) {
+ unless (($is_pdf) && ($clientmobile)) {
my $hostname = $r->hostname();
my $lonhost = $r->dir_config('lonHostID');
my $ip = &Apache::lonnet::get_host_ip($lonhost);
@@ -94,7 +101,7 @@ sub wrapper {
# do not obscure the Functions menu.
#
- unless (($env{'browser.mobile'}) || $uselink) {
+ unless ($clientmobile || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {
$headjs = '
+
+ENDLINK
+ }
+ if ($explanation ne '') {
+ $output .= ''.$explanation.'
';
+ }
} else {
if ($uselink) {
$linktext = &mt('Link to resource');
@@ -184,11 +232,12 @@ var LCresizedef = 0;
};
SCRIPT
# javascript will position the iframe if window was resized (or zoomed)
+ my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
return <
-
+
$endpage
ENDFRAME
@@ -223,7 +272,8 @@ 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,$hostname,
+ $linktext,$explanation,$width,$height);
for ($url){
s|^/adm/wrapper||;
@@ -234,9 +284,35 @@ sub handler {
if ($url =~ /\.pdf$/i) {
$is_pdf = 1;
+ } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
+ $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'};
+ }
+ }
+ 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';
+ }
}
-
- 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'}) &&
@@ -253,10 +329,12 @@ sub handler {
$url .= '#'.$env{'form.anchor'};
}
}
- if (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
+ my $type = 'ext';
+ if ($exttool) {
+ $type = 'tool';
+ } elsif (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
$hostname = $r->hostname();
}
- my $type = 'ext';
$r->print(
&Apache::lonextresedit::display_editor($url,$env{'form.folderpath'},
$env{'form.symb'},
@@ -267,7 +345,11 @@ sub handler {
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);
@@ -277,7 +359,7 @@ sub handler {
#
# Actual URL
#
- if ($url=~/$LONCAPA::assess_re/) {
+ if (($url=~/$LONCAPA::assess_re/) && (!$exttool)) {
#
# This is uploaded homework
#
@@ -287,7 +369,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/\&$//;
@@ -298,9 +380,12 @@ sub handler {
}
# encrypt url if not external
- &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ;
+ unless ($is_ext) {
+ &Apache::lonenc::check_encrypt(\$url);
+ }
- $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf) );
+ $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,
+ $linktext,$explanation,undef,$width,$height) );
} # not just the menu
@@ -327,7 +412,7 @@ described at http://www.lon-capa.org.
=over
-=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title))
+=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height)
=over
@@ -375,8 +460,8 @@ true if URL is for a PDF (based on file
=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
+optional. If wrapped item is a PDF, and $clientmobile 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).