fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 18 : fix a bug for applying default value

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8470 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-06-09 06:43:01 +00:00
parent 8120131863
commit 7107bc0d77
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
classes/validator/Validator.class.php
View file

@ -30,7 +30,7 @@ class Validator
'url' => '/^(https?|ftp|mms):\/\/[0-9a-z-]+(\.[_0-9a-z-]+)+(:[0-9]+)/',
'alpha' => '/^[a-z]*$/i',
'alpha_number' => '/^[a-z][a-z0-9_]*$/i',
'number' => '/^[1-9][0-9]*$/'
'number' => '/^(?:[1-9]\\d*|0)$/'
));
$this->_has_mb_func = is_callable('mb_strlen');
@ -117,7 +117,7 @@ class Validator
if(!is_array($fields)) return true;
$filter_default = array(
'default' => 0,
'default' => '',
'modifiers' => array(),
'length' => 0,
'equalto' => 0,
@ -130,20 +130,21 @@ class Validator
$filter = array_merge($filter_default, $filter);
// attr : default
if(!$value && ($default=trim($filter['default']))) {
if(!$value && strlen($default=trim($filter['default']))) {
$value = $default;
if(is_null($fields_)) Context::set($key, $value);
else $fields_[$key] = $value;
}
$value_len = strlen($value);
// attr : modifier
if(is_string($modifiers=$filter['modifiers'])) $modifiers = explode(',', trim($modifiers));
// attr : required
if(!$value && $filter['required'] === 'true') return $this->error($key, '');
if($filter['required'] === 'true' && !$value_len) return $this->error($key, '');
// if the field wasn't passed, ignore this value
if(!$exists && !$value) continue;
if(!$exists && !$value_len) continue;
// attr : length
if($length=$filter['length']){