--- rat/lonwrapper.pm 2023/01/21 23:25:16 1.49.2.11.2.3
+++ rat/lonwrapper.pm 2023/12/31 21:45:03 1.86
@@ -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.3 2023/01/21 23:25:16 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.86 2023/12/31 21:45:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,6 +38,7 @@ 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();
@@ -52,7 +53,6 @@ sub wrapper {
unless ($env{'form.folderpath'}) {
$forcereg = 1;
}
-
my %lt = &Apache::lonlocal::texthash(
'noif' => 'No iframe support.',
'show' => 'Show content in pop-up window',
@@ -82,7 +82,7 @@ sub wrapper {
}
}
- 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;
@@ -95,9 +95,55 @@ 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 $headjs;
+ 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 $symb=&Apache::lonnet::symbread($url);
+ my @interval=&Apache::lonnet::EXT('resource.0.interval',$symb);
+ my ($timelimit) = split(/_/,$interval[0]);
+ 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();
+ undef($Apache::lonhomework::browse);
+ if ($status eq 'CAN_ANSWER') {
+ if ($resource_due) {
+ my $time_left = $resource_due - time();
+ if ($resource_due && ($time_left > 0)) {
+ $countdown ='
+'."\n".
+ &Apache::lonhtmlcommon::set_due_date($resource_due);
+ }
+ }
+ } else {
+ if ($status eq 'SHOW_ANSWER') {
+ $result = &Apache::lonexttool::display_score().
+ &Apache::lonfeedback::list_discussion('tool','OPEN');
+ }
+ return &Apache::loncommon::start_page('Menu',undef,$args).
+ $result.
+ &Apache::loncommon::end_page();
+ }
+ }
#
# Where iframe is in use, if window.onload() executes before the custom resize function
@@ -107,16 +153,10 @@ sub wrapper {
#
unless ($clientmobile || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {
- $headjs = '
-'."\n";
+ $headjs = &Apache::loncommon::iframe_wrapper_headjs();
}
- my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args);
+ my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args).$countdown.$donemsg;
my $endpage = &Apache::loncommon::end_page();
if (($uselink) && ($title eq '')) {
@@ -233,6 +273,9 @@ ENDLINK
if ($explanation ne '') {
$output .= ''.$explanation.'
';
}
+ if (&Apache::lonnet::EXT('resource.0.gradable')) {
+ $output .= &Apache::lonfeedback::list_discussion('tool','OPEN');
+ }
}
} else {
if ($uselink) {
@@ -253,49 +296,8 @@ ENDLINK
$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']);
- if ($env{'form.inhibitmenu'} eq 'yes') {
- $offset = 0;
- }
- my $script = &Apache::lonhtmlcommon::scripttag(<"');
return <&');
my $crstype = &Apache::loncommon::course_type();
- $brcrum =
- &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
-
+ unless ($env{'form.only_body'}) {
+ $brcrum =
+ &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+ }
}
}
@@ -525,7 +537,9 @@ described at http://www.lon-capa.org.
=over
-=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height,$reuse,$is_supp)
+=item wrapper()
+
+Args: $r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height,$reuse,$is_supp
=over
@@ -630,6 +644,36 @@ of all external resource instances in a
Returns markup for the entire page.
+=item create_link()
+
+Args: $url,$anchor,$title,$linktext
+
+=over
+
+=item $url
+
+URL to link to
+
+=item $anchor
+
+optional. Will be the anchor to append to the URL, if there is one.
+
+=item $title
+
+optional. If provided will be the title displayed above the link. If
+one is not provided, then $env{'form.title'} will be used, unless empty.
+
+=item $linktext
+
+The text to inlcude between the and tags.
+
+=back
+
+Returns HTML needed to show a link which can be followed to display the
+part of the original URL following the initial /adm/wrapper part
+in the original request, in the case where an iframe is not going to be
+used to embed the content available at the URL in the existing page.
+
=item handler()
Content handler for requests for: /adm/wrapper/...