更新核心类库

This commit is contained in:
thinkphp
2015-01-17 22:26:14 +08:00
parent 223760b65d
commit 5a8e9fffde
41 changed files with 614 additions and 387 deletions

View File

@@ -13,78 +13,160 @@ namespace Think;
class Input {
// 全局过滤规则
static $filter = NULL;
static $filter = null;
/**
* 获取系统变量 支持过滤和默认值
* @access public
* @param string $type 输入数据类型
* @param string $method 输入数据类型
* @param array $args 参数 array(key,filter,default)
* @return mixed
*/
static public function __callStatic($type,$args=[]) {
switch(strtolower($type)) {
case 'get': $input =& $_GET;break;
case 'post': $input =& $_POST;break;
case 'put' : parse_str(file_get_contents('php://input'), $input);break;
case 'param' :
static public function __callStatic($method,$args=[]) {
static $_PUT = null;
$name = $args[0];
$default = isset($args[2]) ? $args[2] : null;
if(strpos($name,'/')){ // 指定修饰符
list($name,$type) = explode('/',$name,2);
}else{ // 默认强制转换为字符串
$type = 's';
}
switch(strtolower($method)) {
case 'get' :
$input =& $_GET;
break;
case 'post' :
$input =& $_POST;
break;
case 'put' :
if(is_null($_PUT)){
parse_str(file_get_contents('php://input'), $_PUT);
}
$input = $_PUT;
break;
case 'param' :
switch($_SERVER['REQUEST_METHOD']) {
case 'POST':
$input = $_POST;
break;
case 'PUT':
parse_str(file_get_contents('php://input'), $input);
if(is_null($_PUT)){
parse_str(file_get_contents('php://input'), $_PUT);
}
$input = $_PUT;
break;
default:
$input = $_GET;
}
break;
case 'request': $input =& $_REQUEST;break;
case 'server': $input =& $_SERVER;break;
case 'cookie': $input =& $_COOKIE;break;
case 'session': $input =& $_SESSION;break;
case 'globals': $input =& $GLOBALS;break;
default:return NULL;
case 'path' :
$input = [];
if(!empty($_SERVER['PATH_INFO'])){
$depr = Config::get('url_pathinfo_depr');
$input = explode($depr,trim($_SERVER['PATH_INFO'],$depr));
}
break;
case 'request' :
$input =& $_REQUEST;
break;
case 'session' :
$input =& $_SESSION;
break;
case 'cookie' :
$input =& $_COOKIE;
break;
case 'server' :
$input =& $_SERVER;
break;
case 'globals' :
$input =& $GLOBALS;
break;
default:
return null;
}
// 变量全局过滤
array_walk_recursive($input,'self::filter_exp');
if(self::$filter) {
$_filters = explode(',',self::$filter);
foreach($_filters as $_filter){
// 全局参数过滤
array_walk_recursive($input,$_filter);
if(''==$name) { // 获取全部变量
$data = $input;
if(isset(self::$filter)) {
$filter = self::$filter;
if(is_string($filters)){
$filters = explode(',',$filters);
}
foreach($filters as $filter){
$data = self::filter($filter,$data); // 参数过滤
}
}
}
if(''== $args[0]) {
// 返回全部数据
return $input;
}elseif(isset($input[$args[0]])) {
$data = $input[$args[0]];
}elseif(isset($input[$name])) { // 取值操作
$data = $input[$name];
if(!empty($args[1])) {
$filters = explode(',',$args[1]);
foreach($filters as $filter){
if(is_callable($filter)) {
$data = is_array($data)?array_map($filter,$data):$filter($data); // 参数过滤
if(is_string($filters)){
if(0 === strpos($filters,'/') && 1 !== preg_match($filters,(string)$data)){
// 支持正则验证
return $default;
}else{
$data = filter_var($data,is_int($filter)?$filter:filter_id($filter));
if(false === $data) {
return isset($args[2])?$args[2]:NULL;
$filters = explode(',',$filters);
}
}elseif(is_int($filters)){
$filters = array($filters);
}
if(is_array($filters)){
foreach($filters as $filter){
if(function_exists($filter)) {
$data = is_array($data) ? self::filter($filter,$data) : $filter($data); // 参数过滤
}else{
$data = filter_var($data,is_int($filter) ? $filter : filter_id($filter));
if(false === $data) {
return $default;
}
}
}
}
}
if(!empty($type)){
switch(strtolower($type)){
case 'a': // 数组
$data = (array)$data;
break;
case 'd': // 数字
$data = (int)$data;
break;
case 'f': // 浮点
$data = (float)$data;
break;
case 'b': // 布尔
$data = (boolean)$data;
break;
case 's': // 字符串
default:
$data = (string)$data;
}
}
}else{
// 不存在指定输入
$data = isset($args[2])?$args[2]:NULL;
}else{ // 变量默认值
$data = $default;
}
is_array($data) && array_walk_recursive($data,'self::filterExp');
return $data;
}
// 过滤表单中的表达式
static private function filter_exp(&$value){
if (in_array(strtolower($value),['exp','or'])){
static public function filterExp(&$value){
// TODO 其他安全过滤
// 过滤查询特殊字符
if(preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOTIN|NOT IN|IN)$/i',$value)){
$value .= ' ';
}
}
static public function filter($filter, $data) {
$result = array();
foreach ($data as $key => $val) {
$result[$key] = is_array($val)
? self::filter($filter, $val)
: call_user_func($filter, $val);
}
return $result;
}
}