--- rat/lonwrapper.pm	2023/10/06 17:35:54	1.49.2.11.2.5
+++ rat/lonwrapper.pm	2022/10/27 21:35:30	1.80
@@ -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.5 2023/10/06 17:35:54 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.80 2022/10/27 21:35:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -95,8 +95,6 @@ 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);
@@ -304,7 +302,7 @@ ENDLINK
     } else {
         my $offset = 5;
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
-        if (($env{'form.inhibitmenu'} eq 'yes') || ($env{'form.only_body'})) {
+        if ($env{'form.inhibitmenu'} eq 'yes') {
             $offset = 0;
         }
         my $script = &Apache::lonhtmlcommon::scripttag(<<SCRIPT);
@@ -336,12 +334,12 @@ ENDLINK
             }
         });
         window.onload = function(){
-            if (LCresizedef) {
-                LCnotready = 0;
-                \$(window).trigger('resize');
-            } else {
-                LCnotready = 1;
-            }
+             if (LCresizedef) {
+                 LCnotready = 0;
+                 \$(window).trigger('resize');
+             } else {
+                 LCnotready = 1;
+             }
         };
 SCRIPT
         # javascript will position the iframe if window was resized (or zoomed)
@@ -427,16 +425,9 @@ sub handler {
         my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'],
                                             $cdom,$cnum);
         if ($toolhash{'id'}) {
-            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'};
+            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') {
@@ -455,7 +446,7 @@ sub handler {
     }
     if (($is_ext) || ($exttool)) {
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-            ['forceedit','register','folderpath','symb','idx','title','anchor','only_body']);
+            ['forceedit','register','folderpath','symb','idx','title','anchor']);
         if (($env{'form.forceedit'}) &&
             (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
             (($env{'form.folderpath'} =~ /^supplemental/) ||
@@ -493,17 +484,14 @@ sub handler {
                     $title = &mt('External Tool');
                 }
             }
-            $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);
-            }
+            $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'});
@@ -511,19 +499,17 @@ sub handler {
         if ($url =~ m{^\Q/uploaded/$courseurl/supplemental/\E}) {
             $is_supp = 1;
             &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                                    ['folderpath','title','only_body']);
+                                                    ['folderpath','title']);
             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);
-            }
+            $brcrum =
+                &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+
         }
     }