From cc215651fbe04d53a22b6fb4d93c5921caa34a77 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 06 Oct 2009 08:11:06 -0400
Subject: [PATCH] Fixed: FS#843 - replacePrefix just returns last result (tools.inc.php)

---
 server/plugins-available/apache2_plugin.inc.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 5e8fee3..a07e77e 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -236,7 +236,7 @@
 		$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
 		
 		//* Check if this is a chrooted setup
-		if($web_config['website_basedir'] != '' && @is_file($web_config['/var/www'].'/etc/passwd')) {
+		if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) {
 			$apache_chrooted = true;
 			$app->log("Info: Apache is chrooted.",LOGLEVEL_DEBUG);
 		} else {
@@ -538,6 +538,10 @@
 			$this->_exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
 		}
 		
+		// Change the owner of the error log to the owner of the website
+		if(!@is_file($data["new"]["document_root"]."/log/error.log")) exec('touch '.escapeshellcmd($data["new"]["document_root"])."/log/error.log");
+		$this->_exec("chown $username:$groupname ".escapeshellcmd($data["new"]["document_root"])."/log/error.log");
+		
 		
 		// Create the vhost config file
 		$app->load('tpl');

--
Gitblit v1.9.1