X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=settings%2FCore.setting.php;h=64778e4d87bae74397b25d45c6abe335db0be7e8;hb=c2655a0481b48128e2d9b4b61b273eb8c192dcdd;hp=20b7d50b2412a2d7cbfff46e8c79309d90aee720;hpb=7526f12226fdd2e6c5046386a655aa82c59ebc1f;p=civicrm-core.git

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 20b7d50b24..64778e4d87 100644
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -358,9 +358,26 @@ return [
     'pseudoconstant' => [
       'callback' => 'CRM_Contact_BAO_GroupContactCache::getModes',
     ],
-    'description' => ts('Should the smart groups be by cron jobs or user actions'),
+    'description' => ts('Should the smart groups be flushed by cron jobs or user actions'),
     'help_text' => ts('In "Opportunistic Flush" mode, caches are flushed in response to user actions; this mode is broadly compatible but may add latency during form-submissions. In "Cron Flush" mode, you should schedule a cron job to flush caches; this can improve latency on form-submissions but requires more setup.'),
   ],
+  'acl_cache_refresh_mode' => [
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'acl_cache_refresh_mode',
+    'type' => 'String',
+    'html_type' => 'radio',
+    'default' => 'opportunistic',
+    'add' => '5.37.0',
+    'title' => ts('ACL Group Refresh Mode'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'pseudoconstant' => [
+      'callback' => 'CRM_Contact_BAO_GroupContactCache::getModes',
+    ],
+    'description' => ts('Should the acl cache be by cron jobs or user actions'),
+    'help_text' => ts('In "Opportunistic Flush" mode, caches are flushed in response to user actions; this mode is broadly compatible but may add latency during form-submissions. In "Cron Flush" mode, you should schedule a cron job to flush caches if your site uses ACLs; this can improve latency on form-submissions but requires more setup.'),
+  ],
   'installed' => [
     'bootstrap_comment' => 'This is a boot setting which may be loaded during bootstrap. Defaults are loaded via SettingsBag::getSystemDefaults().',
     'group_name' => 'CiviCRM Preferences',
@@ -531,78 +548,6 @@ return [
     'description' => NULL,
     'help_text' => NULL,
   ],
-  'recaptchaOptions' => [
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'recaptchaOptions',
-    'type' => 'String',
-    'quick_form_type' => 'Element',
-    'html_attributes' => [
-      'size' => 64,
-      'maxlength' => 64,
-    ],
-    'html_type' => 'text',
-    'default' => NULL,
-    'add' => '4.3',
-    'title' => ts('reCAPTCHA Options'),
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => ts('You can specify the reCAPTCHA theme options as comma separated data.(eg: theme:\'blackglass\', lang : \'fr\' ). Check the available options at <a href="https://developers.google.com/recaptcha/docs/display#config">Customizing the Look and Feel of reCAPTCHA</a>.'),
-    'help_text' => NULL,
-  ],
-  'recaptchaPublicKey' => [
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'recaptchaPublicKey',
-    'type' => 'String',
-    'quick_form_type' => 'Element',
-    'html_attributes' => [
-      'size' => 64,
-      'maxlength' => 64,
-    ],
-    'html_type' => 'text',
-    'default' => NULL,
-    'add' => '4.3',
-    'title' => ts('reCAPTCHA Site Key'),
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => NULL,
-    'help_text' => NULL,
-  ],
-  'forceRecaptcha' => [
-    'add' => '4.7',
-    'help_text' => NULL,
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'forceRecaptcha',
-    'type' => 'Boolean',
-    'quick_form_type' => 'YesNo',
-    'html_type' => '',
-    'default' => '0',
-    'title' => ts('Force reCAPTCHA on Contribution pages'),
-    'description' => ts('If enabled, reCAPTCHA will show on all contribution pages.'),
-  ],
-  'recaptchaPrivateKey' => [
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'recaptchaPrivateKey',
-    'type' => 'String',
-    'quick_form_type' => 'Element',
-    'html_attributes' => [
-      'size' => 64,
-      'maxlength' => 64,
-    ],
-    'html_type' => 'text',
-    'default' => NULL,
-    'add' => '4.3',
-    'title' => ts('reCAPTCHA Secret Key'),
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => NULL,
-    'help_text' => NULL,
-  ],
   'checksum_timeout' => [
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',