CRM-15934: more quota patterns

For responses:
Sorry, this user has overdrawn their diskspace quota
user overdrawn his diskspace quota
mail action aborted: exceeded storage allocation
QuotaExceeded
message could not be delivered because the user's mailfolder is full
The recipients inbox is full
recipient doesn't have enough disk space left for it
Mailbox is over the limit
The account is running out of disk space

diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
index dee21cb640665855e0f6b5e705efdd6e66375a5a..acb0f95bb567b7e3c0e25a6084e20a341eafbc88 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
@@ -6,3 +6,16 @@ UPDATE `civicrm_navigation` SET url = 'civicrm/api' WHERE url = 'civicrm/api/exp
 UPDATE civicrm_mailing_group SET group_type = 'Include' WHERE group_type = 'include';
 UPDATE civicrm_mailing_group SET group_type = 'Exclude' WHERE group_type = 'exclude';
 UPDATE civicrm_mailing_group SET group_type = 'Base' WHERE group_type = 'base';
+
+-- CRM-15934
+SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Quota';
+INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern)
+    VALUES
+      (@bounceTypeID, 'doesn.t have enough disk space left'),
+      (@bounceTypeID, 'exceeded storage allocation'),
+      (@bounceTypeID, 'running out of disk space');
+
+UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'disk(space)?|over the allowed|exceed(ed|s)?|storage) quota' WHERE `id` = 87;
+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;

diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index 5bb218f0d445d9c723a30312568dbc2dd0d672a1..d149497d8efa95eb4ba73d8650765d83ee7fa969 100644 (file)
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -1294,20 +1294,23 @@ SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Q
 INSERT INTO civicrm_mailing_bounce_pattern
         (bounce_type_id, pattern)
         VALUES
-    (@bounceTypeID, '(disk|over the allowed|exceed(ed|s)?|storage) quota'),
+    (@bounceTypeID, '(disk(space)?|over the allowed|exceed(ed|s)?|storage) quota'),
     (@bounceTypeID, '522_mailbox_full'),
     (@bounceTypeID, 'exceeds allowed message count'),
     (@bounceTypeID, 'file too large'),
     (@bounceTypeID, 'full mailbox'),
-    (@bounceTypeID, 'mailbox ((for user \w+ )?is )?full'),
-    (@bounceTypeID, 'mailbox has exceeded the limit'),
+    (@bounceTypeID, '(mail|in)(box|folder) ((for user \w+ )?is )?full'),
+    (@bounceTypeID, 'mailbox (has exceeded|is over) the limit'),
     (@bounceTypeID, 'mailbox( exceeds allowed)? size'),
     (@bounceTypeID, 'no space left for this user'),
     (@bounceTypeID, 'over\\s?quota'),
     (@bounceTypeID, 'quota (for the mailbox )?has been exceeded'),
-    (@bounceTypeID, 'quota (usage|violation|exceeded)'),
+    (@bounceTypeID, 'quota ?(usage|violation|exceeded)'),
     (@bounceTypeID, 'recipient storage full'),
-    (@bounceTypeID, 'not able to receive more mail');
+    (@bounceTypeID, 'not able to receive more mail'),
+    (@bounceTypeID, 'doesn.t have enough disk space left'),
+    (@bounceTypeID, 'exceeded storage allocation'),
+    (@bounceTypeID, 'running out of disk space');
 
 INSERT INTO civicrm_mailing_bounce_type
         (name, description, hold_threshold)