--- rat/lonpage.pm	2017/10/14 22:16:59	1.120.4.3
+++ rat/lonpage.pm	2020/02/18 22:28:41	1.133
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.120.4.3 2017/10/14 22:16:59 raeburn Exp $
+# $Id: lonpage.pm,v 1.133 2020/02/18 22:28:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -186,6 +186,7 @@ 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};
@@ -323,8 +324,8 @@ ENDEXT
                               }
                           } elsif ($cellemb{$_} eq 'ssi') {
 # --------------------------------------------------------- This is an SSI cell
-			      my $prefix=$_.'_';
-                              my $idprefix= join('_',($mapid,$resid,''));
+			      my $prefix='p_'.$_.'_';
+                              my $idprefix= 'p_'.join('_',($mapid,$resid,''));
                               my %posthash=('request.prefix' => $prefix,
 					    'LONCAPA_INTERNAL_no_discussion' => 'true',
 					    'symb' => $symb);
@@ -337,29 +338,31 @@ ENDEXT
 				  $posthash{'rndseed'}=$env{'form.rndseed'};
                                   $posthash{'answer_output_mode'} = $env{'form.answer_output_mode'};
 			      }
-			      my $submitted=exists($env{'form.all_submit'});
+			      my $submitted=$env{'form.all_submit_pressed'};
 			      if (!$submitted) {
 				  foreach my $key (keys(%env)) {
-				      if ($key=~/^form.\Q$prefix\Esubmit_/) {
-					  $submitted=1;last;
+				      if ($key=~/^\Qform.$prefix\Esubmit_(.+)_pressed$/) {
+                                          if ($env{$key}) {
+                                              $submitted=1;
+                                              last;
+                                          }
 				      }
-				  }
+                                  }
 			      }
                               if ($submitted) {
 				  foreach my $key (keys(%env)) {
-				      if ($key=~/^form.\Q$prefix\E/) {
+				      if ($key=~/^\Qform.$prefix\E/) {
 					  my $name=$key;
-					  $name=~s/^form.\Q$prefix\E//;
+					  $name=~s/^\Qform.$prefix\E//;
 					  $posthash{$name}=$env{$key};
-				      }
+                                      }
 				  }
-				  if (exists($env{'form.all_submit'})) {
+				  if ($env{'form.all_submit_pressed'}) {
 				      $posthash{'all_submit'}='yes';
 				  }
-			      }
-                              if ($env{'environment.remote'} eq 'on') {
-                                  $posthash{'inhibitmenu'} = 'yes';
-                              }
+			      } elsif ($env{'form.'.$prefix.'markaccess'} eq 'yes') {
+		                  $posthash{'markaccess'} = $env{'form.'.$prefix.'markaccess'};
+		              }
                               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')) {
@@ -467,8 +470,6 @@ 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 '') {
@@ -622,7 +623,9 @@ ENDEXT
 				  "\n</script>\n";
 			  }
                           if (($nforms) && ($nuploads)) {
-                              $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps);
+                              $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps).
+                                            '<script type="text/javascript" '.
+                                            'src="/res/adm/includes/file_upload.js"></script>';
                           }
                           if (($nforms) && (&Apache::lonhtmlcommon::htmlareabrowser())) {
                               my %textarea_args = (
@@ -640,6 +643,7 @@ ENDEXT
                                             '// ]]>'.
                                             "\n</script>\n";
                           }
+                          &Apache::lonhtmlcommon::clear_breadcrumb_tools();
                           if (keys(%hastimeleft)) {
                               my (%uniquetimes,%uniquedisplays);
                               foreach my $item (values(%hastimeleft)) {
@@ -752,7 +756,7 @@ ENDEXT
                           my $avespan=$lcm/($#colcont+1);
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
-			      my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide).'<br />';
+			      my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide,$hostname).'<br />';
 			    unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				$r->print('<td colspan="'.$avespan.'"');
 			    }
@@ -842,6 +846,8 @@ 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>');
                       }
@@ -880,7 +886,7 @@ ENDEXT
 }
 
 sub get_buttons {
-    my ($hash,$rid,$buttonshide) = @_;
+    my ($hash,$rid,$buttonshide,$hostname) = @_;
 
     my $metainfo = '';
     my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
@@ -893,6 +899,9 @@ sub get_buttons {
             return;
         }
     }
+    my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '')
+                                               ? "/$env{'request.course.sec'}"
+                                               : '');
     if ($hash->{'encrypted_'.$rid}) {
 	$symb=&Apache::lonenc::encrypted($symb);
 	$esrc=&Apache::lonenc::encrypted($esrc);
@@ -922,7 +931,8 @@ sub get_buttons {
     if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&
 	($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
 
-	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
+	if ((&Apache::lonnet::allowed('mgr',$crs_sec)) ||
+            (&Apache::lonnet::allowed('vgr',$crs_sec))) {
 	    $metainfo.=
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=submission" target="LONcatInfo">'.
@@ -930,7 +940,10 @@ sub get_buttons {
                 '<img src="/adm/lonMisc/subm_button.png" class="LC_icon"'.
                 ' alt="'.&mt('View Submissions for a Student or a Group of Students').'"'.
                 ' title="'.&mt('View Submissions for a Student or a Group of Students').'" />'.
-		'</a>'.
+		'</a>';
+        }
+        if (&Apache::lonnet::allowed('mgr',$crs_sec)) {
+            $metainfo.=
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=gradingmenu" target="LONcatInfo">'.
 		'&command=gradingmenu">'.
@@ -939,7 +952,8 @@ sub get_buttons {
                 ' title="'.&mt('Content Grades').'" />'.
 		'</a>';
 	}
-	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
+	if ((&Apache::lonnet::allowed('opa',$crs_sec)) ||
+            (&Apache::lonnet::allowed('vpa',$crs_sec))) {
 	    $metainfo.=
 		'<a href="/adm/parmset?symb='.&escape($symb).
 #               '" target="LONcatInfo">'.
@@ -961,7 +975,8 @@ sub get_buttons {
             if ($cfile ne '') {
                 my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
                                                                      $forceedit,1,$symb,undef,
-                                                                     &escape($env{'form.title'}));
+                                                                     &escape($env{'form.title'}),
+                                                                     $hostname);
                 if ($jscall) {
                     $editbutton = 1;
                     my $icon = 'pcstr.png';
@@ -979,12 +994,15 @@ sub get_buttons {
             if ((&Apache::lonnet::allowed('cre','/')) &&
                 (&Apache::lonnet::metadata($url,'sourceavail') eq 'open')) {
                 $viewsrcbutton = 1;
-            } elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) {
+            } elsif (&Apache::lonnet::allowed('vxc',$crs_sec)) {
                 if ($url =~ m{^\Q/res/$cdom/\E($LONCAPA::match_username)/}) {
                     my $auname = $1;
                     if (($env{'request.course.adhocsrcaccess'} ne '') &&
                         (grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {
                         $viewsrcbutton = 1;
+                    } elsif ((&Apache::lonnet::metadata($url,'sourceavail') eq 'open') &&
+                             (&Apache::lonnet::allowed('bre',$crs_sec))) {
+                        $viewsrcbutton = 1;
                     }
                 }
             }
@@ -1047,7 +1065,6 @@ $collapse
 <span id="ddcountexpand" class="LC_menubuttons_inline_text" >$expand</span>
 <img src="/res/adm/pages/timer.png" title="$desc" class="LC_icon" alt="$alttxt" /><span class="LC_menubuttons_inline_text">$title</span></a>
 END
-    &Apache::lonhtmlcommon::clear_breadcrumb_tools();
     &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$output);
     return;
 }