--- rat/lonwrapper.pm	2016/11/29 19:53:58	1.54
+++ rat/lonwrapper.pm	2017/04/22 16:15:13	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.54 2016/11/29 19:53:58 damieng Exp $
+# $Id: lonwrapper.pm,v 1.59 2017/04/22 16:15:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,7 +74,10 @@ sub wrapper {
         $args->{'bread_crumbs'} = $brcrum;
     }
     if ($absolute) {
-        $args->{'use_absolute'} = $absolute; 
+        $args->{'use_absolute'} = $absolute;
+    }
+    if ($env{'form.only_body'}) {
+        $args->{'only_body'} = $env{'form.only_body'};
     }
 
     my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
@@ -111,11 +114,16 @@ sub wrapper {
         $output .= $endpage;
         return $output;
     } 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 = 5;
+                var offset = $offset;
                 var height = 0;
                 var hdrtop = 0;
                 if (\$('div.LC_head_subbox:first').length) {
@@ -156,7 +164,7 @@ sub handler {
     return OK if $r->header_only;
 
     my $url = $r->uri;
-    my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum);
+    my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname);
 
     for ($url){
         s|^/adm/wrapper||;
@@ -196,16 +204,16 @@ sub handler {
                 }
             }
             my $type = 'ext';
-            my %ltitools;
             if ($exttool) {
                 $type = 'tool';
-                %ltitools = &Apache::lonnet::get_domain_ltitools($cdom);
+            } elsif (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
+                $hostname = $r->hostname();
             }
             $r->print(
                 &Apache::lonextresedit::display_editor($url,$env{'form.folderpath'},
                                                        $env{'form.symb'},
                                                        $env{'form.idx'},$type,$cdom,
-                                                       $cnum,\%ltitools));
+                                                       $cnum,$hostname));
             return OK;
         } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
             my $crstype = &Apache::loncommon::course_type();
@@ -246,7 +254,7 @@ sub handler {
         }
 
         # encrypt url if not external
-        unless ($is_ext || $exttool) {
+        unless ($is_ext) {
             &Apache::lonenc::check_encrypt(\$url);
         }