CRM-17658 PDFs: add new region 'pdf-header' in head of PDFs

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

diff --git a/settings/Mailing.setting.php b/settings/Mailing.setting.php
index 4e999a22937b2bcff9a4793a9847a4806ce16408..415219a0cae66067e78261b30b40862cd317bbe6 100644 (file)
--- 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,
@@ -224,7 +224,6 @@ return array(
     'is_contact' => 0,
     'description' => 'Throttle email delivery by setting the maximum number of emails sent during each CiviMail run (0 = unlimited).',
     'help_text' => NULL,
-    'prefetch' => 1,
   ),
   'mailerJobSize' => array(
     'group_name' => 'Mailing Preferences',
@@ -244,7 +243,6 @@ return array(
     '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,
-    'prefetch' => 1,
   ),
   'mailerJobsMax' => array(
     'group_name' => 'Mailing Preferences',
@@ -264,7 +262,6 @@ return array(
     '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,
-    'prefetch' => 1,
   ),
   'mailThrottleTime' => array(
     'group_name' => 'Mailing Preferences',
@@ -284,7 +281,6 @@ return array(
     '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,
-    'prefetch' => 1,
   ),
   'verpSeparator' => array(
     'group_name' => 'Mailing Preferences',
@@ -304,6 +300,19 @@ return array(
     'is_contact' => 0,
     'description' => 'Separator character used when CiviMail generates VERP (variable envelope return path) Mail-From addresses.',
     'help_text' => NULL,
-    'prefetch' => 1,
+  ),
+  '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,
   ),
 );