--- loncom/homework/inputtags.pm 2019/12/04 02:10:23 1.333.2.9
+++ loncom/homework/inputtags.pm 2021/09/11 16:48:57 1.333.2.9.2.3
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.333.2.9 2019/12/04 02:10:23 raeburn Exp $
+# $Id: inputtags.pm,v 1.333.2.9.2.3 2021/09/11 16:48:57 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1329,7 +1329,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.");
}
}
@@ -1879,13 +1880,15 @@ 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\s\-]/)) {
+ if (($env{'request.state'} eq 'construct') || ($id =~ /\W/)) {
$function_name .= $Apache::lonxml::curdepth;
} else {
- $function_name .= &js_escape($id);
+ $function_name .= $id;
}
$function_name .= '_'.$Apache::lonxml::counter;
- my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."
";
+ my $possmathjax = 1;
+ my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,
+ &mt($tries_text),$possmathjax)."
";
return $result;
}