--- loncom/homework/lonhomework.pm	2015/10/26 20:36:45	1.359
+++ loncom/homework/lonhomework.pm	2016/03/15 14:25:33	1.360
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.359 2015/10/26 20:36:45 musolffc Exp $
+# $Id: lonhomework.pm,v 1.360 2016/03/15 14:25:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1172,7 +1172,7 @@ sub editxmlmode {
 #    Render the page in whatever target desired.
 #
 sub renderpage {
-    my ($request,$file,$targets,$return_string) = @_;
+    my ($request,$file,$targets,$return_string,$donebuttonmsg) = @_;
 
     my @targets = @{$targets || [&get_target()]};
     &Apache::lonhomework::showhashsubset(\%env,'form.');
@@ -1225,7 +1225,12 @@ sub renderpage {
 	    if ($target eq 'analyze') {
 		$result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze);
 		undef(%Apache::lonhomework::analyze);
-	    }
+	    } elsif ($target eq 'web') {
+                if ($donebuttonmsg) {
+                    $result =~ s{</body>}{};
+                    $result.= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($donebuttonmsg,1))."\n</body>";
+                }
+            }
 	    #my $td=&tv_interval($t0);
 	    #if ( $Apache::lonxml::debug) {
 	    #$result =~ s:</body>::;
@@ -1430,34 +1435,57 @@ sub zero_timer {
     my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
     if (@interval > 1) {
         if ($interval[1] eq 'course') {
-            return;
+            return ('fail',&mt('Ending of timed events not supported for intervals set course-wide'));
         } else {
             my $now = time;
             my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
             if ($first_access > 0) {
-                my ($timelimit) = split(/_/,$interval[0]);
-                if ($first_access+$timelimit > $now) {
-                    my $done_time = $now - $first_access;
-                    my $snum = 1;
-                    if ($interval[1] eq 'map') {
-                        $snum = 2;
+                my ($timelimit,$done,$proctor,$secret) = split(/_/,$interval[0]);
+                if ($done eq 'done') { 
+                    if (($proctor) && ($secret ne '')) {
+                        my $key = $env{'form.LC_interval_done_proctorpass'};
+                        $key =~ s/^\s+//;
+                        $key =~ s/\s+$//;
+                        if ($env{'form.LC_interval_done_proctorpass'} ne $secret) {
+                            return ('fail',
+                                   &mt('Incorrect key entered by proctor')); 
+                        }
                     }
-                    my $result = 
-                        &Apache::lonparmset::storeparm_by_symb_inner($symb,'0_interval',
-                                                                     $snum,$done_time,
-                                                                     'date_interval',
-                                                                     $env{'user.name'},
-                                                                     $env{'user.domain'});
-                        # Record action in "User Notes"
-                        &Apache::lonmsg::store_instructor_comment(
-                            'Pressed Done button for symb:<br />'.$symb,
-                            $env{'user.name'}, $env{'user.domain'});
-                    return $result;
+                    if ($first_access+$timelimit > $now) {
+                        my $done_time = $now - $first_access;
+                        my $snum = 1;
+                        if ($interval[1] eq 'map') {
+                            $snum = 2;
+                        }
+                        my $result =
+                            &Apache::lonparmset::storeparm_by_symb_inner($symb,'0_interval',
+                                                                         $snum,$done_time,
+                                                                         'date_interval',
+                                                                         $env{'user.name'},
+                                                                         $env{'user.domain'});
+                        if ($result eq '') {
+                            # Record action in "User Notes"
+                            &Apache::lonmsg::store_instructor_comment(
+                                'Pressed Done button for symb:<br />'.$symb,
+                                $env{'user.name'}, $env{'user.domain'});
+                            return ('ok');
+                        } else {
+                            return ('fail',&mt('Error ending timed event: [_1]',$result));
+                        } 
+                    } else {
+                        return ('fail',&mt('Timed event already ended'));
+                    }
+                } else {
+                    return ('fail',&mt('Timed event can not be ended before the time limit'));
                 }
+            } else {
+                return ('fail',&mt('Timer not yet started for this timed event'));
             }
         }
+    } else {
+        return ('fail',&mt('No timer in use'));
     }
-    return;
+    return();
 }
 
 sub handler {
@@ -1519,13 +1547,15 @@ sub handler {
     } else {
         # Set the event timer to zero if the "done button" was clicked.  The button is
         # part of the doneButton form created in lonmenu.pm
+        my ($donebuttonresult,$donemsg);
         if ($symb && $env{'form.LC_interval_done'} eq 'true') {  
-            &zero_timer($symb);
+            ($donebuttonresult,$donemsg) = &zero_timer($symb);
             undef($env{'form.LC_interval_done'});
+            undef($env{'form.LC_interval_done_proctorpass'});
         }
 	# just render the page normally outside of construction space
 	&Apache::lonxml::debug("not construct");
-	&renderpage($request,$file);
+	&renderpage($request,$file,undef,undef,$donemsg);
     }
     #my $td=&tv_interval($t0);
     #&Apache::lonxml::debug("Spent $td seconds processing");