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

修正Think\App类中的别名加载方法

Browse Source
This commit is contained in:
thinkphp
2013-03-26 10:53:36 +08:00
parent dcb7fa34f2
commit daec8267ed
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Think/App.php
View File

@@ -39,7 +39,7 @@ class App {
} }
// 加载别名文件 // 加载别名文件
if(is_file(APP_PATH.'alias'.EXT)) { if(is_file(APP_PATH.'alias'.EXT)) {
Loader::import(include APP_PATH.'alias'.EXT); Loader::loadMap(include APP_PATH.'alias'.EXT);
} }
// 加载公共文件 // 加载公共文件
if(is_file(APP_PATH.'common'.EXT)) { if(is_file(APP_PATH.'common'.EXT)) {
@@ -201,12 +201,12 @@ class App {
// 定位模块 // 定位模块
$part = pathinfo($_SERVER['PATH_INFO']); $part = pathinfo($_SERVER['PATH_INFO']);
define('__EXT__', isset($part['extension'])?strtolower($part['extension']):''); define('__EXT__', isset($part['extension'])?strtolower($part['extension']):'');
$_SERVER['PATH_INFO'] = preg_replace('/\.('.trim($config['url_html_suffix'],'.').')$/i', '',$_SERVER['PATH_INFO']); $_SERVER['PATH_INFO'] = trim(preg_replace('/\.('.trim($config['url_html_suffix'],'.').')$/i', '',$_SERVER['PATH_INFO']),'/');
$url = trim($_SERVER['PATH_INFO'],'/'); if($_SERVER['PATH_INFO']) {
if($url) { $paths = explode($config['pathinfo_depr'],$_SERVER['PATH_INFO']);
$paths = explode($config['pathinfo_depr'],$url); // 获取URL中的模块名
if($config['require_module'] && !isset($_GET[$var_m])) { if($config['require_module'] && !isset($_GET[$var_m])) {
$_GET[$var_m] = array_shift($paths); $_GET[$var_m] = array_shift($paths);
$_SERVER['PATH_INFO'] = implode('/',$paths); $_SERVER['PATH_INFO'] = implode('/',$paths);
} }
} }
@@ -227,14 +227,13 @@ class App {
if(is_file(MODULE_PATH.'config'.EXT)) { if(is_file(MODULE_PATH.'config'.EXT)) {
$config = Config::set(include MODULE_PATH.'config'.EXT); $config = Config::set(include MODULE_PATH.'config'.EXT);
} }
if($config['app_status']) { if($config['app_status'] && is_file(MODULE_PATH.$config['app_status'].EXT)) {
// 加载对应的项目配置文件 // 加载对应的项目配置文件
if(is_file(MODULE_PATH.$config['app_status'].EXT)) $config = Config::set(include MODULE_PATH.$config['app_status'].EXT);
$config = Config::set(include MODULE_PATH.$config['app_status'].EXT);
} }
// 加载别名文件 // 加载别名文件
if(is_file(MODULE_PATH.'alias'.EXT)) { if(is_file(MODULE_PATH.'alias'.EXT)) {
Loader::import(include MODULE_PATH.'alias'.EXT); Loader::loadMap(include MODULE_PATH.'alias'.EXT);
} }
// 加载公共文件 // 加载公共文件
if(is_file(MODULE_PATH.'common'.EXT)) { if(is_file(MODULE_PATH.'common'.EXT)) {
@@ -250,8 +249,8 @@ class App {
}else{ }else{
_404('module not exists :'.MODULE_NAME); _404('module not exists :'.MODULE_NAME);
} }
// 路由检测 // 路由检测和控制器、操作解析
Route::check(trim($_SERVER['PATH_INFO'],'/')); Route::check($_SERVER['PATH_INFO']);
// 获取控制器名 // 获取控制器名
define('CONTROLLER_NAME', strtolower(isset($_GET[$var_c])?$_GET[$var_c]:$config['default_controller'])); define('CONTROLLER_NAME', strtolower(isset($_GET[$var_c])?$_GET[$var_c]:$config['default_controller']));