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.
---
interface/lib/classes/IDS/Monitor.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/IDS/Monitor.php b/interface/lib/classes/IDS/Monitor.php
index f93e748..90c8958 100644
--- a/interface/lib/classes/IDS/Monitor.php
+++ b/interface/lib/classes/IDS/Monitor.php
@@ -250,7 +250,7 @@
$filterSet = $this->storage->getFilterSet();
if ($tags = $this->tags) {
- $filterSet = array_filter(
+ $filterSet = @array_filter(
$filterSet,
function (Filter $filter) use ($tags) {
return (bool) array_intersect($tags, $filter->getTags());
@@ -259,7 +259,7 @@
}
$scanKeys = $this->scanKeys;
- $filterSet = array_filter(
+ $filterSet = @array_filter(
$filterSet,
function (Filter $filter) use ($key, $value, $scanKeys) {
return $filter->match($value) || $scanKeys && $filter->match($key);
--
Gitblit v1.9.1