--- rat/lonwrapper.pm	2017/06/22 02:11:30	1.49.2.4.2.1
+++ rat/lonwrapper.pm	2017/02/25 19:39:10	1.57
@@ -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.2.1 2017/06/22 02:11:30 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.57 2017/02/25 19:39:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,18 +38,16 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonextresedit();
 use Apache::lonexttool();
-use LONCAPA qw(:DEFAULT :match);
+use LONCAPA qw(:DEFAULT :match);;
 
 # ================================================================ Main Handler
 sub wrapper {
-    my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
-        $title,$width,$height) = @_;
+    my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$title) = @_;
 
     my $forcereg;
     unless ($env{'form.folderpath'}) {
         $forcereg = 1;
     }
-
     my %lt = &Apache::lonlocal::texthash(
                                           'noif' => 'No iframe support.',
                                           'show' => 'Show content in pop-up window',
@@ -84,8 +82,8 @@ sub wrapper {
 
     my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
     my $endpage = &Apache::loncommon::end_page();
-
-    if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
+    
+    if (($env{'browser.mobile'}) || ($exttool eq 'window')) {
         my $output = $startpage;
         if ($is_pdf) {
             if ($title eq '') {
@@ -101,46 +99,11 @@ 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>';
-            }
+        } 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>';
         } else {
             $output .= '<div style="overflow:scroll; -webkit-overflow-scrolling:touch;">'."\n".
                        '<iframe src="'.$url.$anchor.'" height="100%" width="100%" frameborder="0">'."\n".
@@ -201,8 +164,7 @@ sub handler {
     return OK if $r->header_only;
 
     my $url = $r->uri;
-    my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,
-        $linktext,$explanation,$width,$height); 
+    my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum);
 
     for ($url){
         s|^/adm/wrapper||;
@@ -211,37 +173,19 @@ sub handler {
         s|&colon;|:|g;              
     }
 
+
     if ($url =~ /\.pdf$/i) {
         $is_pdf = 1;
-    } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
+    } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/exttools?$}) {
         $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'};
-            }
-        }
+        my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target'],$cdom,$cnum);
         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';
+           $exttool = 'window'; 
         }
     }
-
     if (($is_ext) || ($exttool)) {
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
             ['forceedit','register','folderpath','symb','idx','title','anchor']);
@@ -260,20 +204,26 @@ sub handler {
                 }
             }
             my $type = 'ext';
+            my %ltitools;
             if ($exttool) {
                 $type = 'tool';
+                %ltitools = &Apache::lonnet::get_domain_ltitools($cdom);
             }
             $r->print(
                 &Apache::lonextresedit::display_editor($url,$env{'form.folderpath'},
                                                        $env{'form.symb'},
                                                        $env{'form.idx'},$type,$cdom,
-                                                       $cnum));
+                                                       $cnum,\%ltitools));
             return OK;
         } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
             my $crstype = &Apache::loncommon::course_type();
             my $title = $env{'form.title'};
             if ($title eq '') {
-                $title = &mt('External Resource');
+                if ($is_ext) {
+                    $title = &mt('External Resource');
+                } else {
+                    $title = &mt('External Tool');
+                }
             }
             $brcrum =
                 &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
@@ -283,7 +233,7 @@ sub handler {
 #
 # Actual URL
 #
-    if (($url=~/$LONCAPA::assess_re/) && (!$exttool)) {
+    if ($url=~/$LONCAPA::assess_re/) {
 #
 # This is uploaded homework
 #
@@ -304,12 +254,11 @@ sub handler {
         }
 
         # encrypt url if not external
-        unless ($is_ext) {
+        unless ($is_ext || $exttool) {
             &Apache::lonenc::check_encrypt(\$url);
         }
 
-        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,
-                           $linktext,$explanation,undef,$width,$height) );
+        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool) );
 
     } # not just the menu
     
@@ -336,7 +285,7 @@ described at http://www.lon-capa.org.
 
 =over
 
-=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$title))
+=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$title))
 
 =over