--- loncom/homework/inputtags.pm	2017/06/13 16:20:40	1.333.2.4.2.1
+++ loncom/homework/inputtags.pm	2019/03/18 20:21:14	1.333.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.333.2.4.2.1 2017/06/13 16:20:40 raeburn Exp $
+# $Id: inputtags.pm,v 1.333.2.5 2019/03/18 20:21:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1318,12 +1318,11 @@ sub decideoutput {
 	&& &hide_award($award)) {
         $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
         my @interval= &Apache::lonnet::EXT("resource.$part.interval");
-        if ($interval[0]) {
+        if ($interval[0] =~ /\d+/) {
             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.");
                 }
             }
@@ -1872,8 +1871,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;
 }