注释和规范化调整及完善

注释和规范化调整及完善,以及部分代码优化
This commit is contained in:
yicheng
2015-12-06 01:56:10 +08:00
parent 491e33af8f
commit 47335634e9
37 changed files with 385 additions and 187 deletions

View File

@@ -41,8 +41,8 @@ class ContentReplace
$script_name = rtrim($_SERVER['SCRIPT_NAME'],'/');
}
define('ROOT_URL', rtrim(dirname(str_replace("\\","\/",$script_name)),'/'));
define('MODULE_URL', ROOT_URL.'/'.(defined('MODULE_ALIAS')?MODULE_ALIAS:MODULE_NAME);
define('CONTROLLER_URL', MODULE_URL.'/'.CONTROLLER_NAME;
define('MODULE_URL', ROOT_URL.'/'.(defined('MODULE_ALIAS')?MODULE_ALIAS:MODULE_NAME));
define('CONTROLLER_URL', MODULE_URL.'/'.CONTROLLER_NAME);
define('ACTION_URL', CONTROLLER_URL.'/'.ACTION_NAME);
// 系统默认的特殊变量替换

View File

@@ -27,9 +27,12 @@ class LocationTemplate
/**
* 自动定位模板文件
* @access private
* @param string $templateFile 文件名
* @access private
*
* @param $template
*
* @return string
* @internal param string $templateFile 文件名
*/
private function parseTemplateFile($template)
{
@@ -39,8 +42,6 @@ class LocationTemplate
$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';
return $templateFile;

View File

@@ -104,7 +104,7 @@ class ReadHtmlCache
* @access public
* @param string $cacheFile 静态文件名
* @param integer $cacheTime 缓存有效期
* @return boolen
* @return bool
*/
public static function checkHTMLCache($cacheFile = '', $cacheTime = '')
{

View File

@@ -8,8 +8,8 @@
// +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
namespace think\behavior;
use think\Behavior;
/**
* 系统行为扩展:表单令牌生成