--- rat/lonpage.pm 2019/08/12 15:36:40 1.111.2.8 +++ rat/lonpage.pm 2022/06/29 17:51:10 1.140 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.111.2.8 2019/08/12 15:36:40 raeburn Exp $ +# $Id: lonpage.pm,v 1.140 2022/06/29 17:51:10 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,8 +41,10 @@ use Apache::lonxml(); use Apache::lonlocal; use Apache::lonmenu; use Apache::lonhomework; +use Apache::lonparmset; use Apache::lonenc(); use HTML::TokeParser; +use HTML::Entities(); use GDBM_File; use Apache::lonsequence; use lib '/home/httpd/lib/perl/'; @@ -100,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; @@ -186,6 +190,8 @@ sub handler { if (-e "$fn.db") { my %buttonshide; my $hostname = $r->hostname(); + my $lonhost = $r->dir_config('lonHostID'); + my $ip = &Apache::lonnet::get_host_ip($lonhost); if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) { # ------------------------------------------------------------------- Hash tied my $firstres=$hash{'map_start_'.$requrl}; @@ -193,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=(); @@ -220,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; + } + } + } + } + } + } } } } @@ -243,6 +278,8 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); + my %cssrefs=(); + my %httpref=(); my %cellemb=(); my %cellexternal=(); @@ -254,6 +291,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++) { @@ -264,28 +311,79 @@ sub handler { foreach (@colcont) { my $src=$hash{'src_'.$_}; my $plainsrc = $src; + my $anchor; + if ($hash{'ext_'.$_} eq 'true:') { + $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:'); + $src =~ s{^/ext/}{http://}; + $src =~ s{http://https://}{https://}; + if ($src =~ /(\#[^#]+)$/) { + $anchor = $1; + $src =~ s/\#[^#]+$//; + } + } + my $unencsrc = $src; my ($extension)=($src=~/\.(\w+)$/); - $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:'); if ($hash{'encrypted_'.$_}) { $src=&Apache::lonenc::encrypted($src); } my ($mapid,$resid)=split(/\./,$_); - my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src); + my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$plainsrc); unless ($env{'request.role.adv'}) { $buttonshide{$symb} = &Apache::lonnet::EXT("resource.0.buttonshide",$symb); } $cellemb{$_}= &Apache::loncommon::fileembstyle($extension); if ($cellexternal{$_}) { - unless (($target eq 'tex') || ($target eq 'tex_answer')) { - $ssibody{$_} = <No iframe support! + if (($target eq 'tex') || ($target eq 'tex_answer')) { + my $shown = $src.$anchor; + if (($hash{'encrypted_'.$_}) && (!$env{'request.role.adv'})) { + $shown = &mt('URL not shown (encrypted)'); + } + my $title=&Apache::lonnet::gettitle($symb); + $title = &Apache::lonxml::latex_special_symbols($title); + $shown = &Apache::lonxml::latex_special_symbols($shown); + $ssibody{$_} = ' \strut \\\\ \textit{'.$title.'} \strut \\\\ '.$shown.'\\\\'; + } else { + my $showsrc = $src; + my ($is_pdf,$title,$linktext); + if ($unencsrc =~ /\.pdf$/i) { + $is_pdf = 1; + } + if (($hash{'encrypted_'.$_}) && ($symb)) { + $title=&Apache::lonnet::gettitle(&Apache::lonenc::encrypted($symb)); + } else { + $title=&Apache::lonnet::gettitle($symb); + } + if ($env{'browser.mobile'}) { + if ($is_pdf) { + $linktext = &mt('Link to PDF (for mobile devices)'); + $ssibody{$_} = &create_extlink($unencsrc,$anchor,$title,$linktext); + } else { + $linktext = &mt('Link to resource'); + $ssibody{$_} = &create_extlink($unencsrc,$anchor,$title,$linktext); + } + } else { + my $absolute = $env{'request.use_absolute'}; + my $uselink = &Apache::loncommon::is_nonframeable($unencsrc,$absolute,$hostname,$ip); + if (($uselink) || (($ENV{'SERVER_PORT'} == 443) && ($unencsrc =~ m{^http://}))) { + $linktext = &mt('Link to resource'); + $ssibody{$_} = &create_extlink($unencsrc,$anchor,$title,$linktext); + } else { + if (($hash{'encrypted_'.$_}) && ($symb) && (!$env{'request.role.adv'})) { + $showsrc .= '?symb='.&Apache::lonenc::encrypted($symb); + } elsif ($anchor) { + $showsrc .= $anchor; + } + $ssibody{$_} = <No iframe support! ENDEXT + } + } } } elsif ($cellemb{$_} eq 'ssi') { # --------------------------------------------------------- This is an SSI cell my $prefix='p_'.$_.'_'; - my $idprefix='p_'.join('_',($mapid,$resid,'')); + my $idprefix= 'p_'.join('_',($mapid,$resid,'')); my %posthash=('request.prefix' => $prefix, 'LONCAPA_INTERNAL_no_discussion' => 'true', 'symb' => $symb); @@ -320,10 +418,9 @@ ENDEXT if ($env{'form.all_submit_pressed'}) { $posthash{'all_submit'}='yes'; } - } - if ($env{'environment.remote'} eq 'on') { - $posthash{'inhibitmenu'} = 'yes'; - } + } elsif ($env{'form.'.$prefix.'markaccess'} eq 'yes') { + $posthash{'markaccess'} = $env{'form.'.$prefix.'markaccess'}; + } my $output=Apache::lonnet::ssi($src,%posthash); $output=~s|//(\s*)?\s||gs; if (($target eq 'tex') || ($target eq 'tex_answer')) { @@ -345,6 +442,7 @@ ENDEXT my $bodydef=0; my $thisxml=0; my @rlinks=(); + my @css_hrefs=(); if ($output=~/\?xml/) { $isxml=1; $thisxml=1; @@ -387,6 +485,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'}; + + } } } } @@ -455,7 +561,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') { @@ -468,11 +575,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; + } } } } @@ -484,6 +606,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; } @@ -491,6 +635,9 @@ ENDEXT $hastimeleft{$symb} = $duedate - $now; $countdowndisp{$symb} = 'none'; } + unless ($donebutton{$symb}) { + $donebutton{$symb} = 0; + } } } } @@ -508,6 +655,28 @@ 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; @@ -520,7 +689,7 @@ ENDEXT &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; $r->print(&Apache::loncommon::start_page(undef,undef, - {'force_register' => 1})); + {'force_register' => 1,})); $r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. '); $r->print('

