Merge pull request #11226 from seamuslee001/CRM-21378

CRM-21378 Ensure that email abuse reports are treated as bounce type …
civicrm · Nov 22, 2017 · 3214aa7 · 3214aa7
2 parents 13501cd + 288a5aa
commit 3214aa7
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 37 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,4 @@ 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';
+
diff --git a/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl
@@ -3,4 +3,8 @@
 -- CRM-21407 ISO compliance for German counties
 UPDATE `civicrm_state_province` SET `name` = 'Baden-Württemberg' WHERE `name` = 'Baden-Wuerttemberg' AND `country_id` = 1082;
 UPDATE `civicrm_state_province` SET `abbreviation` = 'BE' WHERE `name` = 'Berlin' AND `abbreviation` = 'BR' AND `country_id` = 1082;
-UPDATE `civicrm_state_province` SET `name` = 'Thüringen' WHERE `name` = 'Thueringen' AND `country_id` = 1082;
+UPDATE `civicrm_state_province` SET `name` = 'Thüringen' WHERE `name` = 'Thueringen' AND `country_id` = 1082;
+
+-- 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)