mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善路由规则

Browse Source
This commit is contained in:
thinkphp
2015-12-02 19:08:13 +08:00
parent 59f71a86bb
commit 14c134dc46
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
library/think/route.php
View File

@@ -286,7 +286,7 @@ class Route
{ {
$len1 = substr_count($regx, '/'); $len1 = substr_count($regx, '/');
$len2 = substr_count($rule, '/'); $len2 = substr_count($rule, '/');
if ($len1 >= $len2) { if ($len1 >= $len2 || strpos($rule, '[')) {
if ('$' == substr($rule, -1, 1)) { if ('$' == substr($rule, -1, 1)) {
// 完整匹配 // 完整匹配
if ($len1 != $len2) { if ($len1 != $len2) {
@@ -410,7 +410,14 @@ class Route
$m2 = explode('/', $rule); $m2 = explode('/', $rule);
$var = []; $var = [];
foreach ($m2 as $key => $val) { foreach ($m2 as $key => $val) {
if (0 === strpos($val, '[:')) {
$val = substr($val, 1, -1);
}
if (0 === strpos($val, ':')) { if (0 === strpos($val, ':')) {
if ($pos = strpos($val, '|')) {
// 使用函数过滤
$val = substr($val, 1, $pos - 1);
}
// 动态变量 // 动态变量
if (strpos($val, '\\')) { if (strpos($val, '\\')) {
$type = substr($val, -1); $type = substr($val, -1);
@@ -419,7 +426,7 @@ class Route
} }
$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;
} }
@@ -455,8 +462,17 @@ class Route
$matches = []; $matches = [];
$rule = explode('/', $rule); $rule = explode('/', $rule);
foreach ($rule as $item) { foreach ($rule as $item) {
$fun = '';
if (0 === strpos($item, '[:')) {
$item = substr($item, 1, -1);
}
if (0 === strpos($item, ':')) { if (0 === strpos($item, ':')) {
// 动态变量获取 // 动态变量获取
if ($pos = strpos($item, '|')) {
// 支持函数过滤
$fun = substr($item, $pos + 1);
$item = substr($item, 0, $pos);
}
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, '\\')) {
@@ -465,6 +481,10 @@ class Route
$var = substr($item, 1); $var = substr($item, 1);
} }
$matches[$var] = array_shift($paths); $matches[$var] = array_shift($paths);
if (!empty($fun)) {
$matches[$var] = $fun($matches[$var]);
}
} else { } else {
// 过滤URL中的静态变量 // 过滤URL中的静态变量
array_shift($paths); array_shift($paths);