PSR规范调整

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

View File

@@ -10,15 +10,18 @@
// +----------------------------------------------------------------------
namespace think\behavior;
use think\Config;
/**
* 系统行为扩展:模板内容输出替换
*/
class ContentReplace {
class ContentReplace
{
// 行为扩展的执行入口必须是run
public function run(&$content){
public function run(&$content)
{
$content = $this->templateContentReplace($content);
}
@@ -28,12 +31,13 @@ class ContentReplace {
* @param string $content 模板内容
* @return string
*/
protected function templateContentReplace($content) {
protected function templateContentReplace($content)
{
if(IS_CGI) {
//CGI/FASTCGI模式下
$_temp = explode('.php',$_SERVER['PHP_SELF']);
$script_name = rtrim(str_replace($_SERVER['HTTP_HOST'],'',$_temp[0].'.php'),'/');
}else {
} else {
$script_name = rtrim($_SERVER['SCRIPT_NAME'],'/');
}
define('ROOT_URL', rtrim(dirname(str_replace("\\","\/",$script_name)),'/'));
@@ -52,8 +56,9 @@ class ContentReplace {
'__PUBLIC__' => ROOT_URL.'/Public',// 站点公共目录
];
// 允许用户自定义模板的字符串替换
if(is_array(Config::get('tmpl_parse_string')) )
if(is_array(Config::get('tmpl_parse_string')) ){
$replace = array_merge($replace,Config::get('tmpl_parse_string'));
}
$content = str_replace(array_keys($replace),array_values($replace),$content);
return $content;
}

View File

@@ -14,12 +14,14 @@ namespace think\behavior;
/**
* 系统行为扩展:定位模板文件
*/
class LocationTemplate {
class LocationTemplate
{
// 行为扩展的执行入口必须是run
public function run(&$templateFile){
public function run(&$templateFile)
{
// 自动定位模板文件
if(!is_file($templateFile)){
$templateFile = $this->parseTemplateFile($templateFile);
if (!is_file($templateFile)) {
$templateFile = $this->parseTemplateFile($templateFile);
}
}
@@ -29,17 +31,18 @@ class LocationTemplate {
* @param string $templateFile 文件名
* @return string
*/
private function parseTemplateFile($template) {
$template = str_replace(':','/',$template);
if(''==$template) {
private function parseTemplateFile($template)
{
$template = str_replace(':', '/', $template);
if ('' == $template) {
// 如果模板文件名为空 按照默认规则定位
$template = CONTROLLER_NAME.'/'.ACTION_NAME;
}elseif(false === strpos($template,'/')){
$template = CONTROLLER_NAME.'/'.$template;
}elseif(false === strpos($template,'.')) {
$template = $template;
$template = CONTROLLER_NAME . '/' . ACTION_NAME;
} elseif (false === strpos($template, '/')) {
$template = CONTROLLER_NAME . '/' . $template;
} elseif (false === strpos($template, '.')) {
$template = $template;
}
$templateFile = MODULE_PATH.'view/'.$template.'.html';
$templateFile = MODULE_PATH . 'view/' . $template . '.html';
return $templateFile;
}
}

View File

@@ -18,20 +18,23 @@ namespace think\behavior;
* @subpackage Behavior
* @author liu21st <liu21st@gmail.com>
*/
class ReadHtmlCache {
protected $options = [
'HTML_CACHE_ON' => false,
'HTML_CACHE_TIME' => 60,
'HTML_CACHE_RULES' => [],
'HTML_FILE_SUFFIX' => '.html',
];
class ReadHtmlCache
{
protected $options = [
'HTML_CACHE_ON' => false,
'HTML_CACHE_TIME' => 60,
'HTML_CACHE_RULES' => [],
'HTML_FILE_SUFFIX' => '.html',
];
// 行为扩展的执行入口必须是run
public function run(&$params){
public function run(&$params)
{
// 开启静态缓存
if(C('HTML_CACHE_ON')) {
$cacheTime = $this->requireHtmlCache();
if( false !== $cacheTime && $this->checkHTMLCache(HTML_FILE_NAME,$cacheTime)) { //静态页面有效
if (C('HTML_CACHE_ON')) {
$cacheTime = self::requireHtmlCache();
if (false !== $cacheTime && self::checkHTMLCache(HTML_FILE_NAME, $cacheTime)) {
//静态页面有效
// 读取静态页面输出
readfile(HTML_FILE_NAME);
exit();
@@ -40,49 +43,54 @@ class ReadHtmlCache {
}
// 判断是否需要静态缓存
static private function requireHtmlCache() {
private static function requireHtmlCache()
{
// 分析当前的静态规则
$htmls = C('HTML_CACHE_RULES'); // 读取静态规则
if(!empty($htmls)) {
$htmls = C('HTML_CACHE_RULES'); // 读取静态规则
if (!empty($htmls)) {
$htmls = array_change_key_case($htmls);
// 静态规则文件定义格式 actionName=>array('静态规则','缓存时间','附加规则')
// 'read'=>array('{id},{name}',60,'md5') 必须保证静态规则的唯一性 和 可判断性
// 检测静态规则
$moduleName = strtolower(MODULE_NAME);
$actionName = strtolower(ACTION_NAME);
if(isset($htmls[$moduleName.':'.$actionName])) {
$html = $htmls[$moduleName.':'.$actionName]; // 某个模块的操作的静态规则
}elseif(isset($htmls[$moduleName.':'])){// 某个模块的静态规则
$html = $htmls[$moduleName.':'];
}elseif(isset($htmls[$actionName])){
$html = $htmls[$actionName]; // 所有操作的静态规则
}elseif(isset($htmls['*'])){
$html = $htmls['*']; // 全局静态规则
}elseif(isset($htmls['empty:index']) && !class_exists(MODULE_NAME.'Action')){
$html = $htmls['empty:index']; // 空模块静态规则
}elseif(isset($htmls[$moduleName.':_empty']) && $this->isEmptyAction(MODULE_NAME,ACTION_NAME)){
$html = $htmls[$moduleName.':_empty']; // 空操作静态规则
if (isset($htmls[$moduleName . ':' . $actionName])) {
$html = $htmls[$moduleName . ':' . $actionName]; // 某个模块的操作的静态规则
} elseif (isset($htmls[$moduleName . ':'])) {
// 某个模块的静态规则
$html = $htmls[$moduleName . ':'];
} elseif (isset($htmls[$actionName])) {
$html = $htmls[$actionName]; // 所有操作的静态规则
} elseif (isset($htmls['*'])) {
$html = $htmls['*']; // 全局静态规则
} elseif (isset($htmls['empty:index']) && !class_exists(MODULE_NAME . 'Action')) {
$html = $htmls['empty:index']; // 空模块静态规则
} elseif (isset($htmls[$moduleName . ':_empty']) && self::isEmptyAction(MODULE_NAME, ACTION_NAME)) {
$html = $htmls[$moduleName . ':_empty']; // 空操作静态规则
}
if(!empty($html)) {
if (!empty($html)) {
// 解读静态规则
$rule = $html[0];
$rule = $html[0];
// 以$_开头的系统变量
$rule = preg_replace('/{\$(_\w+)\.(\w+)\|(\w+)}/e',"\\3(\$\\1['\\2'])",$rule);
$rule = preg_replace('/{\$(_\w+)\.(\w+)}/e',"\$\\1['\\2']",$rule);
$rule = preg_replace('/{\$(_\w+)\.(\w+)\|(\w+)}/e', "\\3(\$\\1['\\2'])", $rule);
$rule = preg_replace('/{\$(_\w+)\.(\w+)}/e', "\$\\1['\\2']", $rule);
// {ID|FUN} GET变量的简写
$rule = preg_replace('/{(\w+)\|(\w+)}/e',"\\2(\$_GET['\\1'])",$rule);
$rule = preg_replace('/{(\w+)}/e',"\$_GET['\\1']",$rule);
$rule = preg_replace('/{(\w+)\|(\w+)}/e', "\\2(\$_GET['\\1'])", $rule);
$rule = preg_replace('/{(\w+)}/e', "\$_GET['\\1']", $rule);
// 特殊系统变量
$rule = str_ireplace(
['{:app}','{:module}','{:action}','{:group}'],
[APP_NAME,MODULE_NAME,ACTION_NAME,defined('GROUP_NAME')?GROUP_NAME:''],
$rule = str_ireplace(
['{:app}', '{:module}', '{:action}', '{:group}'],
[APP_NAME, MODULE_NAME, ACTION_NAME, defined('GROUP_NAME') ? GROUP_NAME : ''],
$rule);
// {|FUN} 单独使用函数
$rule = preg_replace('/{|(\w+)}/e',"\\1()",$rule);
if(!empty($html[2])) $rule = $html[2]($rule); // 应用附加函数
$cacheTime = isset($html[1])?$html[1]:C('HTML_CACHE_TIME'); // 缓存有效期
$rule = preg_replace('/{|(\w+)}/e', "\\1()", $rule);
if (!empty($html[2])) {
$rule = $html[2]($rule);
}
// 应用附加函数
$cacheTime = isset($html[1]) ? $html[1] : C('HTML_CACHE_TIME'); // 缓存有效期
// 当前缓存文件
define('HTML_FILE_NAME',HTML_PATH . $rule.C('HTML_FILE_SUFFIX'));
define('HTML_FILE_NAME', HTML_PATH . $rule . C('HTML_FILE_SUFFIX'));
return $cacheTime;
}
}
@@ -98,15 +106,16 @@ class ReadHtmlCache {
* @param integer $cacheTime 缓存有效期
* @return boolen
*/
static public function checkHTMLCache($cacheFile='',$cacheTime='') {
if(!is_file($cacheFile)){
public static function checkHTMLCache($cacheFile = '', $cacheTime = '')
{
if (!is_file($cacheFile)) {
return false;
}elseif (filemtime(C('TEMPLATE_NAME')) > filemtime($cacheFile)) {
} elseif (filemtime(C('TEMPLATE_NAME')) > filemtime($cacheFile)) {
// 模板文件如果更新静态文件需要更新
return false;
}elseif(!is_numeric($cacheTime) && function_exists($cacheTime)){
} elseif (!is_numeric($cacheTime) && function_exists($cacheTime)) {
return $cacheTime($cacheFile);
}elseif ($cacheTime != 0 && NOW_TIME > filemtime($cacheFile)+$cacheTime) {
} elseif (0 != $cacheTime && NOW_TIME > filemtime($cacheFile) + $cacheTime) {
// 文件是否在有效期
return false;
}
@@ -115,10 +124,11 @@ class ReadHtmlCache {
}
//检测是否是空操作
static private function isEmptyAction($module,$action) {
$className = $module.'Action';
$class = new $className;
return !method_exists($class,$action);
private static function isEmptyAction($module, $action)
{
$className = $module . 'Action';
$class = new $className;
return !method_exists($class, $action);
}
}

View File

@@ -10,9 +10,10 @@
// +----------------------------------------------------------------------
namespace think\behavior;
use think\Config;
use think\Log;
use think\Debug;
use think\Log;
/**
* 系统行为扩展页面Trace显示输出
@@ -21,11 +22,13 @@ use think\Debug;
* @subpackage Behavior
* @author liu21st <liu21st@gmail.com>
*/
class ShowPageTrace {
class ShowPageTrace
{
// 行为扩展的执行入口必须是run
public function run(&$params){
if(!IS_AJAX && Config::get('show_page_trace')) {
public function run(&$params)
{
if (!IS_AJAX && Config::get('show_page_trace')) {
echo $this->showTrace();
}
}
@@ -34,57 +37,59 @@ class ShowPageTrace {
* 显示页面Trace信息
* @access private
*/
private function showTrace() {
// 系统默认显示信息
$files = get_included_files();
$info = [];
foreach ($files as $key=>$file){
$info[] = $file.' ( '.number_format(filesize($file)/1024,2).' KB )';
private function showTrace()
{
// 系统默认显示信息
$files = get_included_files();
$info = [];
foreach ($files as $key => $file) {
$info[] = $file . ' ( ' . number_format(filesize($file) / 1024, 2) . ' KB )';
}
$trace = [];
Debug::remark('START',NOW_TIME);
$base = [
'请求信息' => date('Y-m-d H:i:s',$_SERVER['REQUEST_TIME']).' '.$_SERVER['SERVER_PROTOCOL'].' '.$_SERVER['REQUEST_METHOD'].' : '.$_SERVER['PHP_SELF'],
'运行时间' => Debug::getUseTime('START','END',6).'s',
'内存开销' => MEMORY_LIMIT_ON?G('START','END','m').'b':'不支持',
'查询信息' => N('db_query').' queries '.N('db_write').' writes ',
'文件加载' => count($files),
'缓存信息' => N('cache_read').' gets '.N('cache_write').' writes ',
'配置加载' => count(Config::get()),
];
$trace = [];
Debug::remark('START', NOW_TIME);
$base = [
'请求信息' => date('Y-m-d H:i:s', $_SERVER['REQUEST_TIME']) . ' ' . $_SERVER['SERVER_PROTOCOL'] . ' ' . $_SERVER['REQUEST_METHOD'] . ' : ' . $_SERVER['PHP_SELF'],
'运行时间' => Debug::getUseTime('START', 'END', 6) . 's',
'内存开销' => MEMORY_LIMIT_ON ? G('START', 'END', 'm') . 'b' : '不支持',
'查询信息' => N('db_query') . ' queries ' . N('db_write') . ' writes ',
'文件加载' => count($files),
'缓存信息' => N('cache_read') . ' gets ' . N('cache_write') . ' writes ',
'配置加载' => count(Config::get()),
];
// 读取项目定义的Trace文件
$traceFile = MODULE_PATH.'trace.php';
if(is_file($traceFile)) {
$base = array_merge($base,include $traceFile);
$traceFile = MODULE_PATH . 'trace.php';
if (is_file($traceFile)) {
$base = array_merge($base, include $traceFile);
}
$debug = Log::getLog();
$tabs = Config::get('trace_page_tabs');
foreach ($tabs as $name=>$title){
switch(strtoupper($name)) {
case 'BASE':// 基本信息
$trace[$title] = $base;
$debug = Log::getLog();
$tabs = Config::get('trace_page_tabs');
foreach ($tabs as $name => $title) {
switch (strtoupper($name)) {
case 'BASE': // 基本信息
$trace[$title] = $base;
break;
case 'FILE': // 文件信息
$trace[$title] = $info;
$trace[$title] = $info;
break;
default:// 调试信息
$name = strtoupper($name);
if(strpos($name,'|')) {// 多组信息
$array = explode('|',$name);
$result = [];
foreach($array as $name){
$result += isset($debug[$name])?$debug[$name]:[];
default: // 调试信息
$name = strtoupper($name);
if (strpos($name, '|')) {
// 多组信息
$array = explode('|', $name);
$result = [];
foreach ($array as $name) {
$result += isset($debug[$name]) ? $debug[$name] : [];
}
$trace[$title] = $result;
}else{
$trace[$title] = isset($debug[$name])?$debug[$name]:'';
$trace[$title] = $result;
} else {
$trace[$title] = isset($debug[$name]) ? $debug[$name] : '';
}
}
}
unset($files,$info,$base,$debug);
unset($files, $info, $base, $debug);
// 调用Trace页面模板
ob_start();
include Config::has('tmpl_trace_file') ? Config::get('tmpl_trace_file') : THINK_PATH.'tpl/page_trace.tpl';
include Config::has('tmpl_trace_file') ? Config::get('tmpl_trace_file') : THINK_PATH . 'tpl/page_trace.tpl';
return ob_get_clean();
}
}

View File

@@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
namespace think\behavior;
/**
* 系统行为扩展:表单令牌生成
* @category Think
@@ -17,45 +18,49 @@ namespace think\behavior;
* @subpackage Behavior
* @author liu21st <liu21st@gmail.com>
*/
class TokenBuild extends Behavior {
class TokenBuild extends Behavior
{
// 行为参数定义
protected $options = [
'TOKEN_ON' => false, // 开启令牌验证
'TOKEN_NAME' => '__hash__', // 令牌验证的表单隐藏字段名称
'TOKEN_TYPE' => 'md5', // 令牌验证哈希规则
'TOKEN_RESET' => true, // 令牌错误后是否重置
protected $options = [
'TOKEN_ON' => false, // 开启令牌验证
'TOKEN_NAME' => '__hash__', // 令牌验证的表单隐藏字段名称
'TOKEN_TYPE' => 'md5', // 令牌验证哈希规则
'TOKEN_RESET' => true, // 令牌错误后是否重置
];
public function run(&$content){
if(C('TOKEN_ON')) {
if(strpos($content,'{__TOKEN__}')) {
public function run(&$content)
{
if (C('TOKEN_ON')) {
if (strpos($content, '{__TOKEN__}')) {
// 指定表单令牌隐藏域位置
$content = str_replace('{__TOKEN__}',$this->buildToken(),$content);
}elseif(preg_match('/<\/form(\s*)>/is',$content,$match)) {
$content = str_replace('{__TOKEN__}', $this->buildToken(), $content);
} elseif (preg_match('/<\/form(\s*)>/is', $content, $match)) {
// 智能生成表单令牌隐藏域
$content = str_replace($match[0],$this->buildToken().$match[0],$content);
$content = str_replace($match[0], $this->buildToken() . $match[0], $content);
}
}else{
$content = str_replace('{__TOKEN__}','',$content);
} else {
$content = str_replace('{__TOKEN__}', '', $content);
}
}
// 创建表单令牌
private function buildToken() {
$tokenName = C('TOKEN_NAME');
$tokenType = C('TOKEN_TYPE');
if(!isset($_SESSION[$tokenName])) {
$_SESSION[$tokenName] = [];
private function buildToken()
{
$tokenName = C('TOKEN_NAME');
$tokenType = C('TOKEN_TYPE');
if (!isset($_SESSION[$tokenName])) {
$_SESSION[$tokenName] = [];
}
// 标识当前页面唯一性
$tokenKey = md5($_SERVER['REQUEST_URI']);
if(isset($_SESSION[$tokenName][$tokenKey])) {// 相同页面不重复生成session
$tokenKey = md5($_SERVER['REQUEST_URI']);
if (isset($_SESSION[$tokenName][$tokenKey])) {
// 相同页面不重复生成session
$tokenValue = $_SESSION[$tokenName][$tokenKey];
}else{
$tokenValue = $tokenType(microtime(true));
$_SESSION[$tokenName][$tokenKey] = $tokenValue;
} else {
$tokenValue = $tokenType(microtime(true));
$_SESSION[$tokenName][$tokenKey] = $tokenValue;
}
$token = '<input type="hidden" name="'.$tokenName.'" value="'.$tokenKey.'_'.$tokenValue.'" />';
$token = '<input type="hidden" name="' . $tokenName . '" value="' . $tokenKey . '_' . $tokenValue . '" />';
return $token;
}
}