--- loncom/homework/bridgetask.pm	2008/08/13 09:10:44	1.239
+++ loncom/homework/bridgetask.pm	2025/04/02 23:44:02	1.275
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.239 2008/08/13 09:10:44 bisitz Exp $
+# $Id: bridgetask.pm,v 1.275 2025/04/02 23:44:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,11 +32,14 @@ package Apache::bridgetask;
 
 use strict;
 use Apache::lonnet;
+use Apache::loncommon;
 use Apache::File();
 use Apache::lonmenu;
 use Apache::lonlocal;
 use Apache::lonxml;
 use Apache::slotrequest();
+use Apache::structuretags();
+use HTML::Entities();
 use Time::HiRes qw( gettimeofday tv_interval );
 use LONCAPA;
  
@@ -64,6 +67,7 @@ sub initialize_bridgetask {
 sub proctor_check_auth {
     my ($slot_name,$slot,$type)=@_;
     my $user=$env{'form.proctorname'};
+    $user =~ s/^\s+|\s+$//g;
     my $domain=$env{'form.proctordomain'};
     
     my @allowed=split(",",$slot->{'proctor'});
@@ -82,7 +86,10 @@ sub proctor_check_auth {
 		}
 	    }
 	    if ($authenticated) {
-		&check_in($type,$user,$domain,$slot_name);
+		my $check = &check_in($type,$user,$domain,$slot_name,$slot->{'iptied'});
+                if ($check =~ /^error:/) {
+                    return 0;
+                }
 		return 1;
 	    }
 	}
@@ -91,41 +98,82 @@ sub proctor_check_auth {
 }
 
 sub check_in {
-    my ($type,$user,$domain,$slot_name) = @_;
+    my ($type,$user,$domain,$slot_name,$needsiptied) = @_;
     my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
+    my $ip=$ENV{'REMOTE_ADDR'} || $env{'request.host'};
     if ( $useslots eq 'map_map') {
-	&check_in_sequence($user,$domain,$slot_name);
+	my $result = &check_in_sequence($user,$domain,$slot_name,$ip,$needsiptied);
+        if ($result =~ /^error: /) {
+            return $result;
+        }
     } else {
-	&create_new_version($type,$user,$domain,$slot_name);
-	&Apache::structuretags::finalize_storage();
+        my ($symb) = &Apache::lonnet::whichuser();
+	my $result = &create_new_version($type,$user,$domain,$slot_name,$symb,$ip,$needsiptied);
+        if ($result eq 'ok') {
+	    &Apache::structuretags::finalize_storage();
+        }
+        return $result; 
     }
     return 1;
 }
 
 sub check_in_sequence {
-    my ($user,$domain,$slot_name) = @_;
+    my ($user,$domain,$slot_name,$ip,$needsiptied) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
+    if (!defined($navmap)) {
+        return 'error: No navmap';
+    }
     my ($symb) = &Apache::lonnet::whichuser();
     my ($map)  = &Apache::lonnet::decode_symb($symb);
     my @resources = 
-	$navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0);
+	$navmap->retrieveResources($map, sub { $_[0]->is_problem() || $_[0]->is_tool() },0,0);
     my %old_history = %Apache::lonhomework::history;
     my %old_results = %Apache::lonhomework::results;
 
+    my $errorcount;
     foreach my $res (@resources) {
 	&Apache::lonxml::debug("doing ".$res->src);
 	&Apache::structuretags::initialize_storage($res->symb);
-	my $type = ($res->is_task()) ? 'Task' : 'problem';
-	&create_new_version($type,$user,$domain,$slot_name);
-	&Apache::structuretags::finalize_storage($res->symb);
+	my $type;
+        if ($res->is_task()) {
+            $type = 'Task';
+        } elsif ($res->is_tool) {
+            $type = 'tool';
+        } else {
+            $type = 'problem';
+        }
+	my $result = &create_new_version($type,$user,$domain,$slot_name,$res->symb,$ip,$needsiptied);
+        if ($result eq 'ok') {
+	    &Apache::structuretags::finalize_storage($res->symb);
+        } else {
+            $errorcount ++;
+        }
     }
     
     %Apache::lonhomework::history = %old_history;
     %Apache::lonhomework::results = %old_results;
