X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=settings%2FCore.setting.php;h=0b35e75822059163b85573644aa6f78a5cf5e2d3;hb=648631cd94799e87fe2347487d465b1a7256aa57;hp=73a444dcdc879dcb0d9af61a16d7e3a9dc3e98d4;hpb=2399ff35dc5188431904b55fcd68c6e97c27c987;p=civicrm-core.git

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 73a444dcdc..0b35e75822 100644
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2016                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,11 +28,12 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2016
+ * @copyright CiviCRM LLC (c) 2004-2017
  * $Id$
  *
  */
-/*
+
+/**
  * Settings metadata file
  */
 return array(
@@ -176,6 +177,21 @@ return array(
     'description' => NULL,
     'help_text' => NULL,
   ),
+  'remote_profile_submissions' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'remote_profile_submissions',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => FALSE,
+    'html_type' => 'radio',
+    'add' => '4.7',
+    'title' => 'Accept profile submissions from external sites',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'If enabled, CiviCRM will permit submissions from external sites to profiles. This is disabled by default to limit abuse.',
+    'help_text' => NULL,
+  ),
   'editor_id' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
@@ -497,25 +513,6 @@ return array(
     'description' => NULL,
     'help_text' => NULL,
   ),
-  'dashboardCacheTimeout' => array(
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'dashboardCacheTimeout',
-    'type' => 'Integer',
-    'quick_form_type' => 'Element',
-    'html_attributes' => array(
-      'size' => 3,
-      'maxlength' => 5,
-    ),
-    'html_type' => 'Text',
-    'default' => NULL,
-    'add' => '4.3',
-    'title' => 'Dashboard cache timeout',
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => NULL,
-    'help_text' => NULL,
-  ),
   'checksum_timeout' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
@@ -597,6 +594,8 @@ return array(
     'group' => 'core',
     'name' => 'resCacheCode',
     'type' => 'String',
+    'quick_form_type' => 'Element',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => 'resCacheCode',
@@ -814,11 +813,32 @@ return array(
     'description' => 'CiviCRM will use this setting as path to bootstrap WP.',
     'help_text' => NULL,
   ),
+  'secure_cache_timeout_minutes' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'secure_cache_timeout_minutes',
+    'type' => 'Integer',
+    'quick_form_type' => 'Element',
+    'html_type' => 'text',
+    'html_attributes' => array(
+      'size' => 2,
+      'maxlength' => 8,
+    ),
+    'default' => 20,
+    'add' => '4.7',
+    'title' => 'Secure Cache Timeout',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'Maximum number of minutes that secure form data should linger',
+    'help_text' => NULL,
+  ),
   'site_id' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'site_id',
     'type' => 'String',
+    'quick_form_type' => 'Element',
+    'html_type' => 'text',
     'default' => '',
     'add' => '4.6',
     'title' => 'Unique Site ID',
@@ -832,6 +852,8 @@ return array(
     'group' => 'core',
     'name' => 'systemStatusCheckResult',
     'type' => 'Integer',
+    'quick_form_type' => 'Element',
+    'html_type' => 'text',
     'default' => 0,
     'add' => '4.7',
     'title' => 'systemStatusCheckResult',
@@ -881,4 +903,19 @@ return array(
       'callback' => 'CRM_Utils_Recent::getProviders',
     ),
   ),
+  'dedupe_default_limit' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'dedupe_default_limit',
+    'type' => 'Integer',
+    'default' => 0,
+    'quick_form_type' => 'Element',
+    'html_type' => 'text',
+    'add' => '4.7',
+    'title' => 'Default limit for dedupe screen',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => ts('Default to only loading matches against this number of contacts'),
+    'help_text' => ts('Deduping larger databases can crash the server. By configuring a limit other than 0 here the dedupe query will only search for matches against a limited number of contacts.'),
+  ),
 );