INFRA-132 - Remove white space after an opening "(" or before a closing ")"

[civicrm-core.git] / CRM / Contact / Form / Search / Custom / Group.php

diff --git a/CRM/Contact/Form/Search/Custom/Group.php b/CRM/Contact/Form/Search/Custom/Group.php
index 51fd1908f4256da30af73cdb2031a20782497e5b..131c338a2faedb74fede4d3dd0ba381a3a7ecec6 100644 (file)
--- a/CRM/Contact/Form/Search/Custom/Group.php
+++ b/CRM/Contact/Form/Search/Custom/Group.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -48,10 +48,10 @@ class CRM_Contact_Form_Search_Custom_Group
   /**
    * @param $formValues
    */
-  function __construct(&$formValues) {
+  public function __construct(&$formValues) {
     $this->_formValues = $formValues;
     $this->_columns = array(
-      ts('Contact Id') => 'contact_id',
+      ts('Contact ID') => 'contact_id',
       ts('Contact Type') => 'contact_type',
       ts('Name') => 'sort_name',
       ts('Group Name') => 'gname',
@@ -84,7 +84,7 @@ class CRM_Contact_Form_Search_Custom_Group
     $this->_tags = (!empty($this->_includeTags) || !empty($this->_excludeTags));
   }
 
-  function __destruct() {
+  public function __destruct() {
     // mysql drops the tables when connectiomn is terminated
     // cannot drop tables here, since the search might be used
     // in other parts after the object is destroyed
@@ -93,11 +93,11 @@ class CRM_Contact_Form_Search_Custom_Group
   /**
    * @param CRM_Core_Form $form
    */
-  function buildForm(&$form) {
+  public function buildForm(&$form) {
 
     $this->setTitle(ts('Include / Exclude Search'));
 
-    $groups = CRM_Core_PseudoConstant::group();
+    $groups = CRM_Core_PseudoConstant::nestedGroup();
 
     $tags = CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', array('onlyActive' => FALSE));
     if (count($groups) == 0 || count($tags) == 0) {
@@ -160,8 +160,8 @@ class CRM_Contact_Form_Search_Custom_Group
   /**
    * @return array
    */
-  function setDefaultValues() {
-    $defaults = array( 'andOr' => '1' );
+  public function setDefaultValues() {
+    $defaults = array('andOr' => '1');
 
     if (!empty($this->_formValues)) {
       $defaults['andOr'] = CRM_Utils_Array::value('andOr', $this->_formValues, '1');
@@ -264,7 +264,7 @@ class CRM_Contact_Form_Search_Custom_Group
    * @return string
    * @throws Exception
    */
-  function from() {
+  public function from() {
 
     $iGroups = $xGroups = $iTags = $xTags = 0;
 
@@ -567,7 +567,7 @@ WHERE  gcc.group_id = {$ssGroup->id}
    *
    * @return string
    */
-  function where($includeContactIDs = FALSE) {
+  public function where($includeContactIDs = FALSE) {
     if ($includeContactIDs) {
       $contactIDs = array();
 
@@ -593,12 +593,12 @@ WHERE  gcc.group_id = {$ssGroup->id}
   }
 
   /*
-     * Functions below generally don't need to be modified
-     */
+   * Functions below generally don't need to be modified
+   */
   /**
    * @return mixed
    */
-  function count() {
+  public function count() {
     $sql = $this->all();
 
     $dao = CRM_Core_DAO::executeQuery($sql);
@@ -613,35 +613,35 @@ WHERE  gcc.group_id = {$ssGroup->id}
    *
    * @return string
    */
-  function contactIDs($offset = 0, $rowcount = 0, $sort = NULL, $returnSQL = FALSE) {
+  public function contactIDs($offset = 0, $rowcount = 0, $sort = NULL, $returnSQL = FALSE) {
     return $this->all($offset, $rowcount, $sort, FALSE, TRUE);
   }
 
   /**
    * @return array
    */
-  function &columns() {
+  public function &columns() {
     return $this->_columns;
   }
 
   /**
    * @return null
    */
-  function summary() {
+  public function summary() {
     return NULL;
   }
 
   /**
    * @return string
    */
-  function templateFile() {
+  public function templateFile() {
     return 'CRM/Contact/Form/Search/Custom.tpl';
   }
 
   /**
    * @param $title
    */
-  function setTitle($title) {
+  public function setTitle($title) {
     if ($title) {
       CRM_Utils_System::setTitle($title);
     }
@@ -653,8 +653,7 @@ WHERE  gcc.group_id = {$ssGroup->id}
   /**
    * @param string $tableAlias
    */
-  function buildACLClause($tableAlias = 'contact') {
+  public function buildACLClause($tableAlias = 'contact') {
     list($this->_aclFrom, $this->_aclWhere) = CRM_Contact_BAO_Contact_Permission::cacheClause($tableAlias);
   }
 }
-