'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course'). &Apache::loncommon::end_page()); @@ -563,6 +732,7 @@ ENDEXT '// ]]>'. "\n\n"; } + &Apache::lonhtmlcommon::clear_breadcrumb_tools(); if (keys(%hastimeleft)) { my (%uniquetimes,%uniquedisplays); foreach my $item (values(%hastimeleft)) { @@ -572,8 +742,9 @@ ENDEXT $uniquetimes{$item} = 1; } } - if (keys(%uniquetimes) == 1) { - my (%uniquedisplays,%uniquedones,$currdisp); + if (scalar(keys(%uniquetimes)) == 1) { + my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime, + $donebuttonextras); if (keys(%countdowndisp)) { foreach my $item (values(%countdowndisp)) { if (exists($uniquedisplays{$item})) { @@ -587,7 +758,25 @@ ENDEXT $currdisp = $countdowndisplay[0]; } } - &add_countdown_timer($currdisp); + 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); } } my $pagebuttonshide; @@ -606,6 +795,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, @@ -682,10 +886,7 @@ ENDEXT } $r->print('>'); } - unless (($cellexternal{$rid}) && - ($target eq 'tex') && ($target eq 'tex_answer')) { - $r->print($ssibody{$rid}); - } + $r->print($ssibody{$rid}); unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print(''); } @@ -788,35 +989,48 @@ ENDEXT sub get_buttons { my ($hash,$rid,$buttonshide,$hostname) = @_; - my $metainfo = ''; - my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); my ($mapid,$resid)=split(/\./,$rid); my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid}, $resid, $hash->{'src_'.$rid}); + my $aname; + 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); + } + my $metainfo = ''; unless ($env{'request.role.adv'}) { if ($buttonshide->{$symb} eq 'yes') { - return; + return $metainfo; } } + my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '') + ? "/$env{'request.course.sec'}" + : ''); + my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); if ($hash->{'encrypted_'.$rid}) { - $symb=&Apache::lonenc::encrypted($symb); $esrc=&Apache::lonenc::encrypted($esrc); } if ($hash->{'src_'.$rid} !~ m-^/uploaded/- - && $hash->{'src_'.$rid} !~ m{^https?://} + && $hash->{'src_'.$rid} !~ m{^/ext/} && !$env{'request.enc'} && ($env{'request.role.adv'} || !$hash->{'encrypted_'.$rid})) { - $metainfo .=''. - ''. + $metainfo .= ''. ''.&mt('Show Metadata').''. ''; } if (($hash->{'src_'.$rid} !~ m{^/uploaded/}) && - ($hash->{'src_'.$rid} !~ m{^https?://})) { + ($hash->{'src_'.$rid} !~ m{^/ext/})) { $metainfo .= ''. @@ -828,7 +1042,8 @@ sub get_buttons { if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) && ($hash->{'src_'.$rid} !~ m-^/uploaded/-)) { - if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) { + if ((&Apache::lonnet::allowed('mgr',$crs_sec)) || + (&Apache::lonnet::allowed('vgr',$crs_sec))) { $metainfo.= ''. @@ -836,7 +1051,10 @@ sub get_buttons { ''.&mt('View Submissions for a Student or a Group of Students').''. - ''. + ''; + } + if (&Apache::lonnet::allowed('mgr',$crs_sec)) { + $metainfo.= ''. '&command=gradingmenu">'. @@ -845,7 +1063,8 @@ sub get_buttons { ' title="'.&mt('Content Grades').'" />'. ''; } - if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { + if ((&Apache::lonnet::allowed('opa',$crs_sec)) || + (&Apache::lonnet::allowed('vpa',$crs_sec))) { $metainfo.= ''. @@ -867,8 +1086,8 @@ sub get_buttons { if ($cfile ne '') { my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, $forceedit,1,$symb,undef, - &escape($env{'form.title'}, - $hostname)); + &escape($env{'form.title'}), + $hostname); if ($jscall) { $editbutton = 1; my $icon = 'pcstr.png'; @@ -886,12 +1105,15 @@ sub get_buttons { if ((&Apache::lonnet::allowed('cre','/')) && (&Apache::lonnet::metadata($url,'sourceavail') eq 'open')) { $viewsrcbutton = 1; - } elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) { + } elsif (&Apache::lonnet::allowed('vxc',$crs_sec)) { if ($url =~ m{^\Q/res/$cdom/\E($LONCAPA::match_username)/}) { my $auname = $1; if (($env{'request.course.adhocsrcaccess'} ne '') && (grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) { $viewsrcbutton = 1; + } elsif ((&Apache::lonnet::metadata($url,'sourceavail') eq 'open') && + (&Apache::lonnet::allowed('bre',$crs_sec))) { + $viewsrcbutton = 1; } } } @@ -918,19 +1140,33 @@ sub get_buttons { } sub add_countdown_timer { - my ($currdisp) = @_; - my ($collapse,$expand,$alttxt,$title); + my ($currdisp,$donebuttontime,$donebuttonextras) = @_; + my ($collapse,$expand,$alttxt,$title,$donebutton); if ($currdisp eq 'inline') { $collapse = '► '; } else { $expand = '◄ '; } + if ($donebuttontime) { + my ($type,$proctor,$donebuttontext); + if (ref($donebuttonextras) eq 'HASH') { + $proctor = $donebuttonextras->{'proctor'}; + $donebuttontext = $donebuttonextras->{'text'}; + $type = $donebuttonextras->{'type'}; + } else { + $donebuttontext = &mt('Done'); + $type = 'map'; + } + $donebutton = + &Apache::lonmenu::done_button_js($type,'','',$proctor,$donebuttontext); + } unless ($env{'environment.icons'} eq 'iconsonly') { $alttxt = &mt('Timer'); $title = $alttxt.' '; } my $desc = &mt('Countdown to due date/time'); my $output = < $collapse @@ -940,11 +1176,20 @@ $collapse $expand $alttxt$title END - &Apache::lonhtmlcommon::clear_breadcrumb_tools(); &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$output); return; } +sub create_extlink { + my ($url,$anchor,$title,$linktext) = @_; + my $shownlink; + unless ($title eq '') { + $shownlink = ''.$title.'
'; + } + my $dest = &HTML::Entities::encode($url.$anchor,'&<>"'); + $shownlink .= ''.$linktext.''; + return $shownlink; +} 1; __END__ 500 Internal Server Error

Internal Server Error

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.