CRM-15934: more spam patterns

for reponses:
5.7.0 Local Policy Violation
5.7.1 Message rejected as spam by Content Filtering.
Client host [IP] blocked using
automatic messages are not accepted by this group
automatically-generated messages are not accepted by this group
550 Denied by policy
Our system has detected that this message
     550-5.7.1 is likely unsolicited mail
End-of-data rejected: Blocked - Your IP [IP] has no corresponding reverse (PTR) address
Sporočila ni bilo mogoče dostaviti zaradi varnostnega pravilnika

diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
index ca7173997ff780bf478ccfad70e536d4b6ea40ce..fb0d932ace5a271fe6693cd682302fb72bb90c51 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
@@ -75,3 +75,17 @@ UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'no such (mail drop|mail
 UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'no mailbox (here )?by that name' WHERE `id` = 65;
 UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'recipient (does not exist|(is )?unknown|rejected|denied|not found)' WHERE `id` = 69;
 UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'unknown (local( |-)part|recipient|address error)' WHERE `id` = 73;
+
+SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Spam';
+INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern)
+    VALUES
+      (@bounceTypeID, 'Client host \[[^]]*\] blocked'),
+      (@bounceTypeID, 'automatic(ally-generated)? messages are not accepted'),
+      (@bounceTypeID, 'denied by policy'),
+      (@bounceTypeID, 'has no corresponding reverse \(PTR\) address'),
+      (@bounceTypeID, 'has a policy that( [^ ]*)? prohibited the mail that you sent'),
+      (@bounceTypeID, 'is likely unsolicited mail'),
+      (@bounceTypeID, 'Local Policy Violation'),
+      (@bounceTypeID, 'ni bilo mogo..?e dostaviti zaradi varnostnega pravilnika');
+
+UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = '(detected|rejected) as spam' WHERE `id` = 126;

diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index f4f372013be6d415bfab73f37a3a7d73de648a17..b908f01a97dfca41ca9bdf86de23df4a1c3718b6 100644 (file)
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -1376,8 +1376,16 @@ INSERT INTO civicrm_mailing_bounce_pattern
     (@bounceTypeID, 'sender was rejected'),
     (@bounceTypeID, 'spam(check| reduction software| filters?)'),
     (@bounceTypeID, 'blocked by a user configured filter'),
-    (@bounceTypeID, 'detected as spam'),
-    (@bounceTypeID, 'X-HmXmrOriginalRecipient');
+    (@bounceTypeID, '(detected|rejected) as spam'),
+    (@bounceTypeID, 'X-HmXmrOriginalRecipient'),
+    (@bounceTypeID, 'Client host \[[^]]*\] blocked'),
+    (@bounceTypeID, 'automatic(ally-generated)? messages are not accepted'),
+    (@bounceTypeID, 'denied by policy'),
+    (@bounceTypeID, 'has no corresponding reverse (PTR) address'),
+    (@bounceTypeID, 'has a policy that( [^ ]*)? prohibited the mail that you sent'),
+    (@bounceTypeID, 'is likely unsolicited mail'),
+    (@bounceTypeID, 'Local Policy Violation'),
+    (@bounceTypeID, 'ni bilo mogo..?e dostaviti zaradi varnostnega pravilnika');
 
 INSERT INTO civicrm_mailing_bounce_type
         (name, description, hold_threshold)