Merge branch 'wip-mdl-40469' of git://github.com/rajeshtaneja/moodle

nealpowell · Aug 6, 2013 · 2ad4a76 · 2ad4a76
2 parents 206f18c + c597ff3
commit 2ad4a76
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/grade/export/grade_export_form.php b/grade/export/grade_export_form.php
@@ -110,10 +110,12 @@ function definition() {
             $mform->addElement('text', 'iprestriction', get_string('keyiprestriction', 'userkey'), array('size'=>80));
             $mform->addHelpButton('iprestriction', 'keyiprestriction', 'userkey');
             $mform->setDefault('iprestriction', getremoteaddr()); // own IP - just in case somebody does not know what user key is
+            $mform->setType('iprestriction', PARAM_RAW_TRIMMED);
 
             $mform->addElement('date_time_selector', 'validuntil', get_string('keyvaliduntil', 'userkey'), array('optional'=>true));
             $mform->addHelpButton('validuntil', 'keyvaliduntil', 'userkey');
             $mform->setDefault('validuntil', time()+3600*24*7); // only 1 week default duration - just in case somebody does not know what user key is
+            $mform->setType('validuntil', PARAM_INT);
 
             $mform->disabledIf('iprestriction', 'key', 'noteq', 1);
             $mform->disabledIf('validuntil', 'key', 'noteq', 1);

diff --git a/grade/export/key_form.php b/grade/export/key_form.php
@@ -39,7 +39,10 @@ function definition () {
 
         $mform->addElement('static', 'value', get_string('keyvalue', 'userkey'));
         $mform->addElement('text', 'iprestriction', get_string('keyiprestriction', 'userkey'), array('size'=>80));
+        $mform->setType('iprestriction', PARAM_RAW_TRIMMED);
+
         $mform->addElement('date_time_selector', 'validuntil', get_string('keyvaliduntil', 'userkey'), array('optional'=>true));
+        $mform->setType('validuntil', PARAM_INT);
 
         $mform->addHelpButton('iprestriction', 'keyiprestriction', 'userkey');
         $mform->addHelpButton('validuntil', 'keyvaliduntil', 'userkey');

diff --git a/grade/import/key_form.php b/grade/import/key_form.php
@@ -43,6 +43,7 @@ function definition () {
 
         $mform->addHelpButton('iprestriction', 'keyiprestriction', 'userkey');
         $mform->addHelpButton('validuntil', 'keyvaliduntil', 'userkey');
+        $mform->setType('iprestriction', PARAM_RAW_TRIMMED);
 
         $mform->addElement('hidden','id');
         $mform->setType('id', PARAM_INT);