--- rat/lonpage.pm 2020/02/18 22:28:41 1.133 +++ rat/lonpage.pm 2020/03/06 20:04:01 1.138 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.133 2020/02/18 22:28:41 raeburn Exp $ +# $Id: lonpage.pm,v 1.138 2020/03/06 20:04:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,6 +44,7 @@ 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/'; @@ -187,6 +188,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}; @@ -304,23 +307,74 @@ 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 @@ -782,10 +836,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(''); } @@ -888,38 +939,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 .= ''. @@ -1069,6 +1130,16 @@ 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__