From: Tim Otten Date: Fri, 9 Jan 2015 23:09:24 +0000 (-0800) Subject: INFRA-132 - FunctionDeclarationArgumentSpacing.SpaceBeforeEquals X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=242bd1791a5a3f85fe909f09f2796c0d7af896b2;p=civicrm-core.git INFRA-132 - FunctionDeclarationArgumentSpacing.SpaceBeforeEquals --- diff --git a/CRM/Contact/BAO/GroupContact.php b/CRM/Contact/BAO/GroupContact.php index fe3ce36418..34d12ab7bd 100644 --- a/CRM/Contact/BAO/GroupContact.php +++ b/CRM/Contact/BAO/GroupContact.php @@ -136,8 +136,8 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { static function addContactsToGroup( $contactIds, $groupId, - $method = 'Admin', - $status = 'Added', + $method = 'Admin', + $status = 'Added', $tracking = NULL ) { @@ -187,8 +187,8 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { static function removeContactsFromGroup( &$contactIds, $groupId, - $method = 'Admin', - $status = 'Removed', + $method = 'Admin', + $status = 'Removed', $tracking = NULL ) { if (!is_array($contactIds)) { @@ -214,8 +214,8 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { foreach ($contactIds as $contactId) { if ($status == 'Deleted') { - $query = "DELETE FROM civicrm_group_contact WHERE contact_id=$contactId AND group_id=$groupId"; - $dao = CRM_Core_DAO::executeQuery($query); + $query = "DELETE FROM civicrm_group_contact WHERE contact_id=$contactId AND group_id=$groupId"; + $dao = CRM_Core_DAO::executeQuery($query); $historyParams = array( 'group_id' => $groupId, 'contact_id' => $contactId, @@ -290,8 +290,8 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { $select = $from = $where = ''; $select = 'SELECT DISTINCT civicrm_group.id, civicrm_group.title '; - $from = ' FROM civicrm_group '; - $where = " WHERE civicrm_group.is_active = 1 "; + $from = ' FROM civicrm_group '; + $where = " WHERE civicrm_group.is_active = 1 "; if ($contactId) { $from .= ' , civicrm_group_contact '; $where .= " AND civicrm_group.id = civicrm_group_contact.group_id @@ -343,13 +343,13 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { */ static function &getContactGroup( $contactId, - $status = NULL, - $numGroupContact = NULL, - $count = FALSE, + $status = NULL, + $numGroupContact = NULL, + $count = FALSE, $ignorePermission = FALSE, $onlyPublicGroups = FALSE, - $excludeHidden = TRUE, - $groupId = NULL + $excludeHidden = TRUE, + $groupId = NULL ) { if ($count) { $select = 'SELECT count(DISTINCT civicrm_group_contact.id)'; @@ -734,8 +734,8 @@ AND group_id IN ( $groupIDString ) static function bulkAddContactsToGroup( $contactIDs, $groupID, - $method = 'Admin', - $status = 'Added', + $method = 'Admin', + $status = 'Added', $tracking = NULL ) { diff --git a/CRM/Contact/Form/Search/Custom/Base.php b/CRM/Contact/Form/Search/Custom/Base.php index fe7fa5a45d..cbad293b1f 100644 --- a/CRM/Contact/Form/Search/Custom/Base.php +++ b/CRM/Contact/Form/Search/Custom/Base.php @@ -97,11 +97,11 @@ class CRM_Contact_Form_Search_Custom_Base { */ function sql( $selectClause, - $offset = 0, + $offset = 0, $rowcount = 0, $sort = NULL, $includeContactIDs = FALSE, - $groupBy = NULL + $groupBy = NULL ) { $sql = "SELECT $selectClause " . $this->from(); diff --git a/CRM/Core/BAO/Setting.php b/CRM/Core/BAO/Setting.php index 6dda26f400..584c60fd06 100644 --- a/CRM/Core/BAO/Setting.php +++ b/CRM/Core/BAO/Setting.php @@ -87,8 +87,8 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { $group, $name, $componentID = NULL, - $contactID = NULL, - $load = FALSE, + $contactID = NULL, + $load = FALSE, $domainID = NULL, $force = FALSE ) { @@ -165,9 +165,9 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { */ static function dao( $group, - $name = NULL, + $name = NULL, $componentID = NULL, - $contactID = NULL, + $contactID = NULL, $domainID = NULL ) { if (self::isUpgradeFromPreFourOneAlpha1()) { @@ -179,11 +179,11 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { } $dao = new CRM_Core_DAO_Setting(); - $dao->group_name = $group; - $dao->name = $name; + $dao->group_name = $group; + $dao->name = $name; $dao->component_id = $componentID; if (empty($domainID)) { - $dao->domain_id = CRM_Core_Config::domainID(); + $dao->domain_id = CRM_Core_Config::domainID(); } else { $dao->domain_id = $domainID; @@ -221,11 +221,11 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { */ static function getItem( $group, - $name = NULL, - $componentID = NULL, + $name = NULL, + $componentID = NULL, $defaultValue = NULL, - $contactID = NULL, - $domainID = NULL + $contactID = NULL, + $domainID = NULL ) { if (NULL !== ($override = self::getOverride($group, $name, NULL))) { @@ -352,9 +352,9 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { $group, $name, $componentID = NULL, - $contactID = NULL, - $createdID = NULL, - $domainID = NULL + $contactID = NULL, + $createdID = NULL, + $domainID = NULL ) { $fields = array(); $fieldsToSet = self::validateSettingsInput(array($name => $value), $fields); @@ -387,9 +387,9 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { $group, $name, $componentID = NULL, - $contactID = NULL, - $createdID = NULL, - $domainID = NULL + $contactID = NULL, + $createdID = NULL, + $domainID = NULL ) { if (empty($domainID)) { $domainID = CRM_Core_Config::domainID(); @@ -837,12 +837,12 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { static function valueOptions( $group, $name, - $system = TRUE, - $userID = NULL, - $localize = FALSE, - $returnField = 'name', + $system = TRUE, + $userID = NULL, + $localize = FALSE, + $returnField = 'name', $returnNameANDLabels = FALSE, - $condition = NULL + $condition = NULL ) { $optionValue = self::getItem($group, $name); @@ -897,8 +897,8 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { $group, $name, $value, - $system = TRUE, - $userID = NULL, + $system = TRUE, + $userID = NULL, $keyField = 'name' ) { if (empty($value)) {