[LON-CAPA-cvs] cvs: loncom /homework inputtags.pm

[raeburn]

raeburn		Mon Mar 18 20:18:28 2019 EDT

  Modified files:              
    /loncom/homework	inputtags.pm 
  Log:
  - Bug 6901. Ensure uniqueness of javascript function name for Previous Tries
    modal pop-up. 
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.344 loncom/homework/inputtags.pm:1.345
--- loncom/homework/inputtags.pm:1.344	Tue Dec  6 20:51:11 2016
+++ loncom/homework/inputtags.pm	Mon Mar 18 20:18:27 2019
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.344 2016/12/06 20:51:11 damieng Exp $
+# $Id: inputtags.pm,v 1.345 2019/03/18 20:18:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1904,8 +1904,13 @@
     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;
 }