--- loncom/homework/lonhomework.pm	2024/07/08 01:13:59	1.344.2.11
+++ loncom/homework/lonhomework.pm	2015/10/26 20:36:45	1.359
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.344.2.11 2024/07/08 01:13:59 raeburn Exp $
+# $Id: lonhomework.pm,v 1.359 2015/10/26 20:36:45 musolffc Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,8 +49,10 @@ use Apache::matchresponse();
 use Apache::chemresponse();
 use Apache::functionplotresponse();
 use Apache::drawimage();
+use Apache::loncapamath();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
+use Apache::lonparmset();
 use Apache::lonlocal;
 use Time::HiRes qw( gettimeofday tv_interval );
 use HTML::Entities();
@@ -208,7 +210,7 @@ sub proctor_checked_in {
 }
 
 sub check_slot_access {
-    my ($id,$type,$symb,$partlist)=@_;
+    my ($id,$type,$symb)=@_;
 
     # does it pass normal muster
     my ($status,$datemsg)=&check_access($id,$symb);
@@ -219,8 +221,39 @@ sub check_slot_access {
 	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);
+    $now = time;
+    $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
+
+    if ($checkedin) {
+        $checkinslot = $Apache::lonhomework::history{"$checkin.slot"};
+        my %slot=&Apache::lonnet::get_slot($checkinslot);
+        if ($slot{'iptied'}) {
+            $ipused = $Apache::lonhomework::history{"$checkin.ip"};
+            unless (($ip ne '') && ($ipused eq $ip)) {
+                $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,17 +263,14 @@ sub check_slot_access {
     }
     
     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');
-	}
-    } 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);
+	    if ($blockip eq 'answer') {
+                return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
+            } else {
+	        return ('SHOW_ANSWER');
+            }
+        }
     }
 
     my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb);
@@ -250,11 +280,11 @@ 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;
-    unless ($symb) {
+    if (!$symb) {
         ($symb) = &Apache::lonnet::whichuser();
     }
     foreach my $slot (@slots) {
@@ -267,12 +297,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)) {
@@ -280,70 +339,19 @@ sub check_slot_access {
 	$slotstatus=$status;
     }
 
-    my ($is_correct,$got_grade,$checkin,$checkinslot,$checkedin,$consumed_uniq);
+    my ($is_correct,$got_grade);
     if ($type eq 'Task') {
 	my $version=$Apache::lonhomework::history{'resource.0.version'};
-        $checkin = "resource.$version.0.checkedin";
 	$got_grade = 
 	    ($Apache::lonhomework::history{"resource.$version.0.status"} 
 	     =~ /^(?:pass|fail)$/);
 	$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') {
-        $checkin = 'resource.0.checkedin';
-	$checkedin  = $Apache::lonhomework::history{$checkin};
-    }
-    if ($checkedin) {
-        $checkinslot = $Apache::lonhomework::history{"$checkin.slot"};
-        my %slot=&Apache::lonnet::get_slot($checkinslot);
-        $consumed_uniq = $slot{'uniqueperiod'};
-    }
-    if ($type eq 'problem') {
-        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;
-            }
-        }
+	$got_grade  = 1;
+	$is_correct =
+	    ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
     }
     
     &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
@@ -360,70 +368,31 @@ 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.
+    # (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE).
     if (!defined($slot_name) && $type eq 'problem') {
         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) {
-                            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'};
-                                }
-                            }
+                            $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) {
-                                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'};
-                                    }
-                                }
+                                $slotstatus = 'RESERVABLE_LATER';
+                                $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
                             }
                         }
                     }
@@ -437,14 +406,18 @@ 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 (($is_correct) && ($blockip ne 'answer')) {
 	if ($type eq 'problem') {
 	    return ($status);
 	}
@@ -452,11 +425,11 @@ sub check_slot_access {
     }
 
     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);
+    return ($slotstatus,$datemsg,$slot_name,$returned_slot,$ipused);
 }
 
 # JB, 9/24/2002: Any changes in this function may require a change
