CRM-13672 - Add alerts for security releases

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

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 449c8d1ba549eb1e51489dbe35b2f58a30893d79..ffd41021b338b6e0cca80a3e1e713ba9384f4c6f 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -355,43 +355,67 @@ return array (
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'versionAlert',
-    'type' => 'Boolean',
-    'quick_form_type' => 'YesNo',
+    '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' => 1,
     'add' => '4.3',
     'title' => 'New Version Alerts',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => 'Displays an on-screen alert to users with "Administer CiviCRM" permissions when a new version of CiviCRM is available. This setting will only work if the "Version Check & Statistics Reporting" setting is enabled.',
+    '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',
     'name' => 'versionCheck',
-    'prefetch' => 1,  // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
-    'config_only'=> 1, //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
     'add' => '4.3',
-    'title' => 'Version Check & Statistics Reporting',
+    'title' => 'Automatically Check for Updates',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => "If enabled, CiviCRM automatically checks availablity of a newer version of the software. New version alerts will be displayed on the main CiviCRM Administration page.
-When enabled, statistics about your CiviCRM installation are reported anonymously to the CiviCRM team to assist in prioritizing ongoing development efforts. The following information is gathered: CiviCRM version, versions of PHP, MySQL and framework (Drupal/Joomla/standalone), and default language. Counts (but no actual data) of the following record types are reported: contacts, activities, cases, relationships, contributions, contribution pages, contribution products, contribution widgets, discounts, price sets, profiles, events, participants, tell-a-friend pages, grants, mailings, memberships, membership blocks, pledges, pledge blocks and active payment processor types.",
+    'description' => "",
     'help_text' => null,
   ),
   'securityAlert' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
-    'name' => 'versionCheck',
-    'prefetch' => 0,
+    'name' => 'securityAlert',
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
     'add' => '4.4',
-    'title' => 'Security Alerts',
+    'title' => 'Security Audits',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => "If enabled, CiviCRM will automatically run checks for significant mis-configurations such as ineffective file protections.",