--- rat/lonwrapper.pm	2016/02/22 03:36:52	1.51
+++ rat/lonwrapper.pm	2017/05/10 13:49:21	1.63
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.51 2016/02/22 03:36:52 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.63 2017/05/10 13:49:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,8 @@ use LONCAPA qw(:DEFAULT :match);;
 
 # ================================================================ Main Handler
 sub wrapper {
-    my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$title) = @_;
+    my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
+        $title,$width,$height) = @_;
 
     my $forcereg;
     unless ($env{'form.folderpath'}) {
@@ -54,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'};
         }
     }
 
@@ -70,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'}) || ($exttool eq 'window')) {
+    if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
         my $output = $startpage;
         if ($is_pdf) {
             if ($title eq '') {
@@ -92,11 +100,44 @@ sub wrapper {
                 $output .= $title.'<br />';
             }
             $output .= '<a href="'.$url.'">'.&mt('Link to PDF (for mobile devices)').'</a>';
-        } elsif ($exttool eq 'window') {
-            $output .= '<div>'.
-                       '<a href="'.$url.'" target="LC_LTI" style="padding:0;clear:both;margin:0;border:0">'.
-                       &mt('Launch External Tool').'</a>'.
-                       '</div>';
+        } 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">
+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".
@@ -107,11 +148,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) {
@@ -122,7 +168,7 @@ sub wrapper {
                         header = \$('#LC_breadcrumbs');
                     }
                 }
-                if (header.length) {
+                if (header != null && header.length) {
                     height = header.height();
                     hdrtop = header.position().top;
                 }
@@ -152,7 +198,8 @@ 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,
+        $linktext,$explanation,$width,$height);
 
     for ($url){
         s|^/adm/wrapper||;
@@ -164,34 +211,62 @@ sub handler {
 
     if ($url =~ /\.pdf$/i) {
         $is_pdf = 1;
-    } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/exttools?$}) {
+    } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
         $cdom = $1;
         $cnum = $2;
         my $marker = $3;
         $exttool = 'iframe';
-        my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target'],$cdom,$cnum);
+        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'; 
+            $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) || ($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';
-            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();
@@ -211,7 +286,7 @@ sub handler {
 #
 # Actual URL
 #
-    if ($url=~/$LONCAPA::assess_re/) {
+    if (($url=~/$LONCAPA::assess_re/) && (!$exttool)) {
 #
 # This is uploaded homework
 #
@@ -232,11 +307,12 @@ sub handler {
         }
 
         # encrypt url if not external
-        unless ($is_ext || $exttool) {
+        unless ($is_ext) {
             &Apache::lonenc::check_encrypt(\$url);
         }
 
-        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool) );
+        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,
+                           $linktext,$explanation,undef,$width,$height) );
 
     } # not just the menu