X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=settings%2FMailing.setting.php;h=415219a0cae66067e78261b30b40862cd317bbe6;hb=b0500874b47a9031574a1e26791e3a5a2b3d773c;hp=30a8bc973dcefc237064fa968f4e42ab22e0c224;hpb=84fb7424b4422936811431696b9182b1e1665cf6;p=civicrm-core.git

diff --git a/settings/Mailing.setting.php b/settings/Mailing.setting.php
index 30a8bc973d..415219a0ca 100644
--- a/settings/Mailing.setting.php
+++ b/settings/Mailing.setting.php
@@ -43,7 +43,7 @@ return array(
     'name' => 'profile_double_optin',
     'type' => 'Integer',
     'html_type' => 'checkbox',
-    'default' => 0,
+    'default' => '1',
     'add' => '4.1',
     'title' => 'Enable Double Opt-in for Profile Group(s) field',
     'is_domain' => 1,
@@ -57,7 +57,7 @@ return array(
     'name' => 'track_civimail_replies',
     'type' => 'Integer',
     'html_type' => 'checkbox',
-    'default' => 0,
+    'default' => '0',
     'add' => '4.1',
     'title' => 'Track replies using VERP in Reply-To header',
     'is_domain' => 1,
@@ -72,7 +72,7 @@ return array(
     'name' => 'civimail_workflow',
     'type' => 'Integer',
     'html_type' => 'checkbox',
-    'default' => 0,
+    'default' => '0',
     'add' => '4.1',
     'title' => 'Use CiviMail Workflow',
     'is_domain' => 1,
@@ -86,7 +86,7 @@ return array(
     'name' => 'civimail_server_wide_lock',
     'type' => 'Integer',
     'html_type' => 'checkbox',
-    'default' => 0,
+    'default' => '0',
     'add' => '4.1',
     'title' => 'Lock Mails Server-Wide for Mail Sending',
     'is_domain' => 1,
@@ -114,7 +114,7 @@ return array(
     'name' => 'mailing_backend',
     'type' => 'Array',
     'html_type' => 'checkbox',
-    'default' => 0,
+    'default' => array('outBound_option' => '3'),
     'add' => '4.1',
     'title' => 'Mailing Backend',
     'is_domain' => 1,
@@ -128,7 +128,7 @@ return array(
     'name' => 'profile_add_to_group_double_optin',
     'type' => 'Integer',
     'html_type' => 'checkbox',
-    'default' => 0,
+    'default' => '0',
     'add' => '4.1',
     'title' => 'Enable Double Opt-in for Profile Group(s) field',
     'is_domain' => 1,
@@ -192,4 +192,127 @@ return array(
     '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,
+  ),
+  'write_activity_record' => array(
+    'group_name' => 'Mailing Preferences',
+    'group' => 'mailing',
+    'name' => 'write_activity_record',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => '1',
+    'add' => '4.7',
+    'title' => 'Enable CiviMail to create activities on delivery',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => NULL,
+    'help_text' => NULL,
+  ),
 );