CRM-21378 Ensure that email abuse reports are treated as bounce type …

…of spam
civicrm · Nov 2, 2017 · 9f48b9b · 9f48b9b
1 parent 233f2c0
commit 9f48b9b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 36 deletions.
diff --git a/CRM/Upgrade/Incremental/sql/4.7.28.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.28.mysql.tpl
@@ -53,3 +53,8 @@ UPDATE `civicrm_state_province` SET `name` = 'Pazardzhik' WHERE `name` = 'Pazard
 -- CRM-20772 Price set calculation precision when sales tax enabled
 ALTER TABLE `civicrm_membership_type` CHANGE `minimum_fee` `minimum_fee` DECIMAL(18,9) NULL DEFAULT '0.00' COMMENT 'Minimum fee for this membership (0 for free/complimentary memberships).';
 ALTER TABLE `civicrm_price_field_value` CHANGE `amount` `amount` DECIMAL(18,9) NOT NULL COMMENT 'Price field option amount';
+
+-- CRM-21378 Ensure that email abuse reports are treated as spam
+SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Spam';
+INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) VALUES (@bounceTypeID, 'abuse report');
+
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
@@ -1480,7 +1480,8 @@ INSERT INTO civicrm_mailing_bounce_pattern
     (@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');
+    (@bounceTypeID, 'ni bilo mogo..?e dostaviti zaradi varnostnega pravilnika'),
+    (@bounceTypeID, 'abuse report');
 
 INSERT INTO civicrm_mailing_bounce_type
         (name, description, hold_threshold)