From: skodak Date: Thu, 27 Aug 2009 18:37:53 +0000 (+0000) Subject: MDL-20169 fixed coding style, parameter type required X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=622365d2e1f88a839e383827d48a8864190f91d9;p=moodle.git MDL-20169 fixed coding style, parameter type required --- diff --git a/backup/backuplib.php b/backup/backuplib.php index a0f0ae1968..38a29ffd5d 100644 --- a/backup/backuplib.php +++ b/backup/backuplib.php @@ -2764,8 +2764,8 @@ $preferences->backup_messages = optional_param('backup_messages',1,PARAM_INT); $preferences->backup_blogs = optional_param('backup_blogs',1,PARAM_INT); $preferences->backup_course = $course->id; - $preferences->backup_name = required_param('backup_name',PARAM_FILE); - $preferences->backup_unique_code = required_param('backup_unique_code'); + $preferences->backup_name = required_param('backup_name', PARAM_FILE); + $preferences->backup_unique_code = required_param('backup_unique_code', PARAM_INT); $roles = get_all_roles(); $preferences->backuproleassignments = array(); diff --git a/calendar/event.php b/calendar/event.php index ae5fbee15d..b497b0a9ef 100644 --- a/calendar/event.php +++ b/calendar/event.php @@ -49,9 +49,9 @@ $eventid = optional_param('id', 0, PARAM_INT); $eventtype = optional_param('type', 'select', PARAM_ALPHA); $urlcourse = optional_param('course', 0, PARAM_INT); - $cal_y = optional_param('cal_y'); - $cal_m = optional_param('cal_m'); - $cal_d = optional_param('cal_d'); + $cal_y = optional_param('cal_y', 0, PARAM_INT); + $cal_m = optional_param('cal_m', 0, PARAM_INT); + $cal_d = optional_param('cal_d', 0, PARAM_INT); if(isguest()) { // Guests cannot do anything with events diff --git a/calendar/set.php b/calendar/set.php index 6d1844f34f..106c940232 100644 --- a/calendar/set.php +++ b/calendar/set.php @@ -41,15 +41,14 @@ require_once('../config.php'); require_once($CFG->dirroot.'/calendar/lib.php'); - $from = required_param('from'); - $var = required_param('var'); - $value = optional_param('value'); - $id = optional_param('id'); - $cal_d = optional_param('cal_d'); - $cal_m = optional_param('cal_m'); - $cal_y = optional_param('cal_y'); - $action = optional_param('action'); - $type = optional_param('type'); + $from = required_param('from', PARAM_ALPHA); + $var = required_param('var', PARAM_ALPHA); + $id = optional_param('id', 0, PARAM_INT); + $cal_d = optional_param('cal_d', 0, PARAM_INT); + $cal_m = optional_param('cal_m', 0, PARAM_INT); + $cal_y = optional_param('cal_y', 0, PARAM_INT); + $action = optional_param('action', '', PARAM_ALPHA); + $type = optional_param('type', '', PARAM_ALPHA); // Initialize the session variables calendar_session_vars(); diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php index afa1dfa534..686263542e 100755 --- a/enrol/authorize/enrol.php +++ b/enrol/authorize/enrol.php @@ -579,7 +579,7 @@ class enrolment_plugin_authorize // REQUIRED fields; // an_login - $loginval = optional_param('an_login', ''); + $loginval = optional_param('an_login', '', PARAM_RAW); if (empty($loginval) && empty($mconfig->an_login)) { return false; } @@ -587,9 +587,9 @@ class enrolment_plugin_authorize set_config('an_login', $loginval, 'enrol/authorize'); // an_tran_key, an_password - $tranval = optional_param('an_tran_key', ''); + $tranval = optional_param('an_tran_key', '', PARAM_RAW); $tranval = !empty($tranval) ? rc4encrypt($tranval) : (isset($mconfig->an_tran_key)?$mconfig->an_tran_key:''); - $passwordval = optional_param('an_password', ''); + $passwordval = optional_param('an_password', '', PARAM_RAW); $passwordval = !empty($passwordval) ? rc4encrypt($passwordval) :(isset($mconfig->an_password)?$mconfig->an_password:''); $deletecurrent = optional_param('delete_current', '0', PARAM_BOOL); if (!empty($deletecurrent) and !empty($tranval)) { diff --git a/grade/import/grade_import_form.php b/grade/import/grade_import_form.php index bbc8472c1a..36fc10150c 100755 --- a/grade/import/grade_import_form.php +++ b/grade/import/grade_import_form.php @@ -31,7 +31,7 @@ class grade_import_form extends moodleform { } // course id needs to be passed for auth purposes - $mform->addElement('hidden', 'id', optional_param('id')); + $mform->addElement('hidden', 'id', optional_param('id', 0, PARAM_INT)); $mform->setType('id', PARAM_INT); $mform->addElement('header', 'general', get_string('importfile', 'grades')); // file upload diff --git a/grade/import/xml/grade_import_form.php b/grade/import/xml/grade_import_form.php index 41a0f660aa..26a44a7062 100644 --- a/grade/import/xml/grade_import_form.php +++ b/grade/import/xml/grade_import_form.php @@ -26,7 +26,7 @@ class grade_import_form extends moodleform { $this->set_upload_manager(new upload_manager('userfile', false, false, null, false, 0, true, true, false)); // course id needs to be passed for auth purposes - $mform->addElement('hidden', 'id', optional_param('id')); + $mform->addElement('hidden', 'id', optional_param('id', 0, PARAM_INT)); $mform->setType('id', PARAM_INT); $mform->addElement('header', 'general', get_string('importfile', 'grades')); $mform->disabledIf('url', 'userfile', 'noteq', ''); diff --git a/lib/moodlelib.php b/lib/moodlelib.php index d385ac0242..05144957aa 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -329,7 +329,7 @@ define('MOD_ARCHETYPE_ASSIGNMENT', 2); * This function should be used to initialise all required values * in a script that are based on parameters. Usually it will be * used like this: - * $id = required_param('id'); + * $id = required_param('id', PARAM_INT); * * @param string $parname the name of the page parameter we want, * default PARAM_CLEAN @@ -355,7 +355,7 @@ function required_param($parname, $type=PARAM_CLEAN) { * This function should be used to initialise all optional values * in a script that are based on parameters. Usually it will be * used like this: - * $name = optional_param('name', 'Fred'); + * $name = optional_param('name', 'Fred', PARAM_TEXT); * * @param string $parname the name of the page parameter we want * @param mixed $default the default value to return if nothing is found diff --git a/lib/simpletest/testmoodlelib.php b/lib/simpletest/testmoodlelib.php index ab55d43d22..76a7717cd9 100644 --- a/lib/simpletest/testmoodlelib.php +++ b/lib/simpletest/testmoodlelib.php @@ -232,13 +232,13 @@ class moodlelib_test extends UnitTestCase { { $_POST['username'] = 'post_user'; $_GET['username'] = 'get_user'; - $this->assertEqual(optional_param('username', 'default_user'), 'post_user'); + $this->assertEqual(optional_param('username', 'default_user', PARAM_CLEAN), 'post_user'); unset($_POST['username']); - $this->assertEqual(optional_param('username', 'default_user'), 'get_user'); + $this->assertEqual(optional_param('username', 'default_user', PARAM_CLEAN), 'get_user'); unset($_GET['username']); - $this->assertEqual(optional_param('username', 'default_user'), 'default_user'); + $this->assertEqual(optional_param('username', 'default_user', PARAM_CLEAN), 'default_user'); } /** diff --git a/message/index.php b/message/index.php index 84fa9d5ec8..056cf64c22 100644 --- a/message/index.php +++ b/message/index.php @@ -15,7 +15,7 @@ } /// Optional variables that may be passed in - $tab = optional_param('tab', 'contacts'); // current tab - default to contacts + $tab = optional_param('tab', 'contacts', PARAM_ALPHA); // current tab - default to contacts $addcontact = optional_param('addcontact', 0, PARAM_INT); // adding a contact $removecontact = optional_param('removecontact', 0, PARAM_INT); // removing a contact $blockcontact = optional_param('blockcontact', 0, PARAM_INT); // blocking a contact diff --git a/mod/data/edit.php b/mod/data/edit.php index fe87daf2f3..21b4fa6d06 100755 --- a/mod/data/edit.php +++ b/mod/data/edit.php @@ -30,7 +30,7 @@ $d = optional_param('d', 0, PARAM_INT); // database id $rid = optional_param('rid', 0, PARAM_INT); //record id $import = optional_param('import', 0, PARAM_INT); // show import form - $cancel = optional_param('cancel', ''); // cancel an add + $cancel = optional_param('cancel', '', PARAM_RAW); // cancel an add $mode ='addtemplate'; //define the mode for this page, only 1 mode available if ($id) { diff --git a/mod/data/field.php b/mod/data/field.php index 0878ff474e..824399cd3d 100755 --- a/mod/data/field.php +++ b/mod/data/field.php @@ -33,7 +33,7 @@ $mode = optional_param('mode','',PARAM_ALPHA); $defaultsort = optional_param('defaultsort', 0, PARAM_INT); $defaultsortdir = optional_param('defaultsortdir', 0, PARAM_INT); - $cancel = optional_param('cancel', ''); + $cancel = optional_param('cancel', 0, PARAM_BOOL); if ($cancel) { $mode = 'list'; diff --git a/mod/forum/view.php b/mod/forum/view.php index fb6b79557e..5be3c7810d 100644 --- a/mod/forum/view.php +++ b/mod/forum/view.php @@ -11,7 +11,7 @@ $showall = optional_param('showall', '', PARAM_INT); // show all discussions on one page $changegroup = optional_param('group', -1, PARAM_INT); // choose the current group $page = optional_param('page', 0, PARAM_INT); // which page to show - $search = optional_param('search', ''); // search string + $search = optional_param('search', '', PARAM_CLEAN);// search string $params = array(); if ($id) { diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php index 18ab1747fd..fdda0f4c09 100644 --- a/mod/glossary/formats.php +++ b/mod/glossary/formats.php @@ -6,7 +6,7 @@ require_once("lib.php"); $id = required_param('id', PARAM_INT); - $mode = optional_param('mode'); + $mode = optional_param('mode', '', PARAM_ACTION); admin_externalpage_setup('managemodules'); // this is hacky, tehre should be a special hidden page for it diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php index 4e3875fb5a..593761530e 100644 --- a/mod/hotpot/view.php +++ b/mod/hotpot/view.php @@ -49,7 +49,7 @@ $button = '
'.$button.'
'; $loggedinas = ''.user_login_string($course, $USER).''; $time = time(); - $hppassword = optional_param('hppassword', ''); + $hppassword = optional_param('hppassword', '', PARAM_RAW); if (HOTPOT_FIRST_ATTEMPT && !has_capability('mod/hotpot:grade', $context)) { // check this quiz is available to this student // error message, if quiz is unavailable diff --git a/mod/lesson/action/continue.php b/mod/lesson/action/continue.php index ba84035d50..044404aa5e 100644 --- a/mod/lesson/action/continue.php +++ b/mod/lesson/action/continue.php @@ -445,7 +445,7 @@ $newpageid = 0; if (isset($_POST['answer'])) { - $useranswer = (float) optional_param('answer'); // just doing default PARAM_CLEAN, not doing PARAM_INT because it could be a float + $useranswer = (float) optional_param('answer', 0, PARAM_RAW); // just doing default PARAM_RAW, not doing PARAM_INT because it could be a float } else { $noanswer = true; break; diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php index 6e4a5a967e..8618ebf41a 100644 --- a/mod/wiki/ewiki/ewiki.php +++ b/mod/wiki/ewiki/ewiki.php @@ -735,7 +735,7 @@ function ewiki_page_view($id, &$data, $action, $all=1) { global $ewiki_plugins, $ewiki_config; $o = ""; - $thanks = optional_param('thankyou', ''); + $thanks = optional_param('thankyou', '', PARAM_CLEAN); #-- render requested wiki page <-- goal !!! $render_args = array( @@ -762,7 +762,7 @@ function ewiki_page_view($id, &$data, $action, $all=1) { foreach ($pf_a as $n => $pf) { $pf($o, $id, $data, $action); } } - if (!empty($thankyou) && $ewiki_config["edit_thank_you"]) { + if (!empty($thanks) && $ewiki_config["edit_thank_you"]) { $o = ewiki_t("THANKSFORCONTRIBUTION") . $o; } @@ -1104,7 +1104,7 @@ function ewiki_page_search($id, &$data, $action) { global $CFG; - $q = optional_param('q', ''); + $q = optional_param('q', '', PARAM_CLEAN); $o = ewiki_make_title($id, $id, 2, $action); if ($q == '') { @@ -1367,10 +1367,10 @@ function ewiki_page_edit($id, $data, $action) { global $ewiki_links, $ewiki_author, $ewiki_plugins, $ewiki_ring, $ewiki_errmsg; - $content = optional_param('content', ''); - $version = optional_param('version', ''); - $preview = optional_param('preview', false); - $save = optional_param('save', false); + $content = optional_param('content', '', PARAM_CLEAN); + $version = optional_param('version', '', PARAM_CLEAN); + $preview = optional_param('preview', false, PARAM_BOOL); + $save = optional_param('save', false, PARAM_BOOL); $hidden_postdata = array(); diff --git a/mod/wiki/ewiki/plugins/init.php b/mod/wiki/ewiki/plugins/init.php index 3d47b52d14..323320c271 100644 --- a/mod/wiki/ewiki/plugins/init.php +++ b/mod/wiki/ewiki/plugins/init.php @@ -27,7 +27,7 @@ function ewiki_initialization_wizard($id, &$data, &$action) { global $ewiki_plugins; $abort = optional_param('abort', false); - $init = optional_param('init', ''); + $init = optional_param('init', '', PARAM_BOOL); #-- proceed only if frontpage missing or explicetely requested if ((strtolower($id)=="wikisetupwizard") || ($id==EWIKI_PAGE_INDEX) && ($action=="edit") && empty($data["version"]) && !($abort)) { diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php index 16a2440f7e..03a566addd 100644 --- a/mod/wiki/ewiki/plugins/moodle/downloads.php +++ b/mod/wiki/ewiki/plugins/moodle/downloads.php @@ -116,7 +116,7 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") { } if (count($ewiki_upload_sections) > 1) { if (empty($def_sec)) { - $def_sec = optional_param('section', ''); + $def_sec = optional_param('section', '', PARAM_CLEAN); } $o .= ''.ewiki_t("UPL_INSECT").'