Permalink
Browse files

MDL-25720 moodlelib new PARAM_RAW_TRIMMED.

Will be required by the new question engine.
  • Loading branch information...
timhunt committed Dec 16, 2010
1 parent f056cb5 commit 652599ecc387294ecc6fea0f01cd2ebd38ebe748
Showing with 12 additions and 0 deletions.
  1. +8 −0 lib/moodlelib.php
  2. +4 −0 lib/simpletest/testmoodlelib.php
View
@@ -182,6 +182,11 @@
*/
define('PARAM_RAW', 'raw');
+/**
+ * PARAM_RAW_TRIMMED like PARAM_RAW but leading and trailing whitespace is stripped.
+ */
+define('PARAM_RAW_TRIMMED', 'raw_trimmed');
+
/**
* PARAM_SAFEDIR - safe directory name, suitable for include() and require()
*/
@@ -553,6 +558,9 @@ function clean_param($param, $type) {
case PARAM_RAW: // no cleaning at all
return $param;
+ case PARAM_RAW_TRIMMED: // no cleaning, but strip leading and trailing whitespace.
+ return trim($param);
+
case PARAM_CLEAN: // General HTML cleaning, try to use more specific type if possible
// this is deprecated!, please use more specific type instead
if (is_numeric($param)) {
@@ -313,6 +313,10 @@ function test_clean_param_raw() {
'#()*#,9789\'".,<42897></?$(*DSFMO#$*)(SDJ)($*)');
}
+ function test_clean_param_trim() {
+ $this->assertEqual(clean_param(" Frog toad \r\n ", PARAM_RAW_TRIMMED), 'Frog toad');
+ }
+
function test_clean_param_clean() {
// PARAM_CLEAN is an ugly hack, do not use in new code (skodak)
// instead use more specific type, or submit sothing that can be verified properly

0 comments on commit 652599e

Please sign in to comment.