+    if ($errorcount) {
+        return 'error: IP taken';
+    }
 }
 
 sub create_new_version {
-    my ($type,$user,$domain,$slot_name) = @_;
+    my ($type,$user,$domain,$slot_name,$symb,$ip,$needsiptied) = @_;
+
+    if ($needsiptied) {
+        my $uniqkey = "$slot_name\0$symb\0$ip";
+        my ($cdom,$cnum);
+        if ($env{'request.course.id'}) {
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            my %hash = (
+                          "$slot_name\0$symb\0$ip" => $env{'user.name'}.':'.$env{'user.domain'}, 
+                       );
+            unless (&Apache::lonnet::newput('slot_uniqueips',\%hash,$cdom,$cnum) eq 'ok') {
+                return 'error: IP taken';
+            }
+        }
+    }
     
     my $id = '0';
     if ($type eq 'Task') {
@@ -149,7 +197,7 @@ sub create_new_version {
 	    $domain = $env{'user.domain'};
 	}
 	
-    } elsif ($type eq 'problem') {
+    } elsif (($type eq 'problem') || ($type eq 'tool')) {
 	&Apache::lonxml::debug("authed $slot_name");
     }
     if (!defined($user) || !defined($domain)) {
@@ -159,11 +207,13 @@ sub create_new_version {
 
     $Apache::lonhomework::results{"resource.$id.checkedin"}=
 	$user.':'.$domain;
+    $Apache::lonhomework::results{"resource.$id.checkedin.ip"}=$ip;
 
     if (defined($slot_name)) {
 	$Apache::lonhomework::results{"resource.$id.checkedin.slot"}=
 	    $slot_name;
     }
+    return 'ok'; 
 }
 
 sub get_version {
@@ -189,6 +239,10 @@ sub get_version {
 
 sub add_previous_version_button {
     my ($status)=@_;
+    my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
     my $result;
     if ($Apache::lonhomework::history{'resource.0.version'} eq '') {
 	return '';
@@ -225,7 +279,10 @@ sub add_previous_version_button {
 }
 
 sub add_grading_button {
-    my (undef,$cid)=&Apache::lonnet::whichuser();
+    my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
     my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
@@ -235,15 +292,19 @@ sub add_grading_button {
 	$size=scalar(keys(%sections))+2;
     }
     my $sec_select = "\n".'<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
-    $sec_select .= "\t<option value='all' selected='selected'>all</option>\n";
+    $sec_select .= "\t".'<option value="all" selected="selected">'.&mt('all')."</option>\n";
     foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
 	$sec_select .= "\t<option value=\"$sec\">$sec</option>\n";
     }
-    $sec_select .= "\t<option value='none'>none</option>\n</select>\n";
-    
-    my $result="\n\t".'<input type="submit" name="gradeasubmission" value="'.
-	&mt("Get a submission to grade").'" />';
-    $result.="\n\t".'<input type="hidden" name="grade_target" value="webgrade" />';
+    $sec_select .= "\t".'<option value="none">'.&mt('none')."</option>\n</select>\n";
+
+    my $uri=$env{'request.uri'};
+    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
+    my $result = 
+        '<form name="gradesubmission" method="post" action="'.$uri.'">'.
+        "\n\t".'<input type="submit" name="gradeasubmission" value="'.
+	&mt("Get a submission to grade").'" />'.
+        "\n\t".'<input type="hidden" name="grade_target" value="webgrade" />';
     my $see_all = &Apache::lonnet::allowed('mgq',$env{'request.course.id'});
     my $see_sec = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.
 					   '/'.$env{'request.course.sec'});
@@ -289,11 +350,46 @@ sub add_grading_button {
 	$result.=&Apache::loncommon::studentbrowser_javascript();
 	$result.= '</p>'."\n";
     }
+    $result .= '</form>'."\n";
+    return $result;
+}
+
+sub add_slotlist_button {
+    my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
+    my $symb=&Apache::lonnet::symbread();
+    my $result;
+    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) ||
+        &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+        $result = '<form method="post" name="slotrequest" action="/adm/slotrequest">'.
+                  '<input type="hidden" name="symb" value="'.$symb.'" />'.
+                  '<input type="hidden" name="command" value="showslots" />'.
+                  '<input type="submit" name="requestattempt" value="'.
+                  &mt('Show Slot list').'" />'.
+                  '</form>';
+        my $target_id =
+               &Apache::lonstathelpers::make_target_id({symb => $symb,
+                                                             part => '0'});
+        if (!&section_restricted()) {
+            $result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
+                     '<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
+                     '<input type="hidden" name="reportSelected" value="grading_analysis" />'.
+                     '<input type="submit" name="grading" value="'.
+                     &mt('Show Grading Status').'" />'.
+                     '</form>';
+        }
+    }
     return $result;
 }
 
 sub add_request_another_attempt_button {
     my ($text)=@_;
+    my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
     if (!$text) { $text=&mt('Request another attempt'); }
     my $result;
     my $symb=&Apache::lonnet::symbread();
@@ -306,7 +402,7 @@ sub add_request_another_attempt_button {
     my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
     my $action='get_reservation';
     if ($slot_name) {
-	$text=&mt('Change reservation.');
+	$text=&mt('Change reservation');
 	$action='change_reservation';
 	my $description=&Apache::slotrequest::get_description($slot_name,
 							      $slot);
@@ -316,11 +412,16 @@ sub add_request_another_attempt_button {
                 .'</p>';
     }
     
-    if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
-    $symb=&escape($symb);
+    my $shownsymb;
+    if ($env{'request.enc'}) { 
+        $shownsymb = &Apache::lonenc::encrypted($symb);
+    } else {
+        $shownsymb = $symb;
+    }
+    $shownsymb=&escape($shownsymb);
     $result.=
         "\n\t".'<form method="post" action="/adm/slotrequest">'."\n\t\t".
-	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n\t\t".
+	'<input type="hidden" name="symb" value="'.$shownsymb.'" />'."\n\t\t".
 	'<input type="hidden" name="command" value="'.$action.'" />'."\n\t\t".
 	'<input type="submit" name="requestattempt" value="'.
 	$text.'" />'."\n\t".
@@ -371,6 +472,7 @@ sub show_task {
 		       ( $status eq 'BANNED') ||
 		       ( $status eq 'UNAVAILABLE') ||
 		       ( $status eq 'NOT_IN_A_SLOT') ||
+                       ( $status eq 'NOT_YET_VIEWED') ||
 		       ( $status eq 'NEEDS_CHECKIN') ||
 		       ( $status eq 'WAITING_FOR_GRADE') ||
 		       ( $status eq 'INVALID_ACCESS') ||
@@ -473,7 +575,7 @@ sub file_list {
 	my $file=$file_url.$partial_file;
 	$file=~s|/+|/|g;
 	&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
-	$file_list.='<li><span style="white-space: nowrap;"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
+	$file_list.='<li><span class="LC_nobreak"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
 	    &Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file.
 	    '</a></span></li>'."\n";
     }
@@ -493,13 +595,13 @@ sub webgrade_standard_info {
 
     my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"});
 
-    my %lt=('done'   => 'Next Item',
-	    'stop'   => 'Quit Grading',
-	    'fail'   => 'Fail Rest',
-	    'cancel' => 'Cancel',
-	    'submit' => 'Submit Grades',
-	    );
-    %lt=&Apache::lonlocal::texthash(%lt);
+    my %lt = &Apache::lonlocal::texthash(
+        'done'   => 'Next Item',
+        'stop'   => 'Quit Grading',
+        'fail'   => 'Fail Rest',
+        'cancel' => 'Cancel',
+        'submit' => 'Submit Grades',
+    );
 
     my $result=<<INFO;
   <div class="LC_GRADING_maincontrols">
@@ -536,23 +638,35 @@ sub done_screen {
     my $title=&Apache::lonnet::gettitle($env{'request.uri'});
     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
     my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
-    my $files = '<ul>';
-    my $msg;
-    foreach my $file (@files) {
-	my $url="/uploaded/$domain/$user/portfolio$file";
-	if (! &Apache::lonnet::stat_file($url)) {
-	    $file = '<span class="LC_error">'
-                   .&mt('[_1]Nonexistent file:[_2]'
-                       ,'<span class="LC_error"> '
-                       ,'</span> <span class="LC_filename">'.$file.'</span>');
-	    $msg .= "<p>".&mt('Submitted non-existant file [_1]',$file)."</p>\n";
-	} else {
-	    $file = '<span class="LC_filename">'.$file.'</span>';
-	    $msg .= "<p>".&mt('Submitted file [_1]',$file)."</p>\n";
-	}
-	$files .= '<li>'.$file.'</li>';
+    my ($msg,$files,$shown);
+    if (@files > 0) {
+        $files = '<ul>';
+        foreach my $file (@files) {
+	    my $url="/uploaded/$domain/$user/portfolio$file";
+	    if (! &Apache::lonnet::stat_file($url)) {
+	        $file = '<span class="LC_error">'
+                       .&mt('[_1]Nonexistent file:[_2]'
+                           ,'<span class="LC_error"> '
+                           ,'</span> <span class="LC_filename">'.$file.'</span>');
+	        $msg .= "<p>".&mt('Submitted non-existent file [_1]',$file)."</p>\n";
+	    } else {
+	        $file = '<span class="LC_filename">'.$file.'</span>';
+	        $msg .= "<p>".&mt('Submitted file [_1]',$file)."</p>\n";
+	    }
+	    $files .= '<li>'.$file.'</li>';
+        }
+        $files.='</ul>';
+        $shown = '<p>'.&mt('Files submitted: [_1]',$files).'</p>'
+                .'<p>'.&mt('You are now done with this Bridge Task').'</p>'
+                .'<hr />'
+                .'<p><a href="/adm/logout">'.&mt('Logout').'</a></p>'
+                .'<p><a href="/adm/roles">'.&mt('Change to a different course').'</a></p>';
+    } else {
+        $msg = &mt("Submission status: no files currently submitted, when 'Done' was indicated.");
+        $shown = '<p class="LC_error">'.
+                 &mt('You did not submit any files.  Please try again.').'</span>'.
+                 '</p><p><a href="javascript:history.go(-1);">'.&mt('Back to Bridge Task').'</a></p><hr />';
     }
-    $files.='</ul>';
     my $subject = &mt('Submission message for [_1]',$title);
     my ($message_status,$comment_status);
     my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'};
@@ -572,15 +686,11 @@ sub done_screen {
 	$comment_status = '<p>'.&mt('Message sent to instructor: [_1]',
 				    $comment_status).' </p>';
     }
+ 
     return "<h2>$title</h2>"
-          .'<p>'.&mt('Files submitted: [_1]',$files).'</p>'
-          .'<p>'.&mt('You are now done with this Bridge Task').'</p>'
-          .'<hr />'
-          .'<p><a href="/adm/logout">'.&mt('Logout').'</a></p>'
-.'<p><a href="/adm/roles">'.&mt('Change to a different course').'</a></p>'
-.$message_status
-.$comment_status
-
+          .$shown
+          .$message_status
+          .$comment_status;
 }
 
 sub start_Task {
@@ -610,35 +720,25 @@ sub start_Task {
 	    &Apache::structuretags::page_start($target,$token,$tagstack,
 					       $parstack,$parser,$safeeval,
 					       $name,&style($target));
+
+    }
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+        $target eq 'tex') {
+        if ($env{'form.markaccess'}) {
+            my @interval=&Apache::lonnet::EXT("resource.0.interval");
+            my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+            &Apache::lonnet::set_first_access($interval[1],$timelimit);
+        }
     }
 
     if ($target eq 'web' && $env{'request.state'} ne 'construct') {
 	if ($Apache::lonhomework::queuegrade
 	    || $Apache::lonhomework::modifygrades) {
-	    $result.='<form name="gradesubmission" method="post" action="';
-	    my $uri=$env{'request.uri'};
-	    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
-	    $result.=$uri.'">'.&add_grading_button()."</form>\n";
+	    $result .= &add_grading_button();
 	    my $symb=&Apache::lonnet::symbread();
 	    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})
 		|| &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
-		$result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
-		    '<input type="hidden" name="symb" value="'.$symb.'" />'.
-		    '<input type="hidden" name="command" value="showslots" />'.
-		    '<input type="submit" name="requestattempt" value="'.
-		    &mt('Show Slot list').'" />'.
-		    '</form>';
-		my $target_id = 
-		    &Apache::lonstathelpers::make_target_id({symb => $symb,
-							     part => '0'});
-		if (!&section_restricted()) {
-		    $result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
-			'<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
-			'<input type="hidden" name="reportSelected" value="grading_analysis" />'.
-			'<input type="submit" name="grading" value="'.
-			&mt('Show Grading Status').'" />'.
-			'</form>';
-		}
+                $result .= &add_slotlist_button(); 
 	    }
 	}
     }
@@ -652,19 +752,38 @@ sub start_Task {
 	my ($version,$previous)=&get_version();
 	($status,$accessmsg,my $slot_name,$slot) = 
 	    &Apache::lonhomework::check_slot_access('0','Task');
-	if ($status eq 'CAN_ANSWER' && $version eq '') {
-	    # CAN_ANSWER mode, and no current version, unproctored access
+	if ((($status eq 'CAN_ANSWER') || ($status eq 'NOT_YET_VIEWED')) && ($version eq '')) {
+	    # CAN_ANSWER or NOT_YET_VIEWED mode, and no current version, unproctored access
 	    # thus self-checkedin
-	    &check_in('Task',undef,undef,$slot_name);
+            my $needsiptied;
+            if (ref($slot)) {
+                $needsiptied = $slot->{'iptied'};
+            }
+	    my $check = &check_in('Task',undef,undef,$slot_name,$needsiptied);
+            if ($check =~ /^error:\s+(.*)$/) {
+                my $symb=&Apache::lonnet::symbread();
+                &Apache::lonnet::logthis("Error: $1 during self-checkin of version $version of Task (symb: $symb) using slot: $slot_name");   
+            }
 	    &add_to_queue('gradingqueue',{'type' => 'Task',
 					  'time' => time,
 					  'slot' => $slot_name});
 	    ($version,$previous)=&get_version();
 	}
-	
-	my $status_id = 
-	    ($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback'
-	                                            : 'LC_task_take';
+        if (($target eq 'web') && ($version ne '') && ($slot_name ne '')) {
+            if (ref($slot) eq 'HASH') {
+                if ($slot->{'endtime'} > time()) {
+                    $result .=
+                        &Apache::lonhtmlcommon::set_due_date($slot->{'endtime'});
+                }
+            }
+	}
+
+	my $status_id = 'LC_task_take';
+        if ($previous && $target eq 'answer') {
+            $status_id = 'LC_task_answer';
+        } elsif ($previous || $status eq 'SHOW_ANSWER') {
+	    $status_id = 'LC_task_feedback';
+        }
 	$result .= '<div class="LC_task" id="'.$status_id.'">'."\n";
 
 	push(@Apache::inputtags::status,$status);
@@ -682,26 +801,31 @@ sub start_Task {
 		}
 		my $msg;
 		if ($status eq 'UNAVAILABLE') {
-		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+		    $msg.='<p class="LC_error">'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</p>';
 		} elsif ($status eq 'NOT_IN_A_SLOT') {
-		    $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
-		    $msg.=&add_request_another_attempt_button("Sign up for time to work.");
+		    $msg.='<p class="LC_warning">'.&mt('You are not currently signed up to work at this time and/or place.').'</p>';
+		    $msg.=&add_request_another_attempt_button("Sign up for time to work");
 		} elsif ($status eq 'NEEDS_CHECKIN') {
-		    $msg.='<h1>'.&mt('You need the Proctor to validate you.').
-			'</h1>'.&proctor_validation_screen($slot);
+		    $msg.='<p class="LC_warning">'.&mt('You need the Proctor to validate you.').
+			'</p>'.&proctor_validation_screen($slot);
 		} elsif ($status eq 'WAITING_FOR_GRADE') {
-		    $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
+		    $msg.='<p class="LC_info">'.&mt('Your submission is in the grading queue.').'</p>';
 		} elsif ($env{'form.donescreen'}) {
 		    $result .= &done_screen($version);
-		} elsif ($status ne 'NOT_YET_VIEWED') {
-		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
+		} elsif ($status eq 'NOT_YET_VIEWED') {
+                    my $symb=&Apache::lonnet::symbread();
+                    $msg.=&Apache::structuretags::firstaccess_msg($accessmsg,$symb);
+                } elsif ($status eq 'NEED_DIFFERENT_IP') {
+#FIXME
+		} else {
+		    $msg.='<p class="LC_warning">'.&mt('Not open to be viewed').'</p>';
 		}
 		if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
 		    $msg.='The problem '.$accessmsg;
 		}
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {
-		$result.='\begin{document}\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';
+		$result.='\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';
 		if ($status eq 'UNAVAILABLE') {
 		    $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
 		} else {
@@ -771,6 +895,11 @@ sub start_Task {
 		    $result.='<b>'.&mt("Stopped grading.").'</b>'.$back;
 		} elsif ($status_code eq 'cancel') {
 		    $result.='<b>'.&mt("Cancelled grading.").'</b>'.$back;
+                } elsif ($status_code eq 'terminated') {
+                    $result.= '<b>'.&mt('Terminated grading').'</b><br />'.
+                              '<span class="LC_error">'.
+                              &mt('Grading for [_1] has not been saved because of a grading key mismatch.',
+                              '<tt>'.$env{'form.terminated'}.'</tt>').'</span><br />'.$back;
 		} elsif ($status_code eq 'never_versioned') {
 		    $result.='<b>'.
 			&mt("Requested user has never accessed the task.").
@@ -919,7 +1048,7 @@ sub get_key_todo {
 	    my $classlist=&get_limited_classlist();
 	    if (!&allow_grade_user($classlist->{$uname.':'.$udom})) {
 		return (undef,'not_allowed',
-			&mt('Requested student ([_1]) is in a section you aren\'t allowed to grade.',$uname.':'.$udom));
+			&mt("Requested student ([_1]) is in a section you aren't allowed to grade.",$uname.':'.$udom));
 	    }
 	}
 	my $gradingkey=&encode_queue_key($symb,$udom,$uname);
@@ -991,6 +1120,8 @@ sub get_key_todo {
 		    return (undef,'stop');
 		} elsif ($env{'form.cancel'}) {
 		    return (undef,'cancel');
+                } elsif ($env{'form.terminated'}) {
+                    return (undef, 'terminated');
 		} elsif ($env{'form.next'}) {
 		    return (undef,'select_user');
 		}
@@ -1036,13 +1167,17 @@ sub get_key_todo {
 
     if ($env{'form.queuemode'} ne 'selected') {
 	# don't get something new from the queue if they hit the stop button
-    	if (!(($env{'form.cancel'} || $env{'form.stop'}) 
+    	if (!(($env{'form.cancel'} || $env{'form.stop'} || $env{'form.terminated'}) 
 	      && $target eq 'webgrade') 
 	    && !$env{'form.gradingaction'}) {
 	    &Apache::lonxml::debug("Getting anew $queue");
 	    return (&get_from_queue($queue));
 	} else {
-	    return (undef,'stop');
+            if ($env{'form.terminated'}) {
+                return (undef,'terminated');
+            } else {
+                return (undef,'stop');
+            }
 	}
     }
     return (undef,undef)
@@ -1072,14 +1207,21 @@ sub end_Task {
 		}
 		if ($status eq 'CAN_ANSWER' && !$previous && 
 		    !$env{'form.donescreen'}) {
-		    $result.="\n".'<table border="1">'.
+                    my ($portheader,$porttext);
+                    if ($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}) {
+                        $portheader = &mt('Submit Additional Portfolio Files for Grading');
+                        $porttext = &mt('Indicate which additional files from your portfolio are to be evaluated in grading this task.');
+                    } else {
+                        $portheader = &mt('Submit Portfolio Files for Grading');
+                        $porttext = &mt('Indicate the files from your portfolio to be evaluated in grading this task.');
+                    }
+		    $result.="\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
 			&Apache::inputtags::file_selector("$version.0",
 							  "bridgetask","*",
 							  'portfolioonly',
-							  '
-<h2>'.&mt('Submit Portfolio Files for Grading').'</h2>
-<p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
-							  "</table>";
+                                                          '<h3>'.$portheader.'</h3><br />'.
+                                                          $porttext.'<br />').
+			&Apache::lonhtmlcommon::end_pick_box().'</div>';
 		}
 		if (!$previous && $status ne 'SHOW_ANSWER' &&
 		    &show_task($status,$previous)) {
@@ -1091,10 +1233,11 @@ sub end_Task {
 		if (!$previous && $status ne 'SHOW_ANSWER' &&
 		    &show_task($status,$previous)) {
 		    my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
+                    my $donetext = &mt('Done');
 		    $result.=<<DONEBUTTON;
 <form name="done" method="post" action="$action">
    <input type="hidden" name="donescreen" value="1" />
-   <input type="submit" value="Done" />
+   <input type="submit" value="$donetext" />
 </form>
 DONEBUTTON
                 }
@@ -1161,7 +1304,9 @@ DONEBUTTON
 		}
 		$result.="\n</div>\n".
 		    &Apache::loncommon::end_page({'discussion' => 1});
-	    }
+	    } elsif ($target eq 'answer') {
+                $result.="\n</div>\n";
+            }
 	}
 
 	my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
@@ -1172,13 +1317,16 @@ DONEBUTTON
 	} elsif (defined($Apache::lonhomework::history{"resource.$version.0.checkedin.slot"})) {
 	    $queue_data{'slot'} = $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
 	}
-	
+
 
 	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous
 	    && $status eq 'CAN_ANSWER') {
 	    my $award='SUBMITTED';
+            my $uploadedflag=0;
+            my $totalsize=0;
+            my @deletions = &Apache::loncommon::get_env_multiple('form.HWFILE'.$version.'_0_bridgetask_delete');
 	    &Apache::essayresponse::file_submission("$version.0",'bridgetask',
-						    'portfiles',\$award);
+						    \$award,\$uploadedflag,\$totalsize,\@deletions);
 	    if ($award eq 'SUBMITTED' &&
 		$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) {
 		$Apache::lonhomework::results{"resource.0.tries"}=
@@ -1191,7 +1339,9 @@ DONEBUTTON
 		$Apache::lonhomework::results{"resource.0.submission"}=
 		    $Apache::lonhomework::results{"resource.$version.0.submission"}='';
 	    } else {
-		delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
+                unless($uploadedflag) {
+                    delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
+                }
 		$award = '';
 	    }
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
@@ -1294,38 +1444,64 @@ DONEBUTTON
 		    $Apache::lonhomework::results{"resource.$version.0.solved"};
 	    }
 	    &minimize_storage();
-	    &Apache::structuretags::finalize_storage();
-	    
-	    # data stored, now handle queue
-	    if ($review) {
-		if ($env{'form.queue'} eq 'reviewqueue') {
-		    &check_queue_unlock($env{'form.queue'});
-		    &Apache::lonxml::debug(" still needs review not changing status.");
-		} else {
-		    if ($env{'form.queue'} ne 'none') {
-			&move_between_queues($env{'form.queue'},'reviewqueue');
+            my ($canstore,$domain,$name,$symb,$courseid);
+            ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
+
+            if ($env{'form.gradingkey'}) {
+                my $todo=&unescape($env{'form.gradingkey'});
+                my ($keysymb,$uname,$udom)=&decode_queue_key($todo);
+                if ($symb eq $keysymb) {
+                    if (($domain eq $udom) && ($name eq $uname)) {
+                        $canstore = 1;           
+                    }
+                }
+            }
+            if ($canstore) {
+	        &Apache::structuretags::finalize_storage();
+                my @interval = &Apache::lonnet::EXT("resource.0.interval");
+                if ($interval[0] =~ /^\d+/ && $interval[1] eq 'resource') {
+                    my $key=$courseid."\0".$symb;
+                    my %times=&Apache::lonnet::get('firstaccesstimes',
+                                                   [$key],$domain,$name);
+                    if ($times{$key}) {
+                        my $delresult.=&Apache::lonnet::del('firstaccesstimes',
+                                                            [$key],$domain,$name);
+                    }
+                }
+	        # data stored, now handle queue
+	        if ($review) {
+		    if ($env{'form.queue'} eq 'reviewqueue') {
+		        &check_queue_unlock($env{'form.queue'});
+		        &Apache::lonxml::debug(" still needs review not changing status.");
 		    } else {
-			&add_to_queue('reviewqueue',\%queue_data);
+		        if ($env{'form.queue'} ne 'none') {
+			    &move_between_queues($env{'form.queue'},'reviewqueue');
+		        } else {
+			    &add_to_queue('reviewqueue',\%queue_data);
+		        }
 		    }
-		}
-	    } elsif ($ungraded) {
-		if ($env{'form.queue'} eq 'reviewqueue') {
-		    &Apache::lonxml::debug("moving back.");
-		    &move_between_queues($env{'form.queue'},
-					 'gradingqueue');
-		} elsif ($env{'form.queue'} eq 'none' ) {
-		    &add_to_queue('gradingqueue',\%queue_data);	
-		} else {
-		    &check_queue_unlock($env{'form.queue'});
-		}
-	    } elsif ($mandatory_failed) {
-		&remove_from_queue($env{'form.queue'}); 
-	    } else {
-		&remove_from_queue($env{'form.queue'});
-	    }
-	}
+	        } elsif ($ungraded) {
+		    if ($env{'form.queue'} eq 'reviewqueue') {
+		        &Apache::lonxml::debug("moving back.");
+		        &move_between_queues($env{'form.queue'},
+					     'gradingqueue');
+		    } elsif ($env{'form.queue'} eq 'none' ) {
+		        &add_to_queue('gradingqueue',\%queue_data);	
+		    } else {
+		        &check_queue_unlock($env{'form.queue'});
+		    }
+	        } elsif ($mandatory_failed) {
+		    &remove_from_queue($env{'form.queue'}); 
+	        } else {
+		    &remove_from_queue($env{'form.queue'});
+	        }
+            } else {
+                &check_queue_unlock($env{'form.queue'});
+                $env{'form.terminated'} = $name.':'.$domain;
+            }
+        }
 	if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {
-	    # instance generation occured and hasn't yet been stored
+	    # instance generation occurred and hasn't yet been stored
 	    &Apache::structuretags::finalize_storage();
 	}
     } elsif ($target eq 'webgrade') {
@@ -1381,6 +1557,13 @@ DONEBUTTON
     }
     &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);
+    if ( ($target eq 'grade' && $env{'form.webgrade'}) ||
+          $target eq 'webgrade') {
+        delete($env{'form.grade_symb'});
+        delete($env{'form.grade_domain'});
+        delete($env{'form.grade_username'});
+        delete($env{'form.grade_courseid'});
+    }
     return $result;
 }
 
@@ -1665,7 +1848,7 @@ sub show_queue {
 		    $result.=(<<FORM);
 <td>$status</td>
 <td>
-<form style="display: inline" method="post">
+<form style="display: inline" method="post" action="">
  <input type="hidden" name="gradingkey" value="$ekey" />
  <input type="hidden" name="queue" value="$queue" />
  <input type="hidden" name="gradingaction" value="$action" />
@@ -2080,15 +2263,16 @@ sub select_user {
 		$seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';
 	    }
+            my $buttontext=&mt('Regrade');
 	    $result.=&Apache::loncommon::start_data_table_row();
 	    $result.=<<RESULT;
   <td>
-    <form style="display: inline" method="post">
+    <form style="display: inline" method="post" action="">
       <input type="hidden" name="gradingkey" value="$todo" />
       <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />
       <input type="hidden" name="regrade" value="yes" />
-      <input type="submit" name="submit" value="Regrade" />
+      <input type="submit" name="submit" value="$buttontext" />
       $seclist
     </form>
   <td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt> Sec: $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]</td>
@@ -2647,17 +2831,11 @@ sub question_status_message {
     }
     $status .= '.';
     if ($counts->{'opt'}) {
-        # FIXME &mt() missing!
-	$status .= ' You were required to pass '.$counts->{'opt_req'}.
-	    ' optional ';
-	if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
-	    $status .=
-		($counts->{'opt_req'} == 1?'criterion':'criteria');
-	} else {
-	    $status .=
-		'component'.($counts->{'opt_req'} == 1?'':'s');
-	}
-	$status .= '.';
+        if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
+            $status .= ' '.&mt('You were required to pass [quant,_1,optional criterion,optional criteria].',$counts->{'opt_req'});
+        } else { 
+            $status .= ' '.&mt('You were required to pass [quant,_1,optional component].',$counts->{'opt_req'});
+        }
     }
     return $status;
 }
