From 9cb713fc093d47d83a7a1f9869e40c275039ef4a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 01 Nov 2007 16:59:05 -0400
Subject: [PATCH] - Fixed a bug in apache plugin.
---
server/plugins-enabled/apache2_plugin.inc.php | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/server/plugins-enabled/apache2_plugin.inc.php b/server/plugins-enabled/apache2_plugin.inc.php
index 41342bb..2a634c8 100644
--- a/server/plugins-enabled/apache2_plugin.inc.php
+++ b/server/plugins-enabled/apache2_plugin.inc.php
@@ -33,6 +33,9 @@
var $plugin_name = 'apache2_plugin';
var $class_name = 'apache2_plugin';
+ // private variables
+ var $action = '';
+
/*
This function is called when the plugin is loaded
@@ -169,6 +172,7 @@
function insert($event_name,$data) {
global $app, $conf;
+ $this->action = 'insert';
// just run the update function
$this->update($event_name,$data);
@@ -179,6 +183,7 @@
function update($event_name,$data) {
global $app, $conf;
+ if($this->action != 'insert') $this->action = 'update';
if($data["new"]["type"] != "vhost" && $data["new"]["parent_domain_id"] > 0) {
// This is not a vhost, so we need to update the parent record instead.
@@ -234,12 +239,14 @@
}
}
- // Copy the error pages
- $error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
- exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
+ if($this->action == 'insert') {
+ // Copy the error pages
+ $error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
+ exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
- // copy the standard index page
- exec("cp /usr/local/ispconfig/server/conf/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/");
+ // copy the standard index page
+ exec("cp /usr/local/ispconfig/server/conf/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
+ }
// Create group and user, if not exist
$app->uses("system");
--
Gitblit v1.9.1