From 11c8f36af084f676b60248ad4e6d15e99f8652b4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 21 Jun 2009 17:38:59 +0000
Subject: [PATCH] Fixed: FS#758 - disabling mail filter rules doesn't work
---
interface/web/mail/mail_user_filter_edit.php | 48 +++++++++++---------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/interface/web/mail/mail_user_filter_edit.php b/interface/web/mail/mail_user_filter_edit.php
index e21801e64d..27c0613d63 100644
--- a/interface/web/mail/mail_user_filter_edit.php
+++ b/interface/web/mail/mail_user_filter_edit.php
@@ -114,7 +114,9 @@ class page_action extends tform_actions {
$content = '';
$content .= '### BEGIN FILTER_ID:'.$this->id."\n";
- if($this->dataRecord["action"] == 'move') {
+ if($this->dataRecord["active"] == 'y') {
+
+ if($this->dataRecord["action"] == 'move') {
$content .= "
`test -e ".'$DEFAULT/.'.$this->dataRecord["target"]."`
@@ -125,33 +127,35 @@ if ( ".'$RETURNCODE'." != 0 )
`echo INBOX.".$this->dataRecord["target"]." >> ".'$DEFAULT'."/courierimapsubscribed`
}
";
- }
+ }
- $content .= "if (/^".$this->dataRecord["source"].":";
+ $content .= "if (/^".$this->dataRecord["source"].":";
- $searchterm = preg_quote($this->dataRecord["searchterm"]);
+ $searchterm = preg_quote($this->dataRecord["searchterm"]);
- if($this->dataRecord["op"] == 'contains') {
- $content .= ".*".$searchterm."/:h)\n";
- } elseif ($this->dataRecord["op"] == 'is') {
- $content .= $searchterm."$/:h)\n";
- } elseif ($this->dataRecord["op"] == 'begins') {
- $content .= $searchterm."/:h)\n";
- } elseif ($this->dataRecord["op"] == 'ends') {
- $content .= ".*".$searchterm."$/:h)\n";
- }
+ if($this->dataRecord["op"] == 'contains') {
+ $content .= ".*".$searchterm."/:h)\n";
+ } elseif ($this->dataRecord["op"] == 'is') {
+ $content .= $searchterm."$/:h)\n";
+ } elseif ($this->dataRecord["op"] == 'begins') {
+ $content .= $searchterm."/:h)\n";
+ } elseif ($this->dataRecord["op"] == 'ends') {
+ $content .= ".*".$searchterm."$/:h)\n";
+ }
- $content .= "{\n";
- $content .= "exception {\n";
+ $content .= "{\n";
+ $content .= "exception {\n";
- if($this->dataRecord["action"] == 'move') {
- $content .= 'to $DEFAULT/.'.$this->dataRecord["target"]."/\n";
- } else {
- $content .= "to /dev/null\n";
- }
+ if($this->dataRecord["action"] == 'move') {
+ $content .= 'to $DEFAULT/.'.$this->dataRecord["target"]."/\n";
+ } else {
+ $content .= "to /dev/null\n";
+ }
- $content .= "}\n";
- $content .= "}\n";
+ $content .= "}\n";
+ $content .= "}\n";
+
+ }
$content .= '### END FILTER_ID:'.$this->id."\n";
--
GitLab