--- rat/lonwrapper.pm	2022/08/30 11:41:27	1.79
+++ 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.79 2022/08/30 11:41:27 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.86 2023/12/31 21:45:03 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 = '
-<script type="text/javascript">
-// <![CDATA[
-var LCnotready = 0;
-var LCresizedef = 0;
-// ]]>
-</script>'."\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(<<SCRIPT);
-        \$(document).ready( function() {
-            \$(window).unbind('resize').resize(function(){
-                var header = null;
-                var offset = $offset;
-                var height = 0;
-                var hdrtop = 0;
-                if (\$('div.LC_head_subbox:first').length) {
-                    header = \$('div.LC_head_subbox:first');
-                    offset = 9;
-                } else {
-                    if (\$('#LC_breadcrumbs').length) {
-                        header = \$('#LC_breadcrumbs');
-                    }
-                }
-                if (header != null && header.length) {
-                    height = header.height();
-                    hdrtop = header.position().top;
-                }
-                var pos = height + hdrtop + offset;
-                \$('.LC_iframecontainer').css('top', pos);
-            });
-            LCresizedef = 1;
-            if (LCnotready == 1) {
-                LCnotready = 0;
-                \$(window).trigger('resize');
-            }
-        });
-        window.onload = function(){
-             if (LCresizedef) {
-                 LCnotready = 0;
-                 \$(window).trigger('resize');
-             } else {
-                 LCnotready = 1;
-             }
-        };
-SCRIPT
         # javascript will position the iframe if window was resized (or zoomed)
+        my $script = &Apache::loncommon::iframe_wrapper_resizejs();
         my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
         return <<ENDFRAME;
         $startpage
@@ -384,7 +339,7 @@ sub handler {
 
     my $url = $r->uri;
     my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname,
-        $linktext,$explanation,$width,$height,$reuse);
+        $linktext,$explanation,$width,$height,$reuse,$is_supp);
 
     for ($url){
         s|^/adm/wrapper||;
@@ -425,9 +380,16 @@ sub handler {
         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'};
+            my ($idx,%ltitools);
+            if ($toolhash{'id'} =~ /^c(\d+)$/) {
+                $idx = $1;
+                %ltitools = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer');
+            } else {
+                $idx = $toolhash{'id'};
+                %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
+            }
+            if (ref($ltitools{$idx}) eq 'HASH') {
+                $exttoolremote = $ltitools{$idx}{'url'};
             }
         }
         if ($toolhash{'target'} eq 'window') {
@@ -446,7 +408,7 @@ sub handler {
     }
     if (($is_ext) || ($exttool)) {
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-            ['forceedit','register','folderpath','symb','idx','title','anchor']);
+            ['forceedit','register','folderpath','symb','idx','title','anchor','only_body']);
         if (($env{'form.forceedit'}) &&
             (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
             (($env{'form.folderpath'} =~ /^supplemental/) ||
@@ -460,6 +422,7 @@ sub handler {
                 if ($env{'form.anchor'} ne '') {
                     $url .= '#'.$env{'form.anchor'};
                 }
+                $is_supp = 1;
             }
             my $type = 'ext';
             if ($exttool) {
@@ -483,8 +446,37 @@ sub handler {
                     $title = &mt('External Tool');
                 }
             }
-            $brcrum =
-                &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+            $title = &HTML::Entities::encode($title,'\'"<>&');
+            $is_supp = 1;
+            if ($env{'request.course.id'}) {
+                $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom);
+            }
+            unless ($env{'form.only_body'}) {
+                $brcrum =
+                    &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+            }
+        }
+    } elsif ($env{'request.course.id'}) {
+        my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'});
+        $courseurl =~ s{^/}{};
+        if ($url =~ m{^\Q/uploaded/$courseurl/supplemental/\E}) {
+            $is_supp = 1;
+            &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                                    ['folderpath','title','only_body']);
+            if ($env{'form.folderpath'}) {
+                $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom);
+            }
+            my $title = $env{'form.title'};
+            $title = &HTML::Entities::encode($title,'\'"<>&');
+            my $crstype = &Apache::loncommon::course_type();
+            unless ($env{'form.only_body'}) {
+                $brcrum =
+                    &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+            }
         }
     }
 
@@ -517,7 +509,8 @@ sub handler {
         }
 
         $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,
-                           $linktext,$explanation,undef,$width,$height,$reuse) );
+                           $linktext,$explanation,undef,$width,$height,$reuse,
+                           $is_supp) );
 
     } # not just the menu
     
@@ -544,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)
+=item wrapper()
+
+Args: $r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height,$reuse,$is_supp
 
 =over
 
@@ -649,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 <a href="$url"> and </a> 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/...