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

简化mvc类的命名

Browse Source
This commit is contained in:
thinkphp
2015-01-22 08:43:17 +08:00
parent 562a56a9ab
commit 5c86723d02
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Think/App.php
View File

@@ -212,11 +212,11 @@ class App {
// URL后缀
define('__EXT__', strtolower(pathinfo($_SERVER['PATH_INFO'],PATHINFO_EXTENSION)));
$_SERVER['PATH_INFO'] = __INFO__;
if(!defined('BIND_MODULE')){
if($config['url_deny_suffix'] && preg_match('/\.('.$config['url_deny_suffix'].')$/i', $_SERVER['PATH_INFO'])){
if(__INFO__ && !defined('BIND_MODULE')){
if($config['url_deny_suffix'] && preg_match('/\.('.$config['url_deny_suffix'].')$/i', __INFO__)){
exit;
}
$paths = explode($config['pathinfo_depr'], $_SERVER['PATH_INFO']);
$paths = explode($config['pathinfo_depr'], __INFO__,2);
// 获取URL中的模块名
if($config['require_module'] && !isset($_GET[$config['var_module']])) {
$_GET[$config['var_module']] = array_shift($paths);

11
Library/Think/Loader.php
View File

@@ -33,7 +33,6 @@ class Loader {
$path = APP_PATH;
}
$filename = $path . str_replace('\\', '/', str_replace('\\_','\\',strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $class), "_")))) . EXT;
var_dump($filename);
if(is_file($filename)) {
include $filename;
}
@@ -138,8 +137,7 @@ class Loader {
}else{
$module = MODULE_NAME;
}
$layer = ucwords($layer);
$class = $module . '\\' . $layer . '\\' . parse_name($name, 1). $layer;
$class = $module . '\\' . $layer . '\\' . parse_name($name, 1);
if(class_exists($class)) {
$model = new $class($name);
}else {
@@ -166,14 +164,13 @@ class Loader {
}else{
$module = MODULE_NAME;
}
$layer = ucwords($layer);
$class = $module . '\\' . $layer . '\\' . parse_name($name, 1) . $layer;
$class = $module . '\\' . $layer . '\\' . parse_name($name, 1) ;
if(class_exists($class)) {
$action = new $class;
$_instance[$name . $layer] = $action;
return $action;
}elseif(class_exists($module . '\\' . $layer . '\\Empty' . $layer)){
$class = $module . '\\' . $layer . '\\Empty' . $layer;
}elseif(class_exists($module . '\\' . $layer . '\\Empty')){
$class = $module . '\\' . $layer . '\\Empty';
return new $class;
}else{
return false;