--- loncom/homework/lonhomework.pm	2004/02/16 18:40:52	1.166
+++ loncom/homework/lonhomework.pm	2004/12/17 22:30:30	1.187
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.166 2004/02/16 18:40:52 albertel Exp $
+# $Id: lonhomework.pm,v 1.187 2004/12/17 22:30:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,11 +47,12 @@ use Apache::externalresponse();
 use Apache::rankresponse();
 use Apache::matchresponse();
 use Apache::chemresponse();
+use Apache::drawimage();
 use Apache::Constants qw(:common);
 use HTML::Entities();
 use Apache::loncommon();
 use Apache::lonlocal;
-#use Time::HiRes qw( gettimeofday tv_interval );
+use Time::HiRes qw( gettimeofday tv_interval );
 
 BEGIN {
     &Apache::lonxml::register_insert();
@@ -201,12 +202,16 @@ sub check_access {
     my $passed;
 
     if ($ENV{'request.state'} eq "construct") {
-	if ($ENV{'form.problemstatus'}) {
+	if ($ENV{'form.problemstate'}) {
 	    if ($ENV{'form.problemstate'} =~ /^CANNOT_ANSWER/) {
-		return ('CANNOT_ANSWER','is in this state by royal decree.');
+		if ( ! ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct' &&
+			lc($Apache::lonhomework::problemstatus) eq 'no')) {
+		    return ('CANNOT_ANSWER',
+			    &mt('is in this state due to author settings.'));
+		}
 	    } else {
 		return ($ENV{'form.problemstate'},
-			'is in this state by royal decree.');
+			&mt('is in this state due to author settings.'));
 	    }
 	}
 	&Apache::lonxml::debug("in construction ignoring dates");
@@ -287,7 +292,26 @@ sub check_access {
 	    $status = 'CANNOT_ANSWER';
 	}
     }
-
+    if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') {
+	my $interval=&Apache::lonnet::EXT("resource.$id.interval");
+	&Apache::lonxml::debug("looking for interval $interval");
+	if ($interval) {
+	    my $first_access=&Apache::lonnet::get_first_access('map');
+	    &Apache::lonxml::debug("looking for accesstime $first_access");
+	    if (!$first_access) {
+		$status='NOT_YET_VIEWED';
+		$datemsg=' '.$interval.' seconds';
+	    } else {
+		my $newdate=localtime($first_access+$interval);
+		if (time > ($first_access+$interval)) {
+		    $status='CLOSED';
+		    $datemsg = &mt("was due on")." $newdate".&mt(", and answers will be available on")." $date";
+		} else {
+		    $datemsg = &mt("is due at")." $newdate";
+		}
+	    }
+	}
+    }
   #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
   #    (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
   #    return ('UNCHECKEDOUT','needs to be checked out');
@@ -361,6 +385,12 @@ sub setuppermissions {
                                                '/'.$ENV{'request.course.sec'});
     }
     $Apache::lonhomework::viewgrades = $viewgrades;
+    if ($Apache::lonhomework::browse eq 'F' && 
+	$ENV{'form.devalidatecourseresdata'} eq 'on') {
+	my (undef,$courseid) = &Apache::lonxml::whichuser();
+	&Apache::lonnet::devalidatecourseresdata($ENV{"course.$courseid.num"},
+					      $ENV{"course.$courseid.domain"});
+    }
     return ''
 }
 
