mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 05:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

PSR规范调整

Browse Source
This commit is contained in:
thinkphp
2015-10-04 13:05:15 +08:00
parent 1cfb3704c6
commit 27e724bb3c
135 changed files with 9426 additions and 11556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
library/think/controller.php
View File

@@ -10,38 +10,41 @@
// +----------------------------------------------------------------------
namespace think;
use think\View;
class Controller {
class Controller
{
// 视图类实例
protected $view = null;
protected $config = [
'before_action_list' => [],
'success_tmpl' => '',
'error_tmpl' => '',
protected $view = null;
protected $config = [
'before_action_list' => [],
'success_tmpl' => '',
'error_tmpl' => '',
];
/**
* 架构函数 初始化视图类 并采用内置模板引擎
* @access public
*/
public function __construct($config=[]){
public function __construct($config = [])
{
// 模板引擎参数
$this->view = new View();
$this->config(empty($config)? Config::get() : $config);
$this->view = new View();
$this->config(empty($config) ? Config::get() : $config);
// 控制器初始化
if(method_exists($this, '_initialize')){
if (method_exists($this, '_initialize')) {
$this->_initialize();
}
// 前置操作方法
// 支持 ['action1','action2'] 或者 ['action1'=>['only'=>'index'],'action2'=>'except'=>'login']
$list = $this->config['before_action_list'];
if($list){
foreach($list as $method=>$options){
is_numeric($method)?
$this->beforeAction($options):
$this->beforeAction($method,$options);
$list = $this->config['before_action_list'];
if ($list) {
foreach ($list as $method => $options) {
is_numeric($method) ?
$this->beforeAction($options) :
$this->beforeAction($method, $options);
}
}
}
@@ -52,11 +55,12 @@ class Controller {
* @param array $config 视图参数
* @return View
*/
public function config($config=[]){
if(is_array($config)){
foreach($this->config as $key=>$val){
if(isset($config[$key])){
$this->config[$key] = $config[$key];
public function config($config = [])
{
if (is_array($config)) {
foreach ($this->config as $key => $val) {
if (isset($config[$key])) {
$this->config[$key] = $config[$key];
}
}
return $this;
@@ -65,11 +69,12 @@ class Controller {
/**
* 前置操作
* @access protected
* @access protected
* @param string $method 前置操作方法名
* @param array $options 调用参数 ['only'=>[...]] 或者['except'=>[...]]
*/
protected function beforeAction($method, $options=[]) {
protected function beforeAction($method, $options = [])
{
if (isset($options['only'])) {
if (!in_array(ACTION_NAME, $options['only'])) {
return;
@@ -93,7 +98,8 @@ class Controller {
* @param string $cache_id 模板缓存标识
* @return mixed
*/
public function fetch($template = '', $vars = [], $cache_id = ''){
public function fetch($template = '', $vars = [], $cache_id = '')
{
return $this->view->fetch($template, $vars, $cache_id);
}
@@ -104,8 +110,9 @@ class Controller {
* @param array $vars 模板输出变量
* @return mixed
*/
public function show($content, $vars = []){
return $this->view->fetch($content, $vars,'',true);
public function show($content, $vars = [])
{
return $this->view->fetch($content, $vars, '', true);
}
/**
@@ -115,7 +122,8 @@ class Controller {
* @param mixed $value 变量的值
* @return void
*/
public function assign($name, $value = ''){
public function assign($name, $value = '')
{
$this->view->assign($name, $value);
}
@@ -126,8 +134,9 @@ class Controller {
* @param String $type AJAX返回数据格式
* @return void
*/
protected function ajaxReturn($data, $type='') {
Response::returnData($data,$type);
protected function ajaxReturn($data, $type = '')
{
Response::returnData($data, $type);
}
/**
@@ -138,7 +147,8 @@ class Controller {
* @param mixed $ajax 是否为Ajax方式 当数字时指定跳转时间
* @return void
*/
protected function error($message, $jumpUrl = '', $ajax = false) {
protected function error($message, $jumpUrl = '', $ajax = false)
{
return $this->dispatchJump($message, 0, $jumpUrl, $ajax);
}
@@ -150,7 +160,8 @@ class Controller {
* @param mixed $ajax 是否为Ajax方式 当数字时指定跳转时间
* @return void
*/
protected function success($message, $jumpUrl = '', $ajax = false) {
protected function success($message, $jumpUrl = '', $ajax = false)
{
return $this->dispatchJump($message, 1, $jumpUrl, $ajax);
}
@@ -165,8 +176,10 @@ class Controller {
* @param mixed $ajax 是否为Ajax方式 当数字时指定跳转时间
* @return void
*/
private function dispatchJump($message, $status = 1, $jumpUrl = '', $ajax = false) {
if(true === $ajax || IS_AJAX) {// AJAX提交
private function dispatchJump($message, $status = 1, $jumpUrl = '', $ajax = false)
{
if (true === $ajax || IS_AJAX) {
// AJAX提交
$data = is_array($ajax) ? $ajax : [];
$data['info'] = $message;
$data['status'] = $status;
@@ -174,34 +187,42 @@ class Controller {
$this->ajaxReturn($data);
}
// 模板变量
$data = [];
if(is_int($ajax))
$data['waitSecond'] = $ajax;
if(!empty($jumpUrl))
$data['jumpUrl'] = $jumpUrl;
$data = [];
if (is_int($ajax)) {
$data['waitSecond'] = $ajax;
}
if (!empty($jumpUrl)) {
$data['jumpUrl'] = $jumpUrl;
}
// 提示标题
$data['msgTitle'] = Lang::get( $status ? '_OPERATION_SUCCESS_' : '_OPERATION_FAIL_');
$data['status'] = $status; // 状态
$data['msgTitle'] = Lang::get($status ? '_OPERATION_SUCCESS_' : '_OPERATION_FAIL_');
$data['status'] = $status; // 状态
//保证输出不受静态缓存影响
Config::set('html_cache_on',false);
if($status) { //发送成功信息
$data['message'] = $message;// 提示信息
Config::set('html_cache_on', false);
if ($status) {
//发送成功信息
$data['message'] = $message; // 提示信息
// 成功操作后默认停留1秒
$data['waitSecond'] = '1';
// 默认操作成功自动返回操作前页面
if(!$jumpUrl)
$data["jumpUrl"] = $_SERVER["HTTP_REFERER"];
return $this->display(Config::get('success_tmpl'),$data);
}else{
$data['error'] = $message;// 提示信息
if (!$jumpUrl) {
$data["jumpUrl"] = $_SERVER["HTTP_REFERER"];
}
return $this->display(Config::get('success_tmpl'), $data);
} else {
$data['error'] = $message; // 提示信息
//发生错误时候默认停留3秒
$data['waitSecond'] = '3';
// 默认发生错误的话自动返回上页
if(!$jumpUrl)
$data['jumpUrl'] = 'javascript:history.back(-1);';
return $this->display(Config::get('error_tmpl'),$data);
if (!$jumpUrl) {
$data['jumpUrl'] = 'javascript:history.back(-1);';
}
return $this->display(Config::get('error_tmpl'), $data);
}
}
}