--- rat/lonpage.pm	2020/01/22 15:02:22	1.111.2.10.2.1
+++ rat/lonpage.pm	2017/10/14 22:16:59	1.120.4.3
@@ -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.120.4.3 2017/10/14 22:16:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -186,7 +186,6 @@ sub handler {
       my $fn=$env{'request.course.fn'};
       if (-e "$fn.db") {
           my %buttonshide;
-          my $hostname = $r->hostname();
           if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {
 # ------------------------------------------------------------------- Hash tied
               my $firstres=$hash{'map_start_'.$requrl};
@@ -199,7 +198,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],
@@ -324,8 +323,8 @@ ENDEXT
                               }
                           } elsif ($cellemb{$_} eq 'ssi') {
 # --------------------------------------------------------- This is an SSI cell
-			      my $prefix='p_'.$_.'_';
-                              my $idprefix='p_'.join('_',($mapid,$resid,''));
+			      my $prefix=$_.'_';
+                              my $idprefix= join('_',($mapid,$resid,''));
                               my %posthash=('request.prefix' => $prefix,
 					    'LONCAPA_INTERNAL_no_discussion' => 'true',
 					    'symb' => $symb);
@@ -338,31 +337,26 @@ ENDEXT
 				  $posthash{'rndseed'}=$env{'form.rndseed'};
                                   $posthash{'answer_output_mode'} = $env{'form.answer_output_mode'};
 			      }
-			      my $submitted=$env{'form.all_submit_pressed'};
+			      my $submitted=exists($env{'form.all_submit'});
 			      if (!$submitted) {
 				  foreach my $key (keys(%env)) {
-				      if ($key=~/^\Qform.$prefix\Esubmit_(.+)_pressed$/) {
-                                          if ($env{$key}) {
-                                              $submitted=1;
-                                              last;
-                                          }
+				      if ($key=~/^form.\Q$prefix\Esubmit_/) {
+					  $submitted=1;last;
 				      }
-                                  }
+				  }
 			      }
                               if ($submitted) {
 				  foreach my $key (keys(%env)) {
-				      if ($key=~/^\Qform.$prefix\E/) {
+				      if ($key=~/^form.\Q$prefix\E/) {
 					  my $name=$key;
-					  $name=~s/^\Qform.$prefix\E//;
+					  $name=~s/^form.\Q$prefix\E//;
 					  $posthash{$name}=$env{$key};
-                                      }
+				      }
 				  }
-				  if ($env{'form.all_submit_pressed'}) {
+				  if (exists($env{'form.all_submit'})) {
 				      $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';
                               }
@@ -473,6 +467,8 @@ ENDEXT
                                   $output=~
                                       s/(\Q<td class="LC_status_\E)(\Qsubmit_\E)([^\"]*)(\s*[^\"]*"\>)/$1$idprefix$2$3$4/g;
                                   if ($nuploads) {
+                                      $output=~
+                                          s/\<(input[^\>]+name=\"\Q$prefix\EHWFILE[^\>]+)\s*id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\)]*)\>/\<$1 id="$prefix$2" $3\>/gsi;
                                        ($turninpaths{$prefix},$multiresps{$prefix}) = 
                                            &Apache::loncommon::get_turnedin_filepath($symb,$env{'user.name'},$env{'user.domain'});
                                        if ($turninparent eq '') {
@@ -603,7 +599,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 +622,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 = (
@@ -758,7 +752,7 @@ ENDEXT
                           my $avespan=$lcm/($#colcont+1);
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
-			      my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide,$hostname).'<br />';
+			      my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide).'<br />';
 			    unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				$r->print('<td colspan="'.$avespan.'"');
 			    }
@@ -848,8 +842,6 @@ ENDEXT
                           $r->print(
 	                  '<input name="all_submit" value="'.&mt('Submit All').'" type="'.
 			  (($nforms>1)?'submit':'hidden').'"'.$class.' id="all_submit" />'.
-                          '<input type="hidden" name="all_submit_pressed" '.
-                          'id="all_submit_pressed" value="" />'.
                           '<div id="msg_all_submit" style="display:none">'.
                           &mt('Processing your submission ...').'</div></form>');
                       }
@@ -888,7 +880,7 @@ ENDEXT
 }
 
 sub get_buttons {
-    my ($hash,$rid,$buttonshide,$hostname) = @_;
+    my ($hash,$rid,$buttonshide) = @_;
 
     my $metainfo = '';
     my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
@@ -969,8 +961,7 @@ sub get_buttons {
             if ($cfile ne '') {
                 my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
                                                                      $forceedit,1,$symb,undef,
-                                                                     &escape($env{'form.title'}),
-                                                                     $hostname);
+                                                                     &escape($env{'form.title'}));
                 if ($jscall) {
                     $editbutton = 1;
                     my $icon = 'pcstr.png';
@@ -1037,7 +1028,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') {