代码格式规范调整

This commit is contained in:
麦当苗儿
2013-04-15 17:29:20 +08:00
parent 9b1a67881e
commit 834546a99f

View File

@@ -26,16 +26,16 @@ class Route {
static private $domain = []; static private $domain = [];
// 添加URL映射规则 // 添加URL映射规则
static public function map($map,$route=''){ static public function map($map, $route = ''){
if(is_array($map)) { if(is_array($map)) {
self::$map = array_merge(self::$map,$map); self::$map = array_merge(self::$map, $map);
}else{ }else{
self::$map[$map] = $route; self::$map[$map] = $route;
} }
} }
// 添加子域名部署规则 // 添加子域名部署规则
static public function domain($domain,$rule=''){ static public function domain($domain, $rule = ''){
if(is_array($domain)) { if(is_array($domain)) {
self::$domain = array_merge(self::$domain,$domain); self::$domain = array_merge(self::$domain,$domain);
}else{ }else{
@@ -44,45 +44,45 @@ class Route {
} }
// 注册路由规则 // 注册路由规则
static public function register($rule,$route='',$type='GET',$option=[]){ static public function register($rule, $route = '', $type = 'GET', $option = []){
if(strpos($type,'|')) { if(strpos($type, '|')) {
foreach (explode('|',$type) as $val){ foreach (explode('|', $type) as $val){
self::register($rule,$route,$val,$option); self::register($rule, $route, $val, $option);
} }
}else{ }else{
if(is_array($rule)) { if(is_array($rule)) {
foreach ($rule as $key=>$val){ foreach ($rule as $key => $val){
self::$rules[$type][$key] = ['route'=>$val,'option'=>$option]; self::$rules[$type][$key] = ['route' => $val, 'option' => $option];
} }
}else{ }else{
self::$rules[$type][$rule] = ['route'=>$route,'option'=>$option]; self::$rules[$type][$rule] = ['route' => $route, 'option' => $option];
} }
} }
} }
// 注册任意请求的路由规则 // 注册任意请求的路由规则
static public function any($rule,$route='',$option=[]){ static public function any($rule, $route = '', $option = []){
self::register($rule,$route,'*',$option); self::register($rule, $route, '*', $option);
} }
// 注册get请求的路由规则 // 注册get请求的路由规则
static public function get($rule,$route='',$option=[]){ static public function get($rule, $route = '', $option = []){
self::register($rule,$route,'GET',$option); self::register($rule, $route, 'GET', $option);
} }
// 注册post请求的路由规则 // 注册post请求的路由规则
static public function post($rule,$route='',$option=[]){ static public function post($rule, $route = '', $option = []){
self::register($rule,$route,'POST',$option); self::register($rule, $route, 'POST', $option);
} }
// 注册put请求的路由规则 // 注册put请求的路由规则
static public function put($rule,$route='',$option=[]){ static public function put($rule, $route = '', $option = []){
self::register($rule,$route,'PUT',$option); self::register($rule, $route, 'PUT', $option);
} }
// 注册delete请求的路由规则 // 注册delete请求的路由规则
static public function delete($rule,$route='',$option=[]){ static public function delete($rule, $route = '', $option = []){
self::register($rule,$route,'DELETE',$option); self::register($rule, $route, 'DELETE', $option);
} }
// 检测子域名部署 // 检测子域名部署
@@ -93,17 +93,17 @@ class Route {
if(isset($rules[$_SERVER['HTTP_HOST']])) { // 完整域名或者IP配置 if(isset($rules[$_SERVER['HTTP_HOST']])) { // 完整域名或者IP配置
$rule = $rules[$_SERVER['HTTP_HOST']]; $rule = $rules[$_SERVER['HTTP_HOST']];
}else{// 子域名配置 }else{// 子域名配置
$domain = array_slice(explode('.',$_SERVER['HTTP_HOST']),0,-2); $domain = array_slice(explode('.', $_SERVER['HTTP_HOST']), 0, -2);
if(!empty($domain)) { if(!empty($domain)) {
$subDomain = implode('.',$domain); $subDomain = implode('.', $domain);
$domain2 = array_pop($domain); // 二级域名 $domain2 = array_pop($domain); // 二级域名
if($domain) { // 存在三级域名 if($domain) { // 存在三级域名
$domain3 = array_pop($domain); $domain3 = array_pop($domain);
} }
if($subDomain && isset($rules[$subDomain])) { // 子域名配置 if($subDomain && isset($rules[$subDomain])) { // 子域名配置
$rule = $rules[$subDomain]; $rule = $rules[$subDomain];
}elseif(isset($rules['*.'.$domain2]) && !empty($domain3)){ // 泛三级域名 }elseif(isset($rules['*.' . $domain2]) && !empty($domain3)){ // 泛三级域名
$rule = $rules['*.'.$domain2]; $rule = $rules['*.' . $domain2];
$panDomain = $domain3; $panDomain = $domain3;
}elseif(isset($rules['*']) && !empty($domain2)){ // 泛二级域名 }elseif(isset($rules['*']) && !empty($domain2)){ // 泛二级域名
if('www' != $domain2 ) { if('www' != $domain2 ) {
@@ -125,9 +125,9 @@ class Route {
if(is_array($rule)) { if(is_array($rule)) {
$_GET[Config::get('var_module')] = $rule[0]; $_GET[Config::get('var_module')] = $rule[0];
if(isset($rule[1])) { // 传入参数 if(isset($rule[1])) { // 传入参数
parse_str($rule[1],$parms); parse_str($rule[1], $parms);
if(isset($panDomain)) { if(isset($panDomain)) {
$pos = array_search('*',$parms); $pos = array_search('*', $parms);
if(false !== $pos) { if(false !== $pos) {
// 泛域名作为参数 // 泛域名作为参数
$parms[$pos] = $panDomain; $parms[$pos] = $panDomain;
@@ -147,14 +147,14 @@ class Route {
// 优先检测是否存在PATH_INFO // 优先检测是否存在PATH_INFO
if(empty($regx)) $regx = '/' ; if(empty($regx)) $regx = '/' ;
// 分隔符替换 确保路由定义使用统一的分隔符 // 分隔符替换 确保路由定义使用统一的分隔符
$regx = str_replace(Config::get('pathinfo_depr'),'/',$regx); $regx = str_replace(Config::get('pathinfo_depr'), '/', $regx);
if(isset(self::$map[$regx])) { // URL映射 if(isset(self::$map[$regx])) { // URL映射
return self::parseUrl(self::$map[$regx]); return self::parseUrl(self::$map[$regx]);
} }
// 获取当前请求类型的路由规则 // 获取当前请求类型的路由规则
$rules = self::$rules[REQUEST_METHOD]; $rules = self::$rules[REQUEST_METHOD];
if(!empty(self::$rules['*'])) { // 合并任意请求的路由规则 if(!empty(self::$rules['*'])) { // 合并任意请求的路由规则
$rules = array_merge(self::$rules['*'],$rules); $rules = array_merge(self::$rules['*'], $rules);
} }
// 路由规则检测 // 路由规则检测
if(!empty($rules)) { if(!empty($rules)) {
@@ -176,32 +176,32 @@ class Route {
continue; continue;
} }
} }
if(0===strpos($rule,'/') && preg_match($rule,$regx,$matches)) { // 正则路由 if(0 === strpos($rule, '/') && preg_match($rule, $regx, $matches)) { // 正则路由
if($route instanceof \Closure) { if($route instanceof \Closure) {
// 执行闭包并中止 // 执行闭包并中止
self::invokeRegx($route,$matches); self::invokeRegx($route, $matches);
exit; exit;
}else{ }else{
return self::parseRegex($matches,$route,$regx); return self::parseRegex($matches, $route, $regx);
} }
}else{ // 规则路由 }else{ // 规则路由
$len1 = substr_count($regx,'/'); $len1 = substr_count($regx, '/');
$len2 = substr_count($rule,'/'); $len2 = substr_count($rule, '/');
if($len1>=$len2) { if($len1 >= $len2) {
if('$' == substr($rule,-1,1)) {// 完整匹配 if('$' == substr($rule, -1, 1)) {// 完整匹配
if($len1 != $len2) { if($len1 != $len2) {
continue; continue;
}else{ }else{
$rule = substr($rule,0,-1); $rule = substr($rule, 0, -1);
} }
} }
if(false !== $var = self::match($regx,$rule)){ if(false !== $var = self::match($regx, $rule)){
if($route instanceof \Closure) { if($route instanceof \Closure) {
// 执行闭包并中止 // 执行闭包并中止
self::invokeRule($route,$var); self::invokeRule($route, $var);
exit; exit;
}else{ }else{
return self::parseRule($rule,$route,$regx); return self::parseRule($rule, $route, $regx);
} }
} }
} }
@@ -225,7 +225,7 @@ class Route {
} }
// 执行正则匹配下的闭包方法 支持参数调用 // 执行正则匹配下的闭包方法 支持参数调用
static private function invokeRegx($closure,$var=[]) { static private function invokeRegx($closure, $var = []) {
$reflect = new \ReflectionFunction($closure); $reflect = new \ReflectionFunction($closure);
$params = $reflect->getParameters(); $params = $reflect->getParameters();
$args = []; $args = [];
@@ -242,7 +242,7 @@ class Route {
} }
// 执行规则匹配下的闭包方法 支持参数调用 // 执行规则匹配下的闭包方法 支持参数调用
static private function invokeRule($closure,$var=[]) { static private function invokeRule($closure, $var = []) {
$reflect = new \ReflectionFunction($closure); $reflect = new \ReflectionFunction($closure);
$params = $reflect->getParameters(); $params = $reflect->getParameters();
$args = []; $args = [];
@@ -259,10 +259,10 @@ class Route {
// 解析模块的URL地址 // 解析模块的URL地址
static private function parseUrl($url) { static private function parseUrl($url) {
if('/'==$url) { if('/' == $url) {
return ; return ;
} }
$paths = explode('/',$url); $paths = explode('/', $url);
$var_c = Config::get('var_controller'); $var_c = Config::get('var_controller');
$var_a = Config::get('var_action'); $var_a = Config::get('var_action');
if(Config::get('require_controller') && !isset($_GET[$var_c])) { if(Config::get('require_controller') && !isset($_GET[$var_c])) {
@@ -273,22 +273,22 @@ class Route {
} }
// 解析剩余的URL参数 // 解析剩余的URL参数
$var = []; $var = [];
preg_replace('@(\w+)\/([^\/]+)@e', '$var[\'\\1\']=strip_tags(\'\\2\');', implode('/',$paths)); preg_replace('@(\w+)\/([^\/]+)@e', '$var[\'\\1\']=strip_tags(\'\\2\');', implode('/', $paths));
$_GET = array_merge($var,$_GET); $_GET = array_merge($var, $_GET);
} }
// 解析规范的路由地址 // 解析规范的路由地址
// 地址格式 [控制器/操作?]参数1=值1&参数2=值2... // 地址格式 [控制器/操作?]参数1=值1&参数2=值2...
static private function parseRoute($url) { static private function parseRoute($url) {
$var = []; $var = [];
if(false !== strpos($url,'?')) { // [控制器/操作?]参数1=值1&参数2=值2... if(false !== strpos($url, '?')) { // [控制器/操作?]参数1=值1&参数2=值2...
$info = parse_url($url); $info = parse_url($url);
$path = explode('/',$info['path']); $path = explode('/', $info['path']);
parse_str($info['query'],$var); parse_str($info['query'], $var);
}elseif(strpos($url,'/')){ // [控制器/操作] }elseif(strpos($url, '/')){ // [控制器/操作]
$path = explode('/',$url); $path = explode('/', $url);
}else{ // 参数1=值1&参数2=值2... }else{ // 参数1=值1&参数2=值2...
parse_str($url,$var); parse_str($url, $var);
} }
if(isset($path)) { if(isset($path)) {
$_GET[Config::get('var_action')] = array_pop($path); $_GET[Config::get('var_action')] = array_pop($path);
@@ -300,29 +300,29 @@ class Route {
} }
// 检测URL和规则路由是否匹配 // 检测URL和规则路由是否匹配
static private function match($regx,$rule) { static private function match($regx, $rule) {
$m1 = explode('/',$regx); $m1 = explode('/', $regx);
$m2 = explode('/',$rule); $m2 = explode('/', $rule);
$var = []; $var = [];
foreach ($m2 as $key=>$val){ foreach ($m2 as $key=>$val){
if(0===strpos($val,':')) {// 动态变量 if(0 === strpos($val, ':')) {// 动态变量
if(strpos($val,'\\')) { if(strpos($val, '\\')) {
$type = substr($val,-1); $type = substr($val, -1);
if('d'==$type && !is_numeric($m1[$key])) { if('d' == $type && !is_numeric($m1[$key])) {
return false; return false;
} }
$name = substr($val,1,-2); $name = substr($val, 1, -2);
}elseif($pos = strpos($val,'^')){ }elseif($pos = strpos($val, '^')){
$array = explode('|',substr(strstr($val,'^'),1)); $array = explode('|', substr(strstr($val, '^'), 1));
if(in_array($m1[$key],$array)) { if(in_array($m1[$key], $array)) {
return false; return false;
} }
$name = substr($val,1,$pos-1); $name = substr($val, 1, $pos - 1);
}else{ }else{
$name = substr($val,1); $name = substr($val, 1);
} }
$var[$name] = $m1[$key]; $var[$name] = $m1[$key];
}elseif(0 !== strcasecmp($val,$m1[$key])){ }elseif(0 !== strcasecmp($val, $m1[$key])){
return false; return false;
} }
} }
@@ -339,56 +339,56 @@ class Route {
// 外部地址中可以用动态变量 采用 :1 :2 的方式 // 外部地址中可以用动态变量 采用 :1 :2 的方式
// 'news/:month/:day/:id'=>array('News/read?cate=1','status=1'), // 'news/:month/:day/:id'=>array('News/read?cate=1','status=1'),
// 'new/:id'=>array('/new.php?id=:1',301), 重定向 // 'new/:id'=>array('/new.php?id=:1',301), 重定向
static private function parseRule($rule,$route,$regx) { static private function parseRule($rule, $route, $regx) {
// 获取路由地址规则 // 获取路由地址规则
$url = is_array($route)?$route[0]:$route; $url = is_array($route) ? $route[0] : $route;
// 获取URL地址中的参数 // 获取URL地址中的参数
$paths = explode('/',$regx); $paths = explode('/', $regx);
// 解析路由规则 // 解析路由规则
$matches = []; $matches = [];
$rule = explode('/',$rule); $rule = explode('/', $rule);
foreach ($rule as $item){ foreach ($rule as $item){
if(0===strpos($item,':')) { // 动态变量获取 if(0 === strpos($item, ':')) { // 动态变量获取
if($pos = strpos($item,'^') ) { if($pos = strpos($item, '^') ) {
$var = substr($item,1,$pos-1); $var = substr($item, 1, $pos - 1);
}elseif(strpos($item,'\\')){ }elseif(strpos($item, '\\')){
$var = substr($item,1,-2); $var = substr($item, 1, -2);
}else{ }else{
$var = substr($item,1); $var = substr($item, 1);
} }
$matches[$var] = array_shift($paths); $matches[$var] = array_shift($paths);
}else{ // 过滤URL中的静态变量 }else{ // 过滤URL中的静态变量
array_shift($paths); array_shift($paths);
} }
} }
if(0=== strpos($url,'/') || 0===strpos($url,'http')) { // 路由重定向跳转 if(0 === strpos($url, '/') || 0 === strpos($url, 'http')) { // 路由重定向跳转
if(strpos($url,':')) { // 传递动态参数 if(strpos($url, ':')) { // 传递动态参数
$values = array_values($matches); $values = array_values($matches);
$url = preg_replace('/:(\d+)/e','$values[\\1-1]',$url); $url = preg_replace('/:(\d+)/e', '$values[\\1-1]', $url);
} }
header("Location: $url", true,(is_array($route) && isset($route[1]))?$route[1]:301); header("Location: $url", true, (is_array($route) && isset($route[1])) ? $route[1] : 301);
exit; exit;
}else{ }else{
// 解析路由地址 // 解析路由地址
$var = self::parseRoute($url); $var = self::parseRoute($url);
// 解析路由地址里面的动态参数 // 解析路由地址里面的动态参数
$values = array_values($matches); $values = array_values($matches);
foreach ($var as $key=>$val){ foreach ($var as $key => $val){
if(0===strpos($val,':')) { if(0 === strpos($val, ':')) {
$var[$key] = $values[substr($val,1)-1]; $var[$key] = $values[substr($val, 1) - 1];
} }
} }
$var = array_merge($matches,$var); $var = array_merge($matches, $var);
// 解析剩余的URL参数 // 解析剩余的URL参数
if($paths) { if($paths) {
preg_replace('@(\w+)\/([^\/]+)@e', '$var[strtolower(\'\\1\')]=strip_tags(\'\\2\');', implode('/',$paths)); preg_replace('@(\w+)\/([^\/]+)@e', '$var[strtolower(\'\\1\')]=strip_tags(\'\\2\');', implode('/', $paths));
} }
// 解析路由自动传人参数 // 解析路由自动传人参数
if(is_array($route) && isset($route[1])) { if(is_array($route) && isset($route[1])) {
parse_str($route[1],$params); parse_str($route[1], $params);
$var = array_merge($var,$params); $var = array_merge($var, $params);
} }
$_GET = array_merge($var,$_GET); $_GET = array_merge($var, $_GET);
} }
} }
@@ -400,27 +400,27 @@ class Route {
// 参数值和外部地址中可以用动态变量 采用 :1 :2 的方式 // 参数值和外部地址中可以用动态变量 采用 :1 :2 的方式
// '/new\/(\d+)\/(\d+)/'=>array('News/read?id=:1&page=:2&cate=1','status=1'), // '/new\/(\d+)\/(\d+)/'=>array('News/read?id=:1&page=:2&cate=1','status=1'),
// '/new\/(\d+)/'=>array('/new.php?id=:1&page=:2&status=1','301'), 重定向 // '/new\/(\d+)/'=>array('/new.php?id=:1&page=:2&status=1','301'), 重定向
static private function parseRegex($matches,$route,$regx) { static private function parseRegex($matches, $route, $regx) {
// 获取路由地址规则 // 获取路由地址规则
$url = is_array($route)?$route[0]:$route; $url = is_array($route) ? $route[0] : $route;
$url = preg_replace('/:(\d+)/e','$matches[\\1]',$url); $url = preg_replace('/:(\d+)/e', '$matches[\\1]', $url);
if(0=== strpos($url,'/') || 0===strpos($url,'http')) { // 路由重定向跳转 if(0 === strpos($url, '/') || 0 === strpos($url, 'http')) { // 路由重定向跳转
header("Location: $url", true,(is_array($route) && isset($route[1]))?$route[1]:301); header("Location: $url", true, (is_array($route) && isset($route[1])) ? $route[1] : 301);
exit; exit;
}else{ }else{
// 解析路由地址 // 解析路由地址
$var = self::parseRoute($url); $var = self::parseRoute($url);
// 解析剩余的URL参数 // 解析剩余的URL参数
$regx = substr_replace($regx,'',0,strlen($matches[0])); $regx = substr_replace($regx, '', 0, strlen($matches[0]));
if($regx) { if($regx) {
preg_replace('@(\w+)\/([^,\/]+)@e', '$var[strtolower(\'\\1\')]=strip_tags(\'\\2\');', $regx); preg_replace('@(\w+)\/([^,\/]+)@e', '$var[strtolower(\'\\1\')]=strip_tags(\'\\2\');', $regx);
} }
// 解析路由自动传人参数 // 解析路由自动传人参数
if(is_array($route) && isset($route[1])) { if(is_array($route) && isset($route[1])) {
parse_str($route[1],$params); parse_str($route[1], $params);
$var = array_merge($var,$params); $var = array_merge($var, $params);
} }
$_GET = array_merge($var,$_GET); $_GET = array_merge($var, $_GET);
} }
} }
} }