--- rat/lonwrapper.pm	2013/10/22 23:13:54	1.46
+++ rat/lonwrapper.pm	2014/06/17 23:22:21	1.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.46 2013/10/22 23:13:54 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.49 2014/06/17 23:22:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,7 @@ use Apache::lonextresedit();
 
 # ================================================================ Main Handler
 sub wrapper {
-    my ($url,$brcrum,$absolute,$is_ext) = @_;
+    my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_;
 
     my $forcereg;
     unless ($env{'form.folderpath'}) {
@@ -68,15 +68,30 @@ sub wrapper {
     my $endpage = &Apache::loncommon::end_page();
 
     if ($env{'browser.mobile'}) {
-        return <<ENDFRAME;
-        $startpage
-        <div style="overflow:scroll; -webkit-overflow-scrolling:touch;">
-        <iframe src="$url" height="100%" width="100%" frameborder="0">
-            $lt{'noif'} $noiframe
-        </iframe>
-        </div>
-        $endpage
-ENDFRAME
+        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/(\?[^\?]+)$//;
+                    }
+                }
+            }
+            unless ($title eq '') {
+                $output .= $title.'<br />';
+            }
+            $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 .= $endpage;
+        return $output;
     } else {
         my $script = &Apache::lonhtmlcommon::scripttag(<<SCRIPT);
         \$(document).ready( function() {
@@ -123,7 +138,7 @@ sub handler {
     return OK if $r->header_only;
 
     my $url = $r->uri;
-    my ($is_ext,$brcrum,$absolute);
+    my ($is_ext,$brcrum,$absolute,$is_pdf);
 
     for ($url){
         s|^/adm/wrapper||;
@@ -132,16 +147,11 @@ 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'}) &&
@@ -178,6 +188,7 @@ sub handler {
 # This is not homework
 #
         if ($is_ext) {
+            $absolute = $env{'request.use_absolute'};
             $ENV{'QUERY_STRING'} =~ s/(^|\&)symb=[^\&]*/$1/;
             $ENV{'QUERY_STRING'} =~ s/\&$//;
         }
@@ -189,7 +200,7 @@ sub handler {
         # encrypt url if not external
         &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ;
 
-        $r->print( wrapper($url,$brcrum,$absolute,$is_ext) );
+        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf) );
 
     } # not just the menu
     
@@ -216,7 +227,7 @@ described at http://www.lon-capa.org.
 
 =over
 
-=item wrapper($url,$brcrum,$absolute,$is_ext)
+=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$title))
 
 =over
 
@@ -241,7 +252,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://.
 
@@ -252,6 +265,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.