--- rat/lonpage.pm 2022/10/05 22:59:06 1.111.2.13.2.4 +++ rat/lonpage.pm 2020/03/04 16:33:31 1.135 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.111.2.13.2.4 2022/10/05 22:59:06 raeburn Exp $ +# $Id: lonpage.pm,v 1.135 2020/03/04 16:33:31 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -102,9 +102,7 @@ sub tracetable { } else { $sofar++; if ($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); + my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid}); if (($brepriv eq '2') || ($brepriv eq 'F')) { if (defined($rows[$sofar])) { $rows[$sofar].='&'.$rid; @@ -278,8 +276,6 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); - my %cssrefs=(); - my %httpref=(); my %cellemb=(); my %cellexternal=(); @@ -372,7 +368,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! @@ -383,7 +379,7 @@ 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); @@ -421,9 +417,6 @@ ENDEXT } elsif ($env{'form.'.$prefix.'markaccess'} eq 'yes') { $posthash{'markaccess'} = $env{'form.'.$prefix.'markaccess'}; } - if ($env{'environment.remote'} eq 'on') { - $posthash{'inhibitmenu'} = 'yes'; - } my $output=Apache::lonnet::ssi($src,%posthash); $output=~s|//(\s*)?\s||gs; if (($target eq 'tex') || ($target eq 'tex_answer')) { @@ -445,7 +438,6 @@ ENDEXT my $bodydef=0; my $thisxml=0; my @rlinks=(); - my @css_hrefs=(); if ($output=~/\?xml/) { $isxml=1; $thisxml=1; @@ -488,14 +480,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'}; - - } } } } @@ -658,41 +642,19 @@ 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'); $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()); @@ -745,7 +707,7 @@ ENDEXT $uniquetimes{$item} = 1; } } - if (scalar(keys(%uniquetimes)) == 1) { + if (scalar(keys(%uniquetimes)) == 1) { my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime, $donebuttonextras); if (keys(%countdowndisp)) { @@ -798,21 +760,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, @@ -968,26 +915,9 @@ ENDEXT } # ------------------------------------------------------------- End render page } else { - 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 { - $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); - } + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &Apache::lonsequence::viewmap($r,$requrl); } # ------------------------------------------------------------------ Untie hash unless (untie(%hash)) { @@ -1009,32 +939,20 @@ 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,$shownsymb); - if (($hash->{'encrypted_'.$rid}) && (!$env{'request.role.adv'})) { - $aname = 'LC_'.$rid; - } else { - $shownsymb = $symb; - my $dispsymb = $symb; - if ($symb =~ /\#([^\#]+)$/) { - my $escan = &escape('#'); - $dispsymb =~ s/#([^\#]+)$/$escan$1/; - } - $aname = &escape($dispsymb); - } - my $metainfo = ''; unless ($env{'request.role.adv'}) { if ($buttonshide->{$symb} eq 'yes') { - return $metainfo; + return; } } 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}) { $esrc=&Apache::lonenc::encrypted($esrc); } @@ -1043,8 +961,8 @@ sub get_buttons { && !$env{'request.enc'} && ($env{'request.role.adv'} || !$hash->{'encrypted_'.$rid})) { - $metainfo .= ''. + $metainfo .=''. + ''. ''.&mt('Show Metadata').''. @@ -1106,8 +1024,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,$shownsymb, - undef,&escape($env{'form.title'}), + $forceedit,1,$symb,undef, + &escape($env{'form.title'}), $hostname); if ($jscall) { $editbutton = 1; @@ -1178,7 +1096,7 @@ sub add_countdown_timer { $donebuttontext = &mt('Done'); $type = 'map'; } - $donebutton = + $donebutton = &Apache::lonmenu::done_button_js($type,'','',$proctor,$donebuttontext); } unless ($env{'environment.icons'} eq 'iconsonly') {