Settings - Remove special cases for `prefetch` and `config_only`

[civicrm-core.git] / settings / Mailing.setting.php

diff --git a/settings/Mailing.setting.php b/settings/Mailing.setting.php
index 612974c336883342372074dc3eec2dd50b2cc749..b940aaea371f189eaeb1d37c2b9c1aae0291ec2b 100644 (file)
--- a/settings/Mailing.setting.php
+++ b/settings/Mailing.setting.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -178,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,
+  ),
 );