From a68d817c691fe18f1d0d5280e010641022ca5aac Mon Sep 17 00:00:00 2001
From: Jared Hancock <gravydish@gmail.com>
Date: Sat, 21 Jul 2012 23:56:16 -0500
Subject: [PATCH] Respect configured email-id in email filtering
---
include/class.filter.php | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/include/class.filter.php b/include/class.filter.php
index 53801ce0d..4b5d80845 100644
--- a/include/class.filter.php
+++ b/include/class.filter.php
@@ -71,6 +71,10 @@ class Filter {
return $this->ht['execorder'];
}
+ function getEmailId() {
+ return $this->ht['email_id'];
+ }
+
function isActive(){
return ($this->ht['isactive']);
}
@@ -231,6 +235,10 @@ class Filter {
"dn_contain"=> array("strpos", false)
);
$match = false;
+ # Respect configured filter email-id
+ if ($email['emailId'] && $this->getEmailId()
+ && $this->getEmailId() != $email['emailId'])
+ return false;
foreach ($this->getRules() as $rule) {
list($func, $pos, $neg) = $how[$rule['h']];
# TODO: convert $what and $rule['v'] to mb_strtoupper and do
@@ -603,7 +611,7 @@ class EmailFilter {
} else {
$this->build(
$this->quickList($email['email'], $email['name'],
- $email['subject']));
+ $email['subject'], $email['emailId']));
}
}
--
GitLab