Skip to content
This repository was archived by the owner on Jan 4, 2020. It is now read-only.

Commit 17518dd

Browse files
industrialtabletindustrialtablet
committed
Merge remote-tracking branch 'top-think/master'
2 parents e5c6122 + 8314863 commit 17518dd

139 files changed

Lines changed: 19515 additions & 15966 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ThinkPHP/Common/functions.php‎

Lines changed: 917 additions & 706 deletions
Large diffs are not rendered by default.

‎ThinkPHP/Conf/convention.php‎

Lines changed: 122 additions & 122 deletions
Large diffs are not rendered by default.

‎ThinkPHP/Conf/debug.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
/**
1313
* ThinkPHP 默认的调试模式配置文件
1414
*/
15-
defined('THINK_PATH') or exit();
15+
1616
// 调试模式下面默认设置 可以在应用配置目录下重新定义 debug.php 覆盖
17-
return array(
18-
'LOG_RECORD' => true, // 进行日志记录
19-
'LOG_EXCEPTION_RECORD' => true, // 是否记录异常信息日志
20-
'LOG_LEVEL' => 'EMERG,ALERT,CRIT,ERR,WARN,NOTIC,INFO,DEBUG,SQL', // 允许记录的日志级别
21-
'DB_FIELDS_CACHE' => false, // 字段缓存信息
22-
'DB_DEBUG' => true, // 开启调试模式 记录SQL日志
23-
'TMPL_CACHE_ON' => false, // 是否开启模板编译缓存,设为false则每次都会重新编译
24-
'TMPL_STRIP_SPACE' => false, // 是否去除模板文件里面的html空格与换行
25-
'SHOW_ERROR_MSG' => true, // 显示错误信息
26-
'URL_CASE_INSENSITIVE' => false, // URL区分大小写
17+
return array(
18+
'LOG_RECORD' => true, // 进行日志记录
19+
'LOG_EXCEPTION_RECORD' => true, // 是否记录异常信息日志
20+
'LOG_LEVEL' => 'EMERG,ALERT,CRIT,ERR,WARN,NOTIC,INFO,DEBUG,SQL', // 允许记录的日志级别
21+
'DB_FIELDS_CACHE' => false, // 字段缓存信息
22+
'DB_DEBUG' => true, // 开启调试模式 记录SQL日志
23+
'TMPL_CACHE_ON' => false, // 是否开启模板编译缓存,设为false则每次都会重新编译
24+
'TMPL_STRIP_SPACE' => false, // 是否去除模板文件里面的html空格与换行
25+
'SHOW_ERROR_MSG' => true, // 显示错误信息
26+
'URL_CASE_INSENSITIVE' => false, // URL区分大小写
2727
);

‎ThinkPHP/Lang/en-us.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* ThinkPHP English language package
1414
*/
1515
return array(
16-
/* core language package */
16+
/* core language package */
1717
'_MODULE_NOT_EXIST_' => "Module can't be loaded",
18-
'_CONTROLLER_NOT_EXIST_' => "Controller can't be loaded",
18+
'_CONTROLLER_NOT_EXIST_' => "Controller can't be loaded",
1919
'_ERROR_ACTION_' => 'Illegal Action',
2020
'_LANGUAGE_NOT_LOAD_' => "Can't load language package",
2121
'_TEMPLATE_NOT_EXIST_' => "Template doesn't exist",
@@ -32,7 +32,7 @@
3232
'_NO_DB_CONFIG_' => 'Not define the database configuration',
3333
'_NOT_SUPPORT_' => 'The system does not support',
3434
'_CACHE_TYPE_INVALID_' => 'Unable to load the cache type',
35-
'_FILE_NOT_WRITABLE_' => 'Directory (file) is not writable',
35+
'_FILE_NOT_WRITABLE_' => 'Directory (file) is not writable',
3636
'_METHOD_NOT_EXIST_' => 'The method you requested does not exist!',
3737
'_CLASS_NOT_EXIST_' => 'Instantiating a class does not exist！',
3838
'_CLASS_CONFLICT_' => 'Class name conflicts',
@@ -47,5 +47,5 @@
4747
'_RECORD_HAS_UPDATE_' => 'Record has been updated',
4848
'_NOT_ALLOW_PHP_' => 'PHP codes are not allowed in the template',
4949
'_PARAM_ERROR_' => 'Parameter error or undefined',
50-
'_ERROR_QUERY_EXPRESS_' => 'Query express error',
50+
'_ERROR_QUERY_EXPRESS_' => 'Query express error',
5151
);

‎ThinkPHP/Lang/pt-br.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* ThinkPHP Portuguese language package
1414
*/
1515
return array(
16-
/* core language package */
16+
/* core language package */
1717
'_MODULE_NOT_EXIST_' => "Módulo não pode ser carregado",
1818
'_CONTROLLER_NOT_EXIST_' => "Controller não pode ser carregado",
1919
'_ERROR_ACTION_' => 'Ação ilegal',
@@ -32,7 +32,7 @@
3232
'_NO_DB_CONFIG_' => 'Não define a configuração do banco',
3333
'_NOT_SUPPORT_' => 'O sistema não suporta',
3434
'_CACHE_TYPE_INVALID_' => 'Impossível carregar o tipo de cache',
35-
'_FILE_NOT_WRITABLE_' => 'Diretório (arquivo) não pode ser escrito',
35+
'_FILE_NOT_WRITABLE_' => 'Diretório (arquivo) não pode ser escrito',
3636
'_METHOD_NOT_EXIST_' => 'O método solicitado não existe!',
3737
'_CLASS_NOT_EXIST_' => 'Não existe instância da classe',
3838
'_CLASS_CONFLICT_' => 'Conflitos com nome da classe',
@@ -47,5 +47,5 @@
4747
'_RECORD_HAS_UPDATE_' => 'Gravação não foi atualizada',
4848
'_NOT_ALLOW_PHP_' => 'Código PHP não é permitido no template',
4949
'_PARAM_ERROR_' => 'Parâmetro errado ou indefinido',
50-
'_ERROR_QUERY_EXPRESS_' => 'Erros na expressão da query',
50+
'_ERROR_QUERY_EXPRESS_' => 'Erros na expressão da query',
5151
);

‎ThinkPHP/Lang/zh-cn.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* ThinkPHP 简体中文语言包
1414
*/
1515
return array(
16-
/* 核心语言变量 */
16+
/* 核心语言变量 */
1717
'_MODULE_NOT_EXIST_' => '无法加载模块',
18-
'_CONTROLLER_NOT_EXIST_' => '无法加载控制器',
18+
'_CONTROLLER_NOT_EXIST_' => '无法加载控制器',
1919
'_ERROR_ACTION_' => '非法操作',
2020
'_LANGUAGE_NOT_LOAD_' => '无法加载语言包',
2121
'_TEMPLATE_NOT_EXIST_' => '模板不存在',
@@ -32,7 +32,7 @@
3232
'_NO_DB_CONFIG_' => '没有定义数据库配置',
3333
'_NOT_SUPPORT_' => '系统不支持',
3434
'_CACHE_TYPE_INVALID_' => '无法加载缓存类型',
35-
'_FILE_NOT_WRITABLE_' => '目录（文件）不可写',
35+
'_FILE_NOT_WRITABLE_' => '目录（文件）不可写',
3636
'_METHOD_NOT_EXIST_' => '方法不存在！',
3737
'_CLASS_NOT_EXIST_' => '实例化一个不存在的类！',
3838
'_CLASS_CONFLICT_' => '类名冲突',

‎ThinkPHP/Lang/zh-tw.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* ThinkPHP 繁体中文語言包
1414
*/
1515
return array(
16-
/* 核心語言變數 */
16+
/* 核心語言變數 */
1717
'_MODULE_NOT_EXIST_' => '無法載入模組',
1818
'_CONTROLLER_NOT_EXIST_' => '無法載入控制器',
1919
'_ERROR_ACTION_' => '非法操作',
@@ -32,7 +32,7 @@
3232
'_NO_DB_CONFIG_' => '沒有定義資料庫設定',
3333
'_NOT_SUPPORT_' => '系統不支援',
3434
'_CACHE_TYPE_INVALID_' => '無法載入快取類型',
35-
'_FILE_NOT_WRITABLE_' => '目錄（檔案）不可寫',
35+
'_FILE_NOT_WRITABLE_' => '目錄（檔案）不可寫',
3636
'_METHOD_NOT_EXIST_' => '方法不存在！',
3737
'_CLASS_NOT_EXIST_' => '實例化一個不存在的類別！',
3838
'_CLASS_CONFLICT_' => '類別名稱衝突',
@@ -47,5 +47,5 @@
4747
'_RECORD_HAS_UPDATE_' => '記錄已經更新',
4848
'_NOT_ALLOW_PHP_' => '模板禁用PHP代碼',
4949
'_PARAM_ERROR_' => '參數錯誤或者未定義',
50-
'_ERROR_QUERY_EXPRESS_' => '錯誤的查詢條件',
50+
'_ERROR_QUERY_EXPRESS_' => '錯誤的查詢條件',
5151
);

‎ThinkPHP/Library/Behavior/AgentCheckBehavior.class.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
// | Author: liu21st <liu21st@gmail.com>
1010
// +----------------------------------------------------------------------
1111
namespace Behavior;
12+
1213
/**
1314
* 行为扩展：代理检测
1415
*/
15-
class AgentCheckBehavior {
16-
public function run(&$params) {
16+
class AgentCheckBehavior
17+
{
18+
public function run(&$params)
19+
{
1720
// 代理访问检测
18-
$limitProxyVisit = C('LIMIT_PROXY_VISIT',null,true);
19-
if($limitProxyVisit && ($_SERVER['HTTP_X_FORWARDED_FOR'] || $_SERVER['HTTP_VIA'] || $_SERVER['HTTP_PROXY_CONNECTION'] || $_SERVER['HTTP_USER_AGENT_VIA'])) {
21+
$limitProxyVisit = C('LIMIT_PROXY_VISIT', null, true);
22+
if ($limitProxyVisit && ($_SERVER['HTTP_X_FORWARDED_FOR'] || $_SERVER['HTTP_VIA'] || $_SERVER['HTTP_PROXY_CONNECTION'] || $_SERVER['HTTP_USER_AGENT_VIA'])) {
2023
// 禁止代理访问
2124
exit('Access Denied');
2225
}

‎ThinkPHP/Library/Behavior/BorisBehavior.class.php‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,37 @@
99
// | Author: liu21st <liu21st@gmail.com>
1010
// +----------------------------------------------------------------------
1111
namespace Behavior;
12+
1213
use Think\Think;
14+
1315
/**
1416
* Boris行为扩展
1517
*/
16-
class BorisBehavior {
17-
public function run(&$params) {
18-
if(IS_CLI){
19-
if(!function_exists('pcntl_signal'))
18+
class BorisBehavior
19+
{
20+
public function run(&$params)
21+
{
22+
if (IS_CLI) {
23+
if (!function_exists('pcntl_signal')) {
2024
E("pcntl_signal not working.\nRepl mode based on Linux OS or PHP for OS X(http://php-osx.liip.ch/)\n");
25+
}
26+
2127
Think::addMap(array(
22-
'Boris\Boris' => VENDOR_PATH . 'Boris/Boris.php',
23-
'Boris\Config' => VENDOR_PATH . 'Boris/Config.php',
24-
'Boris\CLIOptionsHandler' => VENDOR_PATH . 'Boris/CLIOptionsHandler.php',
25-
'Boris\ColoredInspector' => VENDOR_PATH . 'Boris/ColoredInspector.php',
26-
'Boris\DumpInspector' => VENDOR_PATH . 'Boris/DumpInspector.php',
27-
'Boris\EvalWorker' => VENDOR_PATH . 'Boris/EvalWorker.php',
28-
'Boris\ExportInspector' => VENDOR_PATH . 'Boris/ExportInspector.php',
29-
'Boris\Inspector' => VENDOR_PATH . 'Boris/Inspector.php',
30-
'Boris\ReadlineClient' => VENDOR_PATH . 'Boris/ReadlineClient.php',
31-
'Boris\ShallowParser' => VENDOR_PATH . 'Boris/ShallowParser.php',
28+
'Boris\Boris' => VENDOR_PATH . 'Boris/Boris.php',
29+
'Boris\Config' => VENDOR_PATH . 'Boris/Config.php',
30+
'Boris\CLIOptionsHandler' => VENDOR_PATH . 'Boris/CLIOptionsHandler.php',
31+
'Boris\ColoredInspector' => VENDOR_PATH . 'Boris/ColoredInspector.php',
32+
'Boris\DumpInspector' => VENDOR_PATH . 'Boris/DumpInspector.php',
33+
'Boris\EvalWorker' => VENDOR_PATH . 'Boris/EvalWorker.php',
34+
'Boris\ExportInspector' => VENDOR_PATH . 'Boris/ExportInspector.php',
35+
'Boris\Inspector' => VENDOR_PATH . 'Boris/Inspector.php',
36+
'Boris\ReadlineClient' => VENDOR_PATH . 'Boris/ReadlineClient.php',
37+
'Boris\ShallowParser' => VENDOR_PATH . 'Boris/ShallowParser.php',
3238
));
33-
$boris = new \Boris\Boris(">>> ");
34-
$config = new \Boris\Config();
39+
$boris = new \Boris\Boris(">>> ");
40+
$config = new \Boris\Config();
3541
$config->apply($boris, true);
36-
$options = new \Boris\CLIOptionsHandler();
42+
$options = new \Boris\CLIOptionsHandler();
3743
$options->handle($boris);
3844
$boris->onStart(sprintf("echo 'REPL MODE FOR THINKPHP \nTHINKPHP_VERSION: %s, PHP_VERSION: %s, BORIS_VERSION: %s\n';", THINK_VERSION, PHP_VERSION, $boris::VERSION));
3945
$boris->start();

‎ThinkPHP/Library/Behavior/BrowserCheckBehavior.class.php‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,29 @@
99
// | Author: liu21st <liu21st@gmail.com>
1010
// +----------------------------------------------------------------------
1111
namespace Behavior;
12+
1213
/**
1314
* 浏览器防刷新检测
1415
*/
15-
class BrowserCheckBehavior {
16-
public function run(&$params) {
17-
if($_SERVER['REQUEST_METHOD'] == 'GET') {
18-
// 启用页面防刷新机制
19-
$guid = md5($_SERVER['PHP_SELF']);
16+
class BrowserCheckBehavior
17+
{
18+
public function run(&$params)
19+
{
20+
if ('GET' == $_SERVER['REQUEST_METHOD']) {
21+
// 启用页面防刷新机制
22+
$guid = md5($_SERVER['PHP_SELF']);
2023
// 浏览器防刷新的时间间隔（秒） 默认为10
21-
$refleshTime = C('LIMIT_REFLESH_TIMES',null,10);
24+
$refleshTime = C('LIMIT_REFLESH_TIMES', null, 10);
2225
// 检查页面刷新间隔
23-
if(cookie('_last_visit_time_'.$guid) && cookie('_last_visit_time_'.$guid)>time()-$refleshTime) {
26+
if (cookie('_last_visit_time_' . $guid) && cookie('_last_visit_time_' . $guid) > time() - $refleshTime) {
2427
// 页面刷新读取浏览器缓存
2528
header('HTTP/1.1 304 Not Modified');
2629
exit;
27-
}else{
30+
} else {
2831
// 缓存当前地址访问时间
29-
cookie('_last_visit_time_'.$guid, $_SERVER['REQUEST_TIME']);
32+
cookie('_last_visit_time_' . $guid, $_SERVER['REQUEST_TIME']);
3033
//header('Last-Modified:'.(date('D,d M Y H:i:s',$_SERVER['REQUEST_TIME']-C('LIMIT_REFLESH_TIMES'))).' GMT');
3134
}
3235
}
3336
}
34-
}
37+
}

0 commit comments

Comments
 (0)