From 9070aa432aa07e8dcdaa55846010f6428eadf01e Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 29 Jul 2020 13:50:12 -0400 Subject: [PATCH] NFC - Docblock cleanup --- civicrm.install | 2 -- .../Engage/Report/Form/CallList.php | 1 - .../Engage/Report/Form/List.php | 31 +++++++++---------- .../Engage/Report/Form/WalkList.php | 1 - modules/civicrm_engage/civicrm_engage.install | 2 -- modules/civicrm_engage/civicrm_engage.module | 2 -- .../civicrm_group_roles.install | 22 +++---------- .../civicrm_group_roles.module | 28 +++++------------ .../civicrm_og_sync/civicrm_og_sync.install | 2 -- .../civicrm_og_sync/civicrm_og_sync.module | 2 -- .../civicrm_rules.contact-eval.inc | 2 -- .../civicrm_rules.event-eval.inc | 2 -- modules/civicrm_rules/civicrm_rules.install | 2 -- .../civicrm_rules.mailing-eval.inc | 2 -- modules/civicrm_rules/civicrm_rules.module | 2 -- .../civicrm_rules.participant-eval.inc | 2 -- modules/civicrm_rules/civicrm_rules.rules.inc | 2 -- .../civicrm_rules/civicrm_rules_action.inc | 2 -- .../civicrm_rules/civicrm_rules_condition.inc | 2 -- .../civicrm_rules/civicrm_rules_entity.inc | 2 -- modules/civicrm_rules/civicrm_rules_event.inc | 2 -- modules/civicrm_rules/civicrm_rules_utils.inc | 2 -- modules/civicrmtheme/civicrmtheme.install | 2 -- modules/civicrmtheme/civicrmtheme.module | 2 -- modules/views/civicrm.views.inc | 22 +++---------- modules/views/civicrm.views_default.inc | 22 +++---------- .../views/civicrm/civicrm_handler_field.inc | 22 +++---------- .../civicrm_handler_field_activity.inc | 22 +++---------- .../civicrm/civicrm_handler_field_address.inc | 22 +++---------- .../civicrm_handler_field_component.inc | 22 +++---------- .../civicrm_handler_field_contact_link.inc | 22 +++---------- .../civicrm/civicrm_handler_field_country.inc | 22 +++---------- .../civicrm/civicrm_handler_field_county.inc | 22 +++---------- .../civicrm/civicrm_handler_field_custom.inc | 22 +++---------- .../civicrm_handler_field_custom_file.inc | 22 +++---------- .../civicrm_handler_field_datetime.inc | 22 +++---------- .../civicrm_handler_field_drupalid.inc | 22 +++---------- .../civicrm/civicrm_handler_field_email.inc | 22 +++---------- ...civicrm_handler_field_encounter_medium.inc | 22 +++---------- .../civicrm/civicrm_handler_field_event.inc | 22 +++---------- .../civicrm_handler_field_event_link.inc | 22 +++---------- .../civicrm/civicrm_handler_field_file.inc | 22 +++---------- .../civicrm/civicrm_handler_field_im.inc | 22 +++---------- .../civicrm/civicrm_handler_field_link.inc | 22 +++---------- .../civicrm_handler_field_link_activity.inc | 22 +++---------- .../civicrm_handler_field_link_contact.inc | 22 +++---------- ...ivicrm_handler_field_link_contribution.inc | 22 +++---------- .../civicrm_handler_field_link_delete.inc | 22 +++---------- .../civicrm_handler_field_link_edit.inc | 22 +++---------- .../civicrm_handler_field_link_event.inc | 22 +++---------- ...civicrm_handler_field_link_participant.inc | 22 +++---------- .../civicrm_handler_field_link_pcp.inc | 22 +++---------- ...ivicrm_handler_field_link_relationship.inc | 22 +++---------- .../civicrm_handler_field_location.inc | 22 +++---------- .../civicrm/civicrm_handler_field_mail.inc | 22 +++---------- .../civicrm/civicrm_handler_field_money.inc | 22 +++---------- .../civicrm/civicrm_handler_field_option.inc | 22 +++---------- ...ivicrm_handler_field_pcp_raised_amount.inc | 22 +++---------- .../civicrm/civicrm_handler_field_phone.inc | 22 +++---------- .../civicrm_handler_field_pseudo_constant.inc | 22 +++---------- ...ivicrm_handler_field_relationship_type.inc | 22 +++---------- .../civicrm/civicrm_handler_field_state.inc | 22 +++---------- .../civicrm/civicrm_handler_field_website.inc | 22 +++---------- .../civicrm_handler_filter_contact_ref.inc | 22 +++---------- .../civicrm_handler_filter_country_multi.inc | 28 +++++------------ .../civicrm_handler_filter_custom_option.inc | 28 +++++------------ ...rm_handler_filter_custom_single_option.inc | 28 +++++------------ .../civicrm_handler_filter_datetime.inc | 22 +++---------- .../civicrm/civicrm_handler_filter_domain.inc | 22 +++---------- ...ivicrm_handler_filter_encounter_medium.inc | 22 +++---------- .../civicrm_handler_filter_group_name.inc | 28 +++++------------ .../civicrm_handler_filter_group_status.inc | 28 +++++------------ .../civicrm/civicrm_handler_filter_option.inc | 22 +++---------- ...civicrm_handler_filter_pseudo_constant.inc | 22 +++---------- ...vicrm_handler_filter_relationship_type.inc | 22 +++---------- .../civicrm_handler_filter_state_multi.inc | 28 +++++------------ .../civicrm_handler_relationship_address.inc | 22 +++---------- ...crm_handler_relationship_contact2users.inc | 22 +++---------- .../civicrm_handler_relationship_im.inc | 22 +++---------- .../civicrm_handler_relationship_location.inc | 22 +++---------- .../civicrm_handler_relationship_mail.inc | 22 +++---------- ...relationship_memberships_contributions.inc | 22 +++---------- .../civicrm_handler_relationship_phone.inc | 22 +++---------- .../civicrm_handler_relationship_website.inc | 22 +++---------- ...rm_handler_sort_address_pseudoconstant.inc | 22 +++---------- .../civicrm/civicrm_handler_sort_county.inc | 22 +++---------- .../civicrm/civicrm_handler_sort_date.inc | 22 +++---------- ...civicrm_handler_sort_pcp_raised_amount.inc | 24 +++----------- .../civicrm/civicrm_handler_sort_state.inc | 22 +++---------- .../civicrm_plugin_argument_default.inc | 22 +++---------- .../views_handler_argument_civicrm_day.inc | 22 +++---------- ...iews_handler_argument_civicrm_fulldate.inc | 22 +++---------- .../views_handler_argument_civicrm_month.inc | 22 +++---------- .../views_handler_argument_civicrm_week.inc | 22 +++---------- .../views_handler_argument_civicrm_year.inc | 22 +++---------- ...ws_handler_argument_civicrm_year_month.inc | 22 +++---------- modules/views/components/civicrm.campaign.inc | 22 +++---------- modules/views/components/civicrm.case.inc | 22 +++---------- .../views/components/civicrm.contribute.inc | 28 +++++------------ modules/views/components/civicrm.core.inc | 22 +++---------- modules/views/components/civicrm.event.inc | 22 +++---------- modules/views/components/civicrm.grant.inc | 22 +++---------- modules/views/components/civicrm.lineitem.inc | 28 +++++------------ modules/views/components/civicrm.mail.inc | 22 +++---------- modules/views/components/civicrm.member.inc | 22 +++---------- .../views/components/civicrm.price_set.inc | 22 +++---------- ...crm_plugin_argument_default_civicrm_id.inc | 22 +++---------- 107 files changed, 383 insertions(+), 1614 deletions(-) diff --git a/civicrm.install b/civicrm.install index 3fee9d53d..11e213f15 100644 --- a/civicrm.install +++ b/civicrm.install @@ -13,8 +13,6 @@ * * @package CRM * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * */ /** diff --git a/modules/civicrm_engage/Engage/Report/Form/CallList.php b/modules/civicrm_engage/Engage/Report/Form/CallList.php index 4ce7cc84b..ac7bc400f 100644 --- a/modules/civicrm_engage/Engage/Report/Form/CallList.php +++ b/modules/civicrm_engage/Engage/Report/Form/CallList.php @@ -14,7 +14,6 @@ * @package CRM * @copyright CiviCRM LLC https://civicrm.org/licensing * @copyright DharmaTech (c) 2009 - * $Id$ * */ diff --git a/modules/civicrm_engage/Engage/Report/Form/List.php b/modules/civicrm_engage/Engage/Report/Form/List.php index 9a72d2e0a..f6bc35611 100644 --- a/modules/civicrm_engage/Engage/Report/Form/List.php +++ b/modules/civicrm_engage/Engage/Report/Form/List.php @@ -14,7 +14,6 @@ * @package CRM * @copyright CiviCRM LLC https://civicrm.org/licensing * @copyright DharmaTech (c) 2009 - * $Id$ * */ @@ -215,8 +214,8 @@ class Engage_Report_Form_List extends CRM_Report_Form { $this->_demoTable = $dao->table_name; $query = " -SELECT column_name -FROM civicrm_custom_field +SELECT column_name +FROM civicrm_custom_field WHERE custom_group_id={$demoTableID} AND column_name = '" . $this->_languageName . "' LIMIT 1"; $dao = CRM_Core_DAO::executeQuery($query); $dao->fetch(); @@ -230,16 +229,16 @@ class Engage_Report_Form_List extends CRM_Report_Form { $this->_coreInfoTable = $dao->table_name; $query = " -SELECT column_name -FROM civicrm_custom_field +SELECT column_name +FROM civicrm_custom_field WHERE custom_group_id={$coreInfoTableID} AND column_name='" . self::CF_OTHER_NAME_NAME . "' LIMIT 1"; $dao = CRM_Core_DAO::executeQuery($query); $dao->fetch(); $this->_coreOtherCol = $dao->column_name; $query = " -SELECT column_name -FROM civicrm_custom_field +SELECT column_name +FROM civicrm_custom_field WHERE custom_group_id={$coreInfoTableID} AND column_name='" . self::CF_CONSTITUENT_TYPE_NAME . "' LIMIT 1"; $dao = CRM_Core_DAO::executeQuery($query); $dao->fetch(); @@ -364,29 +363,29 @@ public function engageWhereGroupClause($clause) { if (!empty($smartGroups)) { $smartGroups = implode(',', $smartGroups); - $smartGroupQuery = " UNION DISTINCT - SELECT DISTINCT smartgroup_contact.contact_id - FROM civicrm_group_contact_cache smartgroup_contact + $smartGroupQuery = " UNION DISTINCT + SELECT DISTINCT smartgroup_contact.contact_id + FROM civicrm_group_contact_cache smartgroup_contact WHERE smartgroup_contact.group_id IN ({$smartGroups}) "; } if ($this->_params['gid_op'] == 'in') { - return " {$this->_aliases['civicrm_contact']}.id IN ( - SELECT DISTINCT {$this->_aliases['civicrm_group']}.contact_id + return " {$this->_aliases['civicrm_contact']}.id IN ( + SELECT DISTINCT {$this->_aliases['civicrm_group']}.contact_id FROM civicrm_group_contact {$this->_aliases['civicrm_group']} - WHERE {$clause} AND {$this->_aliases['civicrm_group']}.status = 'Added' + WHERE {$clause} AND {$this->_aliases['civicrm_group']}.status = 'Added' {$smartGroupQuery} ) "; } elseif ($this->_params['gid_op'] == 'mand') { - $query = " {$this->_aliases['civicrm_contact']}.id IN ( - SELECT DISTINCT {$this->_aliases['civicrm_group']}1.contact_id + $query = " {$this->_aliases['civicrm_contact']}.id IN ( + SELECT DISTINCT {$this->_aliases['civicrm_group']}1.contact_id FROM civicrm_group_contact {$this->_aliases['civicrm_group']}1 "; for ($i = 2; $i <= count($this->_params['gid_value']); $i++) { $j = $i - 1; $status[] = "{$this->_aliases['civicrm_group']}{$i}.group_id != {$this->_aliases['civicrm_group']}{$j}.group_id"; - $query .= " INNER JOIN civicrm_group_contact {$this->_aliases['civicrm_group']}{$i} + $query .= " INNER JOIN civicrm_group_contact {$this->_aliases['civicrm_group']}{$i} ON {$this->_aliases['civicrm_group']}{$i}.contact_id = {$this->_aliases['civicrm_group']}{$j}.contact_id AND " . implode(" AND ", $status) . " "; } diff --git a/modules/civicrm_engage/Engage/Report/Form/WalkList.php b/modules/civicrm_engage/Engage/Report/Form/WalkList.php index 1f2046863..105cd6c0c 100644 --- a/modules/civicrm_engage/Engage/Report/Form/WalkList.php +++ b/modules/civicrm_engage/Engage/Report/Form/WalkList.php @@ -14,7 +14,6 @@ * @package CRM * @copyright CiviCRM LLC https://civicrm.org/licensing * @copyright DharmaTech (c) 2009 - * $Id$ * */ diff --git a/modules/civicrm_engage/civicrm_engage.install b/modules/civicrm_engage/civicrm_engage.install index 95da7ea9e..486180aee 100644 --- a/modules/civicrm_engage/civicrm_engage.install +++ b/modules/civicrm_engage/civicrm_engage.install @@ -13,8 +13,6 @@ * * @package CRM * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * */ /** diff --git a/modules/civicrm_engage/civicrm_engage.module b/modules/civicrm_engage/civicrm_engage.module index 8b10ef6cb..2af58def4 100644 --- a/modules/civicrm_engage/civicrm_engage.module +++ b/modules/civicrm_engage/civicrm_engage.module @@ -13,8 +13,6 @@ * * @package CRM * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * */ define('CIVICRM_ENGAGE_CG_DEMOGRAPHICS_NAME', 'Demographics'); diff --git a/modules/civicrm_group_roles/civicrm_group_roles.install b/modules/civicrm_group_roles/civicrm_group_roles.install index 2be39dbdd..ab55cc0c6 100644 --- a/modules/civicrm_group_roles/civicrm_group_roles.install +++ b/modules/civicrm_group_roles/civicrm_group_roles.install @@ -1,25 +1,11 @@ ensure_my_table(); // @see CRM_PCP_BAO_PCP::thermoMeter for the source of this SQL - $formula = " + $formula = " (SELECT SUM(cc.total_amount) as total FROM {civicrm_pcp} pcp2 LEFT JOIN {civicrm_contribution_soft} cs ON ( pcp2.id = cs.pcp_id ) diff --git a/modules/views/civicrm/civicrm_handler_sort_state.inc b/modules/views/civicrm/civicrm_handler_sort_state.inc index 31192eeae..46e312412 100644 --- a/modules/views/civicrm/civicrm_handler_sort_state.inc +++ b/modules/views/civicrm/civicrm_handler_sort_state.inc @@ -1,25 +1,11 @@