@@ -850,7 +823,7 @@ STATE
 
 sub analyze_header {
     my ($request) = @_;
-    my $js = &Apache::lonxml::setmode_javascript();
+    my $js = &Apache::structuretags::setmode_javascript();
 
     # Breadcrumbs
     my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
@@ -867,7 +840,7 @@ sub analyze_header {
        .&Apache::loncommon::head_subbox(
                 &Apache::loncommon::CSTR_pageheader());
     $result .= 
-            '<form name="lonhomework" method="post" action="'.
+	    '<form name="lonhomework" method="post" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
             '<input type="hidden" name="problemmode" value="'.
             $env{'form.problemmode'}.'" />'.
@@ -882,8 +855,8 @@ sub analyze_header {
             'onclick="javascript:setmode(this.form,'."'view'".')" />
             <hr />
             </div>'
-            .&Apache::lonxml::message_location().'
-            </form>';
+            .&Apache::lonxml::message_location().
+            '</form>';
     &Apache::lonxml::add_messages(\$result);
     $request->print($result);
     $request->rflush();
@@ -1062,9 +1035,8 @@ sub editxmlmode {
 
 	$problem='';
     }
-
     if (($env{'form.problemmode'} eq 'saveeditxml') ||
-        ($env{'form.problemmode'} eq 'saveviewxml') || 
+        ($env{'form.problemmode'} eq 'saveviewxml') ||
         ($env{'form.problemmode'} eq 'undoxml')) {
 	my $error=&handle_save_or_undo($request,\$problem,
 				       \$env{'form.editxmltext'});
@@ -1083,7 +1055,7 @@ sub editxmlmode {
 	my $js =
 	    &Apache::edit::js_change_detection(). 
 	    &Apache::loncommon::resize_textarea_js().
-            &Apache::lonxml::setmode_javascript().
+            &Apache::structuretags::setmode_javascript().
             &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
 
     # Breadcrumbs
@@ -1113,7 +1085,7 @@ sub editxmlmode {
             <div class="LC_edit_problem_header">
               <div class="LC_edit_problem_header_title">'.
                 &mt('Problem Editing').' '.&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').
-                '</div><div class="LC_edit_actionbar" id="actionbar">';
+              '</div><div class="LC_edit_actionbar" id="actionbar">';
 
     $result.='<input type="hidden" name="problemmode" value="saveedit" />'.
                   &Apache::structuretags::problem_edit_buttons('editxml');
@@ -1123,27 +1095,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() .
@@ -1179,7 +1151,7 @@ sub editxmlmode {
                 autoCloseBrackets: true,
                 height: "auto",
                 styleActiveLine: true,
-
+                
                 extraKeys: {
                     "Tab": "indentMore",
                     "Shift-Tab": "indentLess",
@@ -1226,8 +1198,10 @@ sub renderpage {
 	    $problem='';
 	    my $filename=(split('/',$file))[-1];
 	    my $error =
-                &mt('Unable to find [_1]',
-			   '<span class="LC_filename">'.$filename.'</span>');
+		'<p class="LC_error">'
+               .&mt('Unable to find [_1]',
+			   '<span class="LC_filename">'.$filename.'</span>')
+		."</p>";
 	    $result.=
 		&Apache::loncommon::simple_error_page($request,'Not available',
 						      $error,{'no_auto_mt_msg' => 1});
@@ -1278,21 +1252,20 @@ sub finished_parsing {
     undef($Apache::lonhomework::parsing_a_task);
 }
 
-
 # function extracted from get_template_html
 # returns "key" -> list
 # key: path of template
 # value 1: title
 # value 2: category
 # value 3: name of help topic ???
-sub get_template_list {
+sub get_template_list{
     my ($extension) = @_;
-
+    
     my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
-		     '/templates/*.'.$extension);
+                     '/templates/*.'.$extension);
     @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),
                       (&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')),
-                     &mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);
+                      &mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);
     @files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files);
     return @files;
 }
@@ -1304,7 +1277,7 @@ sub get_template_html {
     &Apache::lonxml::debug("Looking for :$extension:");
     my $glob_extension  = $extension;
     if ($extension eq 'survey' || $extension eq 'exam') {
-        $glob_extension = 'problem';
+	$glob_extension = 'problem';
     }
     my @files = &get_template_list($extension);
     my ($midpoint,$seconddiv,$numfiles);
@@ -1368,39 +1341,18 @@ 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);
-        my $templatefilename =
-            $request->dir_config('lonIncludes').'/templates/blank.problem';
-        &File::Copy::copy($templatefilename,$dest);
+        &File::Copy::copy('/home/httpd/html/res/adm/includes/templates/blank.problem',$dest);
         &renderpage($request,$dest);
         return;
     }
-    my $errormsg;
     if ($env{'form.template'}) {
-        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 $file = $env{'form.template'};
+	my $dest = &Apache::lonnet::filelocation("",$request->uri);
+	&File::Copy::copy($file,$dest);
+	&renderpage($request,$dest);
+	return;
     }
 
     my ($extension) = ($request->uri =~ m/\.(\w+)$/);
@@ -1417,6 +1369,7 @@ 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'},
@@ -1466,10 +1419,51 @@ sub update_construct_style {
     }
 }
 
+#
+# 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");
+#
+sub zero_timer {
+    my ($symb) = @_;
+    my ($hastimeleft,$first_access,$now);
+    my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
+    if (@interval > 1) {
+        if ($interval[1] eq 'course') {
+            return;
+        } 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 $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;
+                }
+            }
+        }
+    }
+    return;
+}
 
 sub handler {
     #my $t0 = [&gettimeofday()];
     my $request=$_[0];
+
     $Apache::lonxml::request=$request;
     $Apache::lonxml::debug=$env{'user.debug'};
     $env{'request.uri'}=$request->uri;
@@ -1478,7 +1472,7 @@ sub handler {
     my $file=&Apache::lonnet::filelocation("",$request->uri);
 
     #check if we know where we are
-    if ($env{'request.course.fn'} && !&Apache::lonnet::symbread('','',1,1)) { 
+    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' && 
 	    $env{'request.state'} ne "construct") {
@@ -1492,6 +1486,7 @@ sub handler {
 	&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::lonnet::whichuser();
@@ -1516,12 +1511,18 @@ sub handler {
 		&renderpage($request,$file);
 	    }
 	} else {
-            &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                                    ['mode']);
+		&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+						    ['mode']);
 	    # requested file doesn't exist in contruction space
 	    &newproblem($request);
 	}
     } 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
