From d8faa4e7e3fb74e554f6c9339f6fe4e2883c3bf1 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 18 Sep 2015 13:43:03 -0400
Subject: [PATCH] Fix by dirkd: Since file() doesn't remove "\n" from the lines read the condition $lines[$l] == '' never evaluated to true. So $mailHeaders would always contain every line from the template while $mailBody contained none of them.
---
server/lib/classes/modules.inc.php | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index b909fbf..aa95d47 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -152,12 +152,14 @@
$app->db->errorNumber = 0;
$app->db->errorMessage = '';
$app->db->query($sql, true, $params);
- unset($params);
if($app->db->errorNumber > 0) {
$replication_error = true;
$app->log("Replication failed. Error: (" . $d['dbtable'] . ") in MySQL server: (".$app->db->dbHost.") " . $app->db->errorMessage . " # SQL: " . $sql, LOGLEVEL_ERROR);
}
- $app->log('Replicated from master: '.$sql, LOGLEVEL_DEBUG);
+ $log = $app->db->_build_query_string($sql, true, $params);
+ $app->log('Replicated from master: '.$log, LOGLEVEL_DEBUG);
+ unset($params);
+ unset($log);
}
if($d['action'] == 'd') {
@@ -169,7 +171,9 @@
$replication_error = true;
$app->log("Replication failed. Error: (" . $d[dbtable] . ") " . $app->db->errorMessage . " # SQL: " . $sql, LOGLEVEL_ERROR);
}
- $app->log('Replicated from master: '.$sql, LOGLEVEL_DEBUG);
+ $log = $app->db->_build_query_string($sql, $d['dbtable'], $idx[0], $idx[1]);
+ $app->log('Replicated from master: '.$log, LOGLEVEL_DEBUG);
+ unset($log);
}
--
Gitblit v1.9.1