--- rat/lonpage.pm 2020/07/18 21:49:35 1.111.2.10.2.2 +++ rat/lonpage.pm 2024/07/03 02:38:40 1.111.2.16 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.111.2.10.2.2 2020/07/18 21:49:35 raeburn Exp $ +# $Id: lonpage.pm,v 1.111.2.16 2024/07/03 02:38:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,7 +41,6 @@ use Apache::lonxml(); use Apache::lonlocal; use Apache::lonmenu; use Apache::lonhomework; -use Apache::lonparmset; use Apache::lonenc(); use HTML::TokeParser; use HTML::Entities(); @@ -102,7 +101,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; @@ -197,24 +198,16 @@ sub handler { if (($firstres) && ($lastres)) { # ------------------------------------------------------------- Countdown Timer my $now = time; - my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton, - %donebtnextra,%buttonbytime,$donetime,$symbtosetdone); + my ($pagefirstaccess,%hastimeleft,%countdowndisp); 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=(); @@ -232,27 +225,6 @@ 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; - } - } - } - } - } - } } } } @@ -266,6 +238,7 @@ sub handler { my $nforms=0; my $nuploads=0; my $ntimers=0; + my $hasnumresp; my %turninpaths; my %multiresps; my $turninparent; @@ -276,6 +249,8 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); + my %cssrefs=(); + my %httpref=(); my %cellemb=(); my %cellexternal=(); @@ -287,16 +262,6 @@ 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++) { @@ -441,6 +406,7 @@ ENDEXT my $bodydef=0; my $thisxml=0; my @rlinks=(); + my @css_hrefs=(); if ($output=~/\?xml/) { $isxml=1; $thisxml=1; @@ -483,6 +449,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'}; + + } } } } @@ -502,6 +476,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=~ @@ -551,8 +530,7 @@ 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'))) || - (($status eq 'NOT_YET_VIEWED') && ($posthash{'markaccess'} eq 'yes'))) { + (($probstatus eq 'no') || ($probstatus eq 'no_feedback_ever')))) { my ($slothastime,$timerhastime); if ($slot_name ne '') { if (ref($slot) eq 'HASH') { @@ -565,26 +543,11 @@ 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; - 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); - } + my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb); if ($first_access > 0) { - my ($timelimit) = ($interval[0] =~ /^(\d+)/); - if ($timelimit) { - my $timeremains = $timelimit + $first_access - $now; - if ($timeremains > 0) { - $timerhastime = $timeremains; - } + my $timeremains = $first_access+$interval[0] - $now; + if ($timeremains > 0) { + $timerhastime = $timeremains; } } } @@ -596,28 +559,6 @@ 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; } @@ -625,9 +566,6 @@ ENDEXT $hastimeleft{$symb} = $duedate - $now; $countdowndisp{$symb} = 'none'; } - unless ($donebutton{$symb}) { - $donebutton{$symb} = 0; - } } } } @@ -645,13 +583,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/(\]+)(codebase\=[^\S\>]+)*([^\>]*)\>/$1.($2?$2:' codebase="'.$thisdir.'"').$3.'>'/gei; $ssibody{$_}=$output; # ---------------------------------------------------------------- End SSI cell } } - } + } } unless ($contents) { &Apache::loncommon::content_type($r,'text/html'); @@ -710,9 +670,8 @@ ENDEXT $uniquetimes{$item} = 1; } } - if (scalar(keys(%uniquetimes)) == 1) { - my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime, - $donebuttonextras); + if (keys(%uniquetimes) == 1) { + my (%uniquedisplays,%uniquedones,$currdisp); if (keys(%countdowndisp)) { foreach my $item (values(%countdowndisp)) { if (exists($uniquedisplays{$item})) { @@ -726,25 +685,7 @@ ENDEXT $currdisp = $countdowndisplay[0]; } } - if (keys(%donebutton)) { - foreach my $item (values(%donebutton)) { - if (exists($uniquedones{$item})) { - $uniquedones{$item} ++; - } else { - $uniquedones{$item} = 1; - } - } - my @donebuttons = sort { $ <=> $b } (keys(%uniquedones)); - if (scalar(@donebuttons) == 1) { - if ($donebuttons[0]) { - $donebuttontime = $donebuttons[0]; - if (ref($buttonbytime{$donebuttontime}) eq 'ARRAY') { - $donebuttonextras = $donebtnextra{$buttonbytime{$donebuttontime}->[0]}; - } - } - } - } - &add_countdown_timer($currdisp,$donebuttontime,$donebuttonextras); + &add_countdown_timer($currdisp); } } my $pagebuttonshide; @@ -763,6 +704,21 @@ ENDEXT } } } + if (keys(%cssrefs)) { + my $links; + if (keys(%cssrefs)) { + foreach my $css_href (keys(%cssrefs)) { + next unless ($css_href =~ m{^(/res/|/uploaded/|https?://)}); + $links .= ''."\n"; + } + } + if ($links) { + if (keys(%httpref)) { + &Apache::lonnet::appenv(\%httpref); + } + $allscript .= "\n$links"; + } + } # ------------------------------------------------------------------ Start body $r->print(&Apache::loncommon::start_page(undef,$allscript, {'force_register' => 1, @@ -906,8 +862,11 @@ ENDEXT &mt('Processing your submission ...').''); } unless (($target eq 'tex') || ($target eq 'tex_answer')) { - $r->print(&Apache::loncommon::end_page({'discussion' - => 1,})); + my $args = {'discussion' => 1}; + if ($hasnumresp) { + $args->{'dashjs'} = 1; + } + $r->print(&Apache::loncommon::end_page($args)); } else { $r->print('\end{document}'.$number_of_columns); } @@ -918,9 +877,30 @@ ENDEXT } # ------------------------------------------------------------- End render page } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - &Apache::lonsequence::viewmap($r,$requrl); + if ($hash{'map_type_'.$hash{'map_pc_'.$requrl}} eq 'none') { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $r->print(&Apache::loncommon::start_page(undef,undef, + {'force_register' => 1,})); + my $crstype = &Apache::loncommon::course_type(); + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + $r->print(''.&mt('Missing composite page file.').'
'. + &mt("You may want to use the $crstype Editor to remove this item.")); + } else { + if ($crstype eq 'Placement') { + $r->print(''.&mt('Missing page').''); + } else { + $r->print(''. + &mt('This resource was unavailable when your '.lc($crstype).' session was loaded').'
'. + &mt("Please use 'Contents' to list items available in the $crstype.").''); + } + } + $r->print(&Apache::loncommon::end_page()); + } else { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &Apache::lonsequence::viewmap($r,$requrl); + } } # ------------------------------------------------------------------ Untie hash unless (untie(%hash)) { @@ -946,16 +926,18 @@ sub get_buttons { my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid}, $resid, $hash->{'src_'.$rid}); - my $aname; + my ($aname,$shownsymb); if (($hash->{'encrypted_'.$rid}) && (!$env{'request.role.adv'})) { $aname = 'LC_'.$rid; + $shownsymb = &Apache::lonenc::encrypted($symb); } else { - my $shownsymb = $symb; + $shownsymb = $symb; + my $dispsymb = $symb; if ($symb =~ /\#([^\#]+)$/) { my $escan = &escape('#'); - $shownsymb =~ s/#([^\#]+)$/$escan$1/; + $dispsymb =~ s/#([^\#]+)$/$escan$1/; } - $aname = &escape($shownsymb); + $aname = &escape($dispsymb); } my $metainfo = ''; unless ($env{'request.role.adv'}) { @@ -995,7 +977,7 @@ sub get_buttons { if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) && ($hash->{'src_'.$rid} !~ m-^/uploaded/-)) { - if ((&Apache::lonnet::allowed('mgr',$crs_sec)) || + if ((&Apache::lonnet::allowed('mgr',$crs_sec)) || (&Apache::lonnet::allowed('vgr',$crs_sec))) { $metainfo.= ''. '&command=gradingmenu">'. ''.&mt('Content Grades').''. - ''; - } - if ((&Apache::lonnet::allowed('opa',$crs_sec)) || + ''; + } + if ((&Apache::lonnet::allowed('opa',$crs_sec)) || (&Apache::lonnet::allowed('vpa',$crs_sec))) { $metainfo.= ' $collapse