--- rat/lonpage.pm	2020/01/22 15:02:22	1.111.2.10.2.1
+++ rat/lonpage.pm	2019/08/11 12:27:15	1.127
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.111.2.10.2.1 2020/01/22 15:02:22 raeburn Exp $
+# $Id: lonpage.pm,v 1.127 2019/08/11 12:27:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -199,7 +199,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],
@@ -325,7 +325,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);
@@ -360,12 +360,7 @@ ENDEXT
 				  if ($env{'form.all_submit_pressed'}) {
 				      $posthash{'all_submit'}='yes';
 				  }
-			      } 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')) {
@@ -603,7 +598,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());
@@ -626,9 +621,7 @@ ENDEXT
 				  "\n</script>\n";
 			  }
                           if (($nforms) && ($nuploads)) {
-                              $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps).
-                                            '<script type="text/javascript" '.
-                                            'src="/res/adm/includes/file_upload.js"></script>';
+                              $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps);
                           }
                           if (($nforms) && (&Apache::lonhtmlcommon::htmlareabrowser())) {
                               my %textarea_args = (
@@ -1037,7 +1030,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') {