X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=settings%2FMailing.setting.php;h=b940aaea371f189eaeb1d37c2b9c1aae0291ec2b;hb=52baaadfe713ff5ae123b5bca12dedcc06eee189;hp=6a4cfe7035e7a944fd872d2cc163b1a24599e226;hpb=95d8ddc04c08360567c00283822622fb8bcb0b35;p=civicrm-core.git diff --git a/settings/Mailing.setting.php b/settings/Mailing.setting.php index 6a4cfe7035..b940aaea37 100644 --- a/settings/Mailing.setting.php +++ b/settings/Mailing.setting.php @@ -1,9 +1,9 @@ 'checkbox', 'default' => 0, 'add' => '4.1', - 'title' => 'Enable Double Opt-in for Profile Group(s) field', + 'title' => 'Track replies using VERP in Reply-To header', 'is_domain' => 1, 'is_contact' => 0, - 'description' => 'When CiviMail is enabled, users who "subscribe" to a group from a profile Group(s) checkbox will receive a confirmation email. They must respond (opt-in) before they are added to the group.', + 'description' => 'If checked, mailings will default to tracking replies using VERP-ed Reply-To. ', 'help_text' => NULL, 'validate_callback' => 'CRM_Core_BAO_Setting::validateBoolSetting', ), @@ -94,6 +94,20 @@ return array( 'description' => NULL, 'help_text' => NULL, ), + 'replyTo' => array( + 'group_name' => 'Mailing Preferences', + 'group' => 'mailing', + 'name' => 'replyTo', + 'type' => 'Boolean', + 'quick_form_type' => 'YesNo', + 'default' => 0, + 'add' => '4.6', + 'title' => 'Enable Custom Reply-To', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'Allow CiviMail users to send mailings with a custom Reply-To header', + 'help_text' => NULL, + ), 'mailing_backend' => array( 'group_name' => 'Mailing Preferences', 'group' => 'mailing', @@ -164,4 +178,127 @@ return array( 'description' => 'If enabled, a randomized hash key will be used to reference the mailing URL in the mailing.viewUrl token, instead of the mailing ID', 'help_text' => NULL, ), + 'civimail_multiple_bulk_emails' => array( + 'group_name' => 'Mailing Preferences', + 'group' => 'mailing', + 'name' => 'civimail_multiple_bulk_emails', + 'type' => 'Integer', + 'html_type' => 'checkbox', + 'default' => 0, + 'add' => '4.5', + 'title' => ' Multiple Bulk Emails', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'If enabled, CiviMail will deliver a copy of the email to each bulk email listed for the contact.', + 'help_text' => NULL, + ), + 'include_message_id' => array( + 'group_name' => 'Mailing Preferences', + 'group' => 'mailing', + 'name' => 'include_message_id', + 'type' => 'Integer', + 'html_type' => 'checkbox', + 'default' => FALSE, + 'add' => '4.5', + 'title' => 'Enable CiviMail to generate Message-ID header', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => '', + 'help_text' => NULL, + ), + 'mailerBatchLimit' => array( + 'group_name' => 'Mailing Preferences', + 'group' => 'mailing', + 'name' => 'mailerBatchLimit', + 'type' => 'Integer', + 'quick_form_type' => 'Element', + 'html_type' => 'text', + 'html_attributes' => array( + 'size' => 4, + 'maxlength' => 8, + ), + 'default' => 0, + 'add' => '4.7', + 'title' => 'Mailer Batch Limit', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'Throttle email delivery by setting the maximum number of emails sent during each CiviMail run (0 = unlimited).', + 'help_text' => NULL, + ), + 'mailerJobSize' => array( + 'group_name' => 'Mailing Preferences', + 'group' => 'mailing', + 'name' => 'mailerJobSize', + 'type' => 'Integer', + 'quick_form_type' => 'Element', + 'html_type' => 'text', + 'html_attributes' => array( + 'size' => 4, + 'maxlength' => 8, + ), + 'default' => 0, + 'add' => '4.7', + 'title' => 'Mailer Job Size', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'If you want to utilize multi-threading enter the size you want your sub jobs to be split into. Recommended values are between 1,000 and 10,000. Use a lower value if your server has multiple cron jobs running simultaneously, but do not use values smaller than 1,000. Enter "0" to disable multi-threading and process mail as one single job - batch limits still apply.', + 'help_text' => NULL, + ), + 'mailerJobsMax' => array( + 'group_name' => 'Mailing Preferences', + 'group' => 'mailing', + 'name' => 'mailerJobsMax', + 'type' => 'Integer', + 'quick_form_type' => 'Element', + 'html_type' => 'text', + 'html_attributes' => array( + 'size' => 4, + 'maxlength' => 8, + ), + 'default' => 0, + 'add' => '4.7', + 'title' => 'Mailer Cron Job Limit', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'The maximum number of mailer delivery jobs executing simultaneously (0 = allow as many processes to execute as started by cron)', + 'help_text' => NULL, + ), + 'mailThrottleTime' => array( + 'group_name' => 'Mailing Preferences', + 'group' => 'mailing', + 'name' => 'mailThrottleTime', + 'type' => 'Integer', + 'quick_form_type' => 'Element', + 'html_type' => 'text', + 'html_attributes' => array( + 'size' => 4, + 'maxlength' => 8, + ), + 'default' => 0, + 'add' => '4.7', + 'title' => 'Mailer Throttle Time', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'The time to sleep in between each e-mail in micro seconds. Setting this above 0 allows you to control the rate at which e-mail messages are sent to the mail server, avoiding filling up the mail queue very quickly. Set to 0 to disable.', + 'help_text' => NULL, + ), + 'verpSeparator' => array( + 'group_name' => 'Mailing Preferences', + 'group' => 'mailing', + 'name' => 'verpSeparator', + 'type' => 'String', + 'quick_form_type' => 'Element', + 'html_type' => 'text', + 'html_attributes' => array( + 'size' => 4, + 'maxlength' => 32, + ), + 'default' => '.', + 'add' => '4.7', + 'title' => 'VERP Separator', + 'is_domain' => 1, + 'is_contact' => 0, + 'description' => 'Separator character used when CiviMail generates VERP (variable envelope return path) Mail-From addresses.', + 'help_text' => NULL, + ), );