--- rat/lonwrapper.pm 2017/04/25 22:19:03 1.60
+++ rat/lonwrapper.pm 2020/01/14 14:26:39 1.70
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.60 2017/04/25 22:19:03 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.70 2020/01/14 14:26:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,11 +38,14 @@ use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonextresedit();
use Apache::lonexttool();
-use LONCAPA qw(:DEFAULT :match);;
+use Apache::lonhomework();
+use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities();
# ================================================================ Main Handler
sub wrapper {
- my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title) = @_;
+ my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
+ $title,$width,$height) = @_;
my $forcereg;
unless ($env{'form.folderpath'}) {
@@ -53,7 +56,7 @@ sub wrapper {
'show' => 'Show content in pop-up window',
);
- my $anchor;
+ my ($anchor,$uselink);
if ($is_ext) {
if ($env{'form.symb'}) {
(undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
@@ -63,6 +66,12 @@ 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);
@@ -80,45 +89,132 @@ sub wrapper {
$args->{'only_body'} = $env{'form.only_body'};
}
- my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
- my $endpage = &Apache::loncommon::end_page();
-
- if (($env{'browser.mobile'}) || ($exttool eq 'window')) {
- my $output = $startpage;
- if ($is_pdf) {
- if ($title eq '') {
- $title = $env{'form.title'};
- if ($title eq '') {
- unless ($env{'request.enc'}) {
- ($title) = ($url =~ m{/([^/]+)$});
- $title =~ s/(\?[^\?]+)$//;
- }
+ 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'}) {
+ my $symb=&Apache::lonnet::symbread($url);
+ my @interval=&Apache::lonnet::EXT('resource.0.interval',$symb);
+ my ($timelimit) = split(/_/,$interval[0]);
+ my $setres = &Apache::lonnet::set_first_access($interval[1],$timelimit);
+ if ($setres eq 'ok') {
+ delete($env{'form.markaccess'});
+ }
+ } elsif ($env{'form.LC_interval_done'} eq 'true') {
+ my $symb=&Apache::lonnet::symbread($url);
+ if ($symb) {
+ (my $donebuttonresult,$donemsg) = &Apache::lonhomework::zero_timer($symb);
+ undef($env{'form.LC_interval_done'});
+ undef($env{'form.LC_interval_done_proctorpass'});
+ }
+ }
+ my ($status,$result,$resource_due) =
+ &Apache::lonexttool::gradabletool_access_check();
+ undef($Apache::lonhomework::browse);
+ if ($status eq 'CAN_ANSWER') {
+ if ($resource_due) {
+ my $time_left = $resource_due - time();
+ if ($resource_due && ($time_left > 0)) {
+ $countdown ='
+'."\n".
+ &Apache::lonhtmlcommon::set_due_date($resource_due);
}
}
- unless ($title eq '') {
- $output .= $title.'
';
+ } else {
+ if ($status eq 'SHOW_ANSWER') {
+ $result = &Apache::lonexttool::display_score().
+ &Apache::lonfeedback::list_discussion('tool','OPEN');
+ }
+ return &Apache::loncommon::start_page('Menu',undef,$args).
+ $result.
+ &Apache::loncommon::end_page();
+ }
+ }
+
+ 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'});
+ } else {
+ my $symb=&Apache::lonnet::symbread($r->uri);
+ if ($symb) {
+ $title=&Apache::lonnet::gettitle($symb);
}
- $output .= ''.&mt('Link to PDF (for mobile devices)').'';
- } elsif ($exttool 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')) {
if ($linktext eq '') {
$linktext = &mt('Launch External Tool');
}
- $output .= '
The server encountered an internal error or misconfiguration and was unable to complete your request.
Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.
More information about this error may be available in the server error log.