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

Controll更改为Controller

Browse Source
This commit is contained in:
thinkphp
2013-03-13 17:46:03 +08:00
parent 4b739dabd7
commit 7b1541e1f8
8 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Think/App.php
View File

@@ -51,12 +51,12 @@ class App {
self::dispatch($config);
// 执行操作
$instance = Loader::controll(CONTROLL_NAME);
$instance = Loader::controller(CONTROLL_NAME);
if(!$instance) {
// 是否定义empty控制器
$instance = Loader::controll('empty');
$instance = Loader::controller('empty');
if(!$instance){
_404('controll not exists :'.CONTROLL_NAME);
_404('controller not exists :'.CONTROLL_NAME);
}
}
@@ -127,13 +127,13 @@ class App {
*/
static public function dispatch($config) {
$var_module = $config['var_module'];
$var_controll = $config['var_controll'];
$var_controll = $config['var_controller'];
$var_action = $config['var_action'];
$var_pathinfo = $config['var_pathinfo'];
if(!empty($_GET[$var_pathinfo])) { // 判断URL里面是否有兼容模式参数
$_SERVER['PATH_INFO'] = $_GET[$var_pathinfo];
unset($_GET[$var_pathinfo]);
}elseif(IS_CLI){ // CLI模式下 index.php module/controll/action/params/...
}elseif(IS_CLI){ // CLI模式下 index.php module/controller/action/params/...
$_SERVER['PATH_INFO'] = isset($_SERVER['argv'][1])?$_SERVER['argv'][1]:'';
}
@@ -239,7 +239,7 @@ class App {
// 行为扩展文件
Tag::import(include MODULE_PATH.'tags'.EXT);
}
$var_controll = $config['var_controll'];
$var_controll = $config['var_controller'];
$var_action = $config['var_action'];
}else{
_404('module not exists :'.MODULE_NAME);
@@ -251,7 +251,7 @@ class App {
// 模块路由检测
if($config['url_route'] && !Route::check($url,$config['url_route_rules'])){
$paths = explode($config['pathinfo_depr'],$url);
if($config['require_controll'] && !isset($_GET[$var_controll])) {
if($config['require_controller'] && !isset($_GET[$var_controll])) {
$_GET[$var_controll] = array_shift($paths);
}
if(!isset($_GET[$var_action])) {
@@ -262,12 +262,12 @@ class App {
preg_replace('@(\w+)\/([^\/]+)@e', '$var[\'\\1\']=strip_tags(\'\\2\');', implode('/',$paths));
$_GET = array_merge($var,$_GET);
}
}elseif(isset($_GET[$var_controll]) && !$config['require_controll']) {
}elseif(isset($_GET[$var_controll]) && !$config['require_controller']) {
unset($_GET[$var_controll]);
}
// 获取控制器名
define('CONTROLL_NAME', strtolower(isset($_GET[$var_controll])?$_GET[$var_controll]:$config['default_controll']));
define('CONTROLLER_NAME', strtolower(isset($_GET[$var_controll])?$_GET[$var_controll]:$config['default_controll']));
// 获取操作名
define('ACTION_NAME', strtolower(isset($_GET[$var_action])?$_GET[$var_action]:$config['default_action']));

8
Think/Behavior/ContentReplace.php
View File

@@ -40,15 +40,15 @@ class ContentReplace {
}
define('ROOT_URL', rtrim(dirname(str_replace("\\","\/",$script_name)),'/'));
define('MODULE_URL', ROOT_URL.(Config::get('require_module')?'/'.MODULE_NAME:''));
define('CONTROLL_URL', MODULE_URL.(Config::get('require_controll')?'/'.CONTROLL_NAME:''));
define('ACTION_URL', CONTROLL_URL.'/'.ACTION_NAME);
define('CONTROLLER_URL', MODULE_URL.(Config::get('require_controller')?'/'.CONTROLLER_NAME:''));
define('ACTION_URL', CONTROLLER_URL.'/'.ACTION_NAME);
// 系统默认的特殊变量替换
$replace = array(
'__ROOT__' => ROOT_URL, // 当前网站地址
'__APP__' => MODULE_URL, // 当前项目地址
'__CONTROLL__' => CONTROLL_URL, // 当前操作地址
'__URL__' => CONTROLL_URL,
'__CONTROLL__' => CONTROLLER_URL, // 当前操作地址
'__URL__' => CONTROLLER_URL,
'__ACTION__' => ACTION_URL, // 当前操作地址
'__SELF__' => $_SERVER['PHP_SELF'], // 当前页面地址
'__PUBLIC__' => ROOT_URL.'/Public',// 站点公共目录

4
Think/Behavior/LocationTemplate.php
View File

@@ -36,9 +36,9 @@ class LocationTemplate {
$template = str_replace(':','/',$template);
if(''==$template) {
// 如果模板文件名为空 按照默认规则定位
$template = CONTROLL_NAME.'/'.ACTION_NAME;
$template = CONTROLLER_NAME.'/'.ACTION_NAME;
}elseif(false === strpos($template,'/')){
$template = CONTROLL_NAME.'/'.$template;
$template = CONTROLLER_NAME.'/'.$template;
}elseif(false === strpos($template,'.')) {
$template = $template;
}

2
Think/Controll.php → Think/Controller.php
View File

@@ -10,7 +10,7 @@
// +----------------------------------------------------------------------
// $Id$
namespace Think;
class Controll {
class Controller {
protected $view = null;
public function __construct(){

8
Think/Loader.php
View File

@@ -168,8 +168,8 @@ class Loader {
* @param string $layer 控制层名称
* @return Action|false
*/
static public function controll($name,$layer='') {
$layer = $layer?$layer:'Controll';
static public function controller($name,$layer='') {
$layer = $layer?$layer:'Controller';
static $_instance = [];
if(isset($_instance[$name.$layer])) return $_instance[$name.$layer];
if(strpos($name,'/')) {
@@ -207,8 +207,8 @@ class Loader {
static public function action($url,$vars=[],$layer='') {
$info = pathinfo($url);
$action = $info['basename'];
$module = '.' != $info['dirname']?$info['dirname']:CONTROLL_NAME;
$class = self::controll($module,$layer);
$module = '.' != $info['dirname']?$info['dirname']:CONTROLLER_NAME;
$class = self::controller($module,$layer);
if($class){
if(is_string($vars)) {
parse_str($vars,$vars);

2
Think/Route.php
View File

@@ -83,7 +83,7 @@ class Route {
if(isset($path)) {
$_GET[Config::get('var_action')] = array_pop($path);
if(!empty($path)) {
$_GET[Config::get('var_controll')] = array_pop($path);
$_GET[Config::get('var_controller')] = array_pop($path);
}
if(!empty($path)) {
$_GET[Config::get('var_module')] = array_pop($path);

4
Think/Url.php
View File

@@ -91,8 +91,8 @@ class Url {
$path = explode($depr,$url);
$var = array();
$var[Config::get('var_action')] = !empty($path)?array_pop($path):ACTION_NAME;
if(Config::get('require_controll')) {
$var[Config::get('var_controll')] = !empty($path)?array_pop($path):CONTROLL_NAME;
if(Config::get('require_controller')) {
$var[Config::get('var_controller')] = !empty($path)?array_pop($path):CONTROLL_NAME;
}
if(Config::get('require_module')) {
$var[Config::get('var_module')] = !empty($path)?array_pop($path):MODULE_NAME;