--- rat/lonpage.pm 2023/09/11 12:11:26 1.111.2.13.2.6 +++ rat/lonpage.pm 2020/03/03 01:16:31 1.134 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.111.2.13.2.6 2023/09/11 12:11:26 raeburn Exp $ +# $Id: lonpage.pm,v 1.134 2020/03/03 01:16:31 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,7 +44,6 @@ 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/'; @@ -102,9 +101,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; @@ -190,8 +187,6 @@ 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}; @@ -268,7 +263,6 @@ sub handler { my $nforms=0; my $nuploads=0; my $ntimers=0; - my $hasnumresp; my %turninpaths; my %multiresps; my $turninparent; @@ -279,8 +273,6 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); - my %cssrefs=(); - my %httpref=(); my %cellemb=(); my %cellexternal=(); @@ -312,17 +304,11 @@ 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+)$/); if ($hash{'encrypted_'.$_}) { $src=&Apache::lonenc::encrypted($src); @@ -336,55 +322,26 @@ sub handler { &Apache::loncommon::fileembstyle($extension); if ($cellexternal{$_}) { if (($target eq 'tex') || ($target eq 'tex_answer')) { - my $shown = $src.$anchor; - if (($hash{'encrypted_'.$_}) && (!$env{'request.role.adv'})) { + my $shown = $src; + if ($hash{'encrypted_'.$_}) { $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); + $showsrc .= '?symb='.&Apache::lonenc::encrypted($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! + $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); @@ -422,9 +379,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')) { @@ -446,7 +400,6 @@ ENDEXT my $bodydef=0; my $thisxml=0; my @rlinks=(); - my @css_hrefs=(); if ($output=~/\?xml/) { $isxml=1; $thisxml=1; @@ -489,14 +442,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'}; - - } } } } @@ -516,11 +461,6 @@ ENDEXT $ntimers++; $hastimer = 1; } - unless ($hasnumresp) { - if ($output=~/\]+class\s*=\s*[\'\"]*([^\'\"\>]+|)LC_numresponse_text/) { - $hasnumresp = 1; - } - } $output=~ s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; $output=~ @@ -664,41 +604,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()); @@ -751,7 +669,7 @@ ENDEXT $uniquetimes{$item} = 1; } } - if (scalar(keys(%uniquetimes)) == 1) { + if (scalar(keys(%uniquetimes)) == 1) { my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime, $donebuttonextras); if (keys(%countdowndisp)) { @@ -804,21 +722,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, @@ -895,7 +798,10 @@ ENDEXT } $r->print('>'); } - $r->print($ssibody{$rid}); + unless (($cellexternal{$rid}) && + ($target eq 'tex') && ($target eq 'tex_answer')) { + $r->print($ssibody{$rid}); + } unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print(''); } @@ -962,11 +868,8 @@ ENDEXT &mt('Processing your submission ...').''); } unless (($target eq 'tex') || ($target eq 'tex_answer')) { - my $args = {'discussion' => 1}; - if ($hasnumresp) { - $args->{'dashjs'} = 1; - } - $r->print(&Apache::loncommon::end_page($args)); + $r->print(&Apache::loncommon::end_page({'discussion' + => 1,})); } else { $r->print('\end{document}'.$number_of_columns); } @@ -977,26 +880,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)) { @@ -1018,33 +904,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; - $shownsymb = &Apache::lonenc::encrypted($symb); - } 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); } @@ -1053,8 +926,8 @@ sub get_buttons { && !$env{'request.enc'} && ($env{'request.role.adv'} || !$hash->{'encrypted_'.$rid})) { - $metainfo .= ''. + $metainfo .=''. + ''. ''.&mt('Show Metadata').''. @@ -1116,8 +989,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; @@ -1188,7 +1061,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') { @@ -1211,16 +1084,6 @@ END 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.