--- rat/lonpage.pm	2020/01/18 01:12:51	1.111.2.9
+++ rat/lonpage.pm	2015/09/29 06:27:49	1.113
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.111.2.9 2020/01/18 01:12:51 raeburn Exp $
+# $Id: lonpage.pm,v 1.113 2015/09/29 06:27:49 musolffc Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,7 +41,7 @@ use Apache::lonxml();
 use Apache::lonlocal;
 use Apache::lonmenu;
 use Apache::lonhomework;
-use Apache::lonenc();
+use Apache::lonparmset;
 use HTML::TokeParser;
 use GDBM_File;
 use Apache::lonsequence;
@@ -184,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};
@@ -193,7 +191,8 @@ sub handler {
               if (($firstres) && ($lastres)) {
 # ------------------------------------------------------------- Countdown Timer
                   my $now = time;
-                  my ($pagefirstaccess,%hastimeleft,%countdowndisp);
+                  my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton,
+                      $donetime,$symbtosetdone);
                   my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser();
                   if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) {
                       my %times=&Apache::lonnet::get('firstaccesstimes',
@@ -201,8 +200,12 @@ sub handler {
                                                      $domain,$name);
                       if ($times{$courseid."\0".$pagesymb} =~ /^\d+$/) {
                           $pagefirstaccess = $times{$courseid."\0".$pagesymb};
+                          if ($pagefirstaccess && $env{'form.LC_interval_done'} eq 'true') {
+                              $donetime = $now - $pagefirstaccess;
+                          }
                       }
                   }
+
 # ----------------------------------------------------------------- Render page
 
                   @rows=();
@@ -220,6 +223,24 @@ sub handler {
 			    my ($mapid,$resid)=split(/\./,$rid);
 			    $symbhash{$hash{'src_'.$rid}}=
 				[$hash{'src_'.$rid},$resid];
+                            if (($donetime) && ($symbtosetdone eq '')) {
+                                my $src = $hash{'src_'.$rid};
+                                if ($hash{'encrypted_'.$rid}) {
+                                    $src=&Apache::lonenc::encrypted($src);
+                                }
+                                my ($mapid,$resid)=split(/\./,$rid);
+                                my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
+                                if ($src =~ /$LONCAPA::assess_re/) {
+                                    my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
+                                    if (@interval > 1) {
+                                        if ($interval[1] eq 'map') {
+                                            if ($pagefirstaccess + $interval[0] > $now) {
+                                                $symbtosetdone = $symb;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
 		        }
 		     }
 		  }
@@ -254,6 +275,16 @@ sub handler {
                   my $xmlheader='';
                   my $xmlbody='';
 
+# ---------------------------------------------------------- Handle Done button
+
+                  # Set the event timer to zero if the "done button" was clicked.
+                  if ($donetime && $symbtosetdone) {
+                      &Apache::lonparmset::storeparm_by_symb_inner($symbtosetdone,'0_interval',
+                                                                   2,$donetime,'date_interval',
+                                                                   $name,$domain);
+                      undef($env{'form.LC_interval_done'});
+                  }
+
 # --------------------------------------------- Get SSI output, post parameters
 
                   for ($i=0;$i<=$#rows;$i++) {
@@ -263,17 +294,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{$_}) {
@@ -284,8 +309,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);
@@ -298,39 +326,31 @@ 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')) {
-				  $output =~ s/^([^&]+)\\begin\{document}//;
-				  $output =~ s/\\end\{document}//;
+				  $output =~ s/^([^&]+)\\begin{document}//;
+				  $output =~ s/\\end{document}//;
 #				  $output = '\parbox{\minipagewidth}{ '.$output.' }';
                                   #some additional cleanup necessary for LateX (due to limitations of table environment 
 				  $output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g;
@@ -412,8 +432,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;
@@ -433,6 +451,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 '') {
@@ -445,11 +465,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) =
@@ -486,6 +506,9 @@ ENDEXT
                                                       $countdowndisp{$symb} = 'inline';
                                                       if ((@interval > 1) && ($timerhastime)) {
                                                           $hastimeleft{$symb} = $timerhastime;
+                                                          if ($pagefirstaccess) {
+                                                              $donebutton{$symb} = $interval[1];
+                                                          }
                                                       } else {
                                                           $hastimeleft{$symb} = $slothastime;
                                                       }
@@ -493,6 +516,9 @@ ENDEXT
                                                       $hastimeleft{$symb} = $duedate - $now;
                                                       $countdowndisp{$symb} = 'none';
                                                   }
+                                                  unless ($donebutton{$symb}) {
+                                                     $donebutton{$symb} = 0;
+                                                  }
                                               }
                                           }
                                       }
@@ -522,7 +548,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());
@@ -545,9 +571,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 = (
@@ -575,7 +599,7 @@ ENDEXT
                                   }
                               }
                               if (keys(%uniquetimes) == 1) {
-                                  my (%uniquedisplays,%uniquedones,$currdisp);
+                                  my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime);
                                   if (keys(%countdowndisp)) {
                                       foreach my $item (values(%countdowndisp)) {
                                           if (exists($uniquedisplays{$item})) {
@@ -589,30 +613,28 @@ ENDEXT
                                           $currdisp = $countdowndisplay[0];
                                       }
                                   }
-                                  &add_countdown_timer($currdisp);
-                              }
-                          }
-                          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';
+                                  if (keys(%donebutton)) {
+                                      foreach my $item (values(%donebutton)) {
+                                          if (exists($uniquedones{$item})) {
+                                              $uniquedones{$item} ++;
+                                          } else {
+                                              $uniquedones{$item} = 1;
+                                          }
+                                      }
+                                      my @donebuttons = sort { $ <=> $b } (keys(%uniquedones));
+                                      if (scalar(@donebuttons) == 1) {
+                                          if ($donebuttons[0]) {
+                                              $donebuttontime = $donebuttons[0];
+                                          }
+                                      }
                                   }
+                                  &add_countdown_timer($currdisp,$donebuttontime);
                               }
                           }
 # ------------------------------------------------------------------ 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"';
@@ -658,7 +680,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.'"');
 			    }
@@ -748,8 +770,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>');
                       }
@@ -788,7 +808,7 @@ ENDEXT
 }
 
 sub get_buttons {
-    my ($hash,$rid,$buttonshide,$hostname) = @_;
+    my ($hash,$rid) = @_;
 
     my $metainfo = '';
     my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
@@ -797,7 +817,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;
         }
     }
@@ -858,61 +878,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>';
             }
         }
     }
@@ -920,19 +902,23 @@ sub get_buttons {
 }
 
 sub add_countdown_timer {
-    my ($currdisp) = @_;
-    my ($collapse,$expand,$alttxt,$title);
+    my ($currdisp,$donebuttontime) = @_;
+    my ($collapse,$expand,$alttxt,$title,$donebutton);
     if ($currdisp eq 'inline') {
         $collapse = '&#9658;&nbsp;';
     } else {
         $expand = '&#9668;&nbsp;';
     }
+    if ($donebuttontime) {
+        $donebutton = &Apache::lonmenu::done_button_js($donebuttontime);
+    }
     unless ($env{'environment.icons'} eq 'iconsonly') {
         $alttxt = &mt('Timer');
         $title = $alttxt.'&nbsp;';
     }
     my $desc = &mt('Countdown to due date/time');
     my $output = <<END;
+$donebutton
 <a href="javascript:toggleCountdown();" class="LC_menubuttons_link">
 <span id="ddcountcollapse" class="LC_menubuttons_inline_text">
 $collapse