diff --git a/course/delete_category_form.php b/course/delete_category_form.php index 48b0f44ca77..8e63d9f18da 100644 --- a/course/delete_category_form.php +++ b/course/delete_category_form.php @@ -110,11 +110,14 @@ class delete_category_form extends moodleform { } } else { $mform->addElement('hidden', 'fulldelete', 1); + $mform->setType('fulldelete', PARAM_INT); $mform->addElement('static', 'emptymessage', '', get_string('deletecategoryempty')); } $mform->addElement('hidden', 'delete'); + $mform->setType('delete', PARAM_ALPHANUM); $mform->addElement('hidden', 'sure'); + $mform->setType('sure', PARAM_ALPHANUM); $mform->setDefault('sure', md5(serialize($category))); //-------------------------------------------------------------------------------- diff --git a/course/edit_form.php b/course/edit_form.php index 86d67e319f8..e5bc904dbcd 100644 --- a/course/edit_form.php +++ b/course/edit_form.php @@ -65,6 +65,7 @@ class course_edit_form extends moodleform { $mform->addElement('select', 'category', get_string('category'), $displaylist); } else { $mform->addElement('hidden', 'category', null); + $mform->setType('category', PARAM_INT); } $mform->setHelpButton('category', array('coursecategory', get_string('category'))); $mform->setDefault('category', $category->id); @@ -378,6 +379,7 @@ class course_edit_form extends moodleform { $mform->disabledIf('allowedmods', 'restrictmodules', 'eq', 0); } else { $mform->addElement('hidden', 'restrictmodules', null); + $mform->setType('restrictmodules', PARAM_INT); } if ($CFG->restrictmodulesfor == 'all') { $mform->setDefault('allowedmods', explode(',',$CFG->defaultallowedmodules)); @@ -412,9 +414,13 @@ class course_edit_form extends moodleform { // fill in default teacher and student names to keep backwards compatibility for a while $mform->addElement('hidden', 'teacher', get_string('defaultcourseteacher')); + $mform->setType('teacher', PARAM_RAW); $mform->addElement('hidden', 'teachers', get_string('defaultcourseteachers')); + $mform->setType('teachers', PARAM_RAW); $mform->addElement('hidden', 'student', get_string('defaultcoursestudent')); + $mform->setType('student', PARAM_RAW); $mform->addElement('hidden', 'students', get_string('defaultcoursestudents')); + $mform->setType('students', PARAM_RAW); } function definition_after_data() { diff --git a/course/recent_form.php b/course/recent_form.php index dde3dbe45c8..05ce8433a21 100644 --- a/course/recent_form.php +++ b/course/recent_form.php @@ -99,6 +99,7 @@ class recent_form extends moodleform { } } else { $mform->addElement('hidden','group'); + $mform->setType('group', PARAM_INT); $mform->setConstants(array('group'=>0)); } @@ -111,6 +112,7 @@ class recent_form extends moodleform { $mform->addElement('date_time_selector', 'date', get_string('since'), array('optional'=>true)); $mform->addElement('hidden','id'); + $mform->setType('id', PARAM_INT); $mform->setType('courseid', PARAM_INT); $this->add_action_buttons(false, get_string('showrecent')); diff --git a/course/request_form.php b/course/request_form.php index 89a73e97c71..98a74ef27a8 100644 --- a/course/request_form.php +++ b/course/request_form.php @@ -128,6 +128,7 @@ class reject_request_form extends moodleform { $mform =& $this->_form; $mform->addElement('hidden', 'reject', 0); + $mform->setType('reject', PARAM_INT); $mform->addElement('header','coursedetails', get_string('coursereasonforrejecting')); diff --git a/course/reset_form.php b/course/reset_form.php index 96bddad93e0..ce0fe4c0822 100644 --- a/course/reset_form.php +++ b/course/reset_form.php @@ -80,6 +80,7 @@ class course_reset_form extends moodleform { } $mform->addElement('hidden', 'id', $COURSE->id); + $mform->setType('id', PARAM_INT); $buttonarray = array(); $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('resetcourse')); diff --git a/grade/edit/outcome/import_outcomes_form.php b/grade/edit/outcome/import_outcomes_form.php index e819b7fdb7d..d447e013866 100644 --- a/grade/edit/outcome/import_outcomes_form.php +++ b/grade/edit/outcome/import_outcomes_form.php @@ -27,7 +27,9 @@ class import_outcomes_form extends moodleform { //$this->set_upload_manager(new upload_manager('importfile', false, false, null, false, 0, true, true, false)); $mform->addElement('hidden', 'action', 'upload'); + $mform->setType('action', PARAM_ACTION); $mform->addElement('hidden', 'id', $COURSE->id); + $mform->setType('id', PARAM_INT); $scope = array(); if (($COURSE->id > 1) && has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM))) { diff --git a/grade/edit/tree/grade_form.php b/grade/edit/tree/grade_form.php index 52b32b194b6..b794d40c1ad 100755 --- a/grade/edit/tree/grade_form.php +++ b/grade/edit/tree/grade_form.php @@ -106,7 +106,9 @@ class edit_grade_form extends moodleform { // hidden params $mform->addElement('hidden', 'oldgrade'); + $mform->setType('oldgrade', PARAM_RAW); $mform->addElement('hidden', 'oldfeedback'); + $mform->setType('oldfeedback', PARAM_RAW); $mform->addElement('hidden', 'id', 0); $mform->setType('id', PARAM_INT); diff --git a/grade/export/grade_export_form.php b/grade/export/grade_export_form.php index c0dffe3ffab..84a65064398 100755 --- a/grade/export/grade_export_form.php +++ b/grade/export/grade_export_form.php @@ -126,6 +126,7 @@ class grade_export_form extends moodleform { } $mform->addElement('hidden', 'id', $COURSE->id); + $mform->setType('id', PARAM_INT); $this->add_action_buttons(false, get_string('submit')); } diff --git a/grade/import/xml/grade_import_form.php b/grade/import/xml/grade_import_form.php index d8a2a219c89..e24105d9713 100644 --- a/grade/import/xml/grade_import_form.php +++ b/grade/import/xml/grade_import_form.php @@ -28,6 +28,7 @@ class grade_import_form extends moodleform { // course id needs to be passed for auth purposes $mform->addElement('hidden', 'id', optional_param('id')); $mform->setType('id', PARAM_INT); + $mform->addElement('header', 'general', get_string('importfile', 'grades')); $mform->disabledIf('url', 'userfile', 'noteq', ''); diff --git a/lib/formslib.php b/lib/formslib.php index f1bf8772c2f..2af556db195 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -116,8 +116,10 @@ class moodleform { $this->definition(); $this->_form->addElement('hidden', 'sesskey', null); // automatic sesskey protection + $this->_form->setType('sesskey', PARAM_RAW); $this->_form->setDefault('sesskey', sesskey()); $this->_form->addElement('hidden', '_qf__'.$this->_formname, null); // form submission marker + $this->_form->setType('_qf__'.$this->_formname, PARAM_RAW); $this->_form->setDefault('_qf__'.$this->_formname, 1); $this->_form->_setDefaultRuleMessages(); @@ -572,6 +574,7 @@ class moodleform { $mform =& $this->_form; $mform->registerNoSubmitButton($addfieldsname); $mform->addElement('hidden', $repeathiddenname, $repeats); + $mform->setType($repeathiddenname, PARAM_INT); //value not to be overridden by submitted value $mform->setConstants(array($repeathiddenname=>$repeats)); $namecloned = array(); @@ -668,6 +671,7 @@ class moodleform { } $mform->addElement('hidden', "checkbox_controller$groupid"); + $mform->setType("checkbox_controller$groupid", PARAM_INT); $mform->setConstants(array("checkbox_controller$groupid" => $new_select_value)); // Locate all checkboxes for this group and set their value, IF the optional param was given @@ -863,6 +867,7 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless { $this->registerNoSubmitButton('mform_showadvanced'); $this->addElement('hidden', 'mform_showadvanced_last'); + $this->setType('mform_showadvanced_last', PARAM_INT); } } /** diff --git a/mod/forum/post_form.php b/mod/forum/post_form.php index 02b3cc53965..44cdb38fd01 100644 --- a/mod/forum/post_form.php +++ b/mod/forum/post_form.php @@ -39,6 +39,7 @@ class mod_forum_post_form extends moodleform { $mform->addElement('static', 'subscribemessage', get_string('subscription', 'forum'), get_string('everyoneissubscribed', 'forum')); $mform->addElement('hidden', 'subscribe'); + $mform->setType('subscribe', PARAM_INT); $mform->setHelpButton('subscribemessage', array('subscription', get_string('subscription', 'forum'), 'forum')); } else if (isset($forum->forcesubscribe)&& $forum->forcesubscribe != FORUM_DISALLOWSUBSCRIBE || @@ -53,6 +54,7 @@ class mod_forum_post_form extends moodleform { } else if ($forum->forcesubscribe == FORUM_DISALLOWSUBSCRIBE) { $mform->addElement('static', 'subscribemessage', get_string('subscription', 'forum'), get_string('disallowsubscribe', 'forum')); $mform->addElement('hidden', 'subscribe'); + $mform->setType('subscribe', PARAM_INT); $mform->setHelpButton('subscribemessage', array('subscription', get_string('subscription', 'forum'), 'forum')); } diff --git a/mod/glossary/edit_form.php b/mod/glossary/edit_form.php index b9f357eaeee..f4e72f0a159 100644 --- a/mod/glossary/edit_form.php +++ b/mod/glossary/edit_form.php @@ -64,8 +64,11 @@ class mod_glossary_entry_form extends moodleform { } if ( !$glossary->usedynalink ) { $mform->addElement('hidden', 'usedynalink', $usedynalink); + $mform->setType('usedynalink', PARAM_INT); $mform->addElement('hidden', 'casesensitive', $casesensitive); + $mform->setType('casesensitive', PARAM_INT); $mform->addElement('hidden', 'fullmatch', $fullmatch); + $mform->setType('fullmatch', PARAM_INT); } else { //------------------------------------------------------------------------------- $mform->addElement('header', 'linkinghdr', get_string('linking', 'glossary')); @@ -86,9 +89,13 @@ class mod_glossary_entry_form extends moodleform { } $mform->addElement('hidden', 'e', $e); + $mform->setType('e', PARAM_INT); $mform->addElement('hidden', 'id', $cm->id); + $mform->setType('id', PARAM_INT); $mform->addElement('hidden', 'mode', $mode); + $mform->setType('mode', PARAM_ALPHA); $mform->addElement('hidden', 'hook', $hook); + $mform->setType('hook', PARAM_ALPHANUM); //------------------------------------------------------------------------------- $this->add_action_buttons(); diff --git a/mod/glossary/mod_form.php b/mod/glossary/mod_form.php index d1048dfa399..d5096c4910b 100644 --- a/mod/glossary/mod_form.php +++ b/mod/glossary/mod_form.php @@ -35,6 +35,7 @@ class mod_glossary_mod_form extends moodleform_mod { }else{ $mform->addElement('hidden', 'globalglossary'); + $mform->setType('globalglossary', PARAM_INT); } $options = array(1=>get_string('mainglossary', 'glossary'), 0=>get_string('secondaryglossary', 'glossary')); diff --git a/mod/hotpot/mod_form.php b/mod/hotpot/mod_form.php index 5186f3cdb5c..aba497441f2 100644 --- a/mod/hotpot/mod_form.php +++ b/mod/hotpot/mod_form.php @@ -55,6 +55,7 @@ class mod_hotpot_mod_form extends moodleform_mod { } else { // existing HotPot $mform->addElement('hidden', 'namesource', HOTPOT_TEXTSOURCE_SPECIFIC); + $mform->setType('namesource', PARAM_RAW); $mform->addElement('text', 'name', get_string('name'), array('size' => '40')); } $mform->setType('namesource', PARAM_INT); @@ -81,6 +82,7 @@ class mod_hotpot_mod_form extends moodleform_mod { } if (array_key_exists($location, $HOTPOT_LOCATION)) { $mform->addElement('hidden', 'location', $location); + $mform->setType('location', PARAM_RAW); } else { // admin can select from "site" or "course" files $mform->addElement('select', 'location', get_string('location', 'hotpot'), $HOTPOT_LOCATION); } @@ -120,6 +122,7 @@ class mod_hotpot_mod_form extends moodleform_mod { } else { // existing HotPot $mform->addElement('hidden', 'summarysource', HOTPOT_TEXTSOURCE_SPECIFIC); + $mform->setType('summarysource', PARAM_RAW); $mform->addElement('htmleditor', 'summary', get_string('summary')); $mform->setType('summary', PARAM_RAW); $mform->setHelpButton('summary', array('writing', 'questions', 'richtext'), false, 'editorhelpbutton'); @@ -245,6 +248,7 @@ class mod_hotpot_mod_form extends moodleform_mod { // Remove grade item if (empty($this->_instance) || ! record_exists('grade_items', 'itemtype', 'mod', 'itemmodule', 'hotpot', 'iteminstance', $this->_instance)) { $mform->addElement('hidden', 'removegradeitem', 0); + $mform->setType('removegradeitem', PARAM_INT); } else { $mform->addElement('selectyesno', 'removegradeitem', get_string('removegradeitem', 'hotpot')); $mform->setHelpButton('removegradeitem', array('removegradeitem', get_string('removegradeitem', 'hotpot'), 'hotpot')); diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php index c5b01c161bb..a5d8971dbe1 100644 --- a/mod/quiz/mod_form.php +++ b/mod/quiz/mod_form.php @@ -222,6 +222,7 @@ class mod_quiz_mod_form extends moodleform_mod { $mform->setHelpButton('overallfeedbackhdr', array('overallfeedback', get_string('overallfeedback', 'quiz'), 'quiz')); $mform->addElement('hidden', 'grade', $CFG->quiz_maximumgrade); + $mform->setType('grade', PARAM_RAW); if (empty($this->_cm)) { $needwarning = $CFG->quiz_maximumgrade == 0; } else { diff --git a/mod/resource/mod_form.php b/mod/resource/mod_form.php index e6a800022e0..cde9a0f6a40 100644 --- a/mod/resource/mod_form.php +++ b/mod/resource/mod_form.php @@ -19,6 +19,7 @@ class mod_resource_mod_form extends moodleform_mod { $type = required_param('type', PARAM_ALPHA); } $mform->addElement('hidden', 'type', $type); + $mform->setType('type', PARAM_ALPHA); $mform->setDefault('type', $type); require($CFG->dirroot.'/mod/resource/type/'.$type.'/resource.class.php'); diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php index fa0ea8be181..88394441182 100644 --- a/mod/scorm/mod_form.php +++ b/mod/scorm/mod_form.php @@ -155,10 +155,15 @@ class mod_scorm_mod_form extends moodleform_mod { //------------------------------------------------------------------------------- // Hidden Settings $mform->addElement('hidden', 'datadir', null); + $mform->setType('datadir', PARAM_RAW); $mform->addElement('hidden', 'pkgtype', null); + $mform->setType('pkgtype', PARAM_RAW); $mform->addElement('hidden', 'launch', null); + $mform->setType('launch', PARAM_RAW); $mform->addElement('hidden', 'redirect', null); + $mform->setType('redirect', PARAM_RAW); $mform->addElement('hidden', 'redirecturl', null); + $mform->setType('redirecturl', PARAM_RAW); //------------------------------------------------------------------------------- diff --git a/question/move_form.php b/question/move_form.php index 331a509ff74..01a0870a1a8 100644 --- a/question/move_form.php +++ b/question/move_form.php @@ -18,6 +18,7 @@ class question_move_form extends moodleform { $this->add_action_buttons(true, get_string('categorymoveto', 'quiz')); //-------------------------------------------------------------------------------- $mform->addElement('hidden', 'delete', $currentcat); + $mform->setType('delete', PARAM_INT); } } ?> diff --git a/question/type/calculated/edit_calculated_form.php b/question/type/calculated/edit_calculated_form.php index b3422b41aed..a8cb8332df1 100644 --- a/question/type/calculated/edit_calculated_form.php +++ b/question/type/calculated/edit_calculated_form.php @@ -51,6 +51,7 @@ class question_edit_calculated_form extends question_edit_form { $this->qtypeobj =& $QTYPES[$this->qtype()]; $label = get_string("sharedwildcards", "qtype_datasetdependent"); $mform->addElement('hidden', 'initialcategory', 1); + $mform->setType('initialcategory', PARAM_INT); $html2 = $this->qtypeobj->print_dataset_definitions_category($this->question); $mform->insertElementBefore($mform->createElement('static','listcategory',$label,$html2),'name'); $addfieldsname='updatecategory'; diff --git a/question/type/datasetdependent/datasetitems_form.php b/question/type/datasetdependent/datasetitems_form.php index 48460928052..aafc08b1396 100644 --- a/question/type/datasetdependent/datasetitems_form.php +++ b/question/type/datasetdependent/datasetitems_form.php @@ -84,7 +84,9 @@ class question_dataset_dependent_items_form extends moodleform { $this->qtypeobj->custom_generator_tools_part(&$mform, $idx, $j); $idx++; $mform->addElement('hidden', "definition[$j]"); + $mform->setType("definition[$j]", PARAM_RAW); $mform->addElement('hidden', "itemid[$j]"); + $mform->setType("itemid[$j]", PARAM_RAW); $mform->addElement('static', "divider[$j]", '', '
'); $j++; } diff --git a/question/type/description/edit_description_form.php b/question/type/description/edit_description_form.php index 6771eb5a964..184ff5cb287 100644 --- a/question/type/description/edit_description_form.php +++ b/question/type/description/edit_description_form.php @@ -24,6 +24,7 @@ class question_edit_description_form extends question_edit_form { $mform->removeElement('penalty'); $mform->addElement('hidden', 'defaultgrade', 0); + $mform->setType('defaultgrade', PARAM_RAW); } function qtype() { diff --git a/question/type/essay/edit_essay_form.php b/question/type/essay/edit_essay_form.php index b207c2e1007..9efd100cc32 100644 --- a/question/type/essay/edit_essay_form.php +++ b/question/type/essay/edit_essay_form.php @@ -24,10 +24,12 @@ class question_edit_essay_form extends question_edit_form { $mform->setType('feedback', PARAM_RAW); $mform->addElement('hidden', 'fraction', 0); + $mform->setType('fraction', PARAM_RAW); //don't need this default element. $mform->removeElement('penalty'); $mform->addElement('hidden', 'penalty', 0); + $mform->setType('penalty', PARAM_RAW); } function set_data($question) { diff --git a/question/type/randomsamatch/edit_randomsamatch_form.php b/question/type/randomsamatch/edit_randomsamatch_form.php index 63c1c617739..1dfd51697c3 100644 --- a/question/type/randomsamatch/edit_randomsamatch_form.php +++ b/question/type/randomsamatch/edit_randomsamatch_form.php @@ -30,6 +30,7 @@ class question_edit_randomsamatch_form extends question_edit_form { $mform->setType('feedback', PARAM_RAW); $mform->addElement('hidden', 'fraction', 0); + $mform->setType('fraction', PARAM_RAW); } function set_data($question) { diff --git a/tag/edit_form.php b/tag/edit_form.php index fbfdf067b89..5aaec36198e 100644 --- a/tag/edit_form.php +++ b/tag/edit_form.php @@ -11,6 +11,7 @@ class tag_edit_form extends moodleform { $mform->addElement('header', 'tag', get_string('description','tag')); $mform->addElement('hidden', 'id'); + $mform->setType('id', PARAM_INT); $systemcontext = get_context_instance(CONTEXT_SYSTEM); diff --git a/user/edit_form.php b/user/edit_form.php index 390a1c05e5e..805772b8705 100644 --- a/user/edit_form.php +++ b/user/edit_form.php @@ -16,7 +16,9 @@ class user_edit_form extends moodleform { /// Add some extra hidden fields $mform->addElement('hidden', 'id'); + $mform->setType('id', PARAM_INT); $mform->addElement('hidden', 'course', $COURSE->id); + $mform->setType('course', PARAM_INT); /// Print the required moodle fields first $mform->addElement('header', 'moodle', $strgeneral); diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php index 054d3959a61..99b0d300e55 100644 --- a/user/editadvanced_form.php +++ b/user/editadvanced_form.php @@ -16,7 +16,9 @@ class user_editadvanced_form extends moodleform { /// Add some extra hidden fields $mform->addElement('hidden', 'id'); + $mform->setType('id', PARAM_INT); $mform->addElement('hidden', 'course', $COURSE->id); + $mform->setType('course', PARAM_INT); /// Print the required moodle fields first $mform->addElement('header', 'moodle', $strgeneral); diff --git a/user/filters/user_filter_forms.php b/user/filters/user_filter_forms.php index d1bbccdc17f..9cd507970e8 100644 --- a/user/filters/user_filter_forms.php +++ b/user/filters/user_filter_forms.php @@ -19,6 +19,7 @@ class user_add_filter_form extends moodleform { if ($extraparams) { foreach ($extraparams as $key=>$value) { $mform->addElement('hidden', $key, $value); + $mform->setType($key, PARAM_RAW); } } @@ -57,6 +58,7 @@ class user_active_filter_form extends moodleform { if ($extraparams) { foreach ($extraparams as $key=>$value) { $mform->addElement('hidden', $key, $value); + $mform->setType($key, PARAM_RAW); } } diff --git a/user/profile/index_category_form.php b/user/profile/index_category_form.php index 51c585ccf38..991d4529d79 100644 --- a/user/profile/index_category_form.php +++ b/user/profile/index_category_form.php @@ -14,7 +14,9 @@ class category_form extends moodleform { /// Add some extra hidden fields $mform->addElement('hidden', 'id'); + $mform->setType('id', PARAM_INT); $mform->addElement('hidden', 'action', 'editcategory'); + $mform->setType('iction', PARAM_ACTION); $mform->addElement('text', 'name', get_string('profilecategoryname', 'admin'), 'maxlength="255" size="30"'); $mform->setType('name', PARAM_MULTILANG); diff --git a/user/profile/index_field_form.php b/user/profile/index_field_form.php index 781c7afaa45..e61848a09e6 100644 --- a/user/profile/index_field_form.php +++ b/user/profile/index_field_form.php @@ -22,8 +22,11 @@ class field_form extends moodleform { /// Add some extra hidden fields $mform->addElement('hidden', 'id'); + $mform->setType('id', PARAM_INT); $mform->addElement('hidden', 'action', 'editfield'); + $mform->setType('action', PARAM_ACTION); $mform->addElement('hidden', 'datatype', $datatype); + $mform->setType('datatype', PARAM_ALPHA); $this->field->define_form($mform);