From c597ff32eff00a7e2d726291c74dff8f7517e291 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Wed, 3 Jul 2013 10:43:46 +0800 Subject: [PATCH] MDL-40469 Gradebook: Fixed setType warning while exporting gradebook with publishing set --- grade/export/grade_export_form.php | 2 ++ grade/export/key_form.php | 3 +++ grade/import/key_form.php | 1 + 3 files changed, 6 insertions(+) diff --git a/grade/export/grade_export_form.php b/grade/export/grade_export_form.php index 9081f00544a..1772b0ade72 100644 --- a/grade/export/grade_export_form.php +++ b/grade/export/grade_export_form.php @@ -110,10 +110,12 @@ class grade_export_form extends moodleform { $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 index 8c44f19f3ce..e30a3a57897 100644 --- a/grade/export/key_form.php +++ b/grade/export/key_form.php @@ -39,7 +39,10 @@ class key_form extends moodleform { $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 index 6706381630b..afda8581a3b 100644 --- a/grade/import/key_form.php +++ b/grade/import/key_form.php @@ -43,6 +43,7 @@ class key_form extends moodleform { $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);