--- rat/lonpage.pm 2020/11/13 02:46:48 1.111.2.10.2.3 +++ rat/lonpage.pm 2020/03/05 20:46:04 1.111.2.11 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.111.2.10.2.3 2020/11/13 02:46:48 raeburn Exp $ +# $Id: lonpage.pm,v 1.111.2.11 2020/03/05 20:46:04 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(); @@ -197,24 +196,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 +223,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; - } - } - } - } - } - } } } } @@ -276,8 +246,6 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); - my %cssrefs=(); - my %httpref=(); my %cellemb=(); my %cellexternal=(); @@ -289,16 +257,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++) { @@ -370,7 +328,7 @@ sub handler { if (($hash{'encrypted_'.$_}) && ($symb) && (!$env{'request.role.adv'})) { $showsrc .= '?symb='.&Apache::lonenc::encrypted($symb); } elsif ($anchor) { - $showsrc .= $anchor; + $showsrc .= $anchor } $ssibody{$_} = <No iframe support! @@ -443,7 +401,6 @@ ENDEXT my $bodydef=0; my $thisxml=0; my @rlinks=(); - my @css_hrefs=(); if ($output=~/\?xml/) { $isxml=1; $thisxml=1; @@ -486,14 +443,6 @@ 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'}; - - } } } } @@ -562,8 +511,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') { @@ -576,26 +524,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; } } } @@ -607,28 +540,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; } @@ -636,9 +547,6 @@ ENDEXT $hastimeleft{$symb} = $duedate - $now; $countdowndisp{$symb} = 'none'; } - unless ($donebutton{$symb}) { - $donebutton{$symb} = 0; - } } } } @@ -656,28 +564,6 @@ 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; @@ -743,9 +629,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})) { @@ -759,25 +644,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; @@ -796,21 +663,6 @@ 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, @@ -998,12 +850,7 @@ sub get_buttons { if (($hash->{'encrypted_'.$rid}) && (!$env{'request.role.adv'})) { $aname = 'LC_'.$rid; } else { - my $shownsymb = $symb; - if ($symb =~ /\#([^\#]+)$/) { - my $escan = &escape('#'); - $shownsymb =~ s/#([^\#]+)$/$escan$1/; - } - $aname = &escape($shownsymb); + $aname = &escape($symb); } my $metainfo = ''; unless ($env{'request.role.adv'}) { @@ -1043,7 +890,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