--- rat/lonwrapper.pm	2020/07/18 20:34:58	1.49.2.7.2.3
+++ rat/lonwrapper.pm	2020/03/05 22:05:50	1.49.2.10
@@ -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.7.2.3 2020/07/18 20:34:58 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.49.2.10 2020/03/05 22:05:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,14 +37,10 @@ use Apache::lonlocal;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonextresedit();
-use Apache::lonexttool();
-use LONCAPA qw(:DEFAULT :match);
-use HTML::Entities();
 
 # ================================================================ Main Handler
 sub wrapper {
-    my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
-        $title,$width,$height) = @_;
+    my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_;
 
     my $forcereg;
     unless ($env{'form.folderpath'}) {
@@ -56,7 +52,7 @@ sub wrapper {
                                           'show' => 'Show content in pop-up window',
                                         );
 
-    my ($anchor,$uselink);
+    my ($anchor,$uselink,$linktext);
     if ($is_ext) {
         if ($env{'form.symb'}) {
             (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
@@ -98,7 +94,7 @@ sub wrapper {
 # do not obscure the Functions menu.
 #
 
-    unless (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {
+    unless (($env{'browser.mobile'}) || $uselink) {
         $headjs = '
 <script type="text/javascript">
 // <![CDATA[
@@ -121,52 +117,11 @@ var LCresizedef = 0;
             }
         }
     }
-    if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
+    if ($env{'browser.mobile'}) {
         my $output = $startpage;
         if ($is_pdf) {
             $linktext = &mt('Link to PDF (for mobile devices)');
             $output .= &create_link($url,$anchor,$title,$linktext);
-        } elsif (($exttool eq 'window') || ($exttool eq 'tab')) {
-            if ($linktext eq '') {
-                $linktext = &mt('Launch External Tool');
-            }
-            $url = &HTML::Entities::encode($url,'"<>&');
-            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 {
             if ($uselink) {
                 $linktext = &mt('Link to resource');
@@ -229,12 +184,11 @@ ENDLINK
         };
 SCRIPT
         # javascript will position the iframe if window was resized (or zoomed)
-        my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
         return <<ENDFRAME;
         $startpage
         $script
         <div class="LC_iframecontainer">
-            <iframe src="$dest">$lt{'noif'} $noiframe</iframe>
+            <iframe src="$url$anchor">$lt{'noif'} $noiframe</iframe>
         </div>
         $endpage
 ENDFRAME
@@ -269,8 +223,7 @@ sub handler {
     return OK if $r->header_only;
 
     my $url = $r->uri;
-    my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname,
-        $linktext,$explanation,$width,$height);
+    my ($is_ext,$brcrum,$absolute,$is_pdf,$cdom,$cnum,$hostname);
 
     for ($url){
         s|^/adm/wrapper||;
@@ -281,35 +234,9 @@ 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_lti($cdom,'consumer');
-            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) || ($exttool)) {
+ 
+    if ($is_ext) {
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
             ['forceedit','register','folderpath','symb','idx','title','anchor']);
         if (($env{'form.forceedit'}) &&
@@ -326,12 +253,10 @@ sub handler {
                     $url .= '#'.$env{'form.anchor'};
                 }
             }
-            my $type = 'ext';
-            if ($exttool) {
-                $type = 'tool';
-            } elsif (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
+            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'},
@@ -342,11 +267,7 @@ sub handler {
             my $crstype = &Apache::loncommon::course_type();
             my $title = $env{'form.title'};
             if ($title eq '') {
-                if ($is_ext) {
-                    $title = &mt('External Resource');
-                } else {
-                    $title = &mt('External Tool');
-                }
+                $title = &mt('External Resource');
             }
             $brcrum =
                 &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
@@ -356,7 +277,7 @@ sub handler {
 #
 # Actual URL
 #
-    if (($url=~/$LONCAPA::assess_re/) && (!$exttool)) {
+    if ($url=~/$LONCAPA::assess_re/) {
 #
 # This is uploaded homework
 #
@@ -366,7 +287,7 @@ sub handler {
 #
 # This is not homework
 #
-        if (($is_ext) || ($exttool)) {
+        if ($is_ext) {
             $absolute = $env{'request.use_absolute'};
             $ENV{'QUERY_STRING'} =~ s/(^|\&)symb=[^\&]*/$1/;
             $ENV{'QUERY_STRING'} =~ s/\&$//;
@@ -377,12 +298,9 @@ sub handler {
         }
 
         # encrypt url if not external
-        unless ($is_ext) {
-            &Apache::lonenc::check_encrypt(\$url);
-        }
+        &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ;
 
-        $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,
-                           $linktext,$explanation,undef,$width,$height) );
+        $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf) );
 
     } # not just the menu
     
@@ -409,7 +327,7 @@ described at http://www.lon-capa.org.
 
 =over
 
-=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height)
+=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title))
 
 =over