X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FAdmin%2FForm%2FPreferences%2FMultisite.php;h=855d374d114be81785e2fe33a019e30a46829de2;hb=ef10e0b52408ba266239a859756d757a10348228;hp=eb849e3a8e436074e45119c59416be59c023e8eb;hpb=d031c654f72b36c9f4d88bdb3dd55ddbadb98535;p=civicrm-core.git

diff --git a/CRM/Admin/Form/Preferences/Multisite.php b/CRM/Admin/Form/Preferences/Multisite.php
index eb849e3a8e..855d374d11 100644
--- a/CRM/Admin/Form/Preferences/Multisite.php
+++ b/CRM/Admin/Form/Preferences/Multisite.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -38,40 +38,43 @@
  *
  */
 class CRM_Admin_Form_Preferences_Multisite extends CRM_Admin_Form_Preferences {
-  function preProcess() {
+  public function preProcess() {
     $msDoc = CRM_Utils_System::docURL2('Multi Site Installation', NULL, NULL, NULL, NULL, "wiki");
     CRM_Utils_System::setTitle(ts('Multi Site Settings'));
     $this->_varNames = array(
-      CRM_Core_BAO_Setting::MULTISITE_PREFERENCES_NAME =>
-      array(
+      CRM_Core_BAO_Setting::MULTISITE_PREFERENCES_NAME => array(
         'is_enabled' => array(
           'html_type' => 'checkbox',
           'title' => ts('Enable Multi Site Configuration'),
           'weight' => 1,
-          'description' => ts('Multi Site provides support for sharing a single CiviCRM database among multiple sites.') . ' ' . $msDoc,
+          'description' => ts('Make CiviCRM aware of multiple domains. You should configure a domain group if enabled') . ' ' . $msDoc,
         ),
-        'uniq_email_per_site' => array(
+        /** Remove this checkbox until some one knows what this setting does
+          'uniq_email_per_site' => array(
           'html_type' => 'checkbox',
           'title' => ts('Ensure multi sites have a unique email per site'),
           'weight' => 2,
           'description' => NULL,
         ),
+         */
         'domain_group_id' => array(
-          'html_type' => 'text',
-          'title' => ts('Parent group for this domain'),
+          'html_type' => 'entity_reference',
+          'title' => ts('Domain Group'),
           'weight' => 3,
-          'description' => ts('Enter the group ID (civicrm_group.id).'),
+          'options' => array('entity' => 'group', 'select' => array('minimumInputLength' => 0)),
+          'description' => ts('Contacts created on this site are added to this group'),
         ),
+        /** Remove this checkbox until some one knows what this setting does
         'event_price_set_domain_id' => array(
           'html_type' => 'text',
           'title' => ts('Domain for event price sets'),
           'weight' => 4,
           'description' => NULL,
         ),
+        */
       ),
     );
 
     parent::preProcess();
   }
 }
-