From 5619c7dd99b674af0922e29ccfd00d58a08979c5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 15 Jul 2010 08:36:47 -0400
Subject: [PATCH] Fixed: FS#1229 - ISPConfig3 creates the desired e-mail domain twice (on master server AND on the selected Slave)
---
server/lib/classes/modules.inc.php | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index 408f4d3..ed855b8 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -109,6 +109,15 @@
$this->current_datalog_id = $d["datalog_id"];
+ /*
+ * If we are in a mirror setup, rewrite the server_id of records that originally
+ * belonged to the mirrored server to the local server_id
+ */
+ if($conf["mirror_server_id"] > 0 && $d['dbtable'] != 'server') {
+ if(isset($data['new']['server_id']) && $data['new']['server_id'] == $conf["mirror_server_id"]) $data['new']['server_id'] = $conf["server_id"];
+ if(isset($data['old']['server_id']) && $data['old']['server_id'] == $conf["mirror_server_id"]) $data['old']['server_id'] = $conf["server_id"];
+ }
+
if(count($data['new']) > 0) {
if($d["action"] == 'i' || $d["action"] == 'u') {
$idx = explode(":",$d["dbidx"]);
--
Gitblit v1.9.1