MDL-20169 fixed coding style, parameter type required

diff --git a/backup/backup.php b/backup/backup.php
index 94a72c1c1aa6be96fee0f893c19d74f4491e0a7b..542e55d6fe59b6bfc139ba6d4974abe831b36b83 100644 (file)
--- a/backup/backup.php
+++ b/backup/backup.php
@@ -8,10 +8,10 @@
     require_once ("backuplib.php");
     require_once ("$CFG->libdir/adminlib.php");
 
-    $id = optional_param( 'id' );       // course id
-    $to = optional_param( 'to' ); // id of course to import into afterwards.
-    $cancel = optional_param( 'cancel' );
-    $launch = optional_param( 'launch' );
+    $id = optional_param('id', 0, PARAM_INT);       // course id
+    $to = optional_param('to', 0, PARAM_INT); // id of course to import into afterwards.
+    $cancel = optional_param('cancel', '', PARAM_RAW);
+    $launch = optional_param('launch', '', PARAM_ACTION);
 
     $loginurl = get_login_url();
 

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

diff --git a/backup/backuplib.php b/backup/backuplib.php
index 38a29ffd5d458e06cfa5dc5362c1ec722cacf706..a391e6d6d31bb8d08e961513ebd83d7a141a385e 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -2724,11 +2724,11 @@
                 foreach ($preferences->$varname as $instance) {
                     $preferences->mods[$modname]->instances[$instance->id]->name = $instance->name;
                     $var = 'backup_'.$modname.'_instance_'.$instance->id;
-                    $$var = optional_param($var,0);
+                    $$var = optional_param($var,0, PARAM_CLEAN);
                     $preferences->$var = $$var;
                     $preferences->mods[$modname]->instances[$instance->id]->backup = $$var;
                     $var = 'backup_user_info_'.$modname.'_instance_'.$instance->id;
-                    $$var = optional_param($var,0);
+                    $$var = optional_param($var,0, PARAM_CLEAN);
                     $preferences->$var = $$var;
                     $preferences->mods[$modname]->instances[$instance->id]->userinfo = $$var;
                     $var = 'backup_'.$modname.'_instances';
@@ -2740,13 +2740,13 @@
                 $preferences->mods[$modname]->name = $modname;
 
                 $var = "backup_".$modname;
-                $$var = optional_param( $var,0);
+                $$var = optional_param( $var,0, PARAM_CLEAN);
                 $preferences->$var = $$var;
                 $preferences->mods[$modname]->backup = $$var;
 
                 //Check include user info
                 $var = "backup_user_info_".$modname;
-                $$var = optional_param( $var,0);
+                $$var = optional_param( $var,0, PARAM_CLEAN);
                 $preferences->$var = $$var;
                 $preferences->mods[$modname]->userinfo = $$var;
 

diff --git a/backup/restore.php b/backup/restore.php
index f4ba4db39773e83286bbb5b9396ea13ee318ef98..a24a64242093f93ee422294eff23dbf11a3453da 100644 (file)
--- a/backup/restore.php
+++ b/backup/restore.php
@@ -14,12 +14,12 @@
     require_once("$CFG->libdir/adminlib.php");
 
     //Optional
-    $id = optional_param( 'id' );
-    $file = optional_param( 'file' );
-    $cancel = optional_param( 'cancel' );
-    $launch = optional_param( 'launch' );
-    $to = optional_param( 'to' );
-    $method = optional_param( 'method' );
+    $id = optional_param('id', 0, PARAM_INT);
+    $file = optional_param( 'file', 0, PARAM_PATH);
+    $cancel = optional_param('cancel', '', PARAM_RAW);
+    $launch = optional_param( 'launch', '', PARAM_ACTION);
+    $to = optional_param('to', '', PARAM_INT);
+    $method = optional_param('method', '', PARAM_ACTION);
     $backup_unique_code = optional_param('backup_unique_code',0,PARAM_INT);
 
     //Get and check course

diff --git a/backup/restore_check.html b/backup/restore_check.html
index de9fa8487e1176bad3d9a0019e1fd668e38454bd..0be840998399c019f503521257d24869bbaa0099 100644 (file)
--- a/backup/restore_check.html
+++ b/backup/restore_check.html
@@ -68,9 +68,9 @@
             foreach ($allmods as $mod) {
                 $modname = $mod->name;
                 $var = "restore_".$modname;
-                $$var = optional_param( $var,0);
+                $$var = optional_param( $var,0, PARAM_CLEAN);
                 $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;
                 if ($instances === NULL) {
                     continue;

diff --git a/backup/restore_form.html b/backup/restore_form.html
index afb8dc71bda3cb82dc7a168c5e898107606213b1..844d7ae18147e8d95c9b30c39cecd62b49b5e3b4 100644 (file)
--- a/backup/restore_form.html
+++ b/backup/restore_form.html
@@ -370,11 +370,11 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
                             foreach ($instances as $instance) {
                                 echo '<tr><td>';
                                 $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;');
                                 echo '</td><td align="right">&nbsp;';
                                 $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')) {
                                     print_checkbox($var,$$var,$$var,get_string('userdata'),'','this.form.elements[\'restore_user_info_'.$modname.'\'].checked=1;');
                                 } else {

diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php
index 057dc2171a6d912189fe217a65bfc5cf5ed79804..ef4105145c813fa1cef4c77561bb58f6999a5091 100644 (file)
--- a/enrol/authorize/locallib.php
+++ b/enrol/authorize/locallib.php
@@ -339,7 +339,7 @@ function authorize_print_order($orderid)
             print_error('refoundtoorigi', '',
                     "$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) {
             print_error('refoundto', '',
                     "$CFG->wwwroot/enrol/authorize/index.php?order=$orderid", $upto);

diff --git a/lib/tablelib.php b/lib/tablelib.php
index 7d12d23f3f0e61e39b322afb14786249e2ac6285..ccfd43cda210c69449b60cbf4919693b5509269d 100644 (file)
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -516,7 +516,7 @@ class flexible_table {
             $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;
 
     /// Always introduce the "flexible" class for the table if not specified

diff --git a/mod/hotpot/attempt.php b/mod/hotpot/attempt.php
index 5cf79bd659296f5e4fb5eb2e602e2e1635f5497e..8cf1f9aa078b1a18812a8914e641c28c960b7b0a 100644 (file)
--- a/mod/hotpot/attempt.php
+++ b/mod/hotpot/attempt.php
@@ -261,7 +261,7 @@ function hotpot_set_attempt_details(&$attempt) {
                 $responsevalue[$key] = clean_param($value, PARAM_CLEAN);
             }
         } else {
-            $responsevalue = optional_param($responsefield, '');
+            $responsevalue = optional_param($responsefield, '', PARAM_CLEAN);
         }
         if (is_array($responsevalue)) {
             // incomplete jquiz multi-select

diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php
index d4f55a31c1c51af2f5d8a6dd3a01afd39a74e271..765319f73e0caa117f05c265f867040c538fcb22 100644 (file)
--- a/mod/lesson/essay.php
+++ b/mod/lesson/essay.php
@@ -83,7 +83,7 @@
             break;
         case 'update':
             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");
                 }
                 

diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index 6f97df90e86f367361d415ce72f9894506a6ea9d..443aae94ccd106bacdadb52984d565ddfaf87c77 100644 (file)
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -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
             redirect("$CFG->wwwroot/mod/lesson/highscores.php?id=$cm->id");
         }

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index a9277b728ea3fad66d5496e2d1a653264cc73044..d2d2f2f80831f44f2862735f879aa5f81a194644 100644 (file)
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -311,7 +311,7 @@ if ((optional_param('addrandom', false, PARAM_BOOL) || $newrandomcategory) && co
     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) {
         $quiz->questions = quiz_add_page_break_after($quiz->questions, $questionid);
     }

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

diff --git a/mod/wiki/ewiki/plugins/email_protect.php b/mod/wiki/ewiki/plugins/email_protect.php
index eaa77e0e1e988984f4fbeb9df14e3dbbbe9f6b61..30f76a5b3d171e8af8a7279ec855ba997cd3baed 100644 (file)
--- a/mod/wiki/ewiki/plugins/email_protect.php
+++ b/mod/wiki/ewiki/plugins/email_protect.php
@@ -235,7 +235,7 @@
 
     global $ewiki_config;
 
-    $ewiki_up_requestlv = optional_param(EWIKI_UP_REQUESTLV, 0);
+    $ewiki_up_requestlv = optional_param(EWIKI_UP_REQUESTLV, 0, PARAM_CLEAN);
     
     $html = "";
     srand(time()/17-1000*microtime());

diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php
index 03a566adddb900d3af9832ab2b5642a3b0cebdc6..2b48d2b6d2b1b70606168f31289536b30946faae 100644 (file)
--- a/mod/wiki/ewiki/plugins/moodle/downloads.php
+++ b/mod/wiki/ewiki/plugins/moodle/downloads.php
@@ -144,7 +144,7 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") {
       if (($s = $upload_file["name"]) && (strlen($s) >= 3)
          || ($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) {
                $meta["Original-Filename"] = $s;
             }
@@ -156,7 +156,7 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") {
          ($p = strrpos($s, '\\')) and ($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]
             || ($action==EWIKI_ACTION_ATTACHMENTS) && ($data["content"])
                && strlen($ewiki_plugins["action"][EWIKI_ACTION_ATTACHMENTS])) {
@@ -168,7 +168,7 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") {
             return($o);
          }
       }
-      if (strlen($s = trim(optional_param("comment",'')))) {
+      if (strlen($s = trim(optional_param("comment",'', PARAM_CLEAN)))) {
          $meta["comment"] = $s;
       }
 

diff --git a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
index 86fe117a750a8a10d8c25aaf0eece0716fe6b594..71c7b586b915b35b47fc6a43d28593ca1014e041 100644 (file)
--- a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
+++ b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
@@ -60,7 +60,7 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) {
     $cont=ewiki_page_wiki_dump_send($binaries, 
                                 $exportformatval, 
                                 $withvirtualpages, 
-                                optional_param("exportdestinations", null));
+                                optional_param("exportdestinations", null,PARAM_CLEAN));
   }  
   if($cont===false) {
      die;