--- loncom/homework/lonhomework.pm	2006/06/20 05:10:00	1.252
+++ loncom/homework/lonhomework.pm	2006/09/25 19:41:56	1.258
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.252 2006/06/20 05:10:00 albertel Exp $
+# $Id: lonhomework.pm,v 1.258 2006/09/25 19:41:56 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);
 	    }
 	}
     }
@@ -505,8 +514,9 @@ sub due_date {
     my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,
 				       $udom,$uname);
     &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date");
-    if (defined($interval)) {
+    if ($interval =~ /\d+/) {
 	my $first_access=&Apache::lonnet::get_first_access('map',$symb);
+	&Apache::lonxml::debug("looking for first_access $first_access");
 	if (defined($first_access)) {
 	    $interval = $first_access+$interval;
 	    $date = ($interval < $due_date)? $interval : $due_date;
@@ -621,6 +631,13 @@ sub setuppermissions {
     return '';
 }
 
+sub unset_permissions {
+    undef($Apache::lonhomework::queuegrade);
+    undef($Apache::lonhomework::modifygrades);
+    undef($Apache::lonhomework::viewgrades);
+    undef($Apache::lonhomework::browse);
+}
+
 sub setupheader {
     my $request=$_[0];
     &Apache::loncommon::content_type($request,'text/html');
@@ -807,7 +824,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; }
@@ -952,7 +969,7 @@ sub newproblem {
 	# I don't like hard-coded filenames but for now, this will work.
 	use File::Copy;
 	my $templatefilename =
-	    $request->dir_config('lonIncludes').'/templates/blank.problem';
+	    $request->dir_config('lonIncludes').'/templates/blank.'.$extension;
 	&Apache::lonxml::debug("$templatefilename");
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	copy($templatefilename,$dest);
@@ -978,16 +995,19 @@ sub newproblem {
 			  'click' => 'click on the',
 			  'Create' => 'Create',
 			  'button' => 'button');
-	$request->print(<<ENDNEWPROBLEM);
+	my $extensionTranslated = &mt($extension);
+	$request->print("
 $start_page
-<h1>$lt{'create'} $extension $lt{'resource'}</h1>
+<h1>".&mt("Creating a new $extension resource.")."</h1>
 $errormsg
-$lt{'requested'} <tt>$shownurl</tt> $lt{'not exist'}.
+".&mt("The requested file [_1] currently does not exist.",
+      "<tt>$shownurl</tt>")."
 <p>
-<b>$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.</b>
-</p>
-<p><form action="$url" method="POST">
-ENDNEWPROBLEM
+<b>
+".&mt("To create a new $extension, select a template from the".
+      "pull-down menu below. Then click on the \"Create $extension\" button.")."</b>
+</p>");
+
 	if (defined($templatelist)) {
 	    $request->print("<select name=\"template\">$templatelist</select>");
 	}
@@ -1020,10 +1040,15 @@ sub handler {
 	if ($Apache::lonhomework::browse ne 'F' && 
 	    $env{'request.state'} ne "construct") {
 	    #should know where we are, so ask
-	    $request->internal_redirect('/adm/ambiguous'); return OK;
+	    &unset_permissions();
+	    $request->internal_redirect('/adm/ambiguous');
+	    return OK;
 	}
     }
-    if (&setupheader($request)) { return OK; }
+    if (&setupheader($request)) {
+	&unset_permissions();
+	return OK;
+    }
     &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:$Apache::lonhomework::modifygrades:$Apache::lonhomework::queuegrade");
     &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'});
     my ($symb) = &Apache::lonxml::whichuser();
@@ -1057,6 +1082,7 @@ sub handler {
     #&Apache::lonxml::debug("Spent $td seconds processing");
     # always turn off debug messages
     $Apache::lonxml::debug=0;
+    &unset_permissions();
     return OK;
 
 }