fix more dir paths

This commit is contained in:
mohrt
2003-06-21 17:39:15 +00:00
parent 9526d1ed42
commit 1bd3c2f992
3 changed files with 5 additions and 5 deletions

View File

@@ -38,12 +38,12 @@ function smarty_core_create_dir_structure($params, &$this)
if (isset($_root_dir[3])) array_shift($_dir_parts); if (isset($_root_dir[3])) array_shift($_dir_parts);
} else { } else {
$_new_dir = str_replace('\\','/', getcwd()).'/'; $_new_dir = str_replace('\\', '/', getcwd()).'/';
} }
if($_use_open_basedir = !empty($_open_basedir_ini)) { if($_use_open_basedir = !empty($_open_basedir_ini)) {
$_open_basedirs = explode(';', str_replace('\\','/', $_open_basedir_ini)); $_open_basedirs = explode(';', str_replace('\\', '/', $_open_basedir_ini));
} }
} }
@@ -56,7 +56,7 @@ function smarty_core_create_dir_structure($params, &$this)
// do not attempt to test or make directories outside of open_basedir // do not attempt to test or make directories outside of open_basedir
$_make_new_dir = false; $_make_new_dir = false;
foreach ($_open_basedirs as $_open_basedir) { foreach ($_open_basedirs as $_open_basedir) {
if (substr($_new_dir.'/', 0, strlen($_open_basedir)) == $_open_basedir) { if (substr($_new_dir . '/', 0, strlen($_open_basedir)) == $_open_basedir) {
$_make_new_dir = true; $_make_new_dir = true;
break; break;
} }

View File

@@ -25,7 +25,7 @@ function smarty_core_write_file($params, &$this)
// write to tmp file, then rename it to avoid // write to tmp file, then rename it to avoid
// file locking race condition // file locking race condition
$_tmp_file = $_dirname . '/' . uniqid(''); $_tmp_file = $_dirname . DIRECTORY_SEPARATOR . uniqid('');
if (!($fd = @fopen($_tmp_file, 'w'))) { if (!($fd = @fopen($_tmp_file, 'w'))) {
$this->trigger_error("problem writing temporary file '$_tmp_file'"); $this->trigger_error("problem writing temporary file '$_tmp_file'");

View File

@@ -63,7 +63,7 @@ function smarty_function_config_load($params, &$smarty)
$_config_dir = $_params['new_file_path']; $_config_dir = $_params['new_file_path'];
} }
$_file_path = $_config_dir . '/' . $_file; $_file_path = $_config_dir . DIRECTORY_SEPARATOR . $_file;
$_compile_file = $smarty->_get_compile_path($_file_path); $_compile_file = $smarty->_get_compile_path($_file_path);
if($smarty->force_compile if($smarty->force_compile