--- rat/lonpage.pm	2020/03/04 16:33:31	1.135
+++ rat/lonpage.pm	2020/11/10 23:55:32	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.135 2020/03/04 16:33:31 raeburn Exp $
+# $Id: lonpage.pm,v 1.139 2020/11/10 23:55:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -276,6 +276,8 @@ sub handler {
                   my %ssilink=();
                   my %ssivlink=();
                   my %ssialink=();
+                  my %cssrefs=();
+                  my %httpref=();
      
                   my %cellemb=();
                   my %cellexternal=();
@@ -368,7 +370,7 @@ sub handler {
                                           if (($hash{'encrypted_'.$_}) && ($symb) && (!$env{'request.role.adv'})) {
                                               $showsrc .= '?symb='.&Apache::lonenc::encrypted($symb);
                                           } elsif ($anchor) {
-                                              $showsrc .= $anchor
+                                              $showsrc .= $anchor;
                                           }
                                           $ssibody{$_} = <<ENDEXT;
 <iframe src="$showsrc" width="100%" height="300px">No iframe support!</iframe>
@@ -438,6 +440,7 @@ ENDEXT
                               my $bodydef=0;
                               my $thisxml=0;
                               my @rlinks=();
+                              my @css_hrefs=();
                               if ($output=~/\?xml/) {
                                  $isxml=1;
                                  $thisxml=1;
@@ -480,6 +483,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'};
+
+                                      }
                                   }
 			        }
 			      }
@@ -642,6 +653,28 @@ 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/(\<applet[^\>]+)(codebase\=[^\S\>]+)*([^\>]*)\>/$1.($2?$2:' codebase="'.$thisdir.'"').$3.'>'/gei;
 			      $ssibody{$_}=$output;
@@ -760,6 +793,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 .= '<link rel="stylesheet" type="text/css" href="'.$css_href.'" />'."\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,
@@ -939,20 +987,31 @@ 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 = '<a name="'.$aname.'"></a>';
     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}) {
 	$esrc=&Apache::lonenc::encrypted($esrc);
     }
@@ -961,8 +1020,8 @@ sub get_buttons {
 	&& !$env{'request.enc'}
 	&& ($env{'request.role.adv'}
 	    || !$hash->{'encrypted_'.$rid})) { 
-	$metainfo .='<a name="'.&escape($symb).'"></a>'.
-	    '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'.
+	$metainfo .= '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" '.
+	    'target="LONcatInfo">'.
             '<img src="/res/adm/pages/catalog.png" class="LC_icon"'.
             ' alt="'.&mt('Show Metadata').'"'.
             ' title="'.&mt('Show Metadata').'" />'.