--- loncom/homework/inputtags.pm	2021/09/11 16:48:57	1.333.2.9.2.3
+++ loncom/homework/inputtags.pm	2021/09/11 16:09:56	1.333.2.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.333.2.9.2.3 2021/09/11 16:48:57 raeburn Exp $
+# $Id: inputtags.pm,v 1.333.2.10 2021/09/11 16:09:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1329,8 +1329,7 @@ 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");
-                my ($timelimit) = ($interval[0] =~ /^(\d+)/);
-                unless (($due_date) && ($due_date < $first_access + $timelimit)) { 
+                unless (($due_date) && ($due_date < $first_access + $interval[0])) { 
                     $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
                 }
             }
@@ -1880,10 +1879,10 @@ sub previous_tries {
     my $prefix = $env{'form.request.prefix'};
     $prefix =~ tr{.}{_};
     my $function_name = 'LONCAPA_previous_tries_'.$prefix;
-    if (($env{'request.state'} eq 'construct') || ($id =~ /\W/)) {
+    if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) {
         $function_name .= $Apache::lonxml::curdepth;
     } else {
-        $function_name .= $id;
+        $function_name .= &js_escape($id);
     }
     $function_name .= '_'.$Apache::lonxml::counter;
     my $possmathjax = 1;