--- rat/lonpage.pm	2020/11/13 02:46:48	1.111.2.10.2.3
+++ rat/lonpage.pm	2020/03/05 16:45:32	1.136
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.111.2.10.2.3 2020/11/13 02:46:48 raeburn Exp $
+# $Id: lonpage.pm,v 1.136 2020/03/05 16:45:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -202,7 +202,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],
@@ -276,8 +276,6 @@ sub handler {
                   my %ssilink=();
                   my %ssivlink=();
                   my %ssialink=();
-                  my %cssrefs=();
-                  my %httpref=();
      
                   my %cellemb=();
                   my %cellexternal=();
@@ -370,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{$_} = <<ENDEXT;
 <iframe src="$showsrc" width="100%" height="300px">No iframe support!</iframe>
@@ -381,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);
@@ -419,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*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs;
                               if (($target eq 'tex') || ($target eq 'tex_answer')) {
@@ -443,7 +438,6 @@ ENDEXT
                               my $bodydef=0;
                               my $thisxml=0;
                               my @rlinks=();
-                              my @css_hrefs=();
                               if ($output=~/\?xml/) {
                                  $isxml=1;
                                  $thisxml=1;
@@ -486,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'};
-
-                                      }
                                   }
 			        }
 			      }
@@ -656,28 +642,6 @@ 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;
@@ -690,7 +654,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('<br /><br />'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').
 				&Apache::loncommon::end_page());
@@ -796,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 .= '<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,
@@ -998,12 +947,7 @@ sub get_buttons {
     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);
+        $aname = &escape($symb);
     }
     my $metainfo = '<a name="'.$aname.'"></a>';
     unless ($env{'request.role.adv'}) {
@@ -1023,8 +967,8 @@ sub get_buttons {
 	&& !$env{'request.enc'}
 	&& ($env{'request.role.adv'}
 	    || !$hash->{'encrypted_'.$rid})) { 
-	$metainfo .= '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" '.
-	    'target="LONcatInfo">'.
+	$metainfo .='<a name="'.&escape($symb).'"></a>'.
+	    '<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').'" />'.
@@ -1043,7 +987,7 @@ sub get_buttons {
     if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&
 	($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
 
-        if ((&Apache::lonnet::allowed('mgr',$crs_sec)) ||
+	if ((&Apache::lonnet::allowed('mgr',$crs_sec)) ||
             (&Apache::lonnet::allowed('vgr',$crs_sec))) {
 	    $metainfo.=
 		'<a href="/adm/grades?symb='.&escape($symb).
@@ -1056,15 +1000,15 @@ sub get_buttons {
         }
         if (&Apache::lonnet::allowed('mgr',$crs_sec)) {
             $metainfo.=
-                '<a href="/adm/grades?symb='.&escape($symb).
+		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=gradingmenu" target="LONcatInfo">'.
 		'&command=gradingmenu">'.
                 '<img src="/res/adm/pages/pgrd.png" class="LC_icon"'.
                 ' alt="'.&mt('Content Grades').'"'.
                 ' title="'.&mt('Content Grades').'" />'.
-                '</a>';
-        }
-        if ((&Apache::lonnet::allowed('opa',$crs_sec)) ||
+		'</a>';
+	}
+	if ((&Apache::lonnet::allowed('opa',$crs_sec)) ||
             (&Apache::lonnet::allowed('vpa',$crs_sec))) {
 	    $metainfo.=
 		'<a href="/adm/parmset?symb='.&escape($symb).
@@ -1158,7 +1102,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') {