molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新内核，API接口开发的一些尝试，后期会增加API接口开发这块

Browse Source
This commit is contained in:
molong
2017-05-22 20:48:10 +08:00
parent a4d58f9f09
commit 426195eb90
47 changed files with 1339 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/library/think/Validate.php
View File

@@ -456,11 +456,13 @@ class Validate
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则
* @param array $data 数据
* @return bool
*/
protected function egt($value, $rule)
protected function egt($value, $rule, $data)
{
return $value >= $rule;
$val = $this->getDataValue($data, $rule);
return !is_null($val) && $value >= $val;
}
/**
@@ -468,11 +470,13 @@ class Validate
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则
* @param array $data 数据
* @return bool
*/
protected function gt($value, $rule)
protected function gt($value, $rule, $data)
{
return $value > $rule;
$val = $this->getDataValue($data, $rule);
return !is_null($val) && $value > $val;
}
/**
@@ -480,11 +484,13 @@ class Validate
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则
* @param array $data 数据
* @return bool
*/
protected function elt($value, $rule)
protected function elt($value, $rule, $data)
{
return $value <= $rule;
$val = $this->getDataValue($data, $rule);
return !is_null($val) && $value <= $val;
}
/**
@@ -492,11 +498,13 @@ class Validate
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则
* @param array $data 数据
* @return bool
*/
protected function lt($value, $rule)
protected function lt($value, $rule, $data)
{
return $value < $rule;
$val = $this->getDataValue($data, $rule);
return !is_null($val) && $value < $val;
}
/**
@@ -1180,13 +1188,15 @@ class Validate
/**
* 获取数据值
* @access protected
* @param array $data 数据
* @param string $key 数据标识 支持二维
* @param array $data 数据
* @param string $key 数据标识 支持二维
* @return mixed
*/
protected function getDataValue($data, $key)
{
if (strpos($key, '.')) {
if (is_numeric($key)) {
$value = $key;
} elseif (strpos($key, '.')) {
// 支持二维数组验证
list($name1, $name2) = explode('.', $key);
$value = isset($data[$name1][$name2]) ? $data[$name1][$name2] : null;