From 6c722cd3c09cd74cd15cca3bdd26f5a9a483b934 Mon Sep 17 00:00:00 2001 From: Jaka Kranjc Date: Sat, 7 Feb 2015 10:52:53 +0100 Subject: [PATCH] CRM-15934: more inactive patterns for responses: The email account that you tried to reach is disabled (gmail) 5.2.1 (not accepting messages) 550 User banned --- CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl | 8 ++++++++ xml/templates/civicrm_data.tpl | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl index acb0f95bb5..447926a93a 100644 --- a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl @@ -19,3 +19,11 @@ UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'disk(space)?|over the a UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = '(mail|in)(box|folder) ((for user \w+ )?is )?full' WHERE `id` = 92; UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'mailbox (has exceeded|is over) the limit' WHERE `id` = 93; UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'quota ?(usage|violation|exceeded)' WHERE `id` = 98; + +SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Inactive'; +INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) + VALUES + (@bounceTypeID, 'account that you tried to reach is disabled'), + (@bounceTypeID, 'User banned'); + +UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'not accepting (mail|messages)' WHERE `id` = 37; diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index d149497d8e..5449b7a602 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -1217,10 +1217,12 @@ INSERT INTO civicrm_mailing_bounce_pattern (@bounceTypeID, 'mail( ?)address is administrative?ly disabled'), (@bounceTypeID, 'mailbox (temporarily disabled|currently suspended)'), (@bounceTypeID, 'no longer (accepting mail|on server|in use|with|employed|on staff|works for|using this account)'), - (@bounceTypeID, 'not accepting mail'), + (@bounceTypeID, 'not accepting (mail|messages)'), (@bounceTypeID, 'please use my new e-?mail address'), (@bounceTypeID, 'this address no longer accepts mail'), - (@bounceTypeID, 'user account suspended'); + (@bounceTypeID, 'user account suspended'), + (@bounceTypeID, 'account that you tried to reach is disabled'), + (@bounceTypeID, 'User banned'); INSERT INTO civicrm_mailing_bounce_type (name, description, hold_threshold) -- 2.25.1