|
@@ -21,105 +21,6 @@ abstract class BridgeAbstract implements BridgeInterface {
|
|
|
return $this->items;
|
|
|
}
|
|
|
|
|
|
- protected function validateTextValue($value, $pattern = null){
|
|
|
- if(!is_null($pattern)){
|
|
|
- $filteredValue = filter_var($value
|
|
|
- , FILTER_VALIDATE_REGEXP
|
|
|
- , array('options' => array(
|
|
|
- 'regexp' => '/^' . $pattern . '$/'
|
|
|
- ))
|
|
|
- );
|
|
|
- } else {
|
|
|
- $filteredValue = filter_var($value);
|
|
|
- }
|
|
|
-
|
|
|
- if($filteredValue === false)
|
|
|
- return null;
|
|
|
-
|
|
|
- return $filteredValue;
|
|
|
- }
|
|
|
-
|
|
|
- protected function validateNumberValue($value){
|
|
|
- $filteredValue = filter_var($value, FILTER_VALIDATE_INT);
|
|
|
-
|
|
|
- if($filteredValue === false && !empty($value))
|
|
|
- return null;
|
|
|
-
|
|
|
- return $filteredValue;
|
|
|
- }
|
|
|
-
|
|
|
- protected function validateCheckboxValue($value){
|
|
|
- $filteredValue = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
|
|
|
-
|
|
|
- if(is_null($filteredValue))
|
|
|
- return null;
|
|
|
-
|
|
|
- return $filteredValue;
|
|
|
- }
|
|
|
-
|
|
|
- protected function validateListValue($value, $expectedValues){
|
|
|
- $filteredValue = filter_var($value);
|
|
|
-
|
|
|
- if($filteredValue === false)
|
|
|
- return null;
|
|
|
-
|
|
|
- if(!in_array($filteredValue, $expectedValues)){ // Check sub-values?
|
|
|
- foreach($expectedValues as $subName => $subValue){
|
|
|
- if(is_array($subValue) && in_array($filteredValue, $subValue))
|
|
|
- return $filteredValue;
|
|
|
- }
|
|
|
- return null;
|
|
|
- }
|
|
|
-
|
|
|
- return $filteredValue;
|
|
|
- }
|
|
|
-
|
|
|
- protected function validateData(&$data){
|
|
|
- if(!is_array($data))
|
|
|
- return false;
|
|
|
-
|
|
|
- foreach($data as $name => $value){
|
|
|
- $registered = false;
|
|
|
- foreach(static::PARAMETERS as $context => $set){
|
|
|
- if(array_key_exists($name, $set)){
|
|
|
- $registered = true;
|
|
|
- if(!isset($set[$name]['type'])){
|
|
|
- $set[$name]['type'] = 'text';
|
|
|
- }
|
|
|
-
|
|
|
- switch($set[$name]['type']){
|
|
|
- case 'number':
|
|
|
- $data[$name] = $this->validateNumberValue($value);
|
|
|
- break;
|
|
|
- case 'checkbox':
|
|
|
- $data[$name] = $this->validateCheckboxValue($value);
|
|
|
- break;
|
|
|
- case 'list':
|
|
|
- $data[$name] = $this->validateListValue($value, $set[$name]['values']);
|
|
|
- break;
|
|
|
- default:
|
|
|
- case 'text':
|
|
|
- if(isset($set[$name]['pattern'])){
|
|
|
- $data[$name] = $this->validateTextValue($value, $set[$name]['pattern']);
|
|
|
- } else {
|
|
|
- $data[$name] = $this->validateTextValue($value);
|
|
|
- }
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if(is_null($data[$name])){
|
|
|
- echo 'Parameter \'' . $name . '\' is invalid!' . PHP_EOL;
|
|
|
- return false;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if(!$registered)
|
|
|
- return false;
|
|
|
- }
|
|
|
-
|
|
|
- return true;
|
|
|
- }
|
|
|
|
|
|
protected function setInputs(array $inputs, $queriedContext){
|
|
|
// Import and assign all inputs to their context
|
|
@@ -256,7 +157,7 @@ abstract class BridgeAbstract implements BridgeInterface {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if(!$this->validateData($inputs)){
|
|
|
+ if(!validateData($inputs, static::PARAMETERS)){
|
|
|
returnClientError('Invalid parameters value(s)');
|
|
|
}
|
|
|
|