应用模块的命名空间调整 为 app根命名空间(可设置APP_NAMESPACE常量)

并且支持没有模块的情况(模块为空) default_module参数和COMMON_MODULE常量设置为空字符串
This commit is contained in:
thinkphp
2016-01-02 18:41:53 +08:00
parent f4c498d3c3
commit e33ec863fe
6 changed files with 84 additions and 58 deletions

View File

@@ -43,15 +43,21 @@ class Url
$url = str_replace('/', $depr, $url);
}
// 解析模块、控制器和操作
$url = trim($url, $depr);
$path = explode($depr, $url);
$var = [];
$var['action'] = !empty($path) ? array_pop($path) : ACTION_NAME;
$url = trim($url, $depr);
$path = explode($depr, $url);
$var = [];
if (!defined('BIND_ACTION')) {
$var['action'] = !empty($path) ? array_pop($path) : ACTION_NAME;
}
if (!defined('BIND_CONTROLLER')) {
$var['controller'] = !empty($path) ? array_pop($path) : CONTROLLER_NAME;
}
if (!defined('BIND_MODULE')) {
$var['module'] = !empty($path) ? array_pop($path) : MODULE_NAME;
if (!empty($path)) {
$var['module'] = array_pop($path);
} elseif (MODULE_NAME) {
$var['module'] = MODULE_NAME;
}
}
}
}