From cab9249b25719fd2611be5917326671b7f73e67c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 28 May 2010 05:20:59 -0400
Subject: [PATCH] Fixed several bugs (revisions 1783-1788 from stable branch).
---
interface/lib/plugins/mail_user_filter_plugin.inc.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
index 4766176..7715e3f 100644
--- a/interface/lib/plugins/mail_user_filter_plugin.inc.php
+++ b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -72,13 +72,13 @@
}
if($skip == false && $line != '') $out .= $line ."\n";
if($line == '### END FILTER_ID:'.$page_form->id) {
- $out .= $this->mail_user_filter_get_rule($page_form);
+ if($page_form->dataRecord["active"] == 'y') $out .= $this->mail_user_filter_get_rule($page_form);
$skip = false;
}
}
// We did not found our rule, so we add it now as first rule.
- if($found == false) {
+ if($found == false && $page_form->dataRecord["active"] == 'y') {
$new_rule = $this->mail_user_filter_get_rule($page_form);
$out = $new_rule . $out;
}
--
Gitblit v1.9.1