--- rat/lonwrapper.pm 2020/01/14 17:14:11 1.49.2.7.2.1
+++ rat/lonwrapper.pm 2017/11/30 14:41:30 1.65
@@ -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.7.2.1 2020/01/14 17:14:11 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.65 2017/11/30 14:41:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -43,20 +43,19 @@ use HTML::Entities();
# ================================================================ Main Handler
sub wrapper {
- my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
+ my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
$title,$width,$height) = @_;
my $forcereg;
unless ($env{'form.folderpath'}) {
$forcereg = 1;
}
-
my %lt = &Apache::lonlocal::texthash(
'noif' => 'No iframe support.',
'show' => 'Show content in pop-up window',
);
- my ($anchor,$uselink);
+ my $anchor;
if ($is_ext) {
if ($env{'form.symb'}) {
(undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
@@ -66,12 +65,6 @@ sub wrapper {
} elsif ($env{'form.anchor'} ne '') {
$anchor = '#'.$env{'form.anchor'};
}
- unless (($is_pdf) && ($env{'browser.mobile'})) {
- my $hostname = $r->hostname();
- my $lonhost = $r->dir_config('lonHostID');
- my $ip = &Apache::lonnet::get_host_ip($lonhost);
- $uselink = &Apache::loncommon::is_nonframeable($url,$absolute,$hostname,$ip);
- }
}
my $noiframe = &Apache::loncommon::modal_link($url.$anchor,$lt{'show'},500,400);
@@ -91,22 +84,23 @@ sub wrapper {
my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
my $endpage = &Apache::loncommon::end_page();
-
- if (($uselink) && ($title eq '')) {
- if ($env{'form.symb'}) {
- $title=&Apache::lonnet::gettitle($env{'form.symb'});
- } else {
- my $symb=&Apache::lonnet::symbread($r->uri);
- if ($symb) {
- $title=&Apache::lonnet::gettitle($symb);
- }
- }
- }
+
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);
+ if ($title eq '') {
+ $title = $env{'form.title'};
+ if ($title eq '') {
+ unless ($env{'request.enc'}) {
+ ($title) = ($url =~ m{/([^/]+)$});
+ $title =~ s/(\?[^\?]+)$//;
+ }
+ }
+ }
+ unless ($title eq '') {
+ $output .= $title.'
';
+ }
+ $output .= ''.&mt('Link to PDF (for mobile devices)').'';
} elsif (($exttool eq 'window') || ($exttool eq 'tab')) {
if ($linktext eq '') {
$linktext = &mt('Launch External Tool');
@@ -121,9 +115,9 @@ sub wrapper {
$output .= <<"ENDLINK";