--- rat/lonwrapper.pm	2016/08/05 21:34:54	1.49.2.1
+++ rat/lonwrapper.pm	2020/04/07 20:39:03	1.49.2.4.4.1
@@ -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.1 2016/08/05 21:34:54 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.49.2.4.4.1 2020/04/07 20:39:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,10 +37,12 @@ use Apache::lonlocal;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonextresedit();
+use LONCAPA qw(:DEFAULT :match);
 
 # ================================================================ Main Handler
 sub wrapper {
-    my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_;
+    my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
+        $title,$width,$height) = @_;
 
     my $forcereg;
     unless ($env{'form.folderpath'}) {
@@ -53,10 +55,14 @@ sub wrapper {
                                         );
 
     my $anchor;
-    if (($is_ext) && ($env{'form.symb'})) {
-        (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
-        if ($res =~ /(\#.+)$/) {
-            $anchor = $1;
+    if ($is_ext) {
+        if ($env{'form.symb'}) {
+            (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
+            if ($res =~ /(#[^#]+)$/) {
+                $anchor = $1;
+            }
+        } elsif ($env{'form.anchor'} ne '') {
+            $anchor = '#'.$env{'form.anchor'};
         }
     }
 
@@ -69,13 +75,16 @@ 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);
     my $endpage = &Apache::loncommon::end_page();
 
-    if ($env{'browser.mobile'}) {
+    if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
         my $output = $startpage;
         if ($is_pdf) {
             if ($title eq '') {
@@ -91,6 +100,46 @@ sub wrapper {
                 $output .= $title.'<br />';
             }
             $output .= '<a href="'.$url.'">'.&mt('Link to PDF (for mobile devices)').'</a>';
+        } elsif (($exttool eq 'window') || ($exttool eq 'tab')) {
+            if ($linktext eq '') {
+                $linktext = &mt('Launch External Tool');
+            }
+            if ($exttool eq 'tab') {
+                $output .= '<div>'.
+                           '<a href="'.$url.'" target="LCExternalToolTab" style="padding:0;clear:both;margin:0;border:0">'.
+                           $linktext.'</a>'.
+                           '</div>';
+            } else {
+                $output .= <<"ENDLINK";
+<script type="text/javascript">
+// <![CDATA[
+var windowObjectReference = null;
+var PreviousUrl;
+
+function openSinglePopup(strUrl) {
+    if (windowObjectReference == null || windowObjectReference.closed) {
+        windowObjectReference = window.open(strUrl, "LCExternalToolPopUp",
+                                            "height=$height,width=$width,scrollbars=yes,resizable=yes,status=yes,menubar=no,location=no'");
+    } else if(PreviousUrl != strUrl) {
+        windowObjectReference = window.open(strUrl, "LCExternalToolPopUp",
+                                            "height=$height,width=$width,scrollbars=yes,resizable=yes,status=yes,menubar=no,location=no'");
+        windowObjectReference.focus();
+    } else {
+        windowObjectReference.focus();
+    };
+    PreviousUrl = strUrl;
+}
+// ]]>
+</script>
+<div>
+<a href="$url" target="LCExternalToolPopUp" onclick="openSinglePopup(this.href); return false;">
+$linktext</a>
+</div>
+ENDLINK
+            }
+            if ($explanation ne '') {
+                $output .= '<div>'.$explanation.'</div>';
+            }
         } else {
             $output .= '<div style="overflow:scroll; -webkit-overflow-scrolling:touch;">'."\n".
                        '<iframe src="'.$url.$anchor.'" height="100%" width="100%" frameborder="0">'."\n".
@@ -101,11 +150,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;
-                var offset = 5;
+                var header = null;
+                var offset = $offset;
                 var height = 0;
                 var hdrtop = 0;
                 if (\$('div.LC_head_subbox:first').length) {
@@ -116,7 +170,7 @@ sub wrapper {
                         header = \$('#LC_breadcrumbs');
                     }
                 }
-                if (header.length) {
+                if (header != null && header.length) {
                     height = header.height();
                     hdrtop = header.position().top;
                 }
@@ -146,7 +200,8 @@ sub handler {
     return OK if $r->header_only;
 
     my $url = $r->uri;
-    my ($is_ext,$brcrum,$absolute,$is_pdf);
+    my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,
+        $linktext,$explanation,$width,$height);
 
     for ($url){
         s|^/adm/wrapper||;
@@ -157,19 +212,60 @@ sub handler {
 
     if ($url =~ /\.pdf$/i) {
         $is_pdf = 1;
+    } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
+        $cdom = $1;
+        $cnum = $2;
+        my $marker = $3;
+        $exttool = 'iframe';
+        my $exttoolremote;
+        my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'],
+                                            $cdom,$cnum);
+        if ($toolhash{'id'}) {
+            my %ltitools = &Apache::lonnet::get_domain_ltitools($cdom);
+            if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') {
+                $exttoolremote = $ltitools{$toolhash{'id'}}{'url'};
+            }
+        }
+        if ($toolhash{'target'} eq 'window') {
+            $exttool = 'window';
+            $width = $toolhash{'width'};
+            $height = $toolhash{'height'};
+        } elsif ($toolhash{'target'} eq 'tab') {
+            $exttool = 'tab';
+        }
+        if (($exttool eq 'window') || ($exttool eq 'tab')) {
+            $linktext = $toolhash{'linktext'};
+            $explanation = $toolhash{'explanation'};
+        } elsif (($exttoolremote =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
+            $exttool = 'tab';
+        }
     }
- 
-    if ($is_ext) {
+    if (($is_ext) || ($exttool)) {
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-            ['forceedit','register','folderpath','symb','idx','title']);
+            ['forceedit','register','folderpath','symb','idx','title','anchor']);
         if (($env{'form.forceedit'}) &&
             (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
             (($env{'form.folderpath'} =~ /^supplemental/) ||
              ($env{'form.symb'} =~ /^uploaded/))) {
+            if ($env{'form.symb'}) {
+                (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
+                if ($res =~ /(#[^#]+)$/) {
+                    $url .= $1;
+                }
+            } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
+                if ($env{'form.anchor'} ne '') {
+                    $url .= '#'.$env{'form.anchor'};
+                }
+            }
+            my $type = 'ext';
+            if ($exttool) {
+                $type = 'tool';
+            }
             $r->print(
                 &Apache::lonextresedit::display_editor($url,$env{'form.folderpath'},
                                                        $env{'form.symb'},
-                                                       $env{'form.idx'}));
+                                                       $env{'form.idx'},$type,$cdom,
+                                                       $cnum));
             return OK;
         } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
             my $crstype = &Apache::loncommon::course_type();
@@ -185,7 +281,7 @@ sub handler {
 #
 # Actual URL
 #
-    if ($url=~/$LONCAPA::assess_re/) {
+    if (($url=~/$LONCAPA::assess_re/) && (!$exttool)) {
 #
 # This is uploaded homework
 #
@@ -195,7 +291,7 @@ sub handler {
 #
 # This is not homework
 #
-        if ($is_ext) {
+        if (($is_ext) || ($exttool)) {
             $absolute = $env{'request.use_absolute'};
             $ENV{'QUERY_STRING'} =~ s/(^|\&)symb=[^\&]*/$1/;
             $ENV{'QUERY_STRING'} =~ s/\&$//;
@@ -206,9 +302,12 @@ sub handler {
         }
 
         # encrypt url if not external
-        &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ;
+        unless ($is_ext) {
+            &Apache::lonenc::check_encrypt(\$url);
+        }
 
-        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf) );
+        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,
+                           $linktext,$explanation,undef,$width,$height) );
 
     } # not just the menu
     
@@ -235,7 +334,7 @@ described at http://www.lon-capa.org.
 
 =over
 
-=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$title))
+=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height)
 
 =over
 
@@ -277,6 +376,22 @@ true if URL is for an external resource.
 
 true if URL is for a PDF (based on file extension).
 
+=item $exttool
+
+If URL is for an External Tool, will contain the target type: iframe, window or tab.
+
+=item $linktext
+
+optional. If URL is for an External Tool, and target type is window or tab,
+then the link text may be an option set in the course for each tool instance,
+or may be a default defined in the domain for all instances of the tool.
+
+=item $explanation
+
+optional. If URL is for an External Tool, and target type is window or tab,
+then the explanation is an option set in the course for each tool instance,
+or may be a default defined in the domain for all instances of the tool.
+
 =item $title
 
 optional. If wrapped item is a PDF, and $env{'browser.mobile'} 
@@ -285,6 +400,20 @@ above the link, but if not provided as a
 will be used, otherwise, the filename will be displayed (unless
 hidden URL set for the resource).
 
+=item $width
+
+optional. If URL is for an External Tool, and target type is window,
+then a default width may have been defined in the domain for all instances of
+the tool.  If so, that width will be used for the window opened (via a link)
+to launch the external tool.
+
+=item $height
+
+optional. If URL is for an External Tool, and target type is window,
+then a default height may have been defined in the domain for all instances of
+the tool.  If so, that height will be used for the window opened (via a link)
+to launch the external tool.
+
 =back
 
 Returns markup for the entire page.