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

改进View类

Browse Source
This commit is contained in:
thinkphp
2013-04-06 18:31:34 +08:00
parent c0fc7e2971
commit 5ed6af8363
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Think/View.php
View File

@@ -22,10 +22,13 @@ class View {
'http_cache_control' => 'private', 'http_cache_control' => 'private',
'http_render_content' => false, 'http_render_content' => false,
'theme_on' => false, 'theme_on' => false,
'auto_detect_theme' => false,
'var_theme' => 't',
'default_theme' => 'default', 'default_theme' => 'default',
'http_cache_id' => null, 'http_cache_id' => null,
'view_path' => '', 'view_path' => '',
'view_suffix' => '.html', 'view_suffix' => '.html',
]; ];
/** /**
@@ -143,10 +146,13 @@ class View {
/** /**
* 自动定位模板文件 * 自动定位模板文件
* @access private * @access private
* @param string $template 模板规则 * @param string $template 模板文件规则
* @return string * @return string
*/ */
private function parseTemplate($template) { private function parseTemplate($template) {
if(is_file($template)) {
return $template;
}
$template = str_replace(':','/',$template); $template = str_replace(':','/',$template);
// 获取当前主题名称 // 获取当前主题名称
$theme = $this->getTemplateTheme(); $theme = $this->getTemplateTheme();
@@ -156,8 +162,6 @@ class View {
$template = CONTROLLER_NAME.'/'.ACTION_NAME; $template = CONTROLLER_NAME.'/'.ACTION_NAME;
}elseif(false === strpos($template,'/')){ }elseif(false === strpos($template,'/')){
$template = CONTROLLER_NAME.'/'.$template; $template = CONTROLLER_NAME.'/'.$template;
}elseif(false === strpos($template,'.')) {
$template = $template;
} }
return ($this->config['view_path']?$this->config['view_path']:MODULE_PATH.'View/').$theme.$template.$this->config['view_suffix']; return ($this->config['view_path']?$this->config['view_path']:MODULE_PATH.'View/').$theme.$template.$this->config['view_suffix'];
} }
@@ -173,7 +177,7 @@ class View {
$theme = $this->theme; $theme = $this->theme;
}elseif($this->config['auto_detect_theme']){ }elseif($this->config['auto_detect_theme']){
// 自动侦测模板主题 // 自动侦测模板主题
$t = C('var_theme'); $t = $this->config['var_theme'];
if (isset($_GET[$t])){ if (isset($_GET[$t])){
$theme = $_GET[$t]; $theme = $_GET[$t];
}elseif(Cookie::get('think_theme')){ }elseif(Cookie::get('think_theme')){