X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=settings%2FMailing.setting.php;h=18f98c89672ade6368af693a6ffcc8db47e83ded;hb=c94fc35e2ac50c553d02de5514bfc41d45df96dd;hp=31b6c02d6027d43fd52b2cee929a34ee2b231bce;hpb=03a8c3dcf5d8c3fe76a0551cbdfea259fc40e101;p=civicrm-core.git

diff --git a/settings/Mailing.setting.php b/settings/Mailing.setting.php
index 31b6c02d60..18f98c8967 100644
--- a/settings/Mailing.setting.php
+++ b/settings/Mailing.setting.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -74,7 +74,7 @@ return array(
     'html_type' => 'checkbox',
     'default' => 0,
     'add' => '4.1',
-    'title' => null,
+    'title' => 'Use CiviMail Workflow',
     '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.',
@@ -88,7 +88,7 @@ return array(
     'html_type' => 'checkbox',
     'default' => 0,
     'add' => '4.1',
-    'title' => null,
+    'title' => 'Lock Mails Server-Wide for Mail Sending',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => null,
@@ -102,7 +102,7 @@ return array(
     'html_type' => 'checkbox',
     'default' => 0,
     'add' => '4.1',
-    'title' => null,
+    'title' => 'Mailing Backend',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => null,
@@ -150,4 +150,32 @@ return array(
     '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,
   ),
-  );
+  'dedupe_email_default' => array(
+    'group_name' => 'Mailing Preferences',
+    'group' => 'mailing',
+    'name' => 'dedupe_email_default',
+    'type' => 'Integer',
+    'html_type' => 'checkbox',
+    'default' => 1,
+    'add' => '4.5',
+    'title' => 'CiviMail dedupes e-mail addresses by default',
+    '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,
+  ),
+  'hash_mailing_url' => array(
+    'group_name' => 'Mailing Preferences',
+    'group' => 'mailing',
+    'name' => 'hash_mailing_url',
+    'type' => 'Integer',
+    'html_type' => 'checkbox',
+    'default' => 0,
+    'add' => '4.5',
+    'title' => 'Hashed Mailing URL\'s',
+    '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,
+  ),
+);