--- rat/lonwrapper.pm 2022/08/30 11:41:27 1.79
+++ 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.79 2022/08/30 11:41:27 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.85 2023/11/18 21:50:06 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,7 +47,7 @@ use Digest::MD5();
# ================================================================ Main Handler
sub wrapper {
my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
- $title,$width,$height,$reuse) = @_;
+ $title,$width,$height,$reuse,$is_supp) = @_;
my $forcereg;
unless ($env{'form.folderpath'}) {
@@ -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,6 +95,8 @@ 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,$donemsg,$headjs);
@@ -151,13 +153,7 @@ 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).$countdown.$donemsg;
@@ -166,7 +162,7 @@ var LCresizedef = 0;
if (($uselink) && ($title eq '')) {
if ($env{'form.symb'}) {
$title=&Apache::lonnet::gettitle($env{'form.symb'});
- } else {
+ } elsif (!$is_supp) {
my $symb=&Apache::lonnet::symbread($r->uri);
if ($symb) {
$title=&Apache::lonnet::gettitle($symb);
@@ -225,7 +221,7 @@ var LCresizedef = 0;
unless ($reuse) {
my $resid;
if ($env{'request.course.id'}) {
- unless ($env{'form.folderpath'} =~ /^supplemental/) {
+ unless (($is_supp) || ($env{'form.folderpath'} =~ /^supplemental/)) {
my $symb=&Apache::lonnet::symbread($r->uri);
if ($symb) {
my $navmap = Apache::lonnavmaps::navmap->new();
@@ -300,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(<