adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changing 'allowEmpty' for model validation, adding 'required' and enabling multiple rules per field

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4934 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-04-30 06:24:33 +00:00
parent c62c550e3f
commit d3c3d34dce
1 changed files with 42 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
cake/libs/model/model.php
View file

@ -1690,41 +1690,49 @@ class Model extends Overloadable {
$Validation = new Validation(); $Validation = new Validation();
foreach($this->validate as $fieldName => $validator) { foreach($this->validate as $fieldName => $ruleSet) {
if (!is_array($validator) && isset($data[$fieldName])) { if (!is_array($ruleSet) || (is_array($ruleSet) && isset($ruleSet['rule']))) {
$validator = array('rule' => $validator); $ruleSet = array($ruleSet);
} }
$validator = am(array( foreach ($ruleSet as $validator) {
'allowEmpty' => true, if (!is_array($validator)) {
'message' => 'This field cannot be left blank', $validator = array('rule' => $validator);
'rule' => 'blank', }
'on' => null
), $validator);
if (empty($validator['on']) || ($validator['on'] == 'create' && !$this->exists()) || ($validator['on'] == 'update' && $this->exists())) { $validator = am(array(
if (empty($data[$fieldName]) && $validator['allowEmpty'] == false) { 'allowEmpty' => true,
$this->invalidate($fieldName, $validator['message']); 'required' => false,
} elseif (isset($data[$fieldName])) { 'message' => 'This field cannot be left blank',
if (is_array($validator['rule'])) { 'rule' => 'blank',
$rule = $validator['rule'][0]; 'last' => false,
unset($validator['rule'][0]); 'on' => null
$ruleParams = am(array($data[$fieldName]), array_values($validator['rule'])); ), $validator);
} else {
$rule = $validator['rule'];
$ruleParams = array($data[$fieldName]);
}
$valid = true; if (empty($validator['on']) || ($validator['on'] == 'create' && !$this->exists()) || ($validator['on'] == 'update' && $this->exists())) {
if (method_exists($this, $rule)) { if ((!isset($data[$fieldName]) && $validator['required'] == true) || (isset($data[$fieldName]) && empty($data[$fieldName]) && $validator['allowEmpty'] == false)) {
$valid = call_user_func_array(array(&$this, $rule), $ruleParams);
} elseif (method_exists($Validation, $rule)) {
$valid = call_user_func_array(array(&$Validation, $rule), $ruleParams);
} elseif (!is_array($validator['rule'])) {
$valid = preg_match($rule, $data[$fieldName]);
}
if (!$valid) {
$this->invalidate($fieldName, $validator['message']); $this->invalidate($fieldName, $validator['message']);
} elseif (isset($data[$fieldName])) {
if (is_array($validator['rule'])) {
$rule = $validator['rule'][0];
unset($validator['rule'][0]);
$ruleParams = am(array($data[$fieldName]), array_values($validator['rule']));
} else {
$rule = $validator['rule'];
$ruleParams = array($data[$fieldName]);
}
$valid = true;
if (method_exists($this, $rule)) {
$valid = call_user_func_array(array(&$this, $rule), $ruleParams);
} elseif (method_exists($Validation, $rule)) {
$valid = call_user_func_array(array(&$Validation, $rule), $ruleParams);
} elseif (!is_array($validator['rule'])) {
$valid = preg_match($rule, $data[$fieldName]);
}
if (!$valid) {
$this->invalidate($fieldName, $validator['message']);
}
} }
} }
} }
@ -1738,10 +1746,13 @@ class Model extends Overloadable {
* @param mixed $value * @param mixed $value
* @return void * @return void
*/ */
function invalidate($field, $value = 1) { function invalidate($field, $value = null) {
if (!is_array($this->validationErrors)) { if (!is_array($this->validationErrors)) {
$this->validationErrors = array(); $this->validationErrors = array();
} }
if (empty($value)) {
$value = true;
}
$this->validationErrors[$field] = $value; $this->validationErrors[$field] = $value;
} }
/** /**