+        if ($symb && $env{'form.LC_interval_done'} eq 'true') {  
+            &zero_timer($symb);
+            undef($env{'form.LC_interval_done'});
+        }
 	# just render the page normally outside of construction space
 	&Apache::lonxml::debug("not construct");
 	&renderpage($request,$file);
@@ -1542,7 +1543,7 @@ sub template_dropdown_datastructure {
     my %tmplthash = ();
     # template title => path
     my %tmpltcontent = ();
-
+	
     foreach my $template (@templates){
         # put in hash if the template is not empty
         unless ($template->[1] eq ''){
@@ -1551,9 +1552,9 @@ sub template_dropdown_datastructure {
         }
     }
 
-        my $catList = [];
+	my $catList = [];
     foreach my $cat (sort keys %tmplthash) {
-                my $catItems = [];
+		my $catItems = [];
         foreach my $title (sort @{$tmplthash{$cat}}) {
             my $path = $tmpltcontent{$title}->[0];
             my $code;
@@ -1563,62 +1564,62 @@ sub template_dropdown_datastructure {
             }
             close(FH);
 
-                        if ($code ne '') {
+			if ($code ne '') {				
                 my $href = 'javascript:insertText(\'' . &convert_for_js(&HTML::Entities::encode($code,'<>&"')) . '\')';
-                                my $currItem = [$href, $title, undef];
-                                push @{$catItems}, $currItem;
-                        }
+				my $currItem = [$href, $title, undef];
+				push @{$catItems}, $currItem;
+			}
         }
-                push @{$catList}, [$catItems, $cat, undef];
+		push @{$catList}, [$catItems, $cat, undef];
     }
 
     return $catList;
 }
 
 sub responseblock_dropdown_datastructure {
+	
+	my $mathCat = [
+		[
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef]
+		], 
+		&mt("Math"), 
+		undef
+	];
 
-    my $mathCat = [
-                    [
-                        ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef],
-                        ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef],
-                        ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef],
-                        ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef]
-                    ],
-                    &mt("Math"),
-                    undef
-        ];
-
-    my $miscCat = [
-                    [
+	my $miscCat = [		
+		[
             ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_imageresponse())) . "\')", &mt("Click on Image"), undef],
             ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_customresponse())) . "\')", &mt("Custom Response"), undef],
             ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_externalresponse())) . "\')", &mt("External Response"), undef],
             ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_matchresponse())) . "\')", &mt("Match Two Lists"), undef],
             ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_radiobuttonresponse())) . "\')", &mt("One out of N statements"), undef],
