--- rat/lonwrapper.pm	2020/02/16 23:52:03	1.49.2.8
+++ rat/lonwrapper.pm	2021/12/15 00:41:48	1.49.2.11
@@ -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.8 2020/02/16 23:52:03 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 @@ sub wrapper {
                                           '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 @@ sub wrapper {
         } 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 @@ sub wrapper {
 # do not obscure the Functions menu.
 #
 
-    unless (($env{'browser.mobile'}) || $uselink) {
+    unless ($clientmobile || $uselink) {
         $headjs = '
 <script type="text/javascript">
 // <![CDATA[
@@ -102,6 +105,7 @@ var LCnotready = 0;
 var LCresizedef = 0;
 // ]]>
 </script>'."\n";
+    }
 
     my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args);
     my $endpage = &Apache::loncommon::end_page();
@@ -116,7 +120,7 @@ var LCresizedef = 0;
             }
         }
     }
-    if ($env{'browser.mobile'}) {
+    if ($clientmobile) {
         my $output = $startpage;
         if ($is_pdf) {
             $linktext = &mt('Link to PDF (for mobile devices)');
@@ -176,7 +180,7 @@ var LCresizedef = 0;
         window.onload = function(){
             if (LCresizedef) {
                 LCnotready = 0;
-                \$(window).trigger('resize') };
+                \$(window).trigger('resize');
             } else {
                 LCnotready = 1;
             }
@@ -227,7 +231,7 @@ sub handler {
     for ($url){
         s|^/adm/wrapper||;
         $is_ext = $_ =~ s|^/ext/|http://|;
-        s|http://https://?|https://| if ($is_ext);
+        s|http://https://|https://| if ($is_ext);
         s|&colon;|:|g;
     }
 
@@ -374,8 +378,8 @@ true if URL is for a PDF (based on file
 
 =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).