CRM-15934: added more Invalid patterns

for responses:
5.1.0 Address rejected
550 <di> recipient rejected
550 Recipient denied
Recipient not found
delivery denied:
     no valid recipient or authentication missing
Message rejected (no valid recipients)
550 Address invalid
Recipient address rejected: address unknown
Recipient address rejected: address invalid
no mailbox by that name is currently available
RESOLVER.ADR.RecipNotFound; not found
Unknown address error
The e-mail address you entered couldn't be found
The email address you specified couldn't be found or is invalid
The recipient's e-mail address was not found
There is no one at this address
Delivery is not allowed to this address
5.2.0 RESOLVER.FWD.NotFound; misconfigured forwarding address
This account is not allowed
Address '<email>' not known here.

diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
index bff4197f91011b2d1a104b89da56ebce3c291dcf..8d685ac2224d4daf2cc39ed11d15af013783baf5 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
@@ -50,3 +50,22 @@ INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern)
       (@bounceTypeID, 'authentication (is )?required');
 
 UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'server is (down or unreachable|not responding)' WHERE `id` = 20;
+
+SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Invalid';
+INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern)
+    VALUES
+      (@bounceTypeID, '5.1.0 Address rejected'),
+      (@bounceTypeID, 'no valid recipients?'),
+      (@bounceTypeID, 'RecipNotFound'),
+      (@bounceTypeID, 'no one at this address'),
+      (@bounceTypeID, 'misconfigured forwarding address'),
+      (@bounceTypeID, 'account is not allowed'),
+      (@bounceTypeID, 'Address .<[^>]*>. not known here');
+
+UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'address(es)?( you (entered|specified))? (could|was)( not|n.t)( be)? found' WHERE `id` = 44;
+UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'address(ee)? (unknown|invalid)' WHERE `id` = 45;
+UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = '(mail )?delivery (to this user )?is not allowed' WHERE `id` = 59;
+UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'no such (mail drop|mailbox( \w+)?|(e-?mail )?address|recipient|(local )?user|person)( here)?' WHERE `id` = 64;
+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;

diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index 1b7319ca6fa77b00b522de7f80a38b8bfb213405..cc966a3fdb24012ba77d99ce7deb2920cf9e3024 100644 (file)
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -1237,8 +1237,8 @@ INSERT INTO civicrm_mailing_bounce_pattern
     (@bounceTypeID, '(user|recipient( name)?) is not recognized'),
     (@bounceTypeID, '554 delivery error'),
     (@bounceTypeID, 'address does not exist'),
-    (@bounceTypeID, 'address(es)? could not be found'),
-    (@bounceTypeID, 'addressee unknown'),
+    (@bounceTypeID, 'address(es)?( you (entered|specified))? (could|was)( not|n.t)( be)? found'),
+    (@bounceTypeID, 'address(ee)? (unknown|invalid)'),
     (@bounceTypeID, 'bad destination'),
     (@bounceTypeID, 'badly formatted address'),
     (@bounceTypeID, 'can\'t open mailbox for'),
@@ -1252,28 +1252,35 @@ INSERT INTO civicrm_mailing_bounce_pattern
     (@bounceTypeID, 'illegal alias'),
     (@bounceTypeID, 'invalid (mailbox|(e-?mail )?address|recipient|final delivery)'),
     (@bounceTypeID, 'invalid( or unknown)?( virtual)? user'),
-    (@bounceTypeID, 'mail delivery to this user is not allowed'),
+    (@bounceTypeID, '(mail )?delivery (to this user )?is not allowed'),
     (@bounceTypeID, 'mailbox (not found|unavailable|name not allowed)'),
     (@bounceTypeID, 'message could not be forwarded'),
     (@bounceTypeID, 'missing or malformed local(-| )part'),
     (@bounceTypeID, 'no e-?mail address registered'),
-    (@bounceTypeID, 'no such (mail drop|mailbox( \w+)?|(e-?mail )?address|recipient|(local )?user)( here)?'),
-    (@bounceTypeID, 'no mailbox here by that name'),
+    (@bounceTypeID, 'no such (mail drop|mailbox( \w+)?|(e-?mail )?address|recipient|(local )?user|person)( here)?'),
+    (@bounceTypeID, 'no mailbox (here )?by that name'),
     (@bounceTypeID, 'not (listed in|found in directory|known at this site|our customer)'),
     (@bounceTypeID, 'not a valid( (user|mailbox))?'),
     (@bounceTypeID, 'not present in directory entry'),
-    (@bounceTypeID, 'recipient (does not exist|(is )?unknown)'),
+    (@bounceTypeID, 'recipient (does not exist|(is )?unknown|rejected|denied|not found)'),
     (@bounceTypeID, 'this user doesn\'t have a yahoo.com address'),
     (@bounceTypeID, 'unavailable to take delivery of the message'),
     (@bounceTypeID, 'unavailable mailbox'),
-    (@bounceTypeID, 'unknown (local( |-)part|recipient)'),
+    (@bounceTypeID, 'unknown (local( |-)part|recipient|address error)'),
     (@bounceTypeID, 'unknown( or illegal)? user( account)?'),
     (@bounceTypeID, 'unrecognized recipient'),
     (@bounceTypeID, 'unregistered address'),
     (@bounceTypeID, 'user (unknown|does not exist)'),
     (@bounceTypeID, 'user doesn\'t have an? \w+ account'),
     (@bounceTypeID, 'user(\'s e-?mail name is)? not found'),
-    (@bounceTypeID, '^Validation failed for:');
+    (@bounceTypeID, '^Validation failed for:'),
+    (@bounceTypeID, '5.1.0 Address rejected'),
+    (@bounceTypeID, 'no valid recipients?'),
+    (@bounceTypeID, 'RecipNotFound'),
+    (@bounceTypeID, 'no one at this address'),
+    (@bounceTypeID, 'misconfigured forwarding address'),
+    (@bounceTypeID, 'account is not allowed'),
+    (@bounceTypeID, 'Address .<[^>]*>. not known here');
 
 INSERT INTO civicrm_mailing_bounce_type
         (name, description, hold_threshold)