--- loncom/homework/inputtags.pm	2016/04/06 00:34:12	1.342
+++ loncom/homework/inputtags.pm	2019/08/07 16:08:09	1.346
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.342 2016/04/06 00:34:12 raeburn Exp $
+# $Id: inputtags.pm,v 1.346 2019/08/07 16:08:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -460,6 +460,7 @@ sub start_textline {
 		}
 		my $name = 'HWVAL_'.$id;
                 my $itemid = 'HWVAL_'.$partid.'_'.$id;
+                # NOTE: the input id should match the one given by defaut_homework input_id().
                 my $input_tag_id = $itemid.'_'.$input_id;
 		if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
 		    $name = "none";
@@ -670,7 +671,7 @@ sub file_selector {
         my $free_space = $maxfilesize * 1048576;
         $result .= &mt('Submit a file: (only one file per submission)').
             ' <br /><input type="file" size="50" name="HWFILE'.$jspart.'_'.$id.
-            '" id="HWFILE'.$jspart.'_'.$id.'" class="flUpload" /><br />'.
+            '" id="HWFILE'.$jspart.'_'.$id.'" class="LC_flUpload" /><br />'.
             '<input type="hidden" id="free_space" value="'.$free_space.'" /><br />'
         }
     if ( $which eq 'both') {
@@ -1333,7 +1334,8 @@ sub decideoutput {
             my $first_access=&Apache::lonnet::get_first_access($interval[1]);
             if (defined($first_access)) {
                 my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");
-                unless (($due_date) && ($due_date < $first_access + $interval[0])) { 
+                my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+                unless (($due_date) && ($due_date < $first_access + $timelimit)) { 
                     $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
                 }
             }
@@ -1902,8 +1904,13 @@ sub previous_tries {
     my $tries_text = &get_tries_text('link');
     my $prefix = $env{'form.request.prefix'};
     $prefix =~ tr{.}{_};
-    my $function_name = "LONCAPA_previous_tries_".$prefix.
-	$Apache::lonxml::curdepth.'_'.$env{'form.counter'};
+    my $function_name = 'LONCAPA_previous_tries_'.$prefix;
+    if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) {
+        $function_name .= $Apache::lonxml::curdepth;
+    } else {
+        $function_name .= &js_escape($id);
+    }
+    $function_name .= '_'.$Apache::lonxml::counter;
     my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";
     return $result;
 }