-            ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_optionresponse())) . "\')", &mt("Select from Options"), undef],
-                        ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef]
-                ],
-                &mt("Miscellaneous"),
-                undef
-        ];
-
-    my $chemCat = [
-                    [
-                        ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef],
-                        ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef]
-                     ],
-                     &mt("Chemistry"),
-                     undef
-                   ];
-
-    my $textCat = [
-                    [
-                      ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],
-                      ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]
-                     ],
-                     &mt("Text"),
-                     undef
-                   ];
+            ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_optionresponse())) . "\')", &mt("Select from Options"), undef], 
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef]
+		],
+		&mt("Miscellaneous"),
+		undef
+	];
+
+	my $chemCat = [
+		[
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef]
+		],
+		&mt("Chemistry"),
+		undef
+	];
+
+	my $textCat = [
+		[
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]
+		],
+		&mt("Text"),
+		undef
+	];
 
     return [$mathCat, $miscCat, $chemCat, $textCat];
 }
@@ -1633,18 +1634,18 @@ sub conditional_scripting_datastructure
 #TODO translated is currently temporarily here, another solution should be found where the
 # needed string can be retrieved
 
-    my $translatedTag = '
+	my $translatedTag = '
 <translated>
     <lang which="en"></lang>
     <lang which="default"></lang>
 </translated>';
     return [
-             ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef],
-             ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],
-             ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef],
-             ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],
-             ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],
-             ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]
         ];
 }
 
@@ -1663,49 +1664,45 @@ sub misc_datastructure {
 
 # helper routine for the datastructure building subroutines
 sub default_xml_tag {
-    my ($tag) = @_;
-    return "\n<$tag></$tag>";
+	my ($tag) = @_;
+	return "\n<$tag></$tag>";
 }
 
+
 sub helpmenu_datastructure {
 
-    # filename, title, width, height
-    my $helpers = [
-                    ['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('Languages'), 800, 600],
-                   ];
-
-    my $help_structure = [];
-
-    foreach my $count (0..(scalar(@{$helpers})-1)) {
-        my $filename = $helpers->[$count]->[0];
-        my $title = $helpers->[$count]->[1];
-        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];
-    }
+	my $width = 500;
+	my $height = 600;
+
+	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')]
+	];
+
+	my $help_structure = [];
+
+	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');");
+		push @{$help_structure}, [$href, $title, undef];
+	}
 
-    return $help_structure;
+	return $help_structure;
 }
 
 # we need substitution to not break javascript code
 sub convert_for_js {
     my $return = shift;
-    $return =~ s|script|ESCAPEDSCRIPT|g;
-    $return =~ s|\\|\\\\|g;
-    $return =~ s|\n|\\r\\n|g;
-    $return =~ s|'|\\'|g;
-    $return =~ s|&#39;|\\&#39;|g;
+        $return =~ s|script|ESCAPEDSCRIPT|g;
+        $return =~ s|\\|\\\\|g;
+        $return =~ s|\n|\\r\\n|g;
+        $return =~ s|'|\\'|g;
+		$return =~ s|&#39;|\\&#39;|g;
     return $return;
 }