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

[raeburn]

raeburn		Wed Dec 15 00:41:48 2021 EDT

  Modified files:              (Branch: version_2_11_X)
    /rat	lonwrapper.pm 
  Log:
  - For 2.11
    Backport 1.77 (part)
  
  
Index: rat/lonwrapper.pm
diff -u rat/lonwrapper.pm:1.49.2.10 rat/lonwrapper.pm:1.49.2.11
--- rat/lonwrapper.pm:1.49.2.10	Thu Mar  5 22:05:50 2020
+++ rat/lonwrapper.pm	Wed Dec 15 00:41:48 2021
@@ -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.10 2020/03/05 22:05:50 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.49.2.11 2021/12/15 00:41:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,6 +52,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,$linktext);
     if ($is_ext) {
         if ($env{'form.symb'}) {
@@ -62,7 +65,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);
@@ -94,7 +97,7 @@
 # do not obscure the Functions menu.
 #
 
-    unless (($env{'browser.mobile'}) || $uselink) {
+    unless ($clientmobile || $uselink) {
         $headjs = '
 <script type="text/javascript">
 // <![CDATA[
@@ -117,7 +120,7 @@
             }
         }
     }
-    if ($env{'browser.mobile'}) {
+    if ($clientmobile) {
         my $output = $startpage;
         if ($is_pdf) {
             $linktext = &mt('Link to PDF (for mobile devices)');
@@ -375,8 +378,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).