--- rat/lonwrapper.pm	2012/11/27 23:45:15	1.42
+++ rat/lonwrapper.pm	2014/05/20 11:47:06	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.42 2012/11/27 23:45:15 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.47 2014/05/20 11:47:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,59 +40,95 @@ use Apache::lonextresedit();
 
 # ================================================================ Main Handler
 sub wrapper {
-    my ($url,$brcrum) = @_;
+    my ($url,$brcrum,$absolute,$is_ext,$is_pdf) = @_;
 
     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 $noiframe = &Apache::loncommon::modal_link($url,$lt{'show'},500,400);
     my $args = {'bgcolor' => '#FFFFFF'};
     if ($forcereg) {
         $args->{'force_register'} = $forcereg;
     }
     if (ref($brcrum) eq 'ARRAY') {
-         $args->{'bread_crumbs'} = $brcrum;
+        $args->{'bread_crumbs'} = $brcrum;
+    }
+    if ($absolute) {
+        $args->{'use_absolute'} = $absolute; 
     }
 
-    my $startpage =  Apache::loncommon::start_page('Menu',undef,$args);
-    my $endpage =  Apache::loncommon::end_page();
+    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');
+    if ($env{'browser.mobile'}) {
+        my $output = $startpage;
+        if ($is_pdf) {
+            my $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 />';
             }
-            var pos = height + hdrtop + offset;
-            \$('.LC_iframecontainer').css('top', pos);
+            $output .= '<a href="'.$url.'">'.&mt('Link to PDF (for mobile devices)').'</a>';
+        } else {
+            $output .= '<div style="overflow:scroll; -webkit-overflow-scrolling:touch;">'."\n".
+                       '<iframe src="$url" height="100%" width="100%" frameborder="0">'."\n".
+                       "$lt{'noif'} $noiframe\n".
+                       "</iframe>\n".
+                       "</div>\n";
+            $output .= '<iframe src="$url" height="100%" width="100%" frameborder="0">'."\n".
+                       "$lt{'noif'} $noiframe\n".
+                       '</iframe>';
+        }
+        $output .= $endpage;
+        return $output;
+    } else {
+        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');
+                    }
+                }
+                if (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)
+        return <<ENDFRAME;
+        $startpage
+        $script
+        <div class="LC_iframecontainer">
+            <iframe src="$url">$lt{'noif'} $noiframe</iframe>
+        </div>
+        $endpage
 ENDFRAME
+    }
 }
 
 sub handler {
@@ -103,7 +139,7 @@ sub handler {
     return OK if $r->header_only;
 
     my $url = $r->uri;
-    my ($is_ext,$brcrum);
+    my ($is_ext,$brcrum,$absolute,$is_pdf);
 
     for ($url){
         s|^/adm/wrapper||;
@@ -112,7 +148,20 @@ sub handler {
         s|&colon;|:|g;              
     }
 
+    if ($url =~ /\.pdf$/i) {
+        $is_pdf = 1;
+    }
+ 
     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;
+            }
+        }
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
             ['forceedit','register','folderpath','symb','idx','title']);
         if (($env{'form.forceedit'}) &&
@@ -126,20 +175,12 @@ sub handler {
             return OK;
         } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
             my $crstype = &Apache::loncommon::course_type();
-            $brcrum =
-                &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$env{'form.title'},1);
-            if (ref($brcrum) eq 'ARRAY') {
-                my $last = $env{'form.title'};
-                if ($last eq '') {
-                    $last = &mt('External Resource');
-                }
-                push(@{$brcrum},
-                         {'title' => $last,
-                          'text' => $last,
-                          'no_mt' => 1,
-                         });
-
+            my $title = $env{'form.title'};
+            if ($title eq '') {
+                $title = &mt('External Resource');
             }
+            $brcrum =
+                &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
         }
     }
 
@@ -168,7 +209,7 @@ sub handler {
         # encrypt url if not external
         &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ;
 
-        $r->print( wrapper($url,$brcrum) );
+        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf) );
 
     } # not just the menu
     
@@ -195,22 +236,53 @@ described at http://www.lon-capa.org.
 
 =over
 
-=item wrapper($url,$brcrum)
+=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf))
+
+=over
 
-Wraps $url in an iframe and generates a page for it.
-$brcrum contains breadcrumbs for unregistered urls
+=item $url
+
+url to display by including in an iframe within a
+LON-CAPA page which has a standard LON-CAPA inline menu.
+
+=item $brcrum
+
+breadcrumbs for unregistered urls
 (i.e., external resources in Supplemental Content).
-Returns markup for the entire page.
 
-=item handler()
+=item $absolute
 
-=back
+contains protocol (http or https) followed by
+the hostname, if menu items in the standard LON-CAPA
+interface created by the call to loncommon::start_page()
+within &wrapper() need to use absolute URLs rather than
+relative URLs.
 
-=cut
+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 
+from https:// to http:// where the the URL of the remote site 
+specified in the resource itself is http://.
+
+This is done to avoid default mixed content blocking
+in Firefox 23 and later, when serving from Apache/SSL.
 
+=item $is_ext
 
+true if URL is for an external resource.
 
+=item $is_pdf
 
+true if URL is for a PDF (based on file extension).
 
+=back
+
+Returns markup for the entire page.
+
+=item handler()
+
+=back
 
+=cut