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

调整View类 支持调试模式模板文件严格检查大小写

Browse Source
This commit is contained in:
thinkphp
2016-01-12 22:43:28 +08:00
parent 03970d0845
commit fd53cfa9f2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/View.php
View File

@@ -30,7 +30,7 @@ class View
'http_cache_id' => null, 'http_cache_id' => null,
'view_path' => '', 'view_path' => '',
'view_suffix' => '.html', 'view_suffix' => '.html',
'view_depr' => '/', 'view_depr' => DS,
'view_layer' => VIEW_LAYER, 'view_layer' => VIEW_LAYER,
'parse_str' => [], 'parse_str' => [],
'engine_type' => 'think', 'engine_type' => 'think',
@@ -153,8 +153,9 @@ class View
if (!$renderContent) { if (!$renderContent) {
// 获取模板文件名 // 获取模板文件名
$template = $this->parseTemplate($template); $template = $this->parseTemplate($template);
// 开启调试模式Win环境严格区分大小写
// 模板不存在 抛出异常 // 模板不存在 抛出异常
if (!is_file($template)) { if (!is_file($template) || (APP_DEBUG && IS_WIN && realpath($template) != $template)) {
throw new Exception('template file not exists:' . $template, 10700); throw new Exception('template file not exists:' . $template, 10700);
} }
} }
@@ -209,7 +210,7 @@ class View
return $template; return $template;
} }
$depr = $this->config['view_depr']; $depr = $this->config['view_depr'];
$template = str_replace(':', $depr, $template); $template = str_replace(['/', ':'], $depr, $template);
// 获取当前模块 // 获取当前模块
$module = MODULE_NAME; $module = MODULE_NAME;
@@ -257,7 +258,7 @@ class View
} else { } else {
$theme = $this->config['default_theme']; $theme = $this->config['default_theme'];
} }
return $theme . '/'; return $theme . DS;
} }
return ''; return '';
} }
@@ -278,7 +279,7 @@ class View
// 定义TMPL_PATH 则改变全局的视图目录到模块之外 // 定义TMPL_PATH 则改变全局的视图目录到模块之外
$tmplPath = defined('TMPL_PATH') ? TMPL_PATH . $module . DS : APP_PATH . (APP_MULTI_MODULE ? $module . DS : '') . $this->config['view_layer'] . DS; $tmplPath = defined('TMPL_PATH') ? TMPL_PATH . $module . DS : APP_PATH . (APP_MULTI_MODULE ? $module . DS : '') . $this->config['view_layer'] . DS;
} }
return $tmplPath . $theme; return realpath($tmplPath) . DS . $theme;
} }
/** /**