Merge pull request #13344 from seamuslee001/unit_test_13343

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

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 996b005c3aa861d6eaa6704af25bc1faef5744cf..b332f3b8e18d1e174ccac9d7d9ea03dce495bb4b 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2019
  */
 
 /**
@@ -112,27 +112,28 @@ return array(
     'group' => 'core',
     'name' => 'address_options',
     'type' => 'String',
-    'html_type' => 'Text',
+    'html_type' => 'checkboxes',
     'pseudoconstant' => array(
       'optionGroupName' => 'address_options',
     ),
     'default' => '\ 11\ 12\ 13\ 14\ 15\ 16\ 18\ 19\ 110\ 111\ 1',
     'add' => '4.1',
-    'title' => 'Addressing Options',
+    'title' => ts('Address Fields'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
     'help_text' => NULL,
+    'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
   ),
   'address_format' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'address_format',
     'type' => 'String',
-    'html_type' => 'TextArea',
+    'html_type' => 'textarea',
     'default' => "{contact.address_name}\n{contact.street_address}\n{contact.supplemental_address_1}\n{contact.supplemental_address_2}\n{contact.supplemental_address_3}\n{contact.city}{, }{contact.state_province}{ }{contact.postal_code}\n{contact.country}",
     'add' => '4.1',
-    'title' => 'Address Format',
+    'title' => ts('Address Display Format'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
@@ -143,10 +144,10 @@ return array(
     'group' => 'core',
     'name' => 'mailing_format',
     'type' => 'String',
-    'html_type' => 'Text',
+    'html_type' => 'textarea',
     'default' => "{contact.addressee}\n{contact.street_address}\n{contact.supplemental_address_1}\n{contact.supplemental_address_2}\n{contact.supplemental_address_3}\n{contact.city}{, }{contact.state_province}{ }{contact.postal_code}\n{contact.country}",
     'add' => '4.1',
-    'title' => 'Mailing Format',
+    'title' => ts('Mailing Label Format'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
@@ -213,10 +214,14 @@ return array(
     'group' => 'core',
     'name' => 'editor_id',
     'type' => 'String',
-    'html_type' => 'Select',
+    'html_type' => 'select',
     'default' => 'CKEditor',
     'add' => '4.1',
     'title' => ts('Wysiwig Editor'),
+    'pseudoconstant' => array(
+      'optionGroupName' => 'wysiwyg_editor',
+      'keyColumn' => 'name',
+    ),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
@@ -235,6 +240,7 @@ return array(
     'is_contact' => 0,
     'description' => NULL,
     'help_text' => NULL,
+    'options' => ['1' => ts('While Typing'), '0' => ts('When Saving'), '2' => ts('Never')],
   ),
   'ajaxPopupsEnabled' => array(
     'group_name' => 'CiviCRM Preferences',
@@ -283,7 +289,8 @@ return array(
     'group' => 'core',
     'name' => 'contact_autocomplete_options',
     'type' => 'String',
-    'quick_form_type' => 'CheckBox',
+    'quick_form_type' => 'CheckBoxes',
+    'html_type' => 'checkboxes',
     'pseudoconstant' => array(
       'callback' => 'CRM_Admin_Form_Setting_Search::getContactAutocompleteOptions',
     ),
@@ -294,13 +301,15 @@ return array(
     'is_contact' => 0,
     'description' => ts("Selected fields will be displayed in back-office autocomplete dropdown search results (Quick Search, etc.). Contact Name is always included."),
     'help_text' => NULL,
+    'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
   ),
   'contact_reference_options' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'contact_reference_options',
     'type' => 'String',
-    'quick_form_type' => 'CheckBox',
+    'quick_form_type' => 'CheckBoxes',
+    'html_type' => 'checkboxes',
     'pseudoconstant' => array(
       'callback' => 'CRM_Admin_Form_Setting_Search::getContactReferenceOptions',
     ),
@@ -311,6 +320,7 @@ return array(
     'is_contact' => 0,
     'description' => ts("Selected fields will be displayed in autocomplete dropdown search results for 'Contact Reference' custom fields. Contact Name is always included. NOTE: You must assign 'access contact reference fields' permission to the anonymous role if you want to use custom contact reference fields in profiles on public pages. For most situations, you should use the 'Limit List to Group' setting when configuring a contact reference field which will be used in public forms to prevent exposing your entire contact list."),
     'help_text' => NULL,
+    'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
   ),
   'contact_smart_group_display' => array(
     'group_name' => 'CiviCRM Preferences',
@@ -487,7 +497,7 @@ return array(
       'size' => 64,
       'maxlength' => 256,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Path to wkhtmltopdf executable'),
@@ -506,7 +516,7 @@ return array(
       'size' => 64,
       'maxlength' => 64,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Recaptcha Options'),
@@ -525,7 +535,7 @@ return array(
       'size' => 64,
       'maxlength' => 64,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Recaptcha Site Key'),
@@ -559,7 +569,7 @@ return array(
       'size' => 64,
       'maxlength' => 64,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Recaptcha Secret Key'),
@@ -578,7 +588,7 @@ return array(
       'size' => 2,
       'maxlength' => 8,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => 7,
     'add' => '4.3',
     'title' => ts('Checksum Lifespan'),
@@ -597,7 +607,7 @@ return array(
       'size' => 64,
       'maxlength' => 128,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => '*default*',
     'add' => '4.3',
     'title' => ts('Blog Feed URL'),
@@ -616,7 +626,7 @@ return array(
       'size' => 64,
       'maxlength' => 128,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => '*default*',
     'add' => '4.3',
     'title' => ts('Community Messages URL'),
@@ -635,7 +645,7 @@ return array(
       'size' => 64,
       'maxlength' => 128,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => '*default*',
     'add' => '4.3',
     'title' => ts('Getting Started URL'),
@@ -849,8 +859,8 @@ return array(
       'size' => '32',
       'maxlength' => '64',
     ),
-    'default' => NULL,
-    'title' => ts('Drupal Users Table Name'),
+    'default' => 'users',
+    'title' => ts('CMS Users Table Name'),
     'description' => '',
   ),
   'wpLoadPhp' => array(
@@ -995,9 +1005,9 @@ return array(
     'is_domain' => 1,
     'is_contact' => 0,
     'default' => array(),
-    'title' => 'Do not notify assignees for',
-    'help_text' => 'These activity types will be excluded from automated email notifications to assignees.',
-    'html_type' => 'Select',
+    'title' => ts('Do not notify assignees for'),
+    'description' => ts('These activity types will be excluded from automated email notifications to assignees.'),
+    'html_type' => 'select',
     'html_attributes' => array(
       'multiple' => 1,
       'class' => 'huge crm-select2',