From 28256691baa8e40141582fe37f25471d8dedd96d Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Mon, 17 Nov 2014 14:55:19 +0800 Subject: [PATCH] MDL-48104 mod_assign: Strip out use of eval() for string parsing I've also replaced other occurrences of M.str with the correct use of M.util.get_string() instead. --- mod/assign/module.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/assign/module.js b/mod/assign/module.js index a2ab7ed..466cda7 100644 --- a/mod/assign/module.js +++ b/mod/assign/module.js @@ -79,7 +79,7 @@ M.mod_assign.init_grading_table = function(Y) { usersinput = Y.one('input.selectedusers'); usersinput.set('value', selectedusers.join(',')); if (selectedusers.length == 0) { - alert(M.str.assign.nousersselected); + alert(M.util.get_string('nousersselected', 'assign')); e.preventDefault(); } else { action = operation.get('value'); @@ -88,9 +88,9 @@ M.mod_assign.init_grading_table = function(Y) { pluginaction = action.substr(prefix.length); plugin = pluginaction.split('_')[0]; action = pluginaction.substr(plugin.length + 1); - confirmmessage = eval('M.str.assignfeedback_' + plugin + '.batchoperationconfirm' + action); + confirmmessage = M.util.get_string('batchoperationconfirm' + action, 'assignfeedback_' + plugin); } else { - confirmmessage = eval('M.str.assign.batchoperationconfirm' + operation.get('value')); + confirmmessage = M.util.get_string('batchoperationconfirm' + operation.get('value'), 'assign'); } if (!confirm(confirmmessage)) { e.preventDefault(); @@ -153,7 +153,7 @@ M.mod_assign.init_grade_change = function(Y) { var originalvalue = gradenode.get('value'); gradenode.on('change', function() { if (gradenode.get('value') != originalvalue) { - alert(M.str.mod_assign.changegradewarning); + alert(M.util.get_string('changegradewarning', 'mod_assign')); } }); } -- 2.1.2