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

Support patterns in field name

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8995 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-09-02 07:49:25 +00:00
parent 578d3d6b6e
commit 76999d3054
2 changed files with 77 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,11 @@ class Validator
/**
* @constructor
*/
function Validator($xml_path=''){
function Validator($xml_path='') {
$this->__construct($xml_path);
}
function __construct($xml_path='') {
$this->_rules = array();
$this->_filters = array();
$this->_xml_ruleset = null;
@ -37,6 +41,11 @@ class Validator
$this->setCacheDir('./files/cache');
}
function __destruct() {
$this->_rules = null;
$this->_filters = null;
}
/**
* Load a xml file
* @param[in] string $xml_path A file name to be loaded
@ -119,7 +128,7 @@ class Validator
* @param[in] (optional) array $fields Target fields. The keys of the array represents field's name, its values represents field's value.
* @return bool True if it is valid, FALSE otherwise.
*/
function validate($fields_=null){
function validate($fields_=null) {
if(is_array($fields_)) {
$fields = $fields_;
} else {
@ -127,7 +136,7 @@ class Validator
$fields = (array)Context::getRequestVars();
}
if(!is_array($fields) || !count($fields)) return true;
if(!is_array($fields)) return true;
$filter_default = array(
'required' => 'false',
@ -140,9 +149,27 @@ class Validator
);
$fields = array_map('trim', $fields);
$field_names = implode("\t", array_keys($fields));
$field_names = array_keys($fields);
$filters = $this->_filters;
// get field names matching patterns
foreach($this->_filters as $key=>$filter) {
$names = array();
if($key{0} == '^') {
$names = preg_grep('/^'.preg_quote(substr($key,1)).'/', $field_names);
}
if(!count($names)) continue;
foreach($names as $name) {
$filters[$name] = $filter;
}
unset($filters[$key]);
}
foreach($filters as $key=>$filter) {
$fname = $key;
$exists = array_key_exists($key, $fields);
$filter = array_merge($filter_default, $filter);
@ -183,7 +210,7 @@ class Validator
list($min, $max) = array((int)$min, (int)$max);
$strbytes = strlen($value);
if(!$is_min_b || !$is_max_b){
if(!$is_min_b || !$is_max_b) {
$strlength = $this->_has_mb_func?mb_strlen($value,'utf-8'):$this->mbStrLen($value);
}