--- rat/lonwrapper.pm 2023/07/06 19:53:17 1.49.2.11.2.4
+++ rat/lonwrapper.pm 2019/05/02 02:12:31 1.69
@@ -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.11.2.4 2023/07/06 19:53:17 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.69 2019/05/02 02:12:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,15 +39,13 @@ use Apache::lonhtmlcommon();
use Apache::lonextresedit();
use Apache::lonexttool();
use Apache::lonhomework();
-use Apache::lonnavmaps();
use LONCAPA qw(:DEFAULT :match);
use HTML::Entities();
-use Digest::MD5();
# ================================================================ Main Handler
sub wrapper {
my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
- $title,$width,$height,$reuse,$is_supp) = @_;
+ $title,$width,$height) = @_;
my $forcereg;
unless ($env{'form.folderpath'}) {
@@ -58,9 +56,6 @@ 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);
if ($is_ext) {
if ($env{'form.symb'}) {
@@ -71,10 +66,7 @@ sub wrapper {
} elsif ($env{'form.anchor'} ne '') {
$anchor = '#'.$env{'form.anchor'};
}
- if (($is_ext eq 'tab') || ($is_ext eq 'window')) {
- $uselink = 1;
- }
- unless (($is_pdf && $clientmobile) || $uselink) {
+ unless (($is_pdf) && ($env{'browser.mobile'})) {
my $hostname = $r->hostname();
my $lonhost = $r->dir_config('lonHostID');
my $ip = &Apache::lonnet::get_host_ip($lonhost);
@@ -97,7 +89,7 @@ sub wrapper {
$args->{'only_body'} = $env{'form.only_body'};
}
- my ($countdown,$donemsg,$headjs);
+ my ($countdown,$donemsg);
if (($exttool) && (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i)) {
$Apache::lonhomework::browse = &Apache::lonnet::allowed('bre',$url);
if ($env{'form.markaccess'}) {
@@ -143,121 +135,47 @@ sub wrapper {
}
}
-#
-# Where iframe is in use, if window.onload() executes before the custom resize function
-# has been defined (jQuery), two global javascript vars (LCnotready and LCresizedef)
-# are used to ensure document.ready() triggers a call to resize, so the iframe contents
-# do not obscure the Functions menu.
-#
-
- unless ($clientmobile || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {
- $headjs = '
-'."\n";
- }
-
- my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args).$countdown.$donemsg;
+ my $startpage = &Apache::loncommon::start_page('Menu',undef,$args).$countdown.$donemsg;
my $endpage = &Apache::loncommon::end_page();
if (($uselink) && ($title eq '')) {
if ($env{'form.symb'}) {
$title=&Apache::lonnet::gettitle($env{'form.symb'});
- } elsif (!$is_supp) {
+ } else {
my $symb=&Apache::lonnet::symbread($r->uri);
if ($symb) {
$title=&Apache::lonnet::gettitle($symb);
}
}
}
- if ($clientmobile || ($exttool eq 'window') || ($exttool eq 'tab') ||
- ($is_ext eq 'tab') || ($is_ext eq 'window')) {
+ if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
my $output = $startpage;
if ($is_pdf) {
$linktext = &mt('Link to PDF (for mobile devices)');
$output .= &create_link($url,$anchor,$title,$linktext);
- } elsif (($exttool eq 'window') || ($exttool eq 'tab') ||
- ($is_ext eq 'tab') || ($is_ext eq 'window')) {
- my $preamble;
+ } elsif (($exttool eq 'window') || ($exttool eq 'tab')) {
if ($linktext eq '') {
- if ($exttool) {
- $linktext = &mt('Launch External Tool');
- } else {
- $linktext = &mt('Link to External Resource');
- }
+ $linktext = &mt('Launch External Tool');
}
- if ($exttool) {
- $url = &HTML::Entities::encode($url,'"<>&');
- } else {
- $url = &HTML::Entities::encode($url.$anchor,'&<>"');
- }
- if (($exttool eq 'tab') || ($is_ext eq 'tab')) {
- my $target;
- if ($exttool) {
- $target = 'LCExternalToolTab';
- } else {
- if ($reuse) {
- $target = 'LCExternalResTab';
- } else {
- $target = '_blank';
- }
- if ($title ne '') {
- $preamble = ''.$title.'
';
- }
- }
- $output .= '