Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NFC - Docblock cleanup #610

Merged
merged 1 commit into from
Jul 29, 2020
Merged

NFC - Docblock cleanup #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions civicrm.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

/**
Expand Down
1 change: 0 additions & 1 deletion modules/civicrm_engage/Engage/Report/Form/CallList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* @copyright DharmaTech (c) 2009
* $Id$
*
*/

Expand Down
31 changes: 15 additions & 16 deletions modules/civicrm_engage/Engage/Report/Form/List.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* @copyright DharmaTech (c) 2009
* $Id$
*
*/

Expand Down Expand Up @@ -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();
Expand All @@ -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();
Expand Down Expand Up @@ -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) . "
";
}
Expand Down
1 change: 0 additions & 1 deletion modules/civicrm_engage/Engage/Report/Form/WalkList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* @copyright DharmaTech (c) 2009
* $Id$
*
*/

Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_engage/civicrm_engage.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

/**
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_engage/civicrm_engage.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

define('CIVICRM_ENGAGE_CG_DEMOGRAPHICS_NAME', 'Demographics');
Expand Down
22 changes: 4 additions & 18 deletions modules/civicrm_group_roles/civicrm_group_roles.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
<?php
/*
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| Copyright CiviCRM LLC. All rights reserved. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
| This work is published under the GNU AGPLv3 license with some |
| permitted exceptions and without any warranty. For full license |
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/

Expand Down
28 changes: 7 additions & 21 deletions modules/civicrm_group_roles/civicrm_group_roles.module
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,12 @@
<?php
/*
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC. All rights reserved. |
| |
| This work is published under the GNU AGPLv3 license with some |
| permitted exceptions and without any warranty. For full license |
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/

/**
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_og_sync/civicrm_og_sync.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

/**
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_og_sync/civicrm_og_sync.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

/**
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules.contact-eval.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

/**
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules.event-eval.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

require_once 'civicrm_rules_utils.inc';
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

/**
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules.mailing-eval.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

require_once 'civicrm_rules_utils.inc';
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

/**
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules.participant-eval.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

require_once 'civicrm_rules_utils.inc';
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules.rules.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/
require_once 'civicrm_rules_utils.inc';
require_once 'civicrm_rules.contact-eval.inc';
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules_action.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

/**
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules_condition.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/
function civicrm_rules_get_condition() {
return array(
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules_entity.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/
function civicrm_rules_get_entity() {

Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules_event.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/
function civicrm_rules_get_event() {
$defaults = array(
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrm_rules/civicrm_rules_utils.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

/**
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrmtheme/civicrmtheme.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

/**
Expand Down
2 changes: 0 additions & 2 deletions modules/civicrmtheme/civicrmtheme.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/

/**
Expand Down
22 changes: 4 additions & 18 deletions modules/views/civicrm.views.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
<?php
/*
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| Copyright CiviCRM LLC. All rights reserved. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
| This work is published under the GNU AGPLv3 license with some |
| permitted exceptions and without any warranty. For full license |
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/

Expand Down
22 changes: 4 additions & 18 deletions modules/views/civicrm.views_default.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
<?php
/*
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| Copyright CiviCRM LLC. All rights reserved. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
| This work is published under the GNU AGPLv3 license with some |
| permitted exceptions and without any warranty. For full license |
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/

Expand Down
Loading