-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.5 |
+-- | CiviCRM version 4.6 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2014 |
-- +--------------------------------------------------------------------+
('payment_instrument' , '{ts escape="sql"}Payment Instruments{/ts}' , 1, 1, 0),
('contribution_status' , '{ts escape="sql"}Contribution Status{/ts}' , 1, 1, 1),
('pcp_status' , '{ts escape="sql"}PCP Status{/ts}' , 1, 1, 1),
+ ('pcp_owner_notify' , '{ts escape="sql"}PCP owner notifications{/ts}' , 1, 1, 1),
('participant_role' , '{ts escape="sql"}Participant Role{/ts}' , 1, 1, 0),
('event_type' , '{ts escape="sql"}Event Type{/ts}' , 1, 1, 0),
('contact_view_options' , '{ts escape="sql"}Contact View Options{/ts}' , 1, 1, 1),
('name_badge' , '{ts escape="sql"}Name Badge Format{/ts}' , 1, 1, 0),
('communication_style' , '{ts escape="sql"}Communication Style{/ts}' , 1, 1, 0),
('msg_mode' , '{ts escape="sql"}Message Mode{/ts}' , 1, 1, 0),
- ('contact_date_reminder_options' , '{ts escape="sql"}Contact Date Reminder Options{/ts}' , 1, 1, 1),
- ('mailing_ab_status' , '{ts escape="sql"}Mailing A/B Status{/ts}' , 1, 1, 1),
- ('mailing_ab_testing_criteria' , '{ts escape="sql"}Mailing A/B Testing Criteria{/ts}' , 1, 1, 1),
- ('mailing_ab_winner_criteria' , '{ts escape="sql"}Mailing A/B Testing Winner Criteria{/ts}', 1, 1, 1);
+ ('contact_date_reminder_options' , '{ts escape="sql"}Contact Date Reminder Options{/ts}' , 1, 1, 1);
SELECT @option_group_id_pcm := max(id) from civicrm_option_group where name = 'preferred_communication_method';
SELECT @option_group_id_act := max(id) from civicrm_option_group where name = 'activity_type';
SELECT @option_group_id_pi := max(id) from civicrm_option_group where name = 'payment_instrument';
SELECT @option_group_id_cs := max(id) from civicrm_option_group where name = 'contribution_status';
SELECT @option_group_id_pcp := max(id) from civicrm_option_group where name = 'pcp_status';
+SELECT @option_group_id_pcpOwnerNotify := max(id) from civicrm_option_group where name = 'pcp_owner_notify';
SELECT @option_group_id_pRole := max(id) from civicrm_option_group where name = 'participant_role';
SELECT @option_group_id_etype := max(id) from civicrm_option_group where name = 'event_type';
SELECT @option_group_id_cvOpt := max(id) from civicrm_option_group where name = 'contact_view_options';
SELECT @option_group_id_communication_style := max(id) from civicrm_option_group where name = 'communication_style';
SELECT @option_group_id_msg_mode := max(id) from civicrm_option_group where name = 'msg_mode';
SELECT @option_group_id_contactDateMode := max(id) from civicrm_option_group where name = 'contact_date_reminder_options';
-SELECT @option_group_id_mailingABStatus := max(id) from civicrm_option_group where name = 'mailing_ab_status';
-SELECT @option_group_id_mailingABCriteria := max(id) from civicrm_option_group where name = 'mailing_ab_testing_criteria';
-SELECT @option_group_id_mailingABWinnerCriteria := max(id) from civicrm_option_group where name = 'mailing_ab_winner_criteria';
SELECT @contributeCompId := max(id) FROM civicrm_component where name = 'CiviContribute';
SELECT @eventCompId := max(id) FROM civicrm_component where name = 'CiviEvent';
(@option_group_id_pcp, '{ts escape="sql"}Approved{/ts}' , 2, 'Approved' , NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL),
(@option_group_id_pcp, '{ts escape="sql"}Not Approved{/ts}' , 3, 'Not Approved' , NULL, 0, NULL, 3, NULL, 0, 1, 1, NULL, NULL),
+ (@option_group_id_pcpOwnerNotify, '{ts escape="sql"}Owner chooses whether to receive notifications{/ts}', 1, 'owner_chooses', NULL, 0, 1, 1, NULL, 0, 1, 1, NULL, NULL),
+ (@option_group_id_pcpOwnerNotify, '{ts escape="sql"}Notifications are sent to ALL owners{/ts}' , 2, 'all_owners' , NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL),
+ (@option_group_id_pcpOwnerNotify, '{ts escape="sql"}Notifications are NOT available{/ts}' , 3, 'no_notifications' , NULL, 0, 0, 3, NULL, 0, 1, 1, NULL, NULL),
+
(@option_group_id_pRole, '{ts escape="sql"}Attendee{/ts}', 1, 'Attendee', NULL, 1, NULL, 1, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_pRole, '{ts escape="sql"}Volunteer{/ts}', 2, 'Volunteer', NULL, 1, NULL, 2, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_pRole, '{ts escape="sql"}Host{/ts}', 3, 'Host', NULL, 1, NULL, 3, NULL, 0, 0, 1, NULL, NULL),
-- Reminder Options for Contact Date Fields
(@option_group_id_contactDateMode, '{ts escape="sql"}Actual date only{/ts}', '1', 'Actual date only', NULL, NULL, 0, 1, NULL, 0, 1, 1, NULL, NULL),
-(@option_group_id_contactDateMode, '{ts escape="sql"}Each anniversary{/ts}', '2', 'Each anniversary', NULL, NULL, 0, 2, NULL, 0, 1, 1, NULL, NULL),
-
--- Mailing A/B Status
-(@option_group_id_mailingABStatus, '{ts escape="sql"}Draft{/ts}', '1', 'Draft', NULL, NULL, 0, 1, NULL, 0, 1, 1, NULL, NULL),
-(@option_group_id_mailingABStatus, '{ts escape="sql"}Testing{/ts}', '2', 'Testing', NULL, NULL, 0, 1, NULL, 0, 1, 1, NULL, NULL),
-(@option_group_id_mailingABStatus, '{ts escape="sql"}Final{/ts}', '3', 'Final', NULL, NULL, 0, 1, NULL, 0, 1, 1, NULL, NULL),
-
--- Mailing A/B Testing Winner Criteria
-(@option_group_id_mailingABWinnerCriteria, '{ts escape="sql"}Open{/ts}', '1', 'Open', NULL, NULL, 0, 1, NULL, 0, 1, 1, NULL, NULL),
-(@option_group_id_mailingABWinnerCriteria, '{ts escape="sql"}Total Unique Clicks{/ts}', '2', 'Total Unique Clicks', NULL, NULL, 0, 2, NULL, 0, 1, 1, NULL, NULL),
-(@option_group_id_mailingABWinnerCriteria, '{ts escape="sql"}Total Clicks on a particular link{/ts}', '3', 'Total Clicks on a particular link', NULL, NULL, 0, 3, NULL, 0, 1, 1, NULL, NULL),
-
--- Mailing A/B Testing Criteria
-(@option_group_id_mailingABCriteria, '{ts escape="sql"}Subject Lines {/ts}', '1', 'Subject Lines', NULL, NULL, 0, 1, NULL, 0, 1, 1, NULL, NULL),
-(@option_group_id_mailingABCriteria, '{ts escape="sql"}From Names {/ts}', '2', 'From Names', NULL, NULL, 0, 2, NULL, 0, 1, 1, NULL, NULL),
-(@option_group_id_mailingABCriteria, '{ts escape="sql"}Two different Emails {/ts}', '3', 'Two different Emails ', NULL, NULL, 0, 3, NULL, 0, 1, 1, NULL, NULL);
+(@option_group_id_contactDateMode, '{ts escape="sql"}Each anniversary{/ts}', '2', 'Each anniversary', NULL, NULL, 0, 2, NULL, 0, 1, 1, NULL, NULL);
-- financial accounts
SELECT @opval := value FROM civicrm_option_value WHERE name = 'Revenue' and option_group_id = @option_group_id_fat;
(@bounceTypeID, 'isn\'t in my control/locals file'),
(@bounceTypeID, 'local configuration error'),
(@bounceTypeID, 'not a gateway'),
- (@bounceTypeID, 'server is down or unreachable'),
+ (@bounceTypeID, 'server is (down or unreachable|not responding)'),
(@bounceTypeID, 'too many connections'),
(@bounceTypeID, 'unable to connect'),
(@bounceTypeID, 'lost connection'),
- (@bounceTypeID, 'conversation with [^ ]* timed out while');
+ (@bounceTypeID, 'conversation with [^ ]* timed out while'),
+ (@bounceTypeID, 'server requires authentication'),
+ (@bounceTypeID, 'authentication (is )?required');
INSERT INTO civicrm_mailing_bounce_type
(name, description, hold_threshold)
(@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)
(@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'),
(@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'),
+ (@bounceTypeID, '{literal}Recipient address rejected: ([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}{/literal}'),
+ (@bounceTypeID, 'Non sono riuscito a trovare l.indirizzo e-mail'),
+ (@bounceTypeID, 'nadie con esta direcci..?n'),
+ (@bounceTypeID, 'ni bilo mogo..?e najti prejemnikovega e-po..?tnega naslova'),
+ (@bounceTypeID, 'Elektronski naslov (je ukinjen|ne obstaja)'),
+ (@bounceTypeID, 'nepravilno nastavljen predal');
INSERT INTO civicrm_mailing_bounce_type
(name, description, hold_threshold)
INSERT INTO civicrm_mailing_bounce_pattern
(bounce_type_id, pattern)
VALUES
- (@bounceTypeID, '(mail|routing) loop'),
+ (@bounceTypeID, '(mail( forwarding)?|routing).loop'),
(@bounceTypeID, 'excessive recursion'),
(@bounceTypeID, 'loop detected'),
(@bounceTypeID, 'maximum hop count exceeded'),
(@bounceTypeID, 'message was forwarded more than the maximum allowed times'),
- (@bounceTypeID, 'too many hops');
+ (@bounceTypeID, 'too many (hops|recursive forwards)');
INSERT INTO civicrm_mailing_bounce_type
(name, description, hold_threshold)
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)
(@bounceTypeID, 'cannot find your hostname'),
(@bounceTypeID, 'ip name lookup'),
(@bounceTypeID, 'not configured to relay mail'),
- (@bounceTypeID, 'relay (not permitted|access denied)'),
+ (@bounceTypeID, 'relay(ing)? (not permitted|(access )?denied)'),
(@bounceTypeID, 'relayed mail to .+? not allowed'),
(@bounceTypeID, 'sender ip must resolve'),
(@bounceTypeID, 'unable to relay'),
(@bounceTypeID, 'No route to host'),
- (@bounceTypeID, 'Network is unreachable');
+ (@bounceTypeID, 'Network is unreachable'),
+ (@bounceTypeID, 'unrouteable address'),
+ (@bounceTypeID, 'We don.t handle mail for'),
+ (@bounceTypeID, 'we do not relay'),
+ (@bounceTypeID, 'Rejected by next-hop'),
+ (@bounceTypeID, 'not permitted to( *550)? relay through this server');
INSERT INTO civicrm_mailing_bounce_type
(name, description, hold_threshold)
(@bounceTypeID, 'sender was rejected'),
(@bounceTypeID, 'spam(check| reduction software| filters?)'),
(@bounceTypeID, 'blocked by a user configured filter'),
- (@bounceTypeID, 'detected as spam'),
- (@bounceTypeID, 'X-HmXmrOriginalRecipient');
+ (@bounceTypeID, '(detected|rejected) as spam'),
+ (@bounceTypeID, 'X-HmXmrOriginalRecipient'),
+ (@bounceTypeID, 'Client host .[^ ]*. blocked'),
+ (@bounceTypeID, 'automatic(ally-generated)? messages are not accepted'),
+ (@bounceTypeID, 'denied by policy'),
+ (@bounceTypeID, 'has no corresponding reverse \\(PTR\\) address'),
+ (@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');
INSERT INTO civicrm_mailing_bounce_type
(name, description, hold_threshold)
projects / civicrm-core.git / blobdiff