--- rat/lonpage.pm 2020/07/18 21:49:35 1.111.2.10.2.2 +++ rat/lonpage.pm 2020/02/17 23:04:24 1.131 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.111.2.10.2.2 2020/07/18 21:49:35 raeburn Exp $ +# $Id: lonpage.pm,v 1.131 2020/02/17 23:04:24 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/'; @@ -188,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}; @@ -202,7 +199,7 @@ sub handler { 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], @@ -307,79 +304,28 @@ 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,$plainsrc); + my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src); unless ($env{'request.role.adv'}) { $buttonshide{$symb} = &Apache::lonnet::EXT("resource.0.buttonshide",$symb); } $cellemb{$_}= &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'})) { - $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! + unless (($target eq 'tex') || ($target eq 'tex_answer')) { + $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); @@ -417,9 +363,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')) { @@ -657,7 +600,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()); @@ -700,7 +643,6 @@ ENDEXT '// ]]>'. "\n\n"; } - &Apache::lonhtmlcommon::clear_breadcrumb_tools(); if (keys(%hastimeleft)) { my (%uniquetimes,%uniquedisplays); foreach my $item (values(%hastimeleft)) { @@ -839,7 +781,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(''); } @@ -942,48 +887,39 @@ 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 $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}) { + $symb=&Apache::lonenc::encrypted($symb); $esrc=&Apache::lonenc::encrypted($esrc); } if ($hash->{'src_'.$rid} !~ m-^/uploaded/- - && $hash->{'src_'.$rid} !~ m{^/ext/} + && $hash->{'src_'.$rid} !~ m{^https?://} && !$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{^/ext/})) { + ($hash->{'src_'.$rid} !~ m{^https?://})) { $metainfo .= ''. @@ -995,8 +931,7 @@ sub get_buttons { if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) && ($hash->{'src_'.$rid} !~ m-^/uploaded/-)) { - if ((&Apache::lonnet::allowed('mgr',$crs_sec)) || - (&Apache::lonnet::allowed('vgr',$crs_sec))) { + if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) { $metainfo.= ''. @@ -1004,20 +939,16 @@ sub get_buttons { ''.&mt('View Submissions for a Student or a Group of Students').''. - ''; - } - if (&Apache::lonnet::allowed('mgr',$crs_sec)) { - $metainfo.= - ''. '&command=gradingmenu">'. ''.&mt('Content Grades').''. - ''; - } - if ((&Apache::lonnet::allowed('opa',$crs_sec)) || - (&Apache::lonnet::allowed('vpa',$crs_sec))) { + ''; + } + if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { $metainfo.= ''. @@ -1110,7 +1041,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') { @@ -1129,20 +1060,11 @@ $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__