mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-13 18:24:57 +02:00
Code Issues Releases Wiki Activity

Refactor of WireInput::sanitizeValue(), should also fix processwire/processwire-issues#1224

Browse Source
This commit is contained in:
Ryan Cramer
2020-08-07 09:14:38 -04:00
parent 5aa6b3939f
commit a3f64cb4c7
1 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
wire/core/WireInput.php
View File

@@ -1391,7 +1391,6 @@ class WireInput extends Wire {
} else if(is_string($valid)) { } else if(is_string($valid)) {
// sanitizer "name" or multiple "name1,name2,name3" specified for $valid argument // sanitizer "name" or multiple "name1,name2,name3" specified for $valid argument
$cleanValue = $this->sanitizeValue($valid, $value, ($forceArray || is_array($fallback))); $cleanValue = $this->sanitizeValue($valid, $value, ($forceArray || is_array($fallback)));
if(empty($value) && $fallback !== null) $cleanValue = $fallback;
} else if(is_array($valid)) { } else if(is_array($valid)) {
// whitelist provided for $valid argument // whitelist provided for $valid argument
@@ -1474,30 +1473,64 @@ class WireInput extends Wire {
*/ */
protected function sanitizeValue($method, $value, $getArray) { protected function sanitizeValue($method, $value, $getArray) {
/** @var Sanitizer $sanitizer */ $sanitizer = $this->wire()->sanitizer;
$sanitizer = $this->wire('sanitizer'); $sanitizers = $sanitizer->getAll(true);
//$values = is_array($value) ? $value : ($value === null ? array() : array($value)); $methods = array();
$values = is_array($value) ? $value : array($value);
$methods = strpos($method, ',') === false ? array($method) : explode(',', $method);
$cleanValues = array();
foreach($values as $value) { foreach(explode(',', $method) as $name) {
foreach($methods as $method) { $name = trim($name);
$method = trim($method); if(empty($name)) continue;
if(empty($method)) continue; if(!isset($sanitizers[$name])) throw new WireException("Unknown sanitizer '$method'");
if($sanitizer->methodExists($method)) { $methods[$name] = $sanitizers[$name]; // value is return type(s)
$value = $sanitizer->sanitize($value, $method);
} else {
throw new WireException("Unknown sanitizer method: $method");
}
}
$cleanValues[] = $value;
} }
$cleanValue = $getArray ? $cleanValues : reset($cleanValues); $lastReturnType = end($methods);
if($cleanValue === false) $cleanValue = null; if(!$getArray) {
if($lastReturnType === 'a') {
$getArray = true; // array return value implied
} else if(strpos($lastReturnType, 'a') !== false) {
$getArray = 1; // array return value possible
}
}
return $cleanValue; foreach($methods as $methodName => $returnType) {
$methodName = trim($methodName);
if(empty($methodName)) continue;
if(is_array($value)) {
// array value
if(!count($value)) {
// nothing to do with value
$value = array();
} else if($getArray && strpos($returnType, 'a') === false) {
// sanitize array with sanitizer that does not do arrays, 1 item at a time
$a = array();
foreach($value as $v) {
$cv = $sanitizer->sanitize($v, $methodName);
if($cv !== null) $a[] = $cv;
}
$value = $a;
} else if($getArray) {
// sanitizer that can handle arrays
$value = $sanitizer->sanitize($value, $methodName);
} else {
// sanitizer does not do arrays, reduce to 1st array item
$value = reset($value);
$value = $sanitizer->sanitize($value, $methodName);
}
} else {
// non-array value
$value = $sanitizer->sanitize($value, $methodName);
}
}
if($getArray === true && !is_array($value)) {
$value = array($value);
}
return $value;
} }