--- rat/lonpage.pm	2020/01/22 15:02:22	1.111.2.10.2.1
+++ rat/lonpage.pm	2016/08/09 23:43:51	1.118
@@ -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.118 2016/08/09 23:43:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,6 @@ use Apache::lonlocal;
 use Apache::lonmenu;
 use Apache::lonhomework;
 use Apache::lonparmset;
-use Apache::lonenc();
 use HTML::TokeParser;
 use GDBM_File;
 use Apache::lonsequence;
@@ -185,8 +184,6 @@ sub handler {
   if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) {
       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 +196,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],
@@ -303,17 +300,11 @@ sub handler {
                       $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
                       foreach (@colcont) {
                           my $src=$hash{'src_'.$_};
-                          my $plainsrc = $src;
                           my ($extension)=($src=~/\.(\w+)$/);
 			  $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:');
 			  if ($hash{'encrypted_'.$_}) {
 			      $src=&Apache::lonenc::encrypted($src);
 			  }
-                          my ($mapid,$resid)=split(/\./,$_);
-                          my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
-                          unless ($env{'request.role.adv'}) {
-                              $buttonshide{$symb} = &Apache::lonnet::EXT("resource.0.buttonshide",$symb);
-                          }
                           $cellemb{$_}=
 			      &Apache::loncommon::fileembstyle($extension);
                           if ($cellexternal{$_}) {
@@ -324,8 +315,11 @@ ENDEXT
                               }
                           } elsif ($cellemb{$_} eq 'ssi') {
 # --------------------------------------------------------- This is an SSI cell
-			      my $prefix='p_'.$_.'_';
-                              my $idprefix='p_'.join('_',($mapid,$resid,''));
+			      my ($mapid,$resid)=split(/\./,$_);
+			      my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
+			      
+			      my $prefix=$_.'_';
+                              my $idprefix= join('_',($mapid,$resid,''));
                               my %posthash=('request.prefix' => $prefix,
 					    'LONCAPA_INTERNAL_no_discussion' => 'true',
 					    'symb' => $symb);
@@ -338,34 +332,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';
-                              }
+			      }
                               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')) {
@@ -452,8 +438,6 @@ ENDEXT
 				      s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
                                   $output=~
                                       s/\<((?:input|select|button|textarea)[^\>]+)id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi;
-                                  $output=~
-                                      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;
@@ -473,6 +457,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 '') {
@@ -485,11 +471,11 @@ ENDEXT
                                   $output=~
                                       s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)\(\'([^\']+)\'\)(;\")/\<$1('$idprefix$2')$3/gsi;
                                   unless ($hastimer) {
-                                      if ($plainsrc =~ /$LONCAPA::assess_re/) {
+                                      if ($src =~ /$LONCAPA::assess_re/) {
                                           %Apache::lonhomework::history =
                                               &Apache::lonnet::restore($symb,$courseid,$domain,$name);
                                           my $type = 'problem';
-                                          if ($extension eq 'task') {
+                                          if ($src =~ /\.task$/) {
                                               $type = 'Task';
                                           }
                                           my ($status,$accessmsg,$slot_name,$slot) =
@@ -603,7 +589,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 +612,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 = (
@@ -692,27 +676,10 @@ ENDEXT
                                   &add_countdown_timer($currdisp,$donebuttontime,$donebuttonextras);
                               }
                           }
-                          my $pagebuttonshide;
-                          if (keys(%buttonshide)) {
-                              my %uniquebuttonhide;
-                              foreach my $item (values(%buttonshide)) {
-                                  if (exists($uniquebuttonhide{$item})) {
-                                      $uniquebuttonhide{$item} ++;
-                                  } else {
-                                      $uniquebuttonhide{$item} = 1;
-                                  }
-                              }
-                              if (keys(%uniquebuttonhide) == 1) {
-                                  if (lc((keys(%uniquebuttonhide))[0]) eq 'yes') {
-                                      $pagebuttonshide = 'yes';
-                                  }
-                              }
-                          }
 # ------------------------------------------------------------------ Start body
 			  $r->print(&Apache::loncommon::start_page(undef,$allscript,
 								   {'force_register' => 1,
-								    'bgcolor'        => '#ffffff',
-								    'hide_buttons'   => $pagebuttonshide}));
+								    'bgcolor'        => '#ffffff',}));
 # ------------------------------------------------------------------ Start form
 			  if ($nforms) {
 			      my $fmtag = '<form name="lonhomework" method="post"  enctype="multipart/form-data"';
@@ -758,7 +725,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).'<br />';
 			    unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				$r->print('<td colspan="'.$avespan.'"');
 			    }
@@ -848,8 +815,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 +853,7 @@ ENDEXT
 }
 
 sub get_buttons {
-    my ($hash,$rid,$buttonshide,$hostname) = @_;
+    my ($hash,$rid) = @_;
 
     my $metainfo = '';
     my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
@@ -897,7 +862,7 @@ sub get_buttons {
 					  $resid,
 					  $hash->{'src_'.$rid});
     unless ($env{'request.role.adv'}) {
-        if ($buttonshide->{$symb} eq 'yes') {
+        if (&Apache::lonnet::EXT('resource.0.buttonshide',$symb)) {
             return;
         }
     }
@@ -958,61 +923,23 @@ sub get_buttons {
 		'</a>';
 	}
     }
-    if ($env{'request.course.id'}) {
+    if (($env{'request.course.id'}) && (&Apache::lonnet::allowed('mdc',$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 $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 ($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'}));
+            if ($jscall) {
                 my $icon = 'pcstr.png';
-                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 $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: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";
+                $metainfo .= '&nbsp;<a href="javascript:'.$jscall.';">'.$pic.'</a>';
             }
         }
     }
@@ -1037,7 +964,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') {