--- rat/lonpage.pm 2020/03/12 07:46:14 1.111.2.12
+++ rat/lonpage.pm 2023/09/12 14:55:16 1.111.2.13.2.7
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.111.2.12 2020/03/12 07:46:14 raeburn Exp $
+# $Id: lonpage.pm,v 1.111.2.13.2.7 2023/09/12 14:55:16 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,6 +41,7 @@ use Apache::lonxml();
use Apache::lonlocal;
use Apache::lonmenu;
use Apache::lonhomework;
+use Apache::lonparmset;
use Apache::lonenc();
use HTML::TokeParser;
use HTML::Entities();
@@ -101,7 +102,9 @@ sub tracetable {
} else {
$sofar++;
if ($hash{'src_'.$rid}) {
- my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid});
+ my ($mapid,$resid)=split(/\./,$rid);
+ my $symb = &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid});
+ my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid},$symb);
if (($brepriv eq '2') || ($brepriv eq 'F')) {
if (defined($rows[$sofar])) {
$rows[$sofar].='&'.$rid;
@@ -196,16 +199,24 @@ sub handler {
if (($firstres) && ($lastres)) {
# ------------------------------------------------------------- Countdown Timer
my $now = time;
- my ($pagefirstaccess,%hastimeleft,%countdowndisp);
+ my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton,
+ %donebtnextra,%buttonbytime,$donetime,$symbtosetdone);
my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser();
+ unless ($pagesymb) {
+ $pagesymb=&Apache::lonnet::symbread($requrl);
+ }
if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) {
my %times=&Apache::lonnet::get('firstaccesstimes',
[$courseid."\0".$pagesymb],
$domain,$name);
if ($times{$courseid."\0".$pagesymb} =~ /^\d+$/) {
$pagefirstaccess = $times{$courseid."\0".$pagesymb};
+ if ($pagefirstaccess && $env{'form.LC_interval_done'} eq 'true') {
+ $donetime = $now - $pagefirstaccess;
+ }
}
}
+
# ----------------------------------------------------------------- Render page
@rows=();
@@ -223,6 +234,27 @@ sub handler {
my ($mapid,$resid)=split(/\./,$rid);
$symbhash{$hash{'src_'.$rid}}=
[$hash{'src_'.$rid},$resid];
+ if (($donetime) && ($symbtosetdone eq '')) {
+ my $src = $hash{'src_'.$rid};
+ if ($hash{'encrypted_'.$rid}) {
+ $src=&Apache::lonenc::encrypted($src);
+ }
+ my ($mapid,$resid)=split(/\./,$rid);
+ my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
+ if ($src =~ /$LONCAPA::assess_re/) {
+ my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
+ if (@interval > 1) {
+ if (($interval[1] eq 'map') && ($pagefirstaccess)) {
+ my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+ if ($timelimit) {
+ if ($pagefirstaccess + $timelimit > $now) {
+ $symbtosetdone = $symb;
+ }
+ }
+ }
+ }
+ }
+ }
}
}
}
@@ -236,6 +268,7 @@ sub handler {
my $nforms=0;
my $nuploads=0;
my $ntimers=0;
+ my $hasnumresp;
my %turninpaths;
my %multiresps;
my $turninparent;
@@ -246,6 +279,8 @@ sub handler {
my %ssilink=();
my %ssivlink=();
my %ssialink=();
+ my %cssrefs=();
+ my %httpref=();
my %cellemb=();
my %cellexternal=();
@@ -257,6 +292,16 @@ sub handler {
my $xmlheader='';
my $xmlbody='';
+# ---------------------------------------------------------- Handle Done button
+
+ # Set the event timer to zero if the "done button" was clicked.
+ if ($donetime && $symbtosetdone) {
+ &Apache::lonparmset::storeparm_by_symb_inner($symbtosetdone,'0_interval',
+ 2,$donetime,'date_interval',
+ $name,$domain);
+ undef($env{'form.LC_interval_done'});
+ }
+
# --------------------------------------------- Get SSI output, post parameters
for ($i=0;$i<=$#rows;$i++) {
@@ -401,6 +446,7 @@ ENDEXT
my $bodydef=0;
my $thisxml=0;
my @rlinks=();
+ my @css_hrefs=();
if ($output=~/\?xml/) {
$isxml=1;
$thisxml=1;
@@ -443,6 +489,14 @@ ENDEXT
($bodydef==0)) {
$allscript.="\n\n"
.$parser->get_text('/script');
+ } elsif (($token->[1] eq 'link') &&
+ ($bodydef==0)) {
+ if (($token->[2]->{'href'} !~ m{^/adm/}) &&
+ ($token->[2]->{'rel'} eq 'stylesheet')) {
+ $css_hrefs[$#css_hrefs+1]=
+ $token->[2]->{'href'};
+
+ }
}
}
}
@@ -462,6 +516,11 @@ ENDEXT
$ntimers++;
$hastimer = 1;
}
+ unless ($hasnumresp) {
+ if ($output=~/\]+class\s*=\s*['"]*[^'">]*LC_numresponse_text\W/) {
+ $hasnumresp = 1;
+ }
+ }
$output=~
s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
$output=~
@@ -511,7 +570,8 @@ ENDEXT
undef(%Apache::lonhomework::history);
my $probstatus = &Apache::lonnet::EXT("resource.0.problemstatus",$symb);
if (($status eq 'CAN_ANSWER') || (($status eq 'CANNOT_ANSWER') &&
- (($probstatus eq 'no') || ($probstatus eq 'no_feedback_ever')))) {
+ (($probstatus eq 'no') || ($probstatus eq 'no_feedback_ever'))) ||
+ (($status eq 'NOT_YET_VIEWED') && ($posthash{'markaccess'} eq 'yes'))) {
my ($slothastime,$timerhastime);
if ($slot_name ne '') {
if (ref($slot) eq 'HASH') {
@@ -524,11 +584,26 @@ ENDEXT
my $duedate = &Apache::lonnet::EXT("resource.0.duedate",$symb);
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
if (@interval > 1) {
- my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
+ my $first_access;
+ if ($interval[1] eq 'map') {
+ my $ignorecache;
+ if ($env{'form.'.$prefix.'markaccess'} eq 'yes') {
+ $ignorecache = 1;
+ }
+ $first_access=&Apache::lonnet::get_first_access($interval[1],undef,$pagesymb,$ignorecache);
+ if (($first_access) && (!$pagefirstaccess)) {
+ $pagefirstaccess = $first_access;
+ }
+ } else {
+ $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
+ }
if ($first_access > 0) {
- my $timeremains = $first_access+$interval[0] - $now;
- if ($timeremains > 0) {
- $timerhastime = $timeremains;
+ my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+ if ($timelimit) {
+ my $timeremains = $timelimit + $first_access - $now;
+ if ($timeremains > 0) {
+ $timerhastime = $timeremains;
+ }
}
}
}
@@ -540,6 +615,28 @@ ENDEXT
$countdowndisp{$symb} = 'inline';
if ((@interval > 1) && ($timerhastime)) {
$hastimeleft{$symb} = $timerhastime;
+ if ($pagefirstaccess) {
+ my ($timelimit,$usesdone,$donebuttontext,$proctor,$secret);
+ ($timelimit,my $donesuffix) = split(/_/,$interval[0],2);
+ if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) {
+ $usesdone = 'done';
+ $donebuttontext = $1;
+ (undef,$proctor,$secret) = split(/_/,$2);
+ } elsif ($donesuffix =~ /^done(|_.+)$/) {
+ $donebuttontext = &mt('Done');
+ ($usesdone,$proctor,$secret) = split(/_/,$donesuffix);
+ }
+ if ($usesdone eq 'done') {
+ $donebutton{$symb} = $timelimit;
+ push(@{$buttonbytime{$timelimit}},$symb);
+ $donebtnextra{$symb} = {
+ text => $donebuttontext,
+ proctor => $proctor,
+ secret => $secret,
+ type => $interval[1],
+ };
+ }
+ }
} else {
$hastimeleft{$symb} = $slothastime;
}
@@ -547,6 +644,9 @@ ENDEXT
$hastimeleft{$symb} = $duedate - $now;
$countdowndisp{$symb} = 'none';
}
+ unless ($donebutton{$symb}) {
+ $donebutton{$symb} = 0;
+ }
}
}
}
@@ -564,13 +664,35 @@ ENDEXT
$output=~s/(\"|\'|\=\s*)$_(\"|\'|\s|\>)/$1$newlocation$2/;
}
}
+ foreach my $css_href (@css_hrefs) {
+ next if ($css_href eq '');
+ unless ($css_href =~ m{https?://}) {
+ my $proburl = &Apache::lonnet::clutter($plainsrc);
+ unless ($css_href =~ m{^/}) {
+ my $probdir = $proburl;
+ $probdir=~s/\/[^\/]*$//;
+ $css_href = &Apache::lonnet::hreflocation($probdir,$css_href);
+ }
+ if ($css_href =~ m{^/(res|uploaded)/}) {
+ unless (($env{'httpref.'.$css_href}) ||
+ ($httpref{'httpref.'.$css_href}) ||
+ (&Apache::lonnet::is_on_map($css_href))) {
+ if ($env{'httpref.'.$proburl}) {
+ $proburl = $env{'httpref.'.$proburl};
+ }
+ $httpref{'httpref.'.$css_href} = $proburl;
+ }
+ }
+ }
+ $cssrefs{$css_href} = 1;
+ }
# -------------------------------------------------- Deal with Applet codebases
$output=~s/(\