From c8c7edae75cdaf81c85f9d0a0fddcb47320f5713 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 07 Sep 2011 11:41:57 -0400
Subject: [PATCH] Fixed: FS#1623 - vhost.conf.master placed in /root overrides vhost.conf.master in ispconfig/server/conf
---
server/server.sh | 1 +
server/lib/classes/tpl.inc.php | 16 ++++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/server/lib/classes/tpl.inc.php b/server/lib/classes/tpl.inc.php
index 285fc66..af2e0da 100644
--- a/server/lib/classes/tpl.inc.php
+++ b/server/lib/classes/tpl.inc.php
@@ -967,7 +967,9 @@
// check fullpath first..
$fullpath = $filepath.'/'.$filename;
- if (is_file($fullpath)) return $fullpath;
+ if (is_file($fullpath)) {
+ return $fullpath;
+ }
// ..then check for relative path for current directory..
if (!empty($this->_currentincludedir)) {
@@ -992,17 +994,23 @@
// ..then check path from TEMPLATE_DIR..
if (!empty($this->OPTIONS['TEMPLATE_DIR'])) {
$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..
$fullpath = realpath($filepath.'/'.$filename);
- if (is_file($fullpath)) return $fullpath;
+ if (is_file($fullpath)) {
+ return $fullpath;
+ }
// ..then check path from template file.
if (!empty($this->VLIBTEMPLATE_ROOT)) {
$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
diff --git a/server/server.sh b/server/server.sh
index 7302ca4..2a6b2c4 100755
--- a/server/server.sh
+++ b/server/server.sh
@@ -21,5 +21,6 @@
#
# 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
fi
\ No newline at end of file
--
Gitblit v1.9.1