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

Author: tbrehm

server/lib/classes/tpl.inc.php

@@ -967,7 +967,9 @@ function _fileSearch ($file) {
 
             // 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 @@ function _fileSearch ($file) {
             // ..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

server/server.sh

@@ -21,5 +21,6 @@ else
 	# 
 	# 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