@@ -2987,25 +3165,25 @@ sub layout_webgrade_Criteria {
     my $link=&link($id);
     my $version = &get_version();
     my $status  = &get_criteria('status',$version,$dim,$id);
-    my %lt = ( 'ungraded' => 'Ungraded',
-	       'fail'     => 'Fail',
-	       'pass'     => 'Pass',
-	       'review'   => 'Review',
-	       'comment'  => 'Additional Comment for Student',
-	       );
-    %lt = &Apache::lonlocal::texthash(%lt);
+    my %lt = &Apache::lonlocal::texthash(
+        'ungraded' => 'Ungraded',
+        'fail'     => 'Fail',
+        'pass'     => 'Pass',
+        'review'   => 'Review',
+        'comment'  => 'Additional Comment for Student',
+    );
     my $comment = &get_criteria('comment',$version,$dim,$id);
     $comment = &HTML::Entities::encode($comment,'<>"&');
     my %checked;
     foreach my $which ('ungraded','fail','pass','review') {
-	if ($status eq $which) { $checked{$which} = 'checked="checked"'; }
+	if ($status eq $which) { $checked{$which} = ' checked="checked"'; }
     }
-    if (!%checked) { $checked{'ungraded'} = 'checked="checked"'; }
+    if (!%checked) { $checked{'ungraded'} = ' checked="checked"'; }
     my $buttons;
     foreach my $which  ('ungraded','fail','pass','review') {
 	$buttons .= <<END_BUTTON;
 		<label class="LC_GRADING_$which">
-			<input type="radio" name="HWVAL_$link" value="$which" $checked{$which} />
+			<input type="radio" name="HWVAL_$link" value="$which"$checked{$which} />
 			$lt{$which}
 		</label>
 END_BUTTON
@@ -3107,14 +3285,8 @@ sub proctor_validation_screen {
     my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
-    if ($url ne '/adm/lonKaputt/lonlogo_broken.gif') {
-	$url = "<tr><td colspan=\"2\"><img src=\"$url\" /></td></tr>";
-    } else {
-	undef($url);
-    }
-
     my $name=&Apache::loncommon::plainname($user,$domain);
-    
+
     my $msg;
     if ($env{'form.proctorpassword'}) {
 	$msg.='<p><span class="LC_warning">'
@@ -3139,34 +3311,80 @@ sub proctor_validation_screen {
     if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     $uri = &HTML::Entities::encode($uri,'<>&"');
-    # FIXME &mt() missing!
-    my $result= (<<ENDCHECKOUT);
-<h2>Proctor Validation</h2>
-    <p>Your room's proctor needs to validate your access to this resource.</p>
-    $msg
+    my %lt = &Apache::lonlocal::texthash(
+                            'prva' => "Proctor Validation",
+                            'yoro' => "Your room's proctor needs to validate your access to this resource.",
+                            'prus'  => "Proctor's Username",
+                            'pasw'  => "Password",
+                            'prdo'  => "Proctor's Domain",
+                            'vali'  => 'Validate',
+                            'stui'  => "Student who should be logged in is:",
+                            'name'  => "Name",
+                            'sid'   => "Student/Employee ID",
+                            'unam'  => "Username",
+                            'phot'  => "Photo", 
+                           );
+    my $proctortable =
+        &Apache::lonhtmlcommon::start_pick_box()."\n".
+        &Apache::lonhtmlcommon::row_title('<label for="proctorname">'.$lt{'prus'}.'</label>').
+        '<input type="text" name="proctorname" value="'.$env{'form.proctorname'}.'" '.
+        'id="proctorname" autocomplete="new-password" />'.
+        &Apache::lonhtmlcommon::row_closure()."\n".
+        &Apache::lonhtmlcommon::row_title('<label for="proctorpassword">'.$lt{'pasw'}.'</label>').
+        '<input type="password" name="proctorpassword" value="" '.
+        'id="proctorpassword" autocomplete="new-password" />'.
+        &Apache::lonhtmlcommon::row_closure()."\n".
+        &Apache::lonhtmlcommon::row_title('<label for="proctordomain">'.$lt{'prdo'}.'</label>').
+        '<input type="text" name="proctordomain" value="'.$env{'form.proctordomain'}.'" '.
+        'id="proctordomain" autocomplete="off" />'.
+        &Apache::lonhtmlcommon::row_closure(1)."\n".
+        &Apache::lonhtmlcommon::end_pick_box()."\n";
+
+    my $studenttable =
+        &Apache::loncommon::start_data_table('LC_manage_reservations').
+        &Apache::loncommon::start_data_table_row().
+        '<th>'.$lt{'name'}.':</th><td>'.$name.'</td>'.
+        &Apache::loncommon::end_data_table_row()."\n".
+        &Apache::loncommon::start_data_table_row().
+        '<th>'.$lt{'sid'}.':</th><td>'.$env{'environment.id'}.'</td>'.
+        &Apache::loncommon::end_data_table_row()."\n".
+        &Apache::loncommon::start_data_table_row().
+        '<th>'.$lt{'unam'}.':</th><td>'.$user.':'.$domain.'</td>'.
+        &Apache::loncommon::end_data_table_row();
+    if ($url ne '/adm/lonKaputt/lonlogo_broken.gif') {
+        $studenttable .= &Apache::loncommon::start_data_table_row().
+                         '<th valign="top">'.$lt{'phot'}.'</th>'.
+                         '<td valign="top"><img src="'.&HTML::Entities::encode($url,'&<>"').'" '.
+                         'alt="'.&mt('Photo of [_1]',$name).'" /></td>'.
+                         &Apache::loncommon::end_data_table_row()."\n";
+    }
+    $studenttable .= &Apache::loncommon::end_data_table()."\n";
+    if ($msg ne '') {
+        $msg = "<p>$msg</p>";
+    } else {
+        $msg = '<br /><br />';
+    }
+    return (<<ENDCHECKOUT);
+<div style="padding:0;clear:both;margin:0;border:0">
+<h2 class="LC_heading_2">$lt{'prva'}</h2><hr />
+<div class="LC_left_float">
+$lt{'yoro'}
+$msg
 <form name="checkout" method="post" action="$uri">
 <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />
-<table>
-  <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
-  <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
-  <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
-</table>
-<input type="submit" name="checkoutbutton" value="Validate"  /><br />
-<table border="1">
-  <tr><td>
-    <table>
-      <tr><td colspan="2">Student who should be logged in is:</td></tr>
-      <tr><td>Name:</td><td>$name</td></tr>
-      <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
-      <tr><td>Usename</td><td>$user:$domain</td></tr>
-      $url
-    </table>
-  </tr></td>
-</table>
+$proctortable
+<br />
+<input type="submit" name="checkoutbutton" value="$lt{'vali'}" />
 </form>
+</div>
+<div class="LC_left_float">
+$lt{'stui'}
+<br /><br />
+$studenttable
+</div>
+</div>
 ENDCHECKOUT
-    return $result;
 }
 
 1;