--- rat/lonwrapper.pm 2017/12/22 02:01:01 1.67
+++ rat/lonwrapper.pm 2023/11/18 21:50:06 1.85
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.67 2017/12/22 02:01:01 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.85 2023/11/18 21:50:06 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,13 +38,16 @@ use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonextresedit();
use Apache::lonexttool();
+use Apache::lonhomework();
+use Apache::lonnavmaps();
use LONCAPA qw(:DEFAULT :match);
use HTML::Entities();
+use Digest::MD5();
# ================================================================ Main Handler
sub wrapper {
- my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
- $title,$width,$height) = @_;
+ my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
+ $title,$width,$height,$reuse,$is_supp) = @_;
my $forcereg;
unless ($env{'form.folderpath'}) {
@@ -55,7 +58,10 @@ sub wrapper {
'show' => 'Show content in pop-up window',
);
- my $anchor;
+ (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'});
@@ -65,9 +71,18 @@ sub wrapper {
} 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 $noiframe = &Apache::loncommon::modal_link($url.$anchor,$lt{'show'},500,400);
+ my $noiframe = &Apache::loncommon::modal_link(&HTML::Entities::encode($url.$anchor,'&<>"\''),$lt{'show'},500,400);
my $args = {'bgcolor' => '#FFFFFF'};
if ($forcereg) {
$args->{'force_register'} = $forcereg;
@@ -80,16 +95,28 @@ sub wrapper {
}
if ($env{'form.only_body'}) {
$args->{'only_body'} = $env{'form.only_body'};
+ } elsif (($is_supp) && ($env{'form.folderpath'} ne '')) {
+ $args->{'bread_crumbs_nomenu'} = 1;
}
- my $countdown;
+ my ($countdown,$donemsg,$headjs);
if (($exttool) && (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i)) {
$Apache::lonhomework::browse = &Apache::lonnet::allowed('bre',$url);
if ($env{'form.markaccess'}) {
- my @interval=&Apache::lonnet::EXT("resource.0.interval");
+ my $symb=&Apache::lonnet::symbread($url);
+ my @interval=&Apache::lonnet::EXT('resource.0.interval',$symb);
my ($timelimit) = split(/_/,$interval[0]);
- &Apache::lonnet::set_first_access($interval[1],$timelimit);
- delete($env{'form.markaccess'});
+ my $setres = &Apache::lonnet::set_first_access($interval[1],$timelimit);
+ if ($setres eq 'ok') {
+ delete($env{'form.markaccess'});
+ }
+ } elsif ($env{'form.LC_interval_done'} eq 'true') {
+ my $symb=&Apache::lonnet::symbread($url);
+ if ($symb) {
+ (my $donebuttonresult,$donemsg) = &Apache::lonhomework::zero_timer($symb);
+ undef($env{'form.LC_interval_done'});
+ undef($env{'form.LC_interval_done_proctorpass'});
+ }
}
my ($status,$result,$resource_due) =
&Apache::lonexttool::gradabletool_access_check();
@@ -118,48 +145,115 @@ sub wrapper {
}
}
- my $startpage = &Apache::loncommon::start_page('Menu',undef,$args).$countdown;
+#
+# 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 = &Apache::loncommon::iframe_wrapper_headjs();
+ }
+
+ my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args).$countdown.$donemsg;
my $endpage = &Apache::loncommon::end_page();
- if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
+ if (($uselink) && ($title eq '')) {
+ if ($env{'form.symb'}) {
+ $title=&Apache::lonnet::gettitle($env{'form.symb'});
+ } elsif (!$is_supp) {
+ 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')) {
my $output = $startpage;
if ($is_pdf) {
- if ($title eq '') {
- $title = $env{'form.title'};
- if ($title eq '') {
- unless ($env{'request.enc'}) {
- ($title) = ($url =~ m{/([^/]+)$});
- $title =~ s/(\?[^\?]+)$//;
- }
+ $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');
}
}
- unless ($title eq '') {
- $output .= $title.'
';
- }
- $output .= ''.&mt('Link to PDF (for mobile devices)').'';
- } elsif (($exttool eq 'window') || ($exttool eq 'tab')) {
- if ($linktext eq '') {
- $linktext = &mt('Launch External Tool');
+ if ($exttool) {
+ $url = &HTML::Entities::encode($url,'"<>&');
+ } else {
+ $url = &HTML::Entities::encode($url.$anchor,'&<>"');
}
- $url = &HTML::Entities::encode($url,'"<>&');
- if ($exttool eq 'tab') {
- $output .= '