--- loncom/homework/lonhomework.pm	2006/06/24 01:28:17	1.253
+++ loncom/homework/lonhomework.pm	2006/06/30 17:42:38	1.256
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.253 2006/06/24 01:28:17 albertel Exp $
+# $Id: lonhomework.pm,v 1.256 2006/06/30 17:42:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -344,9 +344,14 @@ sub check_slot_access {
 	}
 
     }
+
     if ( $is_correct) {
+	if ($type eq 'problem') {
+	    return ($status);
+	}
 	return ('SHOW_ANSWER');
     }
+
     if ( $status eq 'CANNOT_ANSWER' && 
 	 ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {
 	return ($status,$datemsg);
@@ -475,7 +480,11 @@ sub check_access {
 	    if (!$first_access) {
 		$status='NOT_YET_VIEWED';
 		my $due_date = &due_date($id);
-		$datemsg=&seconds_to_human_length($due_date-time);
+		my $seconds_left = $due_date - time;
+		if ($seconds_left > $interval || $due_date eq '') {
+		    $seconds_left = $interval;
+		}
+		$datemsg=&seconds_to_human_length($seconds_left);
 	    }
 	}
     }
@@ -814,7 +823,7 @@ sub editxmlmode {
 	    &Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",
 						    "Problem Editing Help").
 						    '</td><td>'.
-       &Apache::loncommon::help_open_menu('',undef,undef,undef,5,'Authoring').
+       &Apache::loncommon::help_open_menu(undef,undef,5,'Authoring').
                 '</td></tr></table>';
 	if ($cols > 80) { $cols = 80; }
 	if ($cols < 70) { $cols = 70; }