[LON-CAPA-cvs] cvs: rat(version_2_11_X) / lonwrapper.pm

[raeburn]

raeburn		Sun Jul 28 04:05:38 2019 EDT

  Modified files:              (Branch: version_2_11_X)
    /rat	lonwrapper.pm 
  Log:
  - For 2.11
    Backport 1.58
  
  
Index: rat/lonwrapper.pm
diff -u rat/lonwrapper.pm:1.49.2.4 rat/lonwrapper.pm:1.49.2.5
--- rat/lonwrapper.pm:1.49.2.4	Tue Mar 14 04:12:10 2017
+++ rat/lonwrapper.pm	Sun Jul 28 04:05:38 2019
@@ -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.4 2017/03/14 04:12:10 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.49.2.5 2019/07/28 04:05:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -158,7 +158,7 @@
     return OK if $r->header_only;
 
     my $url = $r->uri;
-    my ($is_ext,$brcrum,$absolute,$is_pdf);
+    my ($is_ext,$brcrum,$absolute,$is_pdf,$cdom,$cnum,$hostname);
 
     for ($url){
         s|^/adm/wrapper||;
@@ -188,10 +188,15 @@
                     $url .= '#'.$env{'form.anchor'};
                 }
             }
+            if (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
+                $hostname = $r->hostname();
+            }
+            my $type = 'ext';
             $r->print(
                 &Apache::lonextresedit::display_editor($url,$env{'form.folderpath'},
                                                        $env{'form.symb'},
-                                                       $env{'form.idx'}));
+                                                       $env{'form.idx'},$type,$cdom,
+                                                       $cnum,$hostname));
             return OK;
         } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
             my $crstype = &Apache::loncommon::course_type();