[LON-CAPA-cvs] cvs: rat / lonwrapper.pm

[raeburn]

raeburn		Tue Oct 19 00:16:32 2021 EDT

  Modified files:              
    /rat	lonwrapper.pm 
  Log:
  - On iOS 13-15 "Request Mobile Website" is needed to view a PDF in Safari.
    Browser agent string decoded at request time instead of using value set 
    at session initialization, to accommodate user toggling via Aa control.
  
  
Index: rat/lonwrapper.pm
diff -u rat/lonwrapper.pm:1.76 rat/lonwrapper.pm:1.77
--- rat/lonwrapper.pm:1.76	Sat Feb 29 16:05:26 2020
+++ rat/lonwrapper.pm	Tue Oct 19 00:16:32 2021
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.76 2020/02/29 16:05:26 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.77 2021/10/19 00:16:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,6 +56,9 @@
                                           'show' => 'Show content in pop-up window',
                                         );
 
+    (undef,undef,undef,undef,undef,undef,my $clientmobile) =
+        &Apache::loncommon::decode_user_agent($r);
+
     my ($anchor,$uselink);
     if ($is_ext) {
         if ($env{'form.symb'}) {
@@ -66,7 +69,7 @@
         } elsif ($env{'form.anchor'} ne '') {
             $anchor = '#'.$env{'form.anchor'};
         }
-        unless (($is_pdf) && ($env{'browser.mobile'})) {
+        unless (($is_pdf) && ($clientmobile)) {
             my $hostname = $r->hostname();
             my $lonhost = $r->dir_config('lonHostID');
             my $ip = &Apache::lonnet::get_host_ip($lonhost);
@@ -142,7 +145,7 @@
 # do not obscure the Functions menu.
 #
 
-    unless (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {
+    unless ($clientmobile || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {
         $headjs = '
 <script type="text/javascript">
 // <![CDATA[
@@ -165,7 +168,7 @@
             }
         }
     }
-    if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
+    if ($clientmobile || ($exttool eq 'window') || ($exttool eq 'tab')) {
         my $output = $startpage;
         if ($is_pdf) {
             $linktext = &mt('Link to PDF (for mobile devices)');
@@ -523,8 +526,8 @@
 
 =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
+optional. If wrapped item is a PDF, and $clientmobile 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).