--- rat/lonpage.pm 2020/03/05 20:46:04 1.111.2.11 +++ 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.11 2020/03/05 20:46:04 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 # @@ -101,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; @@ -236,6 +238,7 @@ sub handler { my $nforms=0; my $nuploads=0; my $ntimers=0; + my $hasnumresp; my %turninpaths; my %multiresps; my $turninparent; @@ -246,6 +249,8 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); + my %cssrefs=(); + my %httpref=(); my %cellemb=(); my %cellexternal=(); @@ -328,7 +333,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! @@ -401,6 +406,7 @@ ENDEXT my $bodydef=0; my $thisxml=0; my @rlinks=(); + my @css_hrefs=(); if ($output=~/\?xml/) { $isxml=1; $thisxml=1; @@ -443,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'}; + + } } } } @@ -462,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=~ @@ -564,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'); @@ -663,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, @@ -806,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); } @@ -818,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)) { @@ -846,11 +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 { - $aname = &escape($symb); + $shownsymb = $symb; + my $dispsymb = $symb; + if ($symb =~ /\#([^\#]+)$/) { + my $escan = &escape('#'); + $dispsymb =~ s/#([^\#]+)$/$escan$1/; + } + $aname = &escape($dispsymb); } my $metainfo = ''; unless ($env{'request.role.adv'}) { @@ -933,8 +1020,8 @@ sub get_buttons { &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb); if ($cfile ne '') { my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, - $forceedit,1,$symb,undef, - &escape($env{'form.title'}), + $forceedit,1,$symb,$shownsymb, + undef,&escape($env{'form.title'}), $hostname); if ($jscall) { $editbutton = 1;