--- rat/lonpage.pm	2022/10/05 22:59:06	1.111.2.13.2.4
+++ 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.111.2.13.2.4 2022/10/05 22:59:06 raeburn Exp $
+# $Id: lonpage.pm,v 1.139 2020/11/10 23:55:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,9 +102,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;
@@ -383,7 +381,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);
@@ -421,9 +419,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')) {
@@ -686,13 +681,13 @@ ENDEXT
 # ---------------------------------------------------------------- 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('<br /><br />'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').
 				&Apache::loncommon::end_page());
@@ -745,7 +740,7 @@ ENDEXT
                                       $uniquetimes{$item} = 1;
                                   }
                               }
-                              if (scalar(keys(%uniquetimes)) == 1) { 
+                              if (scalar(keys(%uniquetimes)) == 1) {
                                   my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime,
                                       $donebuttonextras);
                                   if (keys(%countdowndisp)) {
@@ -968,26 +963,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('<span class="LC_warning">'.&mt('Missing composite page file.').'</span><br />'.
-                                    &mt("You may want to use the $crstype Editor to remove this item."));
-                      } else {
-                          $r->print('<span class="LC_info">'.
-                                    &mt('This resource was unavailable when your '.lc($crstype).' session was loaded').'<br />'.
-                                    &mt("Please use 'Contents' to list items available in the $crstype.").'</span>');
-                      }
-                      $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)) {
@@ -1013,17 +991,16 @@ sub get_buttons {
     my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid},
 					  $resid,
 					  $hash->{'src_'.$rid});
-    my ($aname,$shownsymb);
+    my $aname;
     if (($hash->{'encrypted_'.$rid}) && (!$env{'request.role.adv'})) {
         $aname = 'LC_'.$rid;
     } else {
-        $shownsymb = $symb;
-        my $dispsymb = $symb;
+        my $shownsymb = $symb;
         if ($symb =~ /\#([^\#]+)$/) {
             my $escan = &escape('#');
-            $dispsymb =~ s/#([^\#]+)$/$escan$1/;
+            $shownsymb =~ s/#([^\#]+)$/$escan$1/;
         }
-        $aname = &escape($dispsymb);
+        $aname = &escape($shownsymb);
     }
     my $metainfo = '<a name="'.$aname.'"></a>';
     unless ($env{'request.role.adv'}) {
@@ -1106,8 +1083,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;
@@ -1178,7 +1155,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') {