Merge pull request #6444 from PalanteJon/CRM-16981

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

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 143cee55cb148ea81102c6e8aa08716eda788aae..d015b5dfe20814e676d4ecd50ced0d4f8877239b 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
@@ -181,8 +181,8 @@ return array(
     'group' => 'core',
     'name' => 'editor_id',
     'type' => 'String',
-    'html_type' => 'Text',
-    'default' => NULL,
+    'html_type' => 'Select',
+    'default' => 'CKEditor',
     'add' => '4.1',
     'title' => 'Wysiwig Editor',
     'is_domain' => 1,
@@ -356,15 +356,8 @@ return array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'versionAlert',
-    'type' => 'Integer',
-    'quick_form_type' => 'Element',
-    'html_type' => 'select',
-    'option_values' => array(
-      ts('Disabled'),
-      ts('Display In Page Footer'),
-      ts('Display As Popup Alert'),
-      ts('Page Footer + Popup Alert'),
-    ),
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
     'default' => 1,
     'add' => '4.3',
     'title' => 'New Version Alerts',
@@ -373,27 +366,6 @@ return array(
     'description' => "",
     'help_text' => NULL,
   ),
-  'securityUpdateAlert' => array(
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'securityUpdateAlert',
-    'type' => 'Integer',
-    'quick_form_type' => 'Element',
-    'html_type' => 'select',
-    'option_values' => array(
-      ts('Disabled'),
-      ts('Display In Page Footer'),
-      ts('Display As Popup Alert'),
-      ts('Page Footer + Popup Alert'),
-    ),
-    'default' => 3,
-    'add' => '4.6',
-    'title' => 'Security Update Alerts',
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => "",
-    'help_text' => NULL,
-  ),
   'versionCheck' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
@@ -432,10 +404,10 @@ return array(
     'quick_form_type' => 'YesNo',
     'default' => 1,
     'add' => '4.4',
-    'title' => 'Security Audits',
+    'title' => 'Status Alerts',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => "If enabled, CiviCRM will automatically run checks for significant mis-configurations such as ineffective file protections.",
+    'description' => "If enabled, CiviCRM will display pop-up notifications (no more than once per day) for security and misconfiguration issues identified in the system check.",
     'help_text' => NULL,
   ),
   'doNotAttachPDFReceipt' => array(
@@ -643,9 +615,23 @@ return array(
     'title' => 'Verify SSL?',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => 'If disabled, backend HTTPS services will allow unverified, insecure connections',
+    'description' => 'If disabled, outbound web-service requests will allow unverified, insecure HTTPS connections',
     'help_text' => 'Unless you are absolutely unable to configure your server to check the SSL certificate of the remote server you should leave this set to Yes',
   ),
+  'enableSSL' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'enableSSL',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => 0,
+    'add' => '4.5',
+    'title' => 'Force SSL?',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'If enabled, inbound HTTP requests for sensitive pages will be redirected to HTTPS.',
+    'help_text' => 'If enabled, inbound HTTP requests for sensitive pages will be redirected to HTTPS.',
+  ),
   'wpBasePage' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
@@ -734,6 +720,26 @@ return array(
     'description' => 'When enabled, "empowered by CiviCRM" is displayed at the bottom of public forms.',
     'help_text' => NULL,
   ),
+  'logging' => array(
+    'add' => '4.7',
+    'prefetch' => 1,
+    'help_text' => NULL,
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'logging',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'html_type' => '',
+    'default' => '0',
+    'title' => 'Logging',
+    'description' => 'If enabled, all actions will be logged with a complete record of changes.',
+    'validate_callback' => 'CRM_Logging_Schema::checkLoggingSupport',
+    'on_change' => array(
+      'CRM_Logging_Schema::onToggle',
+    ),
+  ),
   'wpLoadPhp' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',