--- rat/lonpage.pm	2017/09/11 12:23:55	1.123
+++ 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.123 2017/09/11 12:23:55 raeburn Exp $
+# $Id: lonpage.pm,v 1.127 2019/08/11 12:27:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,7 @@ use Apache::lonlocal;
 use Apache::lonmenu;
 use Apache::lonhomework;
 use Apache::lonparmset;
+use Apache::lonenc();
 use HTML::TokeParser;
 use GDBM_File;
 use Apache::lonsequence;
@@ -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,23 +338,26 @@ 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';
 				  }
 			      }
@@ -444,7 +448,7 @@ ENDEXT
                                   $output=~
                                       s/\<((?:input|select|button|textarea)[^\>]+)id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi;
                                   $output=~
-                                      s/(\Qthis.form.elements['HWVAL_\E)([^']+\'\]\.)(value=|checked)/$1$prefix$2$3/gsi; 
+                                      s/(\Qthis.form.elements['\E)(HW(?:VAL|CHK)_[^']+\'\]\.(?:value=\'|checked))/$1$prefix$2/gsi;
                                   if ($hastimer) {
                                       $output=~
                                           s/\<(input[^\>]+name=\Q"$prefix\Eaccessbutton"[^\>]+)(?:\Qdocument.markaccess.submit();\E)([^\>]*)\>/\<$1pageTimer(this.form,'$prefix')$2\>/gsi;
@@ -464,8 +468,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 '') {
@@ -839,6 +841,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>');
                       }
@@ -947,24 +951,61 @@ sub get_buttons {
 		'</a>';
 	}
     }
-    if (($env{'request.course.id'}) && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+    if ($env{'request.course.id'}) {
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $file=&Apache::lonnet::declutter($hash->{'src_'.$rid});
-        my ($cfile,$home,$switchserver,$forceedit,$forceview) =
-            &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,undef,
-                                                                 &escape($env{'form.title'}),
-                                                                 $hostname);
-            if ($jscall) {
+        my $editbutton = '';
+        if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+            my ($cfile,$home,$switchserver,$forceedit,$forceview) =
+                &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,undef,
+                                                                     &escape($env{'form.title'}),
+                                                                     $hostname);
+                if ($jscall) {
+                    $editbutton = 1;
+                    my $icon = 'pcstr.png';
+                    my $label = &mt('Edit');
+                    my $title = &mt('Edit this resource');
+                    my $pic = '<img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$icon).'"'.
+                              ' class="LC_icon" alt="'.$label.'" title="'.$title.'" />';
+                    $metainfo .= '&nbsp;<a href="javascript:'.$jscall.';">'.$pic.'</a>';
+                }
+            }
+        }
+        if ((!$editbutton) && ($file=~/$LONCAPA::assess_re/)) {
+            my $url = &Apache::lonnet::clutter($file);
+            my $viewsrcbutton;
+            if ((&Apache::lonnet::allowed('cre','/')) &&
+                (&Apache::lonnet::metadata($url,'sourceavail') eq 'open')) {
+                $viewsrcbutton = 1;
+            } elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) {
+                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;
+                    }
+                }
+            }
+            if ($viewsrcbutton) {
                 my $icon = 'pcstr.png';
-                my $label = &mt('Edit');
-                my $title = &mt('Edit this resource');
+                my $label = &mt('View Source');
+                my $title = &mt('View source code');
+                my $jsrid = $rid;
+                $jsrid =~ s/\./_/g;
+                my $showurl = &escape(&Apache::lonenc::check_encrypt($url));
                 my $pic = '<img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$icon).'"'.
                           ' class="LC_icon" alt="'.$label.'" title="'.$title.'" />';
-                $metainfo .= '&nbsp;<a href="javascript:'.$jscall.';">'.$pic.'</a>';
+                $metainfo .= '&nbsp;<a href="javascript:open_source_'.$jsrid.'();">'.$pic.'</a>'."\n".
+                             '<script type="text/javascript">'."\n".
+                             "function open_source_$jsrid() {\n".
+                             "  sourcewin=window.open('/adm/source?inhibitmenu=yes&viewonly=1&filename=$showurl','LONsource',".
+                             "'height=500,width=600,resizable=yes,location=no,menubar=no,toolbar=no,scrollbars=yes');\n".
+                             "}\n".
+                             "</script>\n";
             }
         }
     }