--- loncom/homework/lonhomework.pm	2005/12/15 23:23:48	1.228
+++ loncom/homework/lonhomework.pm	2006/02/10 23:44:53	1.234
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.228 2005/12/15 23:23:48 albertel Exp $
+# $Id: lonhomework.pm,v 1.234 2006/02/10 23:44:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -171,8 +171,8 @@ sub proctor_checked_in {
     
     my $key;
     if ($type eq 'Task') {
-	my $version=$Apache::lonhomework::history{'resource.version'};
-	$key ="resource.$version.checkedin";
+	my $version=$Apache::lonhomework::history{'resource.0.version'};
+	$key ="resource.$version.0.checkedin";
     } elsif ($type eq 'problem') {
 	$key ='resource.0.checkedin';
     }
@@ -198,6 +198,8 @@ sub check_ip_acc {
     my $ip=$ENV{'REMOTE_ADDR'};
     my $name;
     foreach my $pattern (split(',',$acc)) {
+	$pattern =~ s/^\s*//;
+	$pattern =~ s/\s*$//;
 	if ($pattern =~ /\*$/) {
 	    #35.8.*
 	    $pattern=~s/\*//;
@@ -260,8 +262,8 @@ sub check_slot_access {
     
     if ($type eq 'Task') {
 	my $version=$Apache::lonhomework::history{'resource.version'};
-	if ($Apache::lonhomework::history{"resource.$version.checkedin"} &&
-	    $Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
+	if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} &&
+	    $Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {
 	    return ('SHOW_ANSWER');
 	}
     }
@@ -295,22 +297,23 @@ sub check_slot_access {
 	$slotstatus='CAN_ANSWER';
     }
 
-    my ($pass_status,$checkedin);
+    my ($got_grade,$checkedin);
     if ($type eq 'Task') {
-	my $version=$Apache::lonhomework::history{'resource.version'};
-	$pass_status = 
-	    $Apache::lonhomework::history{"resource.$version.status"} eq 'fail';
+	my $version=$Apache::lonhomework::history{'resource.0.version'};
+	$got_grade = 
+	    ($Apache::lonhomework::history{"resource.$version.0.status"} 
+	     =~ /^(?:pass|fail)$/);
 	$checkedin =
-	    $Apache::lonhomework::history{"resource.$version.checkedin"};
+	    $Apache::lonhomework::history{"resource.$version.0.checkedin"};
     } elsif ($type eq 'problem') {
-	$pass_status = 1;
+	$got_grade = 1;
 	$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"};
     }
     
     if ($slotstatus eq 'NOT_IN_A_SLOT' 
 	&& $checkedin ) {
 
-	if ($pass_status) {
+	if ($got_grade) {
 	    return ('SHOW_ANSWER');
 	} else {
 	    return ('WAITING_FOR_GRADE');
@@ -764,7 +767,7 @@ sub editxmlmode {
 	    &Apache::structuretags::remember_problem_state().'
             <input type="hidden" name="problemmode" value="'.&mt('EditXML').'" />
             <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
-            <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
+            <input type="submit" '.&Apache::edit::submit_ask_anyway().'name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
             <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
             <hr />
             <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
@@ -772,7 +775,9 @@ sub editxmlmode {
             <hr />
             ' . $xml_help . '
             <textarea '.&Apache::edit::element_change_detection().' style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
-	    &HTML::Entities::encode($problem,'<>&"').'</textarea>
+	    &HTML::Entities::encode($problem,'<>&"').'</textarea><br />
+            <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
+            <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
             </form></body></html>';
 	&Apache::lonxml::add_messages(\$result);
 	$request->print($result);
@@ -985,15 +990,6 @@ sub handler {
     &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'});
     my ($symb) = &Apache::lonxml::whichuser();
     &Apache::lonxml::debug('symb is '.$symb);
-    if ($env{'request.state'} eq "construct" || $symb eq '') {
-	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
-	    $env{'form.resetdata'} eq &mt('New Problem Variation') ||
-	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
-	    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-	    &Apache::lonnet::tmpreset($symb,'',$domain,$name);
-	    &Apache::lonxml::debug("Attempt reset");
-	}
-    }
     if ($env{'request.state'} eq "construct") {
 	if ( -e $file ) {
 	    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>