@@ -394,29 +424,29 @@ sub handle_save_or_undo {
 	if ((!$error) && (!copy($filebak,$file))) { $error=1; }
 	if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
 	if (!$error) {
-	    $request->print("<p><b>".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file</b></p>");
+	    &Apache::lonxml::info("<p><b>".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file</b></p>");
 	} else {
-	    $request->print("<p><font color=\"red\" size=\"+1\"><b>".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file</b></font></p>");
+	    &Apache::lonxml::info("<p><font color=\"red\" size=\"+1\"><b>".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file</b></font></p>");
 	    $error=1;
 	}
     } else {
 	my $fs=Apache::File->new(">$filebak");
 	if (defined($fs)) {
 	    print $fs $$problem;
-	    $request->print("<b>".&mt("Making Backup to").
-			    " $filebak</b><br />");
+	    &Apache::lonxml::info("<b>".&mt("Making Backup to").
+				  " $filebak</b>");
 	} else {
-	    $request->print("<font color=\"red\" size=\"+1\"><b>".&mt("Unable to make backup")." $filebak</b></font>");
+	    &Apache::lonxml::info("<font color=\"red\" size=\"+1\"><b>".&mt("Unable to make backup")." $filebak</b></font>");
 	    $error=2;
 	}
 	my $fh=Apache::File->new(">$file");
 	if (defined($fh)) {
 	    print $fh $$result;
-	    $request->print("<b>".&mt("Saving Modifications to").
-			    " $file</b><br />");
+	    &Apache::lonxml::info("<b>".&mt("Saving Modifications to").
+				  " $file</b>");
 	} else {
-	    $request->print("<font color=\"red\" size=\"+1\"><b>".
-			    &mt("Unable to write to")." $file</b></font>");
+	    &Apache::lonxml::info("<font color=\"red\" size=\"+1\"><b>".
+				  &mt("Unable to write to")." $file</b></font>");
 	    $error|=4;
 	}
     }
@@ -425,18 +455,23 @@ sub handle_save_or_undo {
 
 sub analyze_header {
     my ($request) = @_;
+    my $bodytag='<body bgcolor="#ffffff">';
+    if ($ENV{'environment.remote'} eq 'off') {
+	$bodytag=&Apache::loncommon::bodytag();
+    }
     my $result.='<html>
             <head><title>'.&mt("Analyzing a problem").'</title></head>
-            <body bgcolor="#FFFFFF">
+            '.$bodytag.&Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
-	    $ENV{'request.uri'}.'">
+	    &HTML::Entities::encode($ENV{'request.uri'},'<>&"').'">'.
+	    &Apache::structuretags::remember_problem_state().'
             <input type="submit" name="problemmode" value="'.&mt("EditXML").'" />
             <input type="submit" name="problemmode" value="'.&mt('Edit').'" />
             <hr />
             <input type="submit" name="submit" value="'.&mt("View").'" />
             <hr />
-            '.&mt('List of possible answers').':
             </form>';
+    &Apache::lonxml::add_messages(\$result);
     $request->print($result);
     $request->rflush();
 }
@@ -459,10 +494,12 @@ sub analyze {
     my %prog_state=
 	&Apache::lonhtmlcommon::Create_PrgWin($request,&mt('Analyze Progress'),
 					      &mt('Getting Problem Variants'),
-					      $ENV{'form.numtoanalyze'});
+					      $ENV{'form.numtoanalyze'},
+					      'inline',undef);
     for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {
 	&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,
 						 &mt('last problem'));
+	if (&Apache::loncommon::connection_aborted($request)) { return; }
 	my $subresult=&Apache::lonnet::ssi($request->uri,
 					   ('grade_target' => 'analyze'),
 					   ('rndseed' => $i+$rndseed));
@@ -484,15 +521,16 @@ sub analyze {
     }
     &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
 					  &mt('Analyzing Results'));
+    $request->print('<hr />'.&mt('List of possible answers').': ');
     foreach my $part (sort(keys(%allparts))) {
 	if (defined(@{ $overall{$part.'.answer'} })) {
 	    my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
-	    $request->print('<table><tr><td colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</td></tr>');
+	    $request->print('<table><tr><th colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</th></tr>');
 	    my %frequency;
 	    foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
 		$frequency{join("\0",@{ $answer })}++;
 	    }
-	    $request->print('<tr><td colspan="'.($num_cols).'">'.&mt('Answer').'</td><td>'.&mt('Frequency').'</td></tr>');
+	    $request->print('<tr><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'</th></tr>');
 	    foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
 		$request->print('<tr><td align="right">'.
 				join('</td><td align="right">',split("\0",$answer)).
@@ -539,26 +577,32 @@ sub editxmlmode {
 	    &Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",
 						    "Problem Editing Help").
 						    '</td><td>'.
-       &Apache::loncommon::help_open_faq(5).
-       &Apache::loncommon::help_open_bug('Authoring').'</td></tr></table>';
+       &Apache::loncommon::help_open_menu('',undef,undef,undef,5,'Authoring').
+                '</td></tr></table>';
 	if ($cols > 80) { $cols = 80; }
 	if ($cols < 70) { $cols = 70; }
 	if ($rows < 20) { $rows = 20; }
-	$result.='<html><body bgcolor="#FFFFFF">
+	my $bodytag='<body bgcolor="#ffffff">';
+	if ($ENV{'environment.remote'} eq 'off') {
+	    $bodytag=&Apache::loncommon::bodytag();
+	}
+	$result.='<html>'.$bodytag.&Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
-	    $ENV{'request.uri'}.'">
+	    &HTML::Entities::encode($ENV{'request.uri'},'<>&"').'">'.
+	    &Apache::structuretags::remember_problem_state().'
             <input type="hidden" name="problemmode" value="'.&mt('EditXML').'" />
-            <input type="submit" name="problemmode" value="'.&mt('Discard Edits and View').'" />
-            <input type="submit" name="problemmode" value="'.&mt('Edit').'" />
+            <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
+            <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
             <hr />
-            <input type="submit" name="submit" value="'.&mt('Submit Changes').'" />
-            <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />
-            <input type="submit" name="Undo" value="'.&mt('undo').'" />
+            <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
+            <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
+            <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
             <hr />
             ' . $xml_help . '
             <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
-	    &HTML::Entities::encode($problem).'</textarea>
+	    &HTML::Entities::encode($problem,'<>&"').'</textarea>
             </form></body></html>';
+	&Apache::lonxml::add_messages(\$result);
 	$request->print($result);
     }
     return '';
@@ -570,7 +614,15 @@ sub renderpage {
     my (@targets) = &get_target();
     &Apache::lonhomework::showhashsubset(\%ENV,'form.');
     &Apache::lonxml::debug("Running targets ".join(':',@targets));
+    my $overall_result;
     foreach my $target (@targets) {
+	# FIXME need to do something intelligent when a problem goes
+        # from viewable to not viewable due to map conditions
+	#&setuppermissions();
+	#if (   $Apache::lonhomework::browse ne '2'
+	#    && $Apache::lonhomework::browse ne 'F' ) {
+	#    $request->print(" You most likely shouldn't see me.");
+	#}
 	#my $t0 = [&gettimeofday()];
 	my $problem=&Apache::lonnet::getfile($file);
 	if ($problem eq -1) {
@@ -601,12 +653,16 @@ sub renderpage {
 	    #$result =~ s:</body>::;
 	    #$result.="<br />Spent $td seconds processing target $target\n</body>";
 	    #}
-	    $request->print($result);
-	    $request->rflush();
+#	    $request->print($result);
+	    $overall_result.=$result;
+#	    $request->rflush();
 	}
 	#$request->print(":Result ends");
 	#my $td=&tv_interval($t0);
     }
+    &Apache::lonxml::add_messages(\$overall_result);
+    $request->print($overall_result);   
+    $request->rflush();   
 }
 
 # with no arg it returns a HTML <option> list of the template titles
@@ -655,8 +711,8 @@ sub newproblem {
 	copy($templatefilename,$dest);
 	&renderpage($request,$dest);
     } else {
-	my $url=$request->uri;
-	my $shownurl=$url;
+	my $url=&HTML::Entities::encode($request->uri,'<>&"');
+	my $shownurl=$url;	
 	$shownurl=~s-^/~-/priv/-;
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	my $errormsg;
@@ -664,7 +720,8 @@ sub newproblem {
 	    $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";
 	}
 	my $instructions;
-	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
+					($ENV{'environment.remote'} ne 'off'));
 	if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}
 	my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
 			  'resource' => 'resource',
@@ -695,7 +752,7 @@ ENDNEWPROBLEM
 
 sub view_or_edit_menu {
     my ($request) = @_;
-    my $url=$request->uri;
+    my $url=&HTML::Entities::encode($request->uri,'<>&"');
     my %lt=&Apache::lonlocal::texthash( 'would' => 'Would you like to',
 		      'view' => 'View',
 		      'Edit' => 'edit',
@@ -704,8 +761,8 @@ sub view_or_edit_menu {
     $request->print(<<EDITMENU);
 <body bgcolor="#FFFFFF">
 <form action="$url" method="POST">
-$lt{'would'} <input type="submit" name="problemmode" value="&lt{'view'}">
-&lt{'or'} <input type="submit" name="problemmode" value="&lt{'Edit'}">
+$lt{'would'} <input type="submit" name="problemmode" accesskey="v" value="&lt{'view'}">
+&lt{'or'} <input type="submit" name="problemmode" accesskey="e" value="&lt{'Edit'}">
 &lt{'the problem'}.
 </form>
 </body>
@@ -717,12 +774,8 @@ sub handler {
     my $request=$_[0];
     
     $Apache::lonxml::debug=$ENV{'user.debug'};
-    if (&setupheader($request)) { return OK; }
     $ENV{'request.uri'}=$request->uri;
-
-    #setup permissions
-    $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
-    $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+    &setuppermissions();
     &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
     # some times multiple problemmodes are submitted, need to select
     # the last one
@@ -740,7 +793,8 @@ sub handler {
     #check if we know where we are
     if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
 	# if we are browsing we might not be able to know where we are
-	if ($Apache::lonhomework::browse ne 'F') {
+	if ($Apache::lonhomework::browse ne 'F' && 
+	    $ENV{'request.state'} ne "construct") {
 	    #should know where we are, so ask
 	    if ( &Apache::lonnet::mod_perl_version() == 2 ) {
 		&Apache::lonnet::cleanenv();
@@ -748,6 +802,7 @@ sub handler {
 	    $request->internal_redirect('/adm/ambiguous'); return;
 	}
     }
+    if (&setupheader($request)) { return OK; }
 
     my ($symb) = &Apache::lonxml::whichuser();
     &Apache::lonxml::debug('symb is '.$symb);