moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-20169 fixed coding style, parameter type required

Browse source
This commit is contained in:
skodak 2009-08-27 19:14:45 +00:00
parent 622365d2e1
commit 92ebcabeb3
16 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backup/backup.php
View file

@ -8,10 +8,10 @@
require_once ("backuplib.php"); require_once ("backuplib.php");
require_once ("$CFG->libdir/adminlib.php"); require_once ("$CFG->libdir/adminlib.php");
$id = optional_param( 'id' ); // course id $id = optional_param('id', 0, PARAM_INT); // course id
$to = optional_param( 'to' ); // id of course to import into afterwards. $to = optional_param('to', 0, PARAM_INT); // id of course to import into afterwards.
$cancel = optional_param( 'cancel' ); $cancel = optional_param('cancel', '', PARAM_RAW);
$launch = optional_param( 'launch' ); $launch = optional_param('launch', '', PARAM_ACTION);
$loginurl = get_login_url(); $loginurl = get_login_url();

24
backup/backup_form.html
View file

@ -54,23 +54,23 @@
//Check data //Check data
//Check module info //Check module info
$var = "backup_".$modname; $var = "backup_".$modname;
$$var = optional_param( $var,1); $$var = optional_param( $var,1, PARAM_CLEAN);
//Check include user info //Check include user info
$var = "backup_user_info_".$modname; $var = "backup_user_info_".$modname;
$$var = optional_param( $var,1); $$var = optional_param( $var,1, PARAM_CLEAN);
} }
} }
//Check other parameters //Check other parameters
$backup_metacourse = optional_param('backup_metacourse',1); $backup_metacourse = optional_param('backup_metacourse',1, PARAM_BOOL);
$backup_users = optional_param('backup_users',1); $backup_users = optional_param('backup_users',1, PARAM_BOOL);
$backup_logs = optional_param('backup_logs',0); $backup_logs = optional_param('backup_logs',0, PARAM_BOOL);
$backup_user_files = optional_param('backup_user_files',1); $backup_user_files = optional_param('backup_user_files',1, PARAM_BOOL);
$backup_course_files = optional_param('backup_course_files',1); $backup_course_files = optional_param('backup_course_files',1, PARAM_BOOL);
$backup_site_files = optional_param('backup_site_files',1); $backup_site_files = optional_param('backup_site_files',1, PARAM_BOOL);
$backup_gradebook_history = optional_param('backup_gradebook_history', 0, PARAM_INT); $backup_gradebook_history = optional_param('backup_gradebook_history', 0, PARAM_INT);
$backup_messages = optional_param('backup_messages',1); $backup_messages = optional_param('backup_messages',1, PARAM_BOOL);
$backup_blogs = optional_param('backup_blogs',1); $backup_blogs = optional_param('backup_blogs',1, PARAM_BOOL);
if ($count == 0) { if ($count == 0) {
notice("No backupable modules are installed!"); notice("No backupable modules are installed!");
@ -175,11 +175,11 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
foreach ($instances as $instance) { foreach ($instances as $instance) {
echo '<tr><td>'; echo '<tr><td>';
$var = 'backup_'.$modname.'_instance_'.$instance->id; $var = 'backup_'.$modname.'_instance_'.$instance->id;
$$var = optional_param($var,1); $$var = optional_param($var,1, PARAM_CLEAN);
print_checkbox($var,$$var,$$var,$instance->name,$instance->name,'this.form.elements[\'backup_'.$modname.'\'].checked=1;'); print_checkbox($var,$$var,$$var,$instance->name,$instance->name,'this.form.elements[\'backup_'.$modname.'\'].checked=1;');
echo '</td><td align="right">&nbsp;'; echo '</td><td align="right">&nbsp;';
$var = 'backup_user_info_'.$modname.'_instance_'.$instance->id; $var = 'backup_user_info_'.$modname.'_instance_'.$instance->id;
$$var = optional_param($var,1); $$var = optional_param($var,1, PARAM_CLEAN);
if (empty($to)) { if (empty($to)) {
print_checkbox($var,$$var,$$var,get_string('userdata'),'','this.form.elements[\'backup_user_info_'.$modname.'\'].checked=1;'); print_checkbox($var,$$var,$$var,get_string('userdata'),'','this.form.elements[\'backup_user_info_'.$modname.'\'].checked=1;');
} else { } else {

8
backup/backuplib.php
View file

@ -2724,11 +2724,11 @@
foreach ($preferences->$varname as $instance) { foreach ($preferences->$varname as $instance) {
$preferences->mods[$modname]->instances[$instance->id]->name = $instance->name; $preferences->mods[$modname]->instances[$instance->id]->name = $instance->name;
$var = 'backup_'.$modname.'_instance_'.$instance->id; $var = 'backup_'.$modname.'_instance_'.$instance->id;
$$var = optional_param($var,0); $$var = optional_param($var,0, PARAM_CLEAN);
$preferences->$var = $$var; $preferences->$var = $$var;
$preferences->mods[$modname]->instances[$instance->id]->backup = $$var; $preferences->mods[$modname]->instances[$instance->id]->backup = $$var;
$var = 'backup_user_info_'.$modname.'_instance_'.$instance->id; $var = 'backup_user_info_'.$modname.'_instance_'.$instance->id;
$$var = optional_param($var,0); $$var = optional_param($var,0, PARAM_CLEAN);
$preferences->$var = $$var; $preferences->$var = $$var;
$preferences->mods[$modname]->instances[$instance->id]->userinfo = $$var; $preferences->mods[$modname]->instances[$instance->id]->userinfo = $$var;
$var = 'backup_'.$modname.'_instances'; $var = 'backup_'.$modname.'_instances';
@ -2740,13 +2740,13 @@
$preferences->mods[$modname]->name = $modname; $preferences->mods[$modname]->name = $modname;
$var = "backup_".$modname; $var = "backup_".$modname;
$$var = optional_param( $var,0); $$var = optional_param( $var,0, PARAM_CLEAN);
$preferences->$var = $$var; $preferences->$var = $$var;
$preferences->mods[$modname]->backup = $$var; $preferences->mods[$modname]->backup = $$var;
//Check include user info //Check include user info
$var = "backup_user_info_".$modname; $var = "backup_user_info_".$modname;
$$var = optional_param( $var,0); $$var = optional_param( $var,0, PARAM_CLEAN);
$preferences->$var = $$var; $preferences->$var = $$var;
$preferences->mods[$modname]->userinfo = $$var; $preferences->mods[$modname]->userinfo = $$var;

12
backup/restore.php
View file

@ -14,12 +14,12 @@
require_once("$CFG->libdir/adminlib.php"); require_once("$CFG->libdir/adminlib.php");
//Optional //Optional
$id = optional_param( 'id' ); $id = optional_param('id', 0, PARAM_INT);
$file = optional_param( 'file' ); $file = optional_param( 'file', 0, PARAM_PATH);
$cancel = optional_param( 'cancel' ); $cancel = optional_param('cancel', '', PARAM_RAW);
$launch = optional_param( 'launch' ); $launch = optional_param( 'launch', '', PARAM_ACTION);
$to = optional_param( 'to' ); $to = optional_param('to', '', PARAM_INT);
$method = optional_param( 'method' ); $method = optional_param('method', '', PARAM_ACTION);
$backup_unique_code = optional_param('backup_unique_code',0,PARAM_INT); $backup_unique_code = optional_param('backup_unique_code',0,PARAM_INT);
//Get and check course //Get and check course

4
backup/restore_check.html
View file

@ -68,9 +68,9 @@
foreach ($allmods as $mod) { foreach ($allmods as $mod) {
$modname = $mod->name; $modname = $mod->name;
$var = "restore_".$modname; $var = "restore_".$modname;
$$var = optional_param( $var,0); $$var = optional_param( $var,0, PARAM_CLEAN);
$var = "restore_user_info_".$modname; $var = "restore_user_info_".$modname;
$$var = optional_param( $var,0); $$var = optional_param( $var,0, PARAM_CLEAN);
$instances = !empty($info->mods[$mod->name]->instances) ? $info->mods[$mod->name]->instances : NULL; $instances = !empty($info->mods[$mod->name]->instances) ? $info->mods[$mod->name]->instances : NULL;
if ($instances === NULL) { if ($instances === NULL) {
continue; continue;

4
backup/restore_form.html
View file

@ -370,11 +370,11 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
foreach ($instances as $instance) { foreach ($instances as $instance) {
echo '<tr><td>'; echo '<tr><td>';
$var = 'restore_'.$modname.'_instance_'.$instance->id; $var = 'restore_'.$modname.'_instance_'.$instance->id;
$$var = optional_param($var,1); $$var = optional_param($var,1, PARAM_CLEAN);
print_checkbox($var,$$var,$$var,$instance->name,$instance->name,'this.form.elements[\'restore_'.$modname.'\'].checked=1;'); print_checkbox($var,$$var,$$var,$instance->name,$instance->name,'this.form.elements[\'restore_'.$modname.'\'].checked=1;');
echo '</td><td align="right">&nbsp;'; echo '</td><td align="right">&nbsp;';
$var = 'restore_user_info_'.$modname.'_instance_'.$instance->id; $var = 'restore_user_info_'.$modname.'_instance_'.$instance->id;
$$var = optional_param($var,1); $$var = optional_param($var,1, PARAM_CLEAN);
if (!empty($info->mods[$modname]->instances) && ($info->mods[$modname]->instances[$instance->id]->userinfo == 'true')) { if (!empty($info->mods[$modname]->instances) && ($info->mods[$modname]->instances[$instance->id]->userinfo == 'true')) {
print_checkbox($var,$$var,$$var,get_string('userdata'),'','this.form.elements[\'restore_user_info_'.$modname.'\'].checked=1;'); print_checkbox($var,$$var,$$var,get_string('userdata'),'','this.form.elements[\'restore_user_info_'.$modname.'\'].checked=1;');
} else { } else {

2
enrol/authorize/locallib.php
View file

@ -339,7 +339,7 @@ function authorize_print_order($orderid)
print_error('refoundtoorigi', '', print_error('refoundtoorigi', '',
"$CFG->wwwroot/enrol/authorize/index.php?order=$orderid", $order->amount); "$CFG->wwwroot/enrol/authorize/index.php?order=$orderid", $order->amount);
} }
$amount = round(optional_param('amount', $upto), 2); $amount = round(optional_param('amount', $upto, PARAM_RAW), 2);
if ($amount > $upto) { if ($amount > $upto) {
print_error('refoundto', '', print_error('refoundto', '',
"$CFG->wwwroot/enrol/authorize/index.php?order=$orderid", $upto); "$CFG->wwwroot/enrol/authorize/index.php?order=$orderid", $upto);

2
lib/tablelib.php
View file

@ -516,7 +516,7 @@ class flexible_table {
$this->sess->i_last = ''; $this->sess->i_last = '';
} }
$this->currpage = optional_param($this->request[TABLE_VAR_PAGE], 0); $this->currpage = optional_param($this->request[TABLE_VAR_PAGE], 0, PARAM_INT);
$this->setup = true; $this->setup = true;
/// Always introduce the "flexible" class for the table if not specified /// Always introduce the "flexible" class for the table if not specified

2
mod/hotpot/attempt.php
View file

@ -261,7 +261,7 @@ function hotpot_set_attempt_details(&$attempt) {
$responsevalue[$key] = clean_param($value, PARAM_CLEAN); $responsevalue[$key] = clean_param($value, PARAM_CLEAN);
} }
} else { } else {
$responsevalue = optional_param($responsefield, ''); $responsevalue = optional_param($responsefield, '', PARAM_CLEAN);
} }
if (is_array($responsevalue)) { if (is_array($responsevalue)) {
// incomplete jquiz multi-select // incomplete jquiz multi-select

2
mod/lesson/essay.php
View file

@ -83,7 +83,7 @@
break; break;
case 'update': case 'update':
if (confirm_sesskey() and $form = data_submitted()) { if (confirm_sesskey() and $form = data_submitted()) {
if (optional_param('cancel', 0)) { if (optional_param('cancel', 0, PARAM_RAW)) {
redirect("$CFG->wwwroot/mod/lesson/essay.php?id=$cm->id"); redirect("$CFG->wwwroot/mod/lesson/essay.php?id=$cm->id");
} }

2
mod/lesson/view.php
View file

@ -157,7 +157,7 @@
} }
} }
} else if ($lesson->highscores and !$lesson->practice and !optional_param('viewed', 0) and empty($pageid)) { } else if ($lesson->highscores and !$lesson->practice and !optional_param('viewed', 0, PARAM_INT) and empty($pageid)) {
// Display high scores before starting lesson // Display high scores before starting lesson
redirect("$CFG->wwwroot/mod/lesson/highscores.php?id=$cm->id"); redirect("$CFG->wwwroot/mod/lesson/highscores.php?id=$cm->id");
} }

2
mod/quiz/edit.php
View file

@ -311,7 +311,7 @@ if ((optional_param('addrandom', false, PARAM_BOOL) || $newrandomcategory) && co
redirect($thispageurl); redirect($thispageurl);
} }
if (optional_param('addnewpagesafterselected', null) && !empty($selectedquestionids) && confirm_sesskey()) { if (optional_param('addnewpagesafterselected', null, PARAM_CLEAN) && !empty($selectedquestionids) && confirm_sesskey()) {
foreach ($selectedquestionids as $questionid) { foreach ($selectedquestionids as $questionid) {
$quiz->questions = quiz_add_page_break_after($quiz->questions, $questionid); $quiz->questions = quiz_add_page_break_after($quiz->questions, $questionid);
} }

14
mod/wiki/ewiki/ewiki.php
View file

@ -785,10 +785,10 @@ function ewiki_page_view($id, &$data, $action, $all=1) {
further whenever desired further whenever desired
*/ */
function ewiki_id() { function ewiki_id() {
($id = optional_param("id", '')) or ($id = optional_param("id", '', PARAM_CLEAN)) or
($id = optional_param("name", '')) or ($id = optional_param("name", '', PARAM_CLEAN)) or
($id = optional_param("page", '')) or ($id = optional_param("page", '', PARAM_CLEAN)) or
($id = optional_param("file", '')) or ($id = optional_param("file", '', PARAM_CLEAN)) or
(EWIKI_USE_PATH_INFO) and ($id = ltrim(@$_SERVER["PATH_INFO"], "/")) or (EWIKI_USE_PATH_INFO) and ($id = ltrim(@$_SERVER["PATH_INFO"], "/")) or
(!isset($_REQUEST["id"])) and ($id = trim(strtok($_SERVER["QUERY_STRING"], "&"))); (!isset($_REQUEST["id"])) and ($id = trim(strtok($_SERVER["QUERY_STRING"], "&")));
if (!strlen($id) || ($id=="id=")) { if (!strlen($id) || ($id=="id=")) {
@ -1544,8 +1544,8 @@ function ewiki_data_update(&$data, $author="") {
function ewiki_page_edit_form(&$id, &$data, &$hidden_postdata) { function ewiki_page_edit_form(&$id, &$data, &$hidden_postdata) {
global $ewiki_plugins, $ewiki_config, $moodle_format; global $ewiki_plugins, $ewiki_config, $moodle_format;
$content = optional_param('content', ''); $content = optional_param('content', '', PARAM_CLEAN);
$version = optional_param('version', ''); $version = optional_param('version', '', PARAM_CLEAN);
$o=''; $o='';
@ -2562,7 +2562,7 @@ function ewiki_binary($break=0) {
global $ewiki_plugins; global $ewiki_plugins;
global $USER; // MOODLE global $USER; // MOODLE
$id = optional_param(EWIKI_UP_BINARY, ''); $id = optional_param(EWIKI_UP_BINARY, '', PARAM_CLEAN);
#-- reject calls #-- reject calls
if (!strlen($id) || !EWIKI_IDF_INTERNAL) { if (!strlen($id) || !EWIKI_IDF_INTERNAL) {

2
mod/wiki/ewiki/plugins/email_protect.php
View file

@ -235,7 +235,7 @@
global $ewiki_config; global $ewiki_config;
$ewiki_up_requestlv = optional_param(EWIKI_UP_REQUESTLV, 0); $ewiki_up_requestlv = optional_param(EWIKI_UP_REQUESTLV, 0, PARAM_CLEAN);
$html = ""; $html = "";
srand(time()/17-1000*microtime()); srand(time()/17-1000*microtime());

6
mod/wiki/ewiki/plugins/moodle/downloads.php
View file

@ -144,7 +144,7 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") {
if (($s = $upload_file["name"]) && (strlen($s) >= 3) if (($s = $upload_file["name"]) && (strlen($s) >= 3)
|| ($s = substr(md5(time()+microtime()),0,8) . ".dat")) || ($s = substr(md5(time()+microtime()),0,8) . ".dat"))
{ {
if (strlen($uu = trim(optional_param("new_filename",''))) >= 3) { if (strlen($uu = trim(optional_param("new_filename",'', PARAM_FILE))) >= 3) {
if ($uu != $s) { if ($uu != $s) {
$meta["Original-Filename"] = $s; $meta["Original-Filename"] = $s;
} }
@ -156,7 +156,7 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") {
($p = strrpos($s, '\\')) and ($p++); ($p = strrpos($s, '\\')) and ($p++);
$meta["Content-Disposition"] = 'attachment; filename="'.urlencode(substr($s, $p)).'"'; $meta["Content-Disposition"] = 'attachment; filename="'.urlencode(substr($s, $p)).'"';
} }
if (strlen($sect = optional_param("section",''))) { if (strlen($sect = optional_param("section",'', PARAM_CLEAN))) {
if ($ewiki_upload_sections[$sect] if ($ewiki_upload_sections[$sect]
|| ($action==EWIKI_ACTION_ATTACHMENTS) && ($data["content"]) || ($action==EWIKI_ACTION_ATTACHMENTS) && ($data["content"])
&& strlen($ewiki_plugins["action"][EWIKI_ACTION_ATTACHMENTS])) { && strlen($ewiki_plugins["action"][EWIKI_ACTION_ATTACHMENTS])) {
@ -168,7 +168,7 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") {
return($o); return($o);
} }
} }
if (strlen($s = trim(optional_param("comment",'')))) { if (strlen($s = trim(optional_param("comment",'', PARAM_CLEAN)))) {
$meta["comment"] = $s; $meta["comment"] = $s;
} }

2
mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
View file

@ -60,7 +60,7 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) {
$cont=ewiki_page_wiki_dump_send($binaries, $cont=ewiki_page_wiki_dump_send($binaries,
$exportformatval, $exportformatval,
$withvirtualpages, $withvirtualpages,
optional_param("exportdestinations", null)); optional_param("exportdestinations", null,PARAM_CLEAN));
} }
if($cont===false) { if($cont===false) {
die; die;