Commit c8c7edae authored by tbrehm's avatar tbrehm

Fixed: FS#1623 - vhost.conf.master placed in /root overrides vhost.conf.master...

Fixed: FS#1623 - vhost.conf.master placed in /root overrides vhost.conf.master in ispconfig/server/conf
parent fdbfd6ab
...@@ -967,7 +967,9 @@ if (!defined('vlibTemplateClassLoaded')) { ...@@ -967,7 +967,9 @@ if (!defined('vlibTemplateClassLoaded')) {
// check fullpath first.. // check fullpath first..
$fullpath = $filepath.'/'.$filename; $fullpath = $filepath.'/'.$filename;
if (is_file($fullpath)) return $fullpath; if (is_file($fullpath)) {
return $fullpath;
}
// ..then check for relative path for current directory.. // ..then check for relative path for current directory..
if (!empty($this->_currentincludedir)) { if (!empty($this->_currentincludedir)) {
...@@ -992,17 +994,23 @@ if (!defined('vlibTemplateClassLoaded')) { ...@@ -992,17 +994,23 @@ if (!defined('vlibTemplateClassLoaded')) {
// ..then check path from TEMPLATE_DIR.. // ..then check path from TEMPLATE_DIR..
if (!empty($this->OPTIONS['TEMPLATE_DIR'])) { if (!empty($this->OPTIONS['TEMPLATE_DIR'])) {
$fullpath = realpath($this->OPTIONS['TEMPLATE_DIR'].'/'.$filepath.'/'.$filename); $fullpath = realpath($this->OPTIONS['TEMPLATE_DIR'].'/'.$filepath.'/'.$filename);
if (is_file($fullpath)) return $fullpath; if (is_file($fullpath)) {
return $fullpath;
}
} }
// ..then check relative path from executing php script.. // ..then check relative path from executing php script..
$fullpath = realpath($filepath.'/'.$filename); $fullpath = realpath($filepath.'/'.$filename);
if (is_file($fullpath)) return $fullpath; if (is_file($fullpath)) {
return $fullpath;
}
// ..then check path from template file. // ..then check path from template file.
if (!empty($this->VLIBTEMPLATE_ROOT)) { if (!empty($this->VLIBTEMPLATE_ROOT)) {
$fullpath = realpath($this->VLIBTEMPLATE_ROOT.'/'.$filepath.'/'.$filename); $fullpath = realpath($this->VLIBTEMPLATE_ROOT.'/'.$filepath.'/'.$filename);
if (is_file($fullpath)) return $fullpath; if (is_file($fullpath)) {
return $fullpath;
}
} }
return false; // uh oh, file not found return false; // uh oh, file not found
......
...@@ -21,5 +21,6 @@ else ...@@ -21,5 +21,6 @@ else
# #
# there is no update waiting, so lets start the ISPConfig-System # there is no update waiting, so lets start the ISPConfig-System
# #
cd /usr/local/ispconfig/server
/usr/bin/php -q /usr/local/ispconfig/server/server.php /usr/bin/php -q /usr/local/ispconfig/server/server.php
fi fi
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment