Merge pull request #3254 from jitendrapurohit/Webtest_Core_Bugs

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

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 596f99683689fd411a468e19cb6a5d67d28a5863..556dad263c3aea9ae9d20ec6bc03da92320ad56f 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -205,6 +205,20 @@ return array (
     'description' => null,
     'help_text' => null,
   ),
+  'ajaxPopupsEnabled' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'ajaxPopupsEnabled',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => 1,
+    'add' => '4.5',
+    'title' => null,
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => null,
+    'help_text' => null,
+  ),
   'activity_assignee_notification' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
@@ -368,6 +382,22 @@ return array (
 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.",
     'help_text' => null,
   ),
+  'securityAlert' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'versionCheck',
+    'prefetch' => 0,
+    'config_only'=> 0,
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => 1,
+    'add' => '4.4',
+    'title' => 'Security Alerts',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => "If enabled, CiviCRM will automatically run checks for significant mis-configurations such as ineffective file protections.",
+    'help_text' => null,
+  ),
   'doNotAttachPDFReceipt' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
@@ -668,4 +698,20 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'description' => 'Prevent the stylesheet "civicrm.css" from being loaded.',
     'help_text' => NULL,
   ),
+  'empoweredBy' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'empoweredBy',
+    'prefetch' => 1,
+    'config_only'=> 0,
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => 1,
+    'add' => '4.5',
+    'title' => 'Display "empowered by CiviCRM"',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'When enabled, "empowered by CiviCRM" is displayed at the bottom of public forms.',
+    'help_text' => null,
+  ),
 );