update blacklist filters

diff --git a/DataObjects/Core_notify_blacklist.php b/DataObjects/Core_notify_blacklist.php
index e12ba86..305f0af 100644 (file)
--- a/DataObjects/Core_notify_blacklist.php
+++ b/DataObjects/Core_notify_blacklist.php
@@ -37,7 +37,7 @@ class Pman_Core_DataObjects_Core_notify_blacklist extends DB_DataObject
             'poor reputation',
             'AntiSpam',
             'ip address in rbl',
-            'IP address blacklisted',
+            'blacklisted',
             'spamauditor.org',
             'detect spam',
             'message as spam',
@@ -46,6 +46,11 @@ class Pman_Core_DataObjects_Core_notify_blacklist extends DB_DataObject
             'blocked by sbl-xbl.spam',
             'Sophos Anti Spam Engine',
             'spam filters',
+            'JunkMail',
+            'block list',
+            'Cloudmark Sender Intelligence',
+            'Blocked by CSI',
+            
             
         );
         foreach($match as $str) {

diff --git a/DataObjects/Core_notify_sender_blacklist.php b/DataObjects/Core_notify_sender_blacklist.php
index d60cfc5..7ada643 100644 (file)
--- a/DataObjects/Core_notify_sender_blacklist.php
+++ b/DataObjects/Core_notify_sender_blacklist.php
@@ -20,7 +20,8 @@ class Pman_Core_DataObjects_Core_notify_sender_blacklist extends DB_DataObject
     {
         $match = array(
             'BLOCK-SEND-ER',
-            'sender is listed on the block mail' // 'sniper? 
+            'sender is listed on the block mail', // 'sniper?
+            'sender is in my black list',
         );
         foreach($match as $str) {
             if (strpos($err, $str) !== false) {