smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 02:44:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fix special cases of filepath normalization

Browse Source
This commit is contained in:
Uwe Tews
2015-06-27 18:30:47 +02:00
parent e0630b106a
commit aefec40962
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/sysplugins/smarty_internal_resource_file.php
View File

@@ -36,7 +36,7 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
{ {
$file = $source->name; $file = $source->name;
$this->invDS = (DS == '/') ? '\\\\' : '\\/'; $this->invDS = (DS == '/') ? '\\\\' : '/';
preg_match('#(^(?P<absolute>[\\\/]|[a-zA-Z]:[\\\/])|(\[(?P<index>[^\]]+)\])|(?P<rel>\.[\\\/]))|((?P<rel2>\.[\\\/])|(?P<ds>[' . $this->invDS . ']))#', $file, $fileMatch); preg_match('#(^(?P<absolute>[\\\/]|[a-zA-Z]:[\\\/])|(\[(?P<index>[^\]]+)\])|(?P<rel>\.[\\\/]))|((?P<rel2>\.[\\\/])|(?P<ds>[' . $this->invDS . ']))#', $file, $fileMatch);
// save basename // save basename
if (!empty($fileMatch['absolute'])) { if (!empty($fileMatch['absolute'])) {
@@ -99,7 +99,7 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
if (is_file($path)) { if (is_file($path)) {
return $path; return $path;
} }
if ($source->smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_directory)) { if ($source->smarty->use_include_path && !preg_match('/^([\\\/]|[a-zA-Z]:[\\\/])/', $_directory)) {
// try PHP include_path // try PHP include_path
if (function_exists('stream_resolve_include_path')) { if (function_exists('stream_resolve_include_path')) {
$_filepath = stream_resolve_include_path($_filepath); $_filepath = stream_resolve_include_path($_filepath);
@@ -131,7 +131,7 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
public function normalizePath($path) public function normalizePath($path)
{ {
$first = true; $first = true;
while (strrpos($path, '.' . DS) !== false || ($first && strrpos($path, $this->invDS) !== false)) { while (strrpos($path, '.' . DS) !== false || ($first && strrpos($path, $this->invDS[0]) !== false)) {
$path = preg_replace('#([\\\/]+([.][\\\/]+)+)|([\\\/]+([^\\\/]+[\\\/]+){2}([.][.][\\\/]+){2})|([\\\/]+[^\\\/]+[\\\/]+[.][.][\\\/]+)|[' . $this->invDS . ']+#', DS, $path); $path = preg_replace('#([\\\/]+([.][\\\/]+)+)|([\\\/]+([^\\\/]+[\\\/]+){2}([.][.][\\\/]+){2})|([\\\/]+[^\\\/]+[\\\/]+[.][.][\\\/]+)|[' . $this->invDS . ']+#', DS, $path);
$first = false; $first = false;
} }