--- loncom/homework/lonhomework.pm	2015/07/17 19:11:09	1.356
+++ loncom/homework/lonhomework.pm	2023/06/04 05:27:28	1.377
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.356 2015/07/17 19:11:09 raeburn Exp $
+# $Id: lonhomework.pm,v 1.377 2023/06/04 05:27:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,16 +50,22 @@ use Apache::chemresponse();
 use Apache::functionplotresponse();
 use Apache::drawimage();
 use Apache::loncapamath();
+use Apache::loncourseuser();
+use Apache::grades();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonparmset();
+use Apache::lonnavmaps();
 use Apache::lonlocal;
+use LONCAPA qw(:DEFAULT :match);
+use LONCAPA::ltiutils();
 use Time::HiRes qw( gettimeofday tv_interval );
 use HTML::Entities();
 use File::Copy();
 
 # FIXME - improve commenting
 
+my $registered_cleanup;
 
 BEGIN {
     &Apache::lonxml::register_insert();
@@ -190,7 +196,7 @@ sub proctor_checked_in {
     if ($type eq 'Task') {
 	my $version=$Apache::lonhomework::history{'resource.0.version'};
 	$key ="resource.$version.0.checkedin";
-    } elsif ($type eq 'problem') {
+    } elsif (($type eq 'problem') || ($type eq 'tool')) {
 	$key ='resource.0.checkedin';
     }
     # backward compatability, used to be username@domain, 
@@ -205,24 +211,57 @@ sub proctor_checked_in {
 	    return 1;
 	}
     }
-    
     return 0;
 }
 
 sub check_slot_access {
-    my ($id,$type,$symb)=@_;
+    my ($id,$type,$symb,$partlist)=@_;
 
     # does it pass normal muster
     my ($status,$datemsg)=&check_access($id,$symb);
-    
+
     my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
     if ($useslots ne 'resource' && $useslots ne 'map' 
 	&& $useslots ne 'map_map') {
 	return ($status,$datemsg);
     }
 
-    if ($status eq 'SHOW_ANSWER' ||
-	$status eq 'CLOSED' ||
+    my $checkin = 'resource.0.checkedin';
+    my $version;
+    if ($type eq 'Task') {
+        $version=$Apache::lonhomework::history{'resource.version'};
+        $checkin = "resource.$version.0.checkedin";
+    }
+    my $checkedin = $Apache::lonhomework::history{$checkin};
+    my ($returned_slot,$slot_name,$checkinslot,$ipused,$blockip,$now,$ip,
+        $consumed_uniq);
+    $now = time;
+    $ip=$ENV{'REMOTE_ADDR'} || $env{'request.host'};
+
+    if ($checkedin) {
+        $checkinslot = $Apache::lonhomework::history{"$checkin.slot"};
+        my %slot=&Apache::lonnet::get_slot($checkinslot);
+        $consumed_uniq = $slot{'uniqueperiod'};
+        if ($slot{'iptied'}) {
+            $ipused = $Apache::lonhomework::history{"$checkin.ip"};
+            unless (($ip ne '') && 
+                    (($ipused eq $ip) || ($ENV{'REMOTE_ADDR'} eq '127.0.0.1'))) {
+                $blockip = $slot{'iptied'};
+                $slot_name = $checkinslot;
+                $returned_slot = \%slot;
+            }
+        }
+    }
+
+    if ($status eq 'SHOW_ANSWER') {
+        if ($blockip eq 'answer') {
+            return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
+        } else {
+            return ($status,$datemsg);
+        }
+    }
+
+    if ($status eq 'CLOSED' ||
 	$status eq 'INVALID_ACCESS' ||
 	$status eq 'UNAVAILABLE') {
 	return ($status,$datemsg);
@@ -230,13 +269,22 @@ sub check_slot_access {
     if ($env{'request.state'} eq "construct") {
 	return ($status,$datemsg);
     }
-    
+
     if ($type eq 'Task') {
-	my $version=$Apache::lonhomework::history{'resource.version'};
-	if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} &&
+	if ($checkedin &&
 	    $Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {
-	    return ('SHOW_ANSWER');
-	}
+	    if ($blockip eq 'answer') {
+                return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
+            } else {
+	        return ('SHOW_ANSWER');
+            }
+        }
+    } elsif (($type eq 'problem') &&
+             ($Apache::lonhomework::browse eq 'F') &&
+             ($ENV{'REMOTE_ADDR'} eq '127.0.0.1') &&
+             ($env{'form.grade_courseid'} eq $env{'request.course.id'}) &&
+             (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}))) {
+        return ($status,$datemsg);
     }
 
     my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb);
@@ -246,10 +294,13 @@ sub check_slot_access {
 #    if (!@slots) {
 #	return ($status,$datemsg);
 #    }
+    undef($returned_slot);
+    undef($slot_name);
     my $slotstatus='NOT_IN_A_SLOT';
-    my ($returned_slot,$slot_name);
-    my $now = time;
     my $num_usable_slots = 0;
+    if (!$symb) {
+        ($symb) = &Apache::lonnet::whichuser();
+    }
     foreach my $slot (@slots) {
 	$slot =~ s/(^\s*|\s*$)//g;
 	&Apache::lonxml::debug("getting $slot");
@@ -260,12 +311,41 @@ sub check_slot_access {
 	if ($slot{'starttime'} < $now &&
 	    $slot{'endtime'} > $now &&
 	    &Apache::loncommon::check_ip_acc($slot{'ip'})) {
-	    &Apache::lonxml::debug("$slot is good");
-	    $slotstatus='NEEDS_CHECKIN';
-	    $returned_slot=\%slot;
-	    $slot_name=$slot;
-	    last;
-        } 
+            if ($slot{'iptied'}) {
+                if ($env{'request.course.id'}) {
+                    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                    if ($slot eq $checkinslot) {
+                        if ($ip eq $ipused) {
+                            &Apache::lonxml::debug("$slot is good");
+                            $slotstatus ='NEEDS_CHECKIN'; 
+                        } else {
+                            $slotstatus = 'NEED_DIFFERENT_IP';
+                            $slot_name = $slot;
+                            $returned_slot = \%slot;
+                            last;
+                        }
+                    } elsif ($ip) {
+                        my $uniqkey = "$slot\0$symb\0$ip";
+                        my %used_ip = &Apache::lonnet::get('slot_uniqueips',[$uniqkey],$cdom,$cnum);
+                        if ($used_ip{$uniqkey}) {
+                            $slotstatus = 'NEED_DIFFERENT_IP';
+                        } else {
+                            &Apache::lonxml::debug("$slot is good");
+                            $slotstatus ='NEEDS_CHECKIN';
+                        }
+                    }
+                }
+            } else {
+	        &Apache::lonxml::debug("$slot is good");
+	        $slotstatus='NEEDS_CHECKIN';
+            }
+            if ($slotstatus eq 'NEEDS_CHECKIN') {
+	        $returned_slot=\%slot;
+	        $slot_name=$slot;
+	        last;
+            }
+        }
     }
     if ($slotstatus eq 'NEEDS_CHECKIN' &&
 	&proctor_checked_in($slot_name,$returned_slot,$type)) {
@@ -273,7 +353,7 @@ sub check_slot_access {
 	$slotstatus=$status;
     }
 
-    my ($is_correct,$got_grade,$checkedin);
+    my ($is_correct,$got_grade);
     if ($type eq 'Task') {
 	my $version=$Apache::lonhomework::history{'resource.0.version'};
 	$got_grade = 
@@ -282,13 +362,49 @@ sub check_slot_access {
 	$is_correct =  
 	    ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'
 	     || $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );
-	$checkedin =
-	    $Apache::lonhomework::history{"resource.$version.0.checkedin"};
-    } elsif ($type eq 'problem') {
-	$got_grade  = 1;
-	$checkedin  = $Apache::lonhomework::history{"resource.0.checkedin"};
-	$is_correct =
-	    ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
+    } elsif (($type eq 'problem') || ($type eq 'tool')) {
+        if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) {
+            my ($numcorrect,$numgraded) = (0,0);
+            foreach my $part (@{$partlist}) {
+                my $currtries = $Apache::lonhomework::history{"resource.$part.tries"};
+                my $maxtries = &Apache::lonnet::EXT("resource.$part.maxtries",$symb);
+                my $probstatus = &Apache::structuretags::get_problem_status($part);
+                my $earlyout;
+                unless (($probstatus eq 'no') ||
+                        ($probstatus eq 'no_feedback_ever')) {
+                    if ($Apache::lonhomework::history{"resource.$part.solved"} =~/^correct_/) {
+                        $numcorrect ++;
+                    } else {
+                        $earlyout = 1;
+                    }
+                }
+                if ($currtries == $maxtries) {
+                    $earlyout = 1;
+                } else {
+                    $numgraded ++;
+                }
+                last if ($earlyout);
+            }
+            my $numparts = scalar(@{$partlist});
+            if ($numparts == $numcorrect) {
+                $is_correct = 1;
+            }
+            if ($numparts == $numgraded) {
+                $got_grade = 1;
+            }
+        } else {
+            my $currtries = $Apache::lonhomework::history{"resource.0.tries"};
+            my $maxtries = &Apache::lonnet::EXT("resource.0.maxtries",$symb);
+            my $probstatus = &Apache::structuretags::get_problem_status('0');
+            unless (($probstatus eq 'no') ||
+                    ($probstatus eq 'no_feedback_ever')) {
+                $is_correct =
+                    ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
+            }
+            unless (($currtries == $maxtries) || ($is_correct)) {
+                $got_grade = 1;
+            }
+        }
     }
     
     &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
@@ -305,35 +421,13 @@ sub check_slot_access {
     # However, the problem is not closed, and potentially, another slot might be
     # used to gain access to it to work on it, until the due date is reached, and the
     # problem then becomes CLOSED.  Therefore return the slotstatus - 
-    # (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE.
-    if (!defined($slot_name) && $type eq 'problem') {
+    # (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE).
+
+    if (!defined($slot_name) && (($type eq 'problem') || ($type eq 'tool'))) {
         if ($slotstatus eq 'NOT_IN_A_SLOT') {
             if (!$num_usable_slots) {
-                if ($env{'request.course.id'}) {
-                    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-                    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-                    unless ($symb) {
-                        ($symb)=&Apache::lonnet::whichuser();
-                    }
-                    $slotstatus = 'NOTRESERVABLE';
-                    my ($reservable_now_order,$reservable_now,$reservable_future_order,
-                        $reservable_future) = 
-                        &Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
-                    if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
-                        if (@{$reservable_now_order} > 0) {
-                            $slotstatus = 'RESERVABLE';
-                            $datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
-                        }
-                    }
-                    unless ($slotstatus eq 'RESERVABLE') {
-                        if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
-                            if (@{$reservable_future_order} > 0) {
-                                $slotstatus = 'RESERVABLE_LATER';
-                                $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
-                            }
-                        }
-                    }
-                }
+                ($slotstatus,$datemsg) = &check_reservable_slot($slotstatus,$symb,$now,$checkedin,
+                                                                $consumed_uniq);
             }
         }
         return ($slotstatus,$datemsg);
@@ -343,26 +437,105 @@ sub check_slot_access {
 	&& $checkedin ) {
 
 	if ($got_grade) {
-	    return ('SHOW_ANSWER');
+            if ($blockip eq 'answer') {
+                return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
+            } else {
+	        return ('SHOW_ANSWER');
+            }
 	} else {
 	    return ('WAITING_FOR_GRADE');
 	}
 
     }
 
-    if ( $is_correct) {
-	if ($type eq 'problem') {
+    if (($is_correct) && ($blockip ne 'answer')) {
+	if (($type eq 'problem') || ($type eq 'tool')) {
 	    return ($status);
 	}
 	return ('SHOW_ANSWER');
     }
 
     if ( $status eq 'CANNOT_ANSWER' && 
-	 ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {
+	 ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT' &&
+          $slotstatus ne 'NEED_DIFFERENT_IP') ) {
 	return ($status,$datemsg);
     }
+    return ($slotstatus,$datemsg,$slot_name,$returned_slot,$ipused);
+}
 
-    return ($slotstatus,$datemsg,$slot_name,$returned_slot);
+sub check_reservable_slot {
+    my ($slotstatus,$symb,$now,$checkedin,$consumed_uniq) = @_;
+    my $datemsg;
+    if ($slotstatus eq 'NOT_IN_A_SLOT') {
+        if ($env{'request.course.id'}) {
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            unless ($symb) {
+                ($symb)=&Apache::lonnet::whichuser();
+            }
+            $slotstatus = 'NOTRESERVABLE';
+            my ($reservable_now_order,$reservable_now,$reservable_future_order,
+                $reservable_future) =
+                &Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
+            if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
+                if (@{$reservable_now_order} > 0) {
+                    if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
+                        $slotstatus = 'RESERVABLE';
+                        $datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
+                    } else {
+                        my ($uniqstart,$uniqend,$useslot);
+                        if (ref($consumed_uniq) eq 'ARRAY') {
+                            ($uniqstart,$uniqend)=@{$consumed_uniq};
+                        }
+                        foreach my $slot (reverse(@{$reservable_now_order})) {
+                            if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) {
+                                my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+                                next if (!
+                                    ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+                                    ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                            }
+                            $useslot = $slot;
+                            last;
+                        }
+                        if ($useslot) {
+                            $slotstatus = 'RESERVABLE';
+                            $datemsg = $reservable_now->{$useslot}{'endreserve'};
+                        }
+                    }
+                }
+            }
+            unless ($slotstatus eq 'RESERVABLE') {
+                if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
+                    if (@{$reservable_future_order} > 0) {
+                        if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
+                            $slotstatus = 'RESERVABLE_LATER';
+                            $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
+                        } else {
+                            my ($uniqstart,$uniqend,$useslot);
+                            if (ref($consumed_uniq) eq 'ARRAY') {
+                                ($uniqstart,$uniqend)=@{$consumed_uniq};
+                            }
+                            foreach my $slot (@{$reservable_future_order}) {
+                                if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
+                                    my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+                                    next if (!
+                                      ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+                                      ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                                }
+                                $useslot = $slot;
+                                last;
+                            }
+                            if ($useslot) {
+                                $slotstatus = 'RESERVABLE_LATER';
+                                $datemsg = $reservable_future->{$useslot}{'startreserve'};
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return ($slotstatus,$datemsg);
 }
 
 # JB, 9/24/2002: Any changes in this function may require a change
@@ -494,15 +667,16 @@ sub check_access {
     if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') {
 	my @interval=&Apache::lonnet::EXT("resource.$id.interval",$symb);
 	&Apache::lonxml::debug("looking for interval @interval");
-	if ($interval[0]) {
+	if ($interval[0]=~ /^\d+/) {
 	    my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
 	    &Apache::lonxml::debug("looking for accesstime $first_access");
 	    if (!$first_access) {
 		$status='NOT_YET_VIEWED';
 		my $due_date = &due_date($id,$symb);
 		my $seconds_left = $due_date - time;
-		if ($seconds_left > $interval[0] || $due_date eq '') {
-		    $seconds_left = $interval[0];
+		my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+		if ($seconds_left > $timelimit || $due_date eq '') {
+		    $seconds_left = $timelimit;
 		}
 		$datemsg=&seconds_to_human_length($seconds_left);
 	    }
@@ -537,7 +711,8 @@ sub due_date {
 	my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
 	&Apache::lonxml::debug("looking for first_access $first_access ($interval[1])");
 	if (defined($first_access)) {
-	    my $interval = $first_access+$interval[0];
+	    my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+	    my $interval = $first_access+$timelimit;
 	    $date = (!$due_date || $interval < $due_date) ? $interval
                                                           : $due_date;
 	} else {
@@ -622,6 +797,9 @@ sub setuppermissions {
 	$env{'request.course.sec'} !~ /^\s*$/) {
 	$viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}.
                                                '/'.$env{'request.course.sec'});
+        if ($viewgrades) {
+            $Apache::lonhomework::viewgradessec = $env{'request.course.sec'};
+        }
     }
     $Apache::lonhomework::viewgrades = $viewgrades;
 
@@ -639,6 +817,9 @@ sub setuppermissions {
 	$modifygrades = 
 	    &Apache::lonnet::allowed('mgr',$env{'request.course.id'}.
 				     '/'.$env{'request.course.sec'});
+        if ($modifygrades) {
+            $Apache::lonhomework::modifygradessec = $env{'request.course.sec'};
+        }
     }
     $Apache::lonhomework::modifygrades = $modifygrades;
 
@@ -657,7 +838,9 @@ sub setuppermissions {
 sub unset_permissions {
     undef($Apache::lonhomework::queuegrade);
     undef($Apache::lonhomework::modifygrades);
+    undef($Apache::lonhomework::modifygradessec);
     undef($Apache::lonhomework::viewgrades);
+    undef($Apache::lonhomework::viewgradessec);
     undef($Apache::lonhomework::browse);
 }
 
@@ -1028,27 +1211,27 @@ sub editxmlmode {
 
     unless ($env{'environment.nocodemirror'}) {
         # dropdown menus
-        $result .= Apache::lonmenu::create_submenu("#", "", 
+        $result .= Apache::lonmenu::create_submenu("#", "",
             &mt("Problem Templates"), template_dropdown_datastructure());
 
-        $result .= Apache::lonmenu::create_submenu("#", "", 
+        $result .= Apache::lonmenu::create_submenu("#", "",
             &mt("Response Types"), responseblock_dropdown_datastructure());
 
-        $result .= Apache::lonmenu::create_submenu("#", "", 
+        $result .= Apache::lonmenu::create_submenu("#", "",
             &mt("Conditional Blocks"), conditional_scripting_datastructure());
 
-        $result .= Apache::lonmenu::create_submenu("#", "", 
+        $result .= Apache::lonmenu::create_submenu("#", "",
             &mt("Miscellaneous"), misc_datastructure());
     }
 
-    $result .= Apache::lonmenu::create_submenu("#", "", 
+    $result .= Apache::lonmenu::create_submenu("#", "",
         &mt("Help") . ' <img src="/adm/help/help.png" alt="' . &mt("Help") .
-        '" style="vertical-align:text-bottom; height: auto; margin:0; "/>', 
+        '" style="vertical-align:text-bottom; height: auto; margin:0; "/>',
         helpmenu_datastructure(),"");
 
     $result.="</ol></div>";
-         
-    $result .= '</div></div>' . 
+
+    $result .= '</div></div>' .
         &Apache::lonxml::message_location() .
         &Apache::loncommon::xmleditor_js() .
         '<textarea ' . &Apache::edit::element_change_detection() .
@@ -1084,7 +1267,7 @@ sub editxmlmode {
                 autoCloseBrackets: true,
                 height: "auto",
                 styleActiveLine: true,
-                
+
                 extraKeys: {
                     "Tab": "indentMore",
                     "Shift-Tab": "indentLess",
@@ -1105,7 +1288,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,$viewasuser,$symb) = @_;
 
     my @targets = @{$targets || [&get_target()]};
     &Apache::lonhomework::showhashsubset(\%env,'form.');
@@ -1146,6 +1329,10 @@ sub renderpage {
 	if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
 	if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');}
 
+        if (($target eq 'web') && ($viewasuser ne '') && ($symb ne '')) {
+            $env{'request.user_in_effect'} = $viewasuser;
+        }
+
 	&Apache::lonxml::debug("Should be parsing now");
 	$result .= &Apache::lonxml::xmlparse($request, $target, $problem,
 					     &setup_vars($target),%mystyle);
@@ -1158,7 +1345,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>::;
@@ -1166,15 +1358,23 @@ sub renderpage {
 	    #}
 #	    $request->print($result);
 	    $overall_result.=$result;
+            if (($target eq 'web') && ($viewasuser ne '') && ($symb ne '')) {
+                my ($vuname,$vudom) = split(/:/,$viewasuser);
+                $overall_result .= &Apache::grades::view_as_user($symb,$vuname,$vudom).
+                                   '</body></html>';
+            }
 #	    $request->rflush();
 	}
+        if (($target eq 'web') && ($viewasuser ne '') && ($symb ne '')) {
+            undef($env{'request.user_in_effect'});
+        }
 	#$request->print(":Result ends");
 	#my $td=&tv_interval($t0);
     }
     if (!$return_string) {
 	&Apache::lonxml::add_messages(\$overall_result);
 	$request->print($overall_result);   
-	$request->rflush();   
+	$request->rflush();
     } else {
 	return $overall_result;
     }
@@ -1193,7 +1393,7 @@ sub finished_parsing {
 # value 3: name of help topic ???
 sub get_template_list{
     my ($extension) = @_;
-    
+
     my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
                      '/templates/*.'.$extension);
     @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),
@@ -1274,18 +1474,39 @@ sub get_template_html {
 sub newproblem {
     my ($request) = @_;
 
-	if ($env{'form.mode'} eq 'blank'){
+    if ($env{'form.mode'} eq 'blank'){
         my $dest = &Apache::lonnet::filelocation("",$request->uri);
-        &File::Copy::copy('/home/httpd/html/res/adm/includes/templates/blank.problem',$dest);
+        my $templatefilename =
+            $request->dir_config('lonIncludes').'/templates/blank.problem';
+        &File::Copy::copy($templatefilename,$dest);
         &renderpage($request,$dest);
         return;
     }
+    my $errormsg;
     if ($env{'form.template'}) {
-	my $file = $env{'form.template'};
-	my $dest = &Apache::lonnet::filelocation("",$request->uri);
-	&File::Copy::copy($file,$dest);
-	&renderpage($request,$dest);
-	return;
+        my $file;
+        my ($extension) = ($env{'form.template'} =~ /\.(\w+)$/);
+        if ($extension) {
+            my @files = &get_template_list($extension);
+            foreach my $poss (@files) {
+                if (ref($poss) eq 'ARRAY') {
+                    if ($env{'form.template'} eq $poss->[0]) {
+                        $file = $env{'form.template'};
+                        last;
+                    }
+                }
+            }
+            if ($file) {
+	        my $dest = &Apache::lonnet::filelocation("",$request->uri);
+	        &File::Copy::copy($file,$dest);
+	        &renderpage($request,$dest);
+	        return;
+            } else {
+                $errormsg = '<p class="LC_error">'.&mt('Invalid template file.').'</p>';
+            }
+        } else {
+            $errormsg = '<p class="LC_error">'.&mt('Invalid template file; template needs to be a .problem, .library, or .task file.').'</p>';
+        }
     }
 
     my ($extension) = ($request->uri =~ m/\.(\w+)$/);
@@ -1302,7 +1523,6 @@ sub newproblem {
     } else {
 	my $url=&HTML::Entities::encode($request->uri,'<>&"');
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
-	my $errormsg;
 	my $instructions;
         my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
                        'text' => 'Authoring Space'},
@@ -1353,7 +1573,7 @@ sub update_construct_style {
 }
 
 #
-# Sets interval for current user so time left will be zero, either for the entire folder 
+# Sets interval for current user so time left will be zero, either for the entire folder
 # containing the current resource, or just the resource, depending on value of first item
 # in interval array retrieved from EXT("resource.0.interval");
 #
@@ -1363,29 +1583,58 @@ 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) {
-                if ($first_access+$interval[0] > $now) {
-                    my $done_time = $now - $first_access;
-                    my $snum = 1;
-                    if ($interval[1] eq 'map') {
-                        $snum = 2;
+                my ($timelimit,$donesuffix) = split(/_/,$interval[0],2);
+                if ($donesuffix =~ /^done(?:|\:[^\:]+\:)(.*)$/) {
+                    my ($dummy,$proctor,$secret) = split(/_/,$1);
+                    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'));
+                        }
+                    }
+                    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'));
                     }
-                    my $result = 
-                        &Apache::lonparmset::storeparm_by_symb_inner($symb,'0_interval',
-                                                                     $snum,$done_time,
-                                                                     'date_interval',
-                                                                     $env{'user.name'},
-                                                                     $env{'user.domain'});
-                    return $result;
+                } 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 {
@@ -1402,7 +1651,7 @@ sub handler {
     #check if we know where we are
     if ($env{'request.course.fn'} && !&Apache::lonnet::symbread('','',1,1)) {
 	# if we are browsing we might not be able to know where we are
-	if ($Apache::lonhomework::browse ne 'F' && 
+	if ($Apache::lonhomework::browse ne 'F' &&
 	    $env{'request.state'} ne "construct") {
 	    #should know where we are, so ask
 	    &unset_permissions();
@@ -1447,13 +1696,47 @@ 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,$viewasuser);
         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'});
+        }
+        if (($env{'form.LC_viewas'} ne '') && $symb && $env{'request.course.id'} &&
+            ($Apache::lonhomework::viewgrades || $Apache::lonhomework::modifygrades)) {
+            if ($env{'form.LC_viewas'} =~ /^($match_username):($match_domain)$/) {
+                my ($possuname,$possudom) = ($1,$2);
+                my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                my ($canview,$posssec);
+                if ($env{'request.course.sec'} ne '') {
+                    if ($Apache::lonhomework::modifygradessec eq $env{'request.course.sec'}) {
+                        $canview = 'section';
+                        $posssec = $env{'request.course.sec'};
+                    } elsif ($Apache::lonhomework::viewgradessec eq $env{'request.course.sec'}) {
+                        $canview = 'section';
+                        $posssec = $env{'request.course.sec'};
+                    }
+                }
+                my $crstype = &Apache::loncommon::course_type();
+                if (&Apache::loncourseuser::is_course_user($possudom,$possuname,$cdom,$cnum,
+                                                           $canview,$crstype,$posssec)) {
+                    $viewasuser = $possuname.':'.$possudom;
+                }
+            }
+            undef($env{'form.LC_viewas'});
         }
 	# just render the page normally outside of construction space
 	&Apache::lonxml::debug("not construct");
-	&renderpage($request,$file);
+        undef(@Apache::lonhomework::ltipassback);
+	&renderpage($request,$file,undef,undef,$donemsg,$viewasuser,$symb);
+        if (@Apache::lonhomework::ltipassback) {
+            unless ($registered_cleanup) {
+                my $handlers = $request->get_handlers('PerlCleanupHandler');
+                $request->set_handlers('PerlCleanupHandler' =>
+                                       [\&do_ltipassback,@{$handlers}]);
+            }
+        }
     }
     #my $td=&tv_interval($t0);
     #&Apache::lonxml::debug("Spent $td seconds processing");
@@ -1599,16 +1882,15 @@ sub default_xml_tag {
 
 sub helpmenu_datastructure {
 
-	my $width = 500;
-	my $height = 600;
-
+	# filename, title, width, height
 	my $helpers = [
-		['Problem_LON-CAPA_Functions', &mt('Script Functions')],
-		['Greek_Symbols', &mt('Greek Symbols')],
- 		['Other_Symbols', &mt('Other Symbols')],
-		['Authoring_Output_Tags', &mt('Output Tags')],
-		['Authoring_Multilingual_Problems', 
-			&mt('How to create problems in different languages')]
+		['Problem_LON-CAPA_Functions.hlp', &mt('Script Functions'), 800, 600],
+		['Greek_Symbols.hlp', &mt('Greek Symbols'), 500, 600],
+ 		['Other_Symbols.hlp', &mt('Other Symbols'), 500, 600],
+		['Authoring_Output_Tags.hlp', &mt('Output Tags'), 800, 600],
+		['Authoring_Multilingual_Problems.hlp', 
+			&mt('How to create problems in different languages'), 800, 600],
+		['loncapa.html', &mt('Language reference'), 800, 600],
 	];
 
 	my $help_structure = [];
@@ -1616,7 +1898,15 @@ sub helpmenu_datastructure {
 	foreach my $count (0..(scalar(@{$helpers})-1)) {
 		my $filename = $helpers->[$count]->[0];
 		my $title = $helpers->[$count]->[1];
-		my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename.hlp',$width,$height,'yes');");
+		my $width = $helpers->[$count]->[2];
+                my $height = $helpers->[$count]->[3];
+                if ($width eq '') {
+                    $width = 500;
+                }
+                if ($height eq '') {
+                    $height = 600;
+                }
+		my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename',$width,$height,'yes');");
 		push @{$help_structure}, [$href, $title, undef];
 	}
 
@@ -1634,5 +1924,85 @@ sub convert_for_js {
     return $return;
 }
 
+sub do_ltipassback {
+    if (@Apache::lonhomework::ltipassback) {
+        foreach my $item (@Apache::lonhomework::ltipassback) {
+            if (ref($item) eq 'HASH') {
+                if ((ref($item->{'lti'}) eq 'HASH') && ($item->{'cid'} =~ /^($match_domain)_($match_courseid)$/)) {
+                    my ($cdom,$cnum) = ($1,$2);
+                    my $msgformat = $item->{'lti'}->{'passbackformat'};
+                    my $sigmethod = 'HMAC-SHA1';
+                    my $ltinum = $item->{'ltinum'};
+                    my $id = $item->{'pbid'};
+                    my $url = $item->{'pburl'};
+                    my $type = $item->{'pbtype'};
+                    my $scope = $item->{'scope'};
+                    my $map = $item->{'ltimap'};
+                    my $symb = $item->{'ltisymb'};
+                    my $uname = $item->{'uname'};
+                    my $udom = $item->{'udom'};
+                    my $keynum = $item->{'lti'}->{'cipher'};
+                    my $crsdef = $item->{'crsdef'};
+                    my $scoretype = $item->{'format'};
+                    my ($total,$possible);
+                    if ($scope eq 'resource') {
+                        $total = $item->{'total'};
+                        $possible = $item->{'possible'};
+                    } elsif ($scope eq 'map') {
+                        ($total,$possible) = &get_lti_score($uname,$udom,$map);
+                    } elsif ($scope eq 'course') {
+                        ($total,$possible) = &get_lti_score($uname,$udom);
+                    }
+                    if (($id ne '') && ($url ne '') && ($possible)) {
+                        &LONCAPA::ltiutils::send_grade($cdom,$cnum,$crsdef,$type,$ltinum,$keynum,$id,$url,$scoretype,$sigmethod,$msgformat,$total,$possible);
+                    }
+                }
+            }
+        }
+        undef(@Apache::lonhomework::ltipassback);
+    }
+}
+
+sub get_lti_score {
+    my ($uname,$udom,$mapurl) = @_;
+    my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
+    if (ref($navmap)) {
+        my $iterator;
+        if ($mapurl ne '') {
+            my $map = $navmap->getResourceByUrl($mapurl);
+            my $firstres = $map->map_start();
+            my $finishres = $map->map_finish();
+            $iterator = $navmap->getIterator($firstres,$finishres,undef,1);
+        } else {
+            $iterator = $navmap->getIterator(undef,undef,undef,1);
+        }
+        if (ref($iterator)) {
+            my $depth = 1;
+            my $total = 0;
+            my $possible = 0;
+            $iterator->next(); # ignore first BEGIN_MAP
+            my $curRes = $iterator->next();
+            while ( $depth > 0 ) {
+                if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
+                if ($curRes == $iterator->END_MAP()) { $depth--; }
+                if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout) {
+                    my $parts = $curRes->parts();
+                    foreach my $part (@{$parts}) {
+                        next if ($curRes->solved($part) eq 'excused');
+                        $total += $curRes->weight($part) * $curRes->awarded($part);
+                        $possible += $curRes->weight($part);
+                    }
+                }
+                $curRes = $iterator->next();
+            }
+            if ($total > $possible) {
+                $total = $possible;
+            }
+            return ($total,$possible);
+        }
+    }
+    return;
+}
+
 1;
 __END__