--- rat/lonpage.pm	2022/09/19 20:01:39	1.111.2.13.2.3
+++ rat/lonpage.pm	2023/09/11 13:26:26	1.144
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.111.2.13.2.3 2022/09/19 20:01:39 raeburn Exp $
+# $Id: lonpage.pm,v 1.144 2023/09/11 13:26:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -268,6 +268,7 @@ sub handler {
                   my $nforms=0;
                   my $nuploads=0;
                   my $ntimers=0;
+                  my $hasnumresp;
                   my %turninpaths;
                   my %multiresps;
                   my $turninparent;
@@ -383,7 +384,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 +422,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')) {
@@ -515,6 +513,11 @@ ENDEXT
                                       $ntimers++;
                                       $hastimer = 1;
                                   }
+                                  unless ($hasnumresp) {
+                                      if ($output=~/\<input[^\>]+class\s*=\s*['"]*[^'">]*LC_numresponse_text\W/) {
+                                          $hasnumresp = 1;
+                                      }
+                                  }
                                   $output=~
 				      s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
                                   $output=~
@@ -686,13 +689,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 +748,7 @@ ENDEXT
                                       $uniquetimes{$item} = 1;
                                   }
                               }
-                              if (scalar(keys(%uniquetimes)) == 1) { 
+                              if (scalar(keys(%uniquetimes)) == 1) {
                                   my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime,
                                       $donebuttonextras);
                                   if (keys(%countdowndisp)) {
@@ -956,8 +959,11 @@ ENDEXT
                           &mt('Processing your submission ...').'</div></form>');
                       }
 		      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
-			  $r->print(&Apache::loncommon::end_page({'discussion'
-								      => 1,}));
+                          my $args = {'discussion' => 1};
+                          if ($hasnumresp) {
+                              $args->{'dashjs'} = 1;
+                          }
+			  $r->print(&Apache::loncommon::end_page($args));
 		      } else {
 			  $r->print('\end{document}'.$number_of_columns);
 		      }
@@ -968,9 +974,30 @@ ENDEXT
                   }                  
 # ------------------------------------------------------------- End render page
               } else {
-                  &Apache::loncommon::content_type($r,'text/html');
-                  $r->send_http_header;
-                  &Apache::lonsequence::viewmap($r,$requrl);
+                  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 {
+                          if ($crstype eq 'Placement') {
+                              $r->print('<span class="LC_warning">'.&mt('Missing page').'</span>');
+                          } 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);
+                  }
               }
 # ------------------------------------------------------------------ Untie hash
               unless (untie(%hash)) {
@@ -999,6 +1026,7 @@ sub get_buttons {
     my ($aname,$shownsymb);
     if (($hash->{'encrypted_'.$rid}) && (!$env{'request.role.adv'})) {
         $aname = 'LC_'.$rid;
+        $shownsymb = &Apache::lonenc::encrypted($symb);
     } else {
         $shownsymb = $symb;
         my $dispsymb = $symb;
@@ -1161,7 +1189,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') {