--- rat/lonwrapper.pm	2013/10/15 10:17:19	1.45
+++ rat/lonwrapper.pm	2017/11/30 14:41:30	1.65
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.45 2013/10/15 10:17:19 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.65 2017/11/30 14:41:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,16 +37,37 @@ 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 ($url,$brcrum,$absolute,$is_ext) = @_;
+    my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
+        $title,$width,$height) = @_;
 
     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;
+    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'};
+        }
+    }
+
+    my $noiframe = &Apache::loncommon::modal_link($url.$anchor,$lt{'show'},500,400);
     my $args = {'bgcolor' => '#FFFFFF'};
     if ($forcereg) {
         $args->{'force_register'} = $forcereg;
@@ -55,47 +76,124 @@ 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();
-
-    my $script = Apache::lonhtmlcommon::scripttag(<<SCRIPT );
-    \$(document).ready( function() {
-        \$(window).unbind('resize').resize(function(){
-            var header;
-            var offset = 5;
-            var height = 0;
-            var hdrtop = 0;
-            if (\$('div.LC_head_subbox:first').length) {
-                header = \$('div.LC_head_subbox:first');
-                offset = 9;
-            } else {
-                if (\$('#LC_breadcrumbs').length) {
-                    header = \$('#LC_breadcrumbs');
+    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')) {
+        my $output = $startpage;
+        if ($is_pdf) {
+            if ($title eq '') {
+                $title = $env{'form.title'};
+                if ($title eq '') {
+                    unless ($env{'request.enc'}) {
+                        ($title) = ($url =~ m{/([^/]+)$});
+                        $title =~ s/(\?[^\?]+)$//;
+                    }
                 }
             }
-            if (header.length) {
-                height = header.height();
-                hdrtop = header.position().top;
+            unless ($title eq '') {
+                $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');
             }
-            var pos = height + hdrtop + offset;
-            \$('.LC_iframecontainer').css('top', pos);
+            $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 {
+            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 .= $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 = null;
+                var offset = $offset;
+                var height = 0;
+                var hdrtop = 0;
+                if (\$('div.LC_head_subbox:first').length) {
+                    header = \$('div.LC_head_subbox:first');
+                    offset = 9;
+                } else {
+                    if (\$('#LC_breadcrumbs').length) {
+                        header = \$('#LC_breadcrumbs');
+                    }
+                }
+                if (header != null && header.length) {
+                    height = header.height();
+                    hdrtop = header.position().top;
+                }
+                var pos = height + hdrtop + offset;
+                \$('.LC_iframecontainer').css('top', pos);
+            });
         });
-    });
-    window.onload = function(){  \$(window).trigger('resize') }; 
+        window.onload = function(){  \$(window).trigger('resize') };
 SCRIPT
-
-    # javascript will position the iframe if window was resized (or zoomed)
-    return <<ENDFRAME;
-    $startpage
-    $script
-    <div class="LC_iframecontainer">
-        <iframe src="$url">No iframe support!</iframe>
-    </div>
-    $endpage
+        # 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>
+        </div>
+        $endpage
 ENDFRAME
+    }
 }
 
 sub handler {
@@ -106,7 +204,8 @@ sub handler {
     return OK if $r->header_only;
 
     my $url = $r->uri;
-    my ($is_ext,$brcrum,$absolute);
+    my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname,
+        $linktext,$explanation,$width,$height);
 
     for ($url){
         s|^/adm/wrapper||;
@@ -115,32 +214,75 @@ sub handler {
         s|&colon;|:|g;              
     }
 
-    if ($is_ext) {
-        my $hostname = $r->hostname();
-        my $lonhost = &Apache::lonnet::host_from_dns($hostname);
-        if ($lonhost) {
-            my $actual = &Apache::lonnet::absolute_url($hostname);
-            my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; 
-            unless ($actual eq $expected) {
-                $absolute = $expected;
+
+    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)) {
         &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';
+            } 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'}));
+                                                       $env{'form.idx'},$type,$cdom,
+                                                       $cnum,$hostname));
             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);
@@ -150,7 +292,7 @@ sub handler {
 #
 # Actual URL
 #
-    if ($url=~/$LONCAPA::assess_re/) {
+    if (($url=~/$LONCAPA::assess_re/) && (!$exttool)) {
 #
 # This is uploaded homework
 #
@@ -160,7 +302,8 @@ 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/\&$//;
         }
@@ -170,9 +313,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) );
+        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,
+                           $linktext,$explanation,undef,$width,$height) );
 
     } # not just the menu
     
@@ -199,12 +345,12 @@ described at http://www.lon-capa.org.
 
 =over
 
-=item wrapper($url,$brcrum,$absolute,$is_ext)
+=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$linktext,$explanation,$title,$width,$height)
 
 =over
 
-=item $url 
- 
+=item $url
+
 url to display by including in an iframe within a
 LON-CAPA page which has a standard LON-CAPA inline menu.
 
@@ -213,7 +359,7 @@ LON-CAPA page which has a standard LON-C
 breadcrumbs for unregistered urls
 (i.e., external resources in Supplemental Content).
 
-=item $absolute 
+=item $absolute
 
 contains protocol (http or https) followed by
 the hostname, if menu items in the standard LON-CAPA
@@ -224,7 +370,9 @@ relative URLs.
 That will be the case where an external resource has been 
 served from port 80, when the server customarily serves
 requests using Apache/SSL (i.e., port 443). mod_rewrite 
-is used to switch requests for external resources  
+is used to switch requests for external resources and
+the syllabus: /public/<domain>/<courseid>/syllabus
+(which might also point at an external resource)
 from https:// to http:// where the the URL of the remote site 
 specified in the resource itself is http://.
 
@@ -235,6 +383,18 @@ in Firefox 23 and later, when serving fr
 
 true if URL is for an external resource.
 
+=item $is_pdf
+
+true if URL is for a PDF (based on file extension).
+
+=item $title
+
+optional. If wrapped item is a PDF, and $env{'browser.mobile'} 
+is true, a link to a PDF is shown. The "title" will be displayed
+above the link, but if not provided as an arg, $env{'form.title'}
+will be used, otherwise, the filename will be displayed (unless
+hidden URL set for the resource).
+
 =back
 
 Returns markup for the entire page.
@@ -245,9 +405,3 @@ Returns markup for the entire page.
 
 =cut
 
-
-
-
-
-
-