--- rat/lonwrapper.pm	2020/02/17 01:31:20	1.49.2.7.2.2
+++ rat/lonwrapper.pm	2017/04/25 22:19:03	1.60
@@ -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.2 2020/02/17 01:31:20 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.60 2017/04/25 22:19:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,25 +38,22 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonextresedit();
 use Apache::lonexttool();
-use LONCAPA qw(:DEFAULT :match);
-use HTML::Entities();
+use LONCAPA qw(:DEFAULT :match);;
 
 # ================================================================ Main Handler
 sub wrapper {
-    my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
-        $title,$width,$height) = @_;
+    my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$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',
                                         );
 
-    my ($anchor,$uselink);
+    my $anchor;
     if ($is_ext) {
         if ($env{'form.symb'}) {
             (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
@@ -66,12 +63,6 @@ sub wrapper {
         } elsif ($env{'form.anchor'} ne '') {
             $anchor = '#'.$env{'form.anchor'};
         }
-        unless (($is_pdf) && ($env{'browser.mobile'})) {
-            my $hostname = $r->hostname();
-            my $lonhost = $r->dir_config('lonHostID');
-            my $ip = &Apache::lonnet::get_host_ip($lonhost);
-            $uselink = &Apache::loncommon::is_nonframeable($url,$absolute,$hostname,$ip);
-        }
     }
 
     my $noiframe = &Apache::loncommon::modal_link($url.$anchor,$lt{'show'},500,400);
@@ -89,102 +80,45 @@ sub wrapper {
         $args->{'only_body'} = $env{'form.only_body'};
     }
 
-    my $headjs;
-
-#
-# Where iframe is in use, if window.onload() executes before the custom resize function
-# has been defined (jQuery), two global javascript vars (LCnotready and LCresizedef)
-# are used to ensure document.ready() triggers a call to resize, so the iframe contents
-# do not obscure the Functions menu.
-#
-
-    unless (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {
-        $headjs = '
-<script type="text/javascript">
-// <![CDATA[
-var LCnotready = 0;
-var LCresizedef = 0;
-// ]]>
-</script>'."\n";
-    }
-
-    my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args);
+    my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
     my $endpage = &Apache::loncommon::end_page();
-
-    if (($uselink) && ($title eq '')) {
-        if ($env{'form.symb'}) {
-            $title=&Apache::lonnet::gettitle($env{'form.symb'});
-        } else {
-            my $symb=&Apache::lonnet::symbread($r->uri);
-            if ($symb) {
-                $title=&Apache::lonnet::gettitle($symb);
-            }
-        }
-    }
-    if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
+    
+    if (($env{'browser.mobile'}) || ($exttool eq 'window')) {
         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 ($title eq '') {
+                $title = $env{'form.title'};
+                if ($title eq '') {
+                    unless ($env{'request.enc'}) {
+                        ($title) = ($url =~ m{/([^/]+)$});
+                        $title =~ s/(\?[^\?]+)$//;
+                    }
+                }
+            }
+            unless ($title eq '') {
+                $output .= $title.'<br />';
+            }
+            $output .= '<a href="'.$url.'">'.&mt('Link to PDF (for mobile devices)').'</a>';
+        } elsif ($exttool eq 'window') {
             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
-            }
+            $output .= '<div>'.
+                       '<a href="'.$url.'" target="LC_LTI" style="padding:0;clear:both;margin:0;border:0">'.
+                       $linktext.'</a>'.
+                       '</div>';
             if ($explanation ne '') {
                 $output .= '<div>'.$explanation.'</div>';
             }
         } else {
-            if ($uselink) {
-                $linktext = &mt('Link to resource');
-                $output .= &create_link($url,$anchor,$title,$linktext);
-            } else {
-                my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
-                $output .= '<div style="overflow:scroll; -webkit-overflow-scrolling:touch;">'."\n".
-                           '<iframe src="'.$dest.'" height="100%" width="100%" frameborder="0">'."\n".
-                           "$lt{'noif'} $noiframe\n".
-                           "</iframe>\n".
-                           "</div>\n";
-            }
+            $output .= '<div style="overflow:scroll; -webkit-overflow-scrolling:touch;">'."\n".
+                       '<iframe src="'.$url.$anchor.'" height="100%" width="100%" frameborder="0">'."\n".
+                       "$lt{'noif'} $noiframe\n".
+                       "</iframe>\n".
+                       "</div>\n";
         }
         $output .= $endpage;
         return $output;
-    } elsif ($uselink) {
-        $linktext = &mt('Link to resource');
-        return $startpage.&create_link($url,$anchor,$title,$linktext).$endpage;
     } else {
         my $offset = 5;
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
@@ -213,54 +147,21 @@ ENDLINK
                 var pos = height + hdrtop + offset;
                 \$('.LC_iframecontainer').css('top', pos);
             });
-            LCresizedef = 1;
-            if (LCnotready == 1) {
-                LCnotready = 0;
-                \$(window).trigger('resize');
-            }
         });
-        window.onload = function(){
-            if (LCresizedef) {
-                LCnotready = 0;
-                \$(window).trigger('resize');
-            } else {
-                LCnotready = 1;
-            }
-        };
+        window.onload = function(){  \$(window).trigger('resize') };
 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
     }
 }
 
-sub create_link {
-    my ($url,$anchor,$title,$linktext) = @_;
-    my $shownlink;
-    if ($title eq '') {
-        $title = $env{'form.title'};
-        if ($title eq '') {
-            unless ($env{'request.enc'}) {
-                ($title) = ($url =~ m{/([^/]+)$});
-                $title =~ s/(\?[^\?]+)$//;
-            }
-        }
-    }
-    unless ($title eq '') {
-        $shownlink = '<span style="font-weight:bold;">'.$title.'</span><br />';
-    }
-    my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
-    $shownlink .= '<a href="'.$dest.'">'.$linktext.'</a>';
-    return $shownlink;
-}
-
 sub handler {
     my $r=shift;
     &Apache::loncommon::content_type($r,'text/html');
@@ -270,43 +171,29 @@ sub handler {
 
     my $url = $r->uri;
     my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname,
-        $linktext,$explanation,$width,$height);
+        $linktext,$explanation);
 
     for ($url){
         s|^/adm/wrapper||;
-        $is_ext = $_ =~ s|^/ext/|http://|;
-        s|http://https://?|https://| if ($is_ext);
-        s|&colon;|:|g;
+        $is_ext = $_ =~ s|^/ext/|http://|;         
+        s|http://https://|https://|;
+        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'],
+        my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation'],
                                             $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'};
+            $exttool = 'window'; 
+            $linktext = $toolhash{'linktext'}; 
             $explanation = $toolhash{'explanation'};
-        } elsif (($exttoolremote =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
-            $exttool = 'tab';
         }
     }
     if (($is_ext) || ($exttool)) {
@@ -356,7 +243,7 @@ sub handler {
 #
 # Actual URL
 #
-    if (($url=~/$LONCAPA::assess_re/) && (!$exttool)) {
+    if ($url=~/$LONCAPA::assess_re/) {
 #
 # This is uploaded homework
 #
@@ -381,8 +268,7 @@ sub handler {
             &Apache::lonenc::check_encrypt(\$url);
         }
 
-        $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,
-                           $linktext,$explanation,undef,$width,$height) );
+        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation) );
 
     } # not just the menu
     
@@ -409,14 +295,10 @@ 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($url,$brcrum,$absolute,$is_ext,$is_pdf,$title))
 
 =over
 
-=item $r
-
-request object
-
 =item $url
 
 url to display by including in an iframe within a
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>