X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=settings%2FMailing.setting.php;h=70d372b8d439052609ceb39fa92559a849f7c857;hb=13cf686d2b7a944414d08d44e094b57e0ae89213;hp=18f98c89672ade6368af693a6ffcc8db47e83ded;hpb=66f90900f71398c4315f673c4b9b9bd47640e964;p=civicrm-core.git

diff --git a/settings/Mailing.setting.php b/settings/Mailing.setting.php
index 18f98c8967..70d372b8d4 100644
--- a/settings/Mailing.setting.php
+++ b/settings/Mailing.setting.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -48,8 +48,8 @@ return array(
     'title' => 'Enable Double Opt-in for Profile Group(s) field',
     '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.',
-    'help_text' => null,
+    '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.',
+    'help_text' => NULL,
   ),
   'track_civimail_replies' => array(
     'group_name' => 'Mailing Preferences',
@@ -59,11 +59,11 @@ return array(
     'html_type' => '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.',
-    'help_text' => null,
+    'description' => 'If checked, mailings will default to tracking replies using VERP-ed Reply-To. ',
+    'help_text' => NULL,
     'validate_callback' => 'CRM_Core_BAO_Setting::validateBoolSetting',
   ),
   'civimail_workflow' => array(
@@ -78,7 +78,7 @@ return array(
     '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.',
-    'help_text' => null,
+    'help_text' => NULL,
   ),
   'civimail_server_wide_lock' => array(
     'group_name' => 'Mailing Preferences',
@@ -91,36 +91,36 @@ return array(
     'title' => 'Lock Mails Server-Wide for Mail Sending',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,
   ),
-  'mailing_backend' => array(
+  'replyTo' => array(
     'group_name' => 'Mailing Preferences',
     'group' => 'mailing',
-    'name' => 'mailing_backend',
-    'type' => 'Array',
-    'html_type' => 'checkbox',
+    'name' => 'replyTo',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
     'default' => 0,
-    'add' => '4.1',
-    'title' => 'Mailing Backend',
+    'add' => '4.6',
+    'title' => 'Enable Custom Reply-To',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => null,
+    'description' => 'Allow CiviMail users to send mailings with a custom Reply-To header',
+    'help_text' => NULL,
   ),
-  'profile_double_optin' => array(
+  'mailing_backend' => array(
     'group_name' => 'Mailing Preferences',
     'group' => 'mailing',
-    'name' => 'profile_double_optin',
-    'type' => 'Integer',
+    'name' => 'mailing_backend',
+    'type' => 'Array',
     'html_type' => 'checkbox',
     'default' => 0,
     'add' => '4.1',
-    'title' => 'Enable Double Opt-in for Profile Group(s) field',
+    'title' => 'Mailing Backend',
     '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.',
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,
   ),
   'profile_add_to_group_double_optin' => array(
     'group_name' => 'Mailing Preferences',
@@ -134,7 +134,7 @@ return array(
     '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.',
-    'help_text' => null,
+    'help_text' => NULL,
   ),
   'disable_mandatory_tokens_check' => array(
     'group_name' => 'Mailing Preferences',
@@ -148,7 +148,7 @@ return array(
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'Don\'t check for presence of mandatory tokens (domain address; unsubscribe/opt-out) before sending mailings. WARNING: Mandatory tokens are a safe-guard which facilitate compliance with the US CAN-SPAM Act. They should only be disabled if your organization adopts other mechanisms for compliance or if your organization is not subject to CAN-SPAM.',
-    'help_text' => null,
+    'help_text' => NULL,
   ),
   'dedupe_email_default' => array(
     'group_name' => 'Mailing Preferences',
@@ -162,7 +162,7 @@ return array(
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'Set the "dedupe e-mail" option when sending a new mailing to "true" by default.',
-    'help_text' => null,
+    'help_text' => NULL,
   ),
   'hash_mailing_url' => array(
     'group_name' => 'Mailing Preferences',
@@ -176,6 +176,6 @@ return array(
     'is_domain' => 1,
     'is_contact' => 0,
     '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,
+    'help_text' => NULL,
   ),
 );