diff --git a/CRM/Report/BAO/Instance.php b/CRM/Report/BAO/Instance.php
index cf62e9c7a61698d218c0760097e7b59e8328f289..627daae59fd71d1069e17237655ed89d1aaaf9d3 100644
--- a/CRM/Report/BAO/Instance.php
+++ b/CRM/Report/BAO/Instance.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Config.php b/CRM/Report/Config.php
index a59fb1bf04888518fe8e26fb85c58a4f85709d21..4583350ced2bc1e4853a919add2c17e02f6e16c1 100644
--- a/CRM/Report/Config.php
+++ b/CRM/Report/Config.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Form/ActivitySummary.php b/CRM/Report/Form/ActivitySummary.php
index 95ce6d5c9c102f30458b77360a3daea5d3ca51c0..e176003aacd877f2b6e9199de9e76b00f3752c45 100644
--- a/CRM/Report/Form/ActivitySummary.php
+++ b/CRM/Report/Form/ActivitySummary.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -291,25 +290,25 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form {
$this->_from = "
FROM civicrm_activity {$this->_aliases['civicrm_activity']}
-
- LEFT JOIN civicrm_activity_target target_activity
- ON {$this->_aliases['civicrm_activity']}.id = target_activity.activity_id
+
+ LEFT JOIN civicrm_activity_target target_activity
+ ON {$this->_aliases['civicrm_activity']}.id = target_activity.activity_id
LEFT JOIN civicrm_activity_assignment assignment_activity
- ON {$this->_aliases['civicrm_activity']}.id = assignment_activity.activity_id
+ ON {$this->_aliases['civicrm_activity']}.id = assignment_activity.activity_id
LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
ON ({$this->_aliases['civicrm_activity']}.source_contact_id = {$this->_aliases['civicrm_contact']}.id OR
target_activity.target_contact_id = {$this->_aliases['civicrm_contact']}.id OR
assignment_activity.assignee_contact_id = {$this->_aliases['civicrm_contact']}.id )
{$this->_aclFrom}
- LEFT JOIN civicrm_option_value
+ LEFT JOIN civicrm_option_value
ON ( {$this->_aliases['civicrm_activity']}.activity_type_id = civicrm_option_value.value )
- LEFT JOIN civicrm_option_group
+ LEFT JOIN civicrm_option_group
ON civicrm_option_group.id = civicrm_option_value.option_group_id
- LEFT JOIN civicrm_case_activity
+ LEFT JOIN civicrm_case_activity
ON civicrm_case_activity.activity_id = {$this->_aliases['civicrm_activity']}.id
- LEFT JOIN civicrm_case
+ LEFT JOIN civicrm_case
ON civicrm_case_activity.case_id = civicrm_case.id
- LEFT JOIN civicrm_case_contact
+ LEFT JOIN civicrm_case_contact
ON civicrm_case_contact.case_id = civicrm_case.id ";
if ($this->_emailField) {
@@ -328,7 +327,7 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form {
}
function where() {
- $this->_where = " WHERE civicrm_option_group.name = 'activity_type' AND
+ $this->_where = " WHERE civicrm_option_group.name = 'activity_type' AND
{$this->_aliases['civicrm_activity']}.is_test = 0 AND
{$this->_aliases['civicrm_activity']}.is_deleted = 0 AND
{$this->_aliases['civicrm_activity']}.is_current_revision = 1";
diff --git a/CRM/Report/Form/Case/Demographics.php b/CRM/Report/Form/Case/Demographics.php
index 0ab60dbf004dde5cae641f104d007dd4cc6a8c55..6ae1919c71589c08e2a4ef5672df1409ba565f3e 100644
--- a/CRM/Report/Form/Case/Demographics.php
+++ b/CRM/Report/Form/Case/Demographics.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -120,18 +119,18 @@ class CRM_Report_Form_Case_Demographics extends CRM_Report_Form {
),
),
/*
- 'filters' =>
+ 'filters' =>
array(
- 'country_id' =>
+ 'country_id' =>
array( 'title' => ts( 'Country' ),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Core_PseudoConstant::country( ),
- ),
- 'state_province_id' =>
- array( 'title' => ts( 'State / Province' ),
+ ),
+ 'state_province_id' =>
+ array( 'title' => ts( 'State / Province' ),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
- 'options' => CRM_Core_PseudoConstant::stateProvince( ), ),
- ),
+ 'options' => CRM_Core_PseudoConstant::stateProvince( ), ),
+ ),
*/
),
'civicrm_phone' =>
@@ -279,13 +278,13 @@ where (cg.extends='Contact' OR cg.extends='Individual' OR cg.extends_entity_colu
function from() {
$this->_from = "
FROM civicrm_contact {$this->_aliases['civicrm_contact']}
- LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
- ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND
+ LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
+ ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND
{$this->_aliases['civicrm_address']}.is_primary = 1 )
LEFT JOIN civicrm_case_contact ccc ON ccc.contact_id = {$this->_aliases['civicrm_contact']}.id
LEFT JOIN civicrm_case {$this->_aliases['civicrm_case']} ON {$this->_aliases['civicrm_case']}.id = ccc.case_id
LEFT JOIN civicrm_case_activity cca ON cca.case_id = {$this->_aliases['civicrm_case']}.id
- LEFT JOIN civicrm_activity {$this->_aliases['civicrm_activity']} ON {$this->_aliases['civicrm_activity']}.id = cca.activity_id
+ LEFT JOIN civicrm_activity {$this->_aliases['civicrm_activity']} ON {$this->_aliases['civicrm_activity']}.id = cca.activity_id
";
foreach ($this->_columns as $t => $c) {
@@ -297,15 +296,15 @@ where (cg.extends='Contact' OR cg.extends='Individual' OR cg.extends_entity_colu
if ($this->_emailField) {
$this->_from .= "
- LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND
{$this->_aliases['civicrm_email']}.is_primary = 1) ";
}
if ($this->_phoneField) {
$this->_from .= "
- LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
- ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
+ LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
+ ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
{$this->_aliases['civicrm_phone']}.is_primary = 1 ";
}
}
diff --git a/CRM/Report/Form/Case/Detail.php b/CRM/Report/Form/Case/Detail.php
index aaa34500e6d0e5626c7bb9bafaf0fa2f5cc0748d..3a54ac8b60b76fde23b053ceae198977433b203a 100644
--- a/CRM/Report/Form/Case/Detail.php
+++ b/CRM/Report/Form/Case/Detail.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -304,7 +303,7 @@ class CRM_Report_Form_Case_Detail extends CRM_Report_Form {
$this->_relField = TRUE;
}
if ($fieldName == 'sort_name') {
- $select[] = "GROUP_CONCAT({$field['dbAlias']} ORDER BY {$field['dbAlias']} )
+ $select[] = "GROUP_CONCAT({$field['dbAlias']} ORDER BY {$field['dbAlias']} )
as {$tableName}_{$fieldName}";
}
if ($tableName == 'civicrm_activity_last_completed') {
@@ -346,20 +345,20 @@ class CRM_Report_Form_Case_Detail extends CRM_Report_Form {
if ($this->_addressField) {
$this->_from .= "
- LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
- ON {$conact}.id = {$this->_aliases['civicrm_address']}.contact_id AND
+ LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
+ ON {$conact}.id = {$this->_aliases['civicrm_address']}.contact_id AND
{$this->_aliases['civicrm_address']}.is_primary = 1 ";
}
if ($this->_emailField) {
- $this->_from .= "
- LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
- ON {$conact}.id = {$this->_aliases['civicrm_email']}.contact_id AND
+ $this->_from .= "
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ ON {$conact}.id = {$this->_aliases['civicrm_email']}.contact_id AND
{$this->_aliases['civicrm_email']}.is_primary = 1 ";
}
if ($this->_phoneField) {
$this->_from .= "
- LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
- ON ( {$conact}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
+ LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
+ ON ( {$conact}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
{$this->_aliases['civicrm_phone']}.is_primary = 1) ";
}
if ($this->_worldRegionField) {
@@ -491,7 +490,7 @@ class CRM_Report_Form_Case_Detail extends CRM_Report_Form {
if ($activityType = CRM_Utils_Array::value('case_activity_all_dates', $this->_params['case_detail_extra'])) {
$select[] = "GROUP_CONCAT(DISTINCT(civireport_activity_all_{$activityType}.{$this->_caseDetailExtra['case_activity_all_dates']['name']}) ORDER BY civireport_activity_all_{$activityType}.{$this->_caseDetailExtra['case_activity_all_dates']['name']}) as case_activity_all_dates";
- $from[] = " LEFT JOIN civicrm_case_activity civireport_case_activity_all_{$activityType} ON ( civireport_case_activity_all_{$activityType}.case_id = {$case}.id)
+ $from[] = " LEFT JOIN civicrm_case_activity civireport_case_activity_all_{$activityType} ON ( civireport_case_activity_all_{$activityType}.case_id = {$case}.id)
LEFT JOIN civicrm_activity civireport_activity_all_{$activityType} ON ( civireport_activity_all_{$activityType}.id = civireport_case_activity_all_{$activityType}.activity_id AND civireport_activity_all_{$activityType}.activity_type_id = {$activityType})";
$this->_columnHeaders['case_activity_all_dates'] = array(
diff --git a/CRM/Report/Form/Case/Summary.php b/CRM/Report/Form/Case/Summary.php
index 1633a14a366408fada968eeed1cab1bceda35773..6be98140b0dd391298d8b7ee0ef2215472d11d85 100644
--- a/CRM/Report/Form/Case/Summary.php
+++ b/CRM/Report/Form/Case/Summary.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -224,7 +223,7 @@ class CRM_Report_Form_Case_Summary extends CRM_Report_Form {
if ($this->_relField) {
$this->_from = "
- FROM civicrm_contact $c
+ FROM civicrm_contact $c
inner join civicrm_relationship $cr on {$c}.id = ${cr}.contact_id_b
inner join civicrm_case $cc on ${cc}.id = ${cr}.case_id
inner join civicrm_relationship_type $crt on ${crt}.id=${cr}.relationship_type_id
diff --git a/CRM/Report/Form/Case/TimeSpent.php b/CRM/Report/Form/Case/TimeSpent.php
index 41b8f0ed1cf1dbc47d0f429d8c95445a854253bf..bd6ff58adfb0fa9c5d63024d3e72b9c15bbc8e41 100644
--- a/CRM/Report/Form/Case/TimeSpent.php
+++ b/CRM/Report/Form/Case/TimeSpent.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -212,16 +211,16 @@ class CRM_Report_Form_Case_TimeSpent extends CRM_Report_Form {
$this->_from = "
FROM civicrm_activity {$this->_aliases['civicrm_activity']}
-
+
LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
- ON {$this->_aliases['civicrm_activity']}.source_contact_id = {$this->_aliases['civicrm_contact']}.id
+ ON {$this->_aliases['civicrm_activity']}.source_contact_id = {$this->_aliases['civicrm_contact']}.id
LEFT JOIN civicrm_case_activity {$this->_aliases['civicrm_case_activity']}
ON {$this->_aliases['civicrm_case_activity']}.activity_id = {$this->_aliases['civicrm_activity']}.id
";
}
function where() {
- $this->_where = " WHERE {$this->_aliases['civicrm_activity']}.is_current_revision = 1 AND
+ $this->_where = " WHERE {$this->_aliases['civicrm_activity']}.is_current_revision = 1 AND
{$this->_aliases['civicrm_activity']}.is_deleted = 0 AND
{$this->_aliases['civicrm_activity']}.is_test = 0";
$clauses = array();
diff --git a/CRM/Report/Form/Contact/CurrentEmployer.php b/CRM/Report/Form/Contact/CurrentEmployer.php
index 51bfe0fc1e38d12211ded6ea740f234576cf12d3..add585c0245ffb4e19f13516bf0c9074a6b83571 100644
--- a/CRM/Report/Form/Contact/CurrentEmployer.php
+++ b/CRM/Report/Form/Contact/CurrentEmployer.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -42,7 +41,7 @@ class CRM_Report_Form_Contact_CurrentEmployer extends CRM_Report_Form {
'Contact', 'Individual');
public $_drilldownReport = array('contact/detail' => 'Link to Detail Report');
-
+
function __construct() {
$this->_columns = array(
@@ -79,9 +78,9 @@ class CRM_Report_Form_Contact_CurrentEmployer extends CRM_Report_Form {
array('title' => ts('Employee Name'),
'required' => TRUE,
),
- 'first_name' => array('title' => ts('First Name'),
+ 'first_name' => array('title' => ts('First Name'),
),
- 'last_name' => array('title' => ts('Last Name'),
+ 'last_name' => array('title' => ts('Last Name'),
),
'job_title' =>
array('title' => ts('Job Title'),
@@ -216,22 +215,22 @@ class CRM_Report_Form_Contact_CurrentEmployer extends CRM_Report_Form {
function from() {
$this->_from = "
-FROM civicrm_contact {$this->_aliases['civicrm_contact']}
+FROM civicrm_contact {$this->_aliases['civicrm_contact']}
LEFT JOIN civicrm_contact {$this->_aliases['civicrm_employer']}
ON {$this->_aliases['civicrm_employer']}.id={$this->_aliases['civicrm_contact']}.employer_id
{$this->_aclFrom}
LEFT JOIN civicrm_relationship {$this->_aliases['civicrm_relationship']}
- ON ( {$this->_aliases['civicrm_relationship']}.contact_id_a={$this->_aliases['civicrm_contact']}.id
- AND {$this->_aliases['civicrm_relationship']}.contact_id_b={$this->_aliases['civicrm_contact']}.employer_id
- AND {$this->_aliases['civicrm_relationship']}.relationship_type_id=4)
- LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
- ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id
+ ON ( {$this->_aliases['civicrm_relationship']}.contact_id_a={$this->_aliases['civicrm_contact']}.id
+ AND {$this->_aliases['civicrm_relationship']}.contact_id_b={$this->_aliases['civicrm_contact']}.employer_id
+ AND {$this->_aliases['civicrm_relationship']}.relationship_type_id=4)
+ LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
+ ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id
AND {$this->_aliases['civicrm_address']}.is_primary = 1 )
-
- LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
- ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id
+
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id
AND {$this->_aliases['civicrm_email']}.is_primary = 1) ";
}
diff --git a/CRM/Report/Form/Contact/Log.php b/CRM/Report/Form/Contact/Log.php
index c69e7faf21ce7d0f0010c1443967b56f489a1281..72f98308dc8535afd54d764d63cde9d8111d1dd6 100644
--- a/CRM/Report/Form/Contact/Log.php
+++ b/CRM/Report/Form/Contact/Log.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Form/Contact/LoggingDetail.php b/CRM/Report/Form/Contact/LoggingDetail.php
index dd8e471ced142ac8f3bace01cd76e5cd73f28d9f..9c0fcf38bb9dbbbbb679d61428f2f9604221102e 100644
--- a/CRM/Report/Form/Contact/LoggingDetail.php
+++ b/CRM/Report/Form/Contact/LoggingDetail.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Form/Contact/Relationship.php b/CRM/Report/Form/Contact/Relationship.php
index 5500ba90cd3ebd9441e6c51b54d3ee2aee0eaf00..840d02e5e816e8993d037f41ae0777b0d4ffddce 100644
--- a/CRM/Report/Form/Contact/Relationship.php
+++ b/CRM/Report/Form/Contact/Relationship.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -40,9 +39,9 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form {
protected $_emailField_a = FALSE;
protected $_emailField_b = FALSE;
protected $_customGroupExtends = array(
- 'Relationship');
+ 'Relationship');
public $_drilldownReport = array('contact/detail' => 'Link to Detail Report');
-
+
function __construct() {
$contact_type = CRM_Contact_BAO_ContactType::getSelectElements(FALSE, TRUE, '_');
@@ -272,13 +271,13 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form {
function from() {
$this->_from = "
FROM civicrm_relationship {$this->_aliases['civicrm_relationship']}
-
+
INNER JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
- ON ( {$this->_aliases['civicrm_relationship']}.contact_id_a =
+ ON ( {$this->_aliases['civicrm_relationship']}.contact_id_a =
{$this->_aliases['civicrm_contact']}.id )
INNER JOIN civicrm_contact {$this->_aliases['civicrm_contact_b']}
- ON ( {$this->_aliases['civicrm_relationship']}.contact_id_b =
+ ON ( {$this->_aliases['civicrm_relationship']}.contact_id_b =
{$this->_aliases['civicrm_contact_b']}.id )
{$this->_aclFrom} ";
@@ -287,32 +286,32 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form {
!empty($this->_params['state_province_id_value'])
) {
$this->_from .= "
- INNER JOIN civicrm_address {$this->_aliases['civicrm_address']}
+ INNER JOIN civicrm_address {$this->_aliases['civicrm_address']}
ON (( {$this->_aliases['civicrm_address']}.contact_id =
{$this->_aliases['civicrm_contact']}.id OR
{$this->_aliases['civicrm_address']}.contact_id =
- {$this->_aliases['civicrm_contact_b']}.id ) AND
+ {$this->_aliases['civicrm_contact_b']}.id ) AND
{$this->_aliases['civicrm_address']}.is_primary = 1 ) ";
}
$this->_from .= "
INNER JOIN civicrm_relationship_type {$this->_aliases['civicrm_relationship_type']}
- ON ( {$this->_aliases['civicrm_relationship']}.relationship_type_id =
+ ON ( {$this->_aliases['civicrm_relationship']}.relationship_type_id =
{$this->_aliases['civicrm_relationship_type']}.id ) ";
// include Email Field
if ($this->_emailField_a) {
- $this->_from .= "
+ $this->_from .= "
LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
ON ( {$this->_aliases['civicrm_contact']}.id =
- {$this->_aliases['civicrm_email']}.contact_id AND
+ {$this->_aliases['civicrm_email']}.contact_id AND
{$this->_aliases['civicrm_email']}.is_primary = 1 )";
}
if ($this->_emailField_b) {
- $this->_from .= "
- LEFT JOIN civicrm_email {$this->_aliases['civicrm_email_b']}
+ $this->_from .= "
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email_b']}
ON ( {$this->_aliases['civicrm_contact_b']}.id =
- {$this->_aliases['civicrm_email_b']}.contact_id AND
+ {$this->_aliases['civicrm_email_b']}.contact_id AND
{$this->_aliases['civicrm_email_b']}.is_primary = 1 )";
}
}
diff --git a/CRM/Report/Form/Contact/Summary.php b/CRM/Report/Form/Contact/Summary.php
index 8fcead09e203b4c48a459a60e0e206d34db8d696..99b60980dbe8cde2beb32b5faabba024d670baac 100644
--- a/CRM/Report/Form/Contact/Summary.php
+++ b/CRM/Report/Form/Contact/Summary.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -43,7 +42,7 @@ class CRM_Report_Form_Contact_Summary extends CRM_Report_Form {
protected $_phoneField = FALSE;
protected $_customGroupExtends = array(
- 'Contact', 'Individual', 'Household', 'Organization');
+ 'Contact', 'Individual', 'Household', 'Organization');
public $_drilldownReport = array('contact/detail' => 'Link to Detail Report');
@@ -60,9 +59,9 @@ class CRM_Report_Form_Contact_Summary extends CRM_Report_Form {
'required' => TRUE,
'no_repeat' => TRUE,
),
- 'first_name' => array('title' => ts('First Name'),
+ 'first_name' => array('title' => ts('First Name'),
),
- 'last_name' => array('title' => ts('Last Name'),
+ 'last_name' => array('title' => ts('Last Name'),
),
'id' =>
array(
@@ -232,21 +231,21 @@ class CRM_Report_Form_Contact_Summary extends CRM_Report_Form {
function from() {
$this->_from = "
FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}
- LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
- ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND
+ LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
+ ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND
{$this->_aliases['civicrm_address']}.is_primary = 1 ) ";
if ($this->isTableSelected('civicrm_email')) {
$this->_from .= "
- LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND
{$this->_aliases['civicrm_email']}.is_primary = 1) ";
}
if ($this->_phoneField) {
$this->_from .= "
- LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
- ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
+ LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
+ ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
{$this->_aliases['civicrm_phone']}.is_primary = 1 ";
}
diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php
index 858e9d0bd104e4a834e24c1682ce87cd6e3f594a..8936a051a0f8b712f05b2e3e03c2fb31b9ba783b 100644
--- a/CRM/Report/Form/Contribute/Bookkeeping.php
+++ b/CRM/Report/Form/Contribute/Bookkeeping.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -42,8 +41,8 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
protected $_summary = NULL;
protected $_customGroupExtends = array(
- 'Membership');
-
+ 'Membership');
+
function __construct() {
$this->_columns = array(
'civicrm_contact' =>
@@ -124,7 +123,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
'alias' => 'financial_account_civireport_debit',
),
'credit_accounting_code' => array(
- 'title' => ts('Financial Account Code - Credit'),
+ 'title' => ts('Financial Account Code - Credit'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::financialAccount(NULL, NULL, 'accounting_code', 'accounting_code'),
),
@@ -136,12 +135,12 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
'alias' => 'financial_account_civireport_debit',
),
'credit_name' => array(
- 'title' => ts('Financial Account Name - Credit'),
+ 'title' => ts('Financial Account Name - Credit'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::financialAccount(),
),
),
- ),
+ ),
'civicrm_line_item' => array(
'dao' => 'CRM_Price_DAO_LineItem',
'fields' => array(
@@ -150,13 +149,13 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
),
),
'filters' => array(
- 'financial_type_id' => array(
- 'title' => ts('Financial Type'),
+ 'financial_type_id' => array(
+ 'title' => ts('Financial Type'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::financialType(),
),
),
- ),
+ ),
'civicrm_contribution' =>
array(
'dao' => 'CRM_Contribute_DAO_Contribution',
@@ -202,7 +201,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
'currency' => array(
'required' => TRUE,
'no_display' => TRUE,
- ),
+ ),
'trxn_date' => array(
'title' => ts('Transaction Date'),
'default' => TRUE,
@@ -227,13 +226,13 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
'default' => NULL,
'type' => CRM_Utils_Type::T_STRING,
),
- 'trxn_date' => array(
+ 'trxn_date' => array(
'title' => ts('Transaction Date'),
'operatorType' => CRM_Report_Form::OP_DATE,
'type' => CRM_Utils_Type::T_DATE,
),
),
- ),
+ ),
'civicrm_entity_financial_trxn' => array(
'dao' => 'CRM_Financial_DAO_EntityFinancialTrxn',
'fields' => array(
@@ -248,7 +247,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
'amount' =>
array('title' => ts('Amount')),
),
- ),
+ ),
);
parent::__construct();
}
@@ -269,21 +268,21 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
) {
switch ($fieldName) {
case 'credit_accounting_code' :
- $select[] = " CASE
+ $select[] = " CASE
WHEN {$this->_aliases['civicrm_financial_trxn']}.from_financial_account_id IS NOT NULL
THEN {$this->_aliases['civicrm_financial_account']}_credit_1.accounting_code
ELSE {$this->_aliases['civicrm_financial_account']}_credit_2.accounting_code
END AS civicrm_financial_account_credit_accounting_code ";
break;
- case 'amount' :
- $select[] = " CASE
+ case 'amount' :
+ $select[] = " CASE
WHEN {$this->_aliases['civicrm_entity_financial_trxn']}_item.entity_id IS NOT NULL
THEN {$this->_aliases['civicrm_entity_financial_trxn']}_item.amount
ELSE {$this->_aliases['civicrm_entity_financial_trxn']}.amount
END AS civicrm_entity_financial_trxn_amount ";
break;
case 'credit_name' :
- $select[] = " CASE
+ $select[] = " CASE
WHEN {$this->_aliases['civicrm_financial_trxn']}.from_financial_account_id IS NOT NULL
THEN {$this->_aliases['civicrm_financial_account']}_credit_1.name
ELSE {$this->_aliases['civicrm_financial_account']}_credit_2.name
@@ -291,7 +290,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
break;
default :
$select[] = "{$field['dbAlias']} as {$tableName}_{$fieldName}";
- break;
+ break;
}
$this->_columnHeaders["{$tableName}_{$fieldName}"]['title'] = $field['title'];
$this->_columnHeaders["{$tableName}_{$fieldName}"]['type'] = CRM_Utils_Array::value('type', $field);
@@ -308,14 +307,14 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
$this->_from = "FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}
INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
- ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND
+ ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND
{$this->_aliases['civicrm_contribution']}.is_test = 0
LEFT JOIN civicrm_membership_payment payment
ON ( {$this->_aliases['civicrm_contribution']}.id = payment.contribution_id )
LEFT JOIN civicrm_membership {$this->_aliases['civicrm_membership']}
- ON payment.membership_id = {$this->_aliases['civicrm_membership']}.id
+ ON payment.membership_id = {$this->_aliases['civicrm_membership']}.id
LEFT JOIN civicrm_entity_financial_trxn {$this->_aliases['civicrm_entity_financial_trxn']}
- ON ({$this->_aliases['civicrm_contribution']}.id = {$this->_aliases['civicrm_entity_financial_trxn']}.entity_id AND
+ ON ({$this->_aliases['civicrm_contribution']}.id = {$this->_aliases['civicrm_entity_financial_trxn']}.entity_id AND
{$this->_aliases['civicrm_entity_financial_trxn']}.entity_table = 'civicrm_contribution')
LEFT JOIN civicrm_financial_trxn {$this->_aliases['civicrm_financial_trxn']}
ON {$this->_aliases['civicrm_financial_trxn']}.id = {$this->_aliases['civicrm_entity_financial_trxn']}.financial_trxn_id
@@ -324,7 +323,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
LEFT JOIN civicrm_financial_account {$this->_aliases['civicrm_financial_account']}_credit_1
ON {$this->_aliases['civicrm_financial_trxn']}.from_financial_account_id = {$this->_aliases['civicrm_financial_account']}_credit_1.id
LEFT JOIN civicrm_entity_financial_trxn {$this->_aliases['civicrm_entity_financial_trxn']}_item
- ON ({$this->_aliases['civicrm_financial_trxn']}.id = {$this->_aliases['civicrm_entity_financial_trxn']}_item.financial_trxn_id AND
+ ON ({$this->_aliases['civicrm_financial_trxn']}.id = {$this->_aliases['civicrm_entity_financial_trxn']}_item.financial_trxn_id AND
{$this->_aliases['civicrm_entity_financial_trxn']}_item.entity_table = 'civicrm_financial_item')
LEFT JOIN civicrm_financial_item fitem
ON fitem.id = {$this->_aliases['civicrm_entity_financial_trxn']}_item.entity_id
@@ -347,14 +346,14 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
$field['dbAlias'] = "CASE
WHEN financial_trxn_civireport.from_financial_account_id IS NOT NULL
THEN financial_account_civireport_credit_1.accounting_code
- ELSE financial_account_civireport_credit_2.accounting_code
+ ELSE financial_account_civireport_credit_2.accounting_code
END";
}
else if ($fieldName == 'credit_name') {
$field['dbAlias'] = "CASE
WHEN financial_trxn_civireport.from_financial_account_id IS NOT NULL
THEN financial_account_civireport_credit_1.id
- ELSE financial_account_civireport_credit_2.id
+ ELSE financial_account_civireport_credit_2.id
END";
}
if (CRM_Utils_Array::value('type', $field) & CRM_Utils_Type::T_DATE) {
@@ -400,14 +399,14 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
$select = " SELECT COUNT({$this->_aliases['civicrm_financial_trxn']}.id ) as count,
{$this->_aliases['civicrm_contribution']}.currency,
- SUM(CASE
+ SUM(CASE
WHEN {$this->_aliases['civicrm_entity_financial_trxn']}_item.entity_id IS NOT NULL
THEN {$this->_aliases['civicrm_entity_financial_trxn']}_item.amount
ELSE {$this->_aliases['civicrm_entity_financial_trxn']}.amount
- END) as amount
+ END) as amount
";
- $sql = "{$select} {$this->_from} {$this->_where}
+ $sql = "{$select} {$this->_from} {$this->_where}
GROUP BY {$this->_aliases['civicrm_contribution']}.currency
";
@@ -457,7 +456,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
if ($value = CRM_Utils_Array::value('civicrm_financial_trxn_payment_instrument_id', $row)) {
$rows[$rowNum]['civicrm_financial_trxn_payment_instrument_id'] = $paymentInstruments[$value];
}
-
+
// handle financial type id
if ($value = CRM_Utils_Array::value('civicrm_line_item_financial_type_id', $row)) {
$rows[$rowNum]['civicrm_line_item_financial_type_id'] = $contributionTypes[$value];
diff --git a/CRM/Report/Form/Contribute/History.php b/CRM/Report/Form/Contribute/History.php
index 6cf7575057fc971a5cac757f521f63637cae3049..cd127217fae4a5da1dd29e2ae7fd0357a09d2cd3 100644
--- a/CRM/Report/Form/Contribute/History.php
+++ b/CRM/Report/Form/Contribute/History.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -201,8 +200,8 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form {
'options' => CRM_Contribute_PseudoConstant::contributionStatus(),
'default' => array(1),
),
- 'financial_type_id' => array(
- 'title' => ts('Financial Type'),
+ 'financial_type_id' => array(
+ 'title' => ts('Financial Type'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::financialType(),
),
@@ -302,10 +301,10 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form {
$this->_columnHeaders[$fieldName]['title'] = $field['title'];
continue;
}
- elseif ($fieldName == 'receive_date') {
- if ((CRM_Utils_Array::value('this_year_op', $this->_params) == 'fiscal' &&
+ elseif ($fieldName == 'receive_date') {
+ if ((CRM_Utils_Array::value('this_year_op', $this->_params) == 'fiscal' &&
CRM_Utils_Array::value('this_year_value', $this->_params)) ||
- (CRM_Utils_Array::value('other_year_op', $this->_params == 'fiscal') &&
+ (CRM_Utils_Array::value('other_year_op', $this->_params == 'fiscal') &&
CRM_Utils_Array::value('other_year_value', $this->_params)
)){
$select[] = self::fiscalYearOffset($field['dbAlias']) . " as {$tableName}_{$fieldName}";
@@ -332,31 +331,31 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form {
function from() {
$this->_from = "
FROM civicrm_contact {$this->_aliases['civicrm_contact']}
- INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
+ INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND
{$this->_aliases['civicrm_contribution']}.is_test = 0 ";
if ($this->_emailField) {
- $this->_from .= " LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
- ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND
+ $this->_from .= " LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND
{$this->_aliases['civicrm_email']}.is_primary = 1) ";
}
if ($this->_phoneField) {
- $this->_from .= " LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
- ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
+ $this->_from .= " LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
+ ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
{$this->_aliases['civicrm_phone']}.is_primary = 1) ";
}
$relContacAlias = 'contact_relationship';
- $this->_relationshipFrom = " INNER JOIN civicrm_relationship {$this->_aliases['civicrm_relationship']}
+ $this->_relationshipFrom = " INNER JOIN civicrm_relationship {$this->_aliases['civicrm_relationship']}
ON (({$this->_aliases['civicrm_relationship']}.contact_id_a = {$relContacAlias}.id OR {$this->_aliases['civicrm_relationship']}.contact_id_b = {$relContacAlias}.id ) AND {$this->_aliases['civicrm_relationship']}.is_active = 1) ";
if ($this->_addressField) {
$this->_from .= "
- LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
- ON {$this->_aliases['civicrm_contact']}.id =
- {$this->_aliases['civicrm_address']}.contact_id AND
+ LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
+ ON {$this->_aliases['civicrm_contact']}.id =
+ {$this->_aliases['civicrm_address']}.contact_id AND
{$this->_aliases['civicrm_address']}.is_primary = 1\n";
}
}
@@ -528,10 +527,10 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form {
if (CRM_Utils_Array::value('this_year', $this->_referenceYear)) {
(CRM_Utils_Array::value('this_year_op', $this->_params) == 'calendar') ? $receive_date = 'YEAR (contri.receive_date)' : $receive_date = self::fiscalYearOffset('contri.receive_date');
$addWhere .= " AND {$this->_aliases['civicrm_contact']}.id IN ( SELECT DISTINCT cont.id FROM civicrm_contact cont, civicrm_contribution contri WHERE cont.id = contri.contact_id AND {$receive_date} = {$this->_referenceYear['this_year']} AND contri.is_test = 0 ) ";
- }
+ }
$this->limit();
$getContacts = "SELECT SQL_CALC_FOUND_ROWS {$this->_aliases['civicrm_contact']}.id as cid, SUM({$this->_aliases['civicrm_contribution']}.total_amount) as civicrm_contribution_total_amount_sum {$this->_from} {$this->_where} {$addWhere} GROUP BY {$this->_aliases['civicrm_contact']}.id {$this->_having} {$this->_limit}";
-
+
$dao = CRM_Core_DAO::executeQuery($getContacts);
while ($dao->fetch()) {
@@ -683,7 +682,7 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form {
$dao->free();
return array($relationshipRows, $relatedContactIds);
}
-
+
// Override "This Year" $op options
function getOperationPair($type = "string", $fieldName = NULL) {
if ($fieldName == 'this_year' || $fieldName == 'other_year') {
@@ -691,8 +690,8 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form {
}
return parent::getOperationPair($type, $fieldName);
}
-
-
+
+
function alterDisplay(&$rows) {
if (empty($rows)) {
diff --git a/CRM/Report/Form/Contribute/HouseholdSummary.php b/CRM/Report/Form/Contribute/HouseholdSummary.php
index 35f12cb258258944879322d435609195a6f603a0..407a94df1b00eeb219f20ef67e0547be62466e24 100644
--- a/CRM/Report/Form/Contribute/HouseholdSummary.php
+++ b/CRM/Report/Form/Contribute/HouseholdSummary.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -43,7 +42,7 @@ class CRM_Report_Form_Contribute_HouseholdSummary extends CRM_Report_Form {
public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report');
protected $_summary = NULL;
-
+
function __construct() {
self::validRelationships();
diff --git a/CRM/Report/Form/Contribute/LoggingDetail.php b/CRM/Report/Form/Contribute/LoggingDetail.php
index d56ec2964650a7c950a5a8449b6421ed8747bda3..ec580b797f97f12144e640e63886adc10a80de05 100644
--- a/CRM/Report/Form/Contribute/LoggingDetail.php
+++ b/CRM/Report/Form/Contribute/LoggingDetail.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Form/Contribute/LoggingSummary.php b/CRM/Report/Form/Contribute/LoggingSummary.php
index fab8dcd841302b4641b70f83d57d3caa6c9b5dd8..5db8fcfa5b80f13b9d54ded279fe2cb1828ae96d 100644
--- a/CRM/Report/Form/Contribute/LoggingSummary.php
+++ b/CRM/Report/Form/Contribute/LoggingSummary.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Form/Contribute/OrganizationSummary.php b/CRM/Report/Form/Contribute/OrganizationSummary.php
index 6604d124a9e71e713b219464f7a96de8a9c0dd0e..3f157277bcb67bc4402bca1e9cb1c89ed168315e 100644
--- a/CRM/Report/Form/Contribute/OrganizationSummary.php
+++ b/CRM/Report/Form/Contribute/OrganizationSummary.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -43,7 +42,7 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form {
public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report');
protected $_summary = NULL;
-
+
function __construct() {
self::validRelationships();
$config = CRM_Core_Config::singleton();
@@ -198,7 +197,7 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form {
'options' => $this->activeCampaigns,
);
}
-
+
$this->_currencyColumn = 'civicrm_contribution_currency';
parent::__construct();
}
@@ -248,24 +247,24 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form {
$this->_from = NULL;
$this->_from = "
FROM civicrm_relationship {$this->_aliases['civicrm_relationship']}
- LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact_organization']} ON
+ LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact_organization']} ON
({$this->_aliases['civicrm_contact_organization']}.id = {$this->_aliases['civicrm_relationship']}.$this->orgContact AND {$this->_aliases['civicrm_contact_organization']}.contact_type='Organization')
- LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']} ON
- ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_relationship']}.$this->otherContact )
+ LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']} ON
+ ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_relationship']}.$this->otherContact )
{$this->_aclFrom}
INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']} ON
({$this->_aliases['civicrm_contribution']}.contact_id = {$this->_aliases['civicrm_relationship']}.$this->otherContact ) AND {$this->_aliases['civicrm_contribution']}.is_test = 0 ";
if ($this->_addressField) {
- $this->_from .= "
- LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} ON
- {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND
+ $this->_from .= "
+ LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} ON
+ {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND
{$this->_aliases['civicrm_address']}.is_primary = 1\n ";
}
if ($this->_emailField) {
$this->_from .= "
- LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} ON
- {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} ON
+ {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND
{$this->_aliases['civicrm_email']}.is_primary = 1\n ";
}
}
diff --git a/CRM/Report/Form/Contribute/PCP.php b/CRM/Report/Form/Contribute/PCP.php
index d9c933d94c3eddeb5b4a28d7b217af5ca92ef2eb..01f680b7ea168ed2b267988e6481211787919e9b 100644
--- a/CRM/Report/Form/Contribute/PCP.php
+++ b/CRM/Report/Form/Contribute/PCP.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -183,20 +182,20 @@ class CRM_Report_Form_Contribute_PCP extends CRM_Report_Form {
$this->_from = "
FROM civicrm_pcp {$this->_aliases['civicrm_pcp']}
-LEFT JOIN civicrm_contribution_soft {$this->_aliases['civicrm_contribution_soft']}
- ON {$this->_aliases['civicrm_pcp']}.id =
+LEFT JOIN civicrm_contribution_soft {$this->_aliases['civicrm_contribution_soft']}
+ ON {$this->_aliases['civicrm_pcp']}.id =
{$this->_aliases['civicrm_contribution_soft']}.pcp_id
-LEFT JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
- ON {$this->_aliases['civicrm_contribution_soft']}.contribution_id =
+LEFT JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
+ ON {$this->_aliases['civicrm_contribution_soft']}.contribution_id =
{$this->_aliases['civicrm_contribution']}.id
-LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
- ON {$this->_aliases['civicrm_pcp']}.contact_id =
- {$this->_aliases['civicrm_contact']}.id
+LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
+ ON {$this->_aliases['civicrm_pcp']}.contact_id =
+ {$this->_aliases['civicrm_contact']}.id
LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page']}
- ON {$this->_aliases['civicrm_pcp']}.page_id =
+ ON {$this->_aliases['civicrm_pcp']}.page_id =
{$this->_aliases['civicrm_contribution_page']}.id";
}
diff --git a/CRM/Report/Form/Contribute/Repeat.php b/CRM/Report/Form/Contribute/Repeat.php
index 3946e66c4ff1b6eb862927a4dee96f737e23445b..c5fac844ae6ee60a33a5ac871950e115dbb5575d 100644
--- a/CRM/Report/Form/Contribute/Repeat.php
+++ b/CRM/Report/Form/Contribute/Repeat.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -163,7 +162,7 @@ class CRM_Report_Form_Contribute_Repeat extends CRM_Report_Form {
'default' => TRUE,
'required' => TRUE,
'clause' => '
-contribution_civireport1.total_amount_count as contribution1_total_amount_count,
+contribution_civireport1.total_amount_count as contribution1_total_amount_count,
contribution_civireport1.total_amount_sum as contribution1_total_amount_sum',
),
'total_amount2' =>
@@ -175,7 +174,7 @@ contribution_civireport1.total_amount_sum as contribution1_total_amount_sum',
'default' => TRUE,
'required' => TRUE,
'clause' => '
-contribution_civireport2.total_amount_count as contribution2_total_amount_count,
+contribution_civireport2.total_amount_count as contribution2_total_amount_count,
contribution_civireport2.total_amount_sum as contribution2_total_amount_sum',
),
),
@@ -605,14 +604,14 @@ SELECT contact_id FROM civicrm_temp_civireport_repeat1 UNION SELECT contact_id F
$dao = CRM_Core_DAO::executeQuery($sql);
$sql = "
-SELECT civicrm_temp_civireport_repeat3.contact_id,
- civicrm_temp_civireport_repeat1.total_amount_sum as contribution1_total_amount_sum,
- civicrm_temp_civireport_repeat2.total_amount_sum as contribution2_total_amount_sum
+SELECT civicrm_temp_civireport_repeat3.contact_id,
+ civicrm_temp_civireport_repeat1.total_amount_sum as contribution1_total_amount_sum,
+ civicrm_temp_civireport_repeat2.total_amount_sum as contribution2_total_amount_sum
FROM civicrm_temp_civireport_repeat3
LEFT JOIN civicrm_temp_civireport_repeat1
- ON civicrm_temp_civireport_repeat3.contact_id = civicrm_temp_civireport_repeat1.contact_id
+ ON civicrm_temp_civireport_repeat3.contact_id = civicrm_temp_civireport_repeat1.contact_id
LEFT JOIN civicrm_temp_civireport_repeat2
- ON civicrm_temp_civireport_repeat3.contact_id = civicrm_temp_civireport_repeat2.contact_id";
+ ON civicrm_temp_civireport_repeat3.contact_id = civicrm_temp_civireport_repeat2.contact_id";
$dao = CRM_Core_DAO::executeQuery($sql);
//store contributions in array 'contact_sums' for comparison
@@ -683,12 +682,12 @@ LEFT JOIN civicrm_temp_civireport_repeat2
SELECT COUNT({$this->_aliases['civicrm_contribution']}1.total_amount_count ) as count,
SUM({$this->_aliases['civicrm_contribution']}1.total_amount_sum ) as amount,
ROUND(AVG({$this->_aliases['civicrm_contribution']}1.total_amount_sum), 2) as avg,
- COUNT({$this->_aliases['civicrm_contribution']}2.total_amount_count ) as count2,
+ COUNT({$this->_aliases['civicrm_contribution']}2.total_amount_count ) as count2,
SUM({$this->_aliases['civicrm_contribution']}2.total_amount_sum ) as amount2,
ROUND(AVG({$this->_aliases['civicrm_contribution']}2.total_amount_sum), 2) as avg2,
currency";
$sql = "{$select} {$this->_from} {$this->_where}
-GROUP BY currency
+GROUP BY currency
";
$dao = CRM_Core_DAO::executeQuery($sql);
@@ -788,17 +787,17 @@ GROUP BY contribution2.{$contriCol}";
$sql = "
CREATE TEMPORARY TABLE civicrm_temp_civireport_repeat1 (
-{$create}
+{$create}
{$contriCol} int unsigned,
total_amount_sum int,
-total_amount_count int
+total_amount_count int
) ENGINE=HEAP DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci";
CRM_Core_DAO::executeQuery($sql);
$sql = "INSERT INTO civicrm_temp_civireport_repeat1 {$subContributionQuery1}";
CRM_Core_DAO::executeQuery($sql);
$sql = "
-CREATE TEMPORARY TABLE civicrm_temp_civireport_repeat2 (
+CREATE TEMPORARY TABLE civicrm_temp_civireport_repeat2 (
{$create}
{$contriCol} int unsigned,
total_amount_sum int,
@@ -950,7 +949,7 @@ currency varchar(3)
'reset=1&force=1&id_op=eq&id_value=' . $row['contact_civireport_id'],
$this->_absoluteUrl, $this->_id, $this->_drilldownReport
);
-
+
$rows[$rowNum]['contact_civireport_sort_name_link'] = $url;
$rows[$rowNum]['contact_civireport_sort_name_hover'] = ts("View Contribution details for this contact");
}
diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php
index 78dffba2d5ac88906d502090e7e93507ddccd4ba..3a08f24c0eb3be2e07726aceb5e78c374d402bc4 100644
--- a/CRM/Report/Form/Contribute/TopDonor.php
+++ b/CRM/Report/Form/Contribute/TopDonor.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -45,7 +44,7 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
'barChart' => 'Bar Chart',
'pieChart' => 'Pie Chart',
);
-
+
function __construct() {
$this->_columns = array(
'civicrm_contact' =>
@@ -63,9 +62,9 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
'required' => TRUE,
'no_repeat' => TRUE,
),
- 'first_name' => array('title' => ts('First Name'),
+ 'first_name' => array('title' => ts('First Name'),
),
- 'last_name' => array('title' => ts('Last Name'),
+ 'last_name' => array('title' => ts('Last Name'),
),
),
),
@@ -83,7 +82,7 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
'avg' => ts('Average'),
),
),
- 'currency' =>
+ 'currency' =>
array('required' => TRUE,
'no_display' => TRUE,
),
@@ -121,7 +120,7 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
),
),
),
- 'civicrm_email' =>
+ 'civicrm_email' =>
array(
'dao' => 'CRM_Core_DAO_Email',
'fields' =>
@@ -134,7 +133,7 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
),
'grouping' => 'email-fields',
),
-
+
'civicrm_phone' =>
array(
'dao' => 'CRM_Core_DAO_Phone',
@@ -248,15 +247,15 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
function from() {
$this->_from = "
FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}
- INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
- ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND {$this->_aliases['civicrm_contribution']}.is_test = 0
- LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
- ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id
+ INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
+ ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND {$this->_aliases['civicrm_contribution']}.is_test = 0
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id
AND {$this->_aliases['civicrm_email']}.is_primary = 1
- LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
+ LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
- {$this->_aliases['civicrm_phone']}.is_primary = 1
- ";
+ {$this->_aliases['civicrm_phone']}.is_primary = 1
+ ";
}
function where() {
@@ -337,7 +336,7 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
$setVariable = " SET @rows:=0, @rank=0 ";
CRM_Core_DAO::singleValueQuery($setVariable);
- $sql = " {$this->_select} {$this->_from} {$this->_where} {$this->_groupBy}
+ $sql = " {$this->_select} {$this->_from} {$this->_where} {$this->_groupBy}
ORDER BY civicrm_contribution_total_amount_sum DESC
) as abc {$this->_outerCluase} $this->_limit
";
@@ -363,8 +362,8 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
function add2group($groupID) {
if (is_numeric($groupID)) {
- $sql = "
-{$this->_select} {$this->_from} {$this->_where} {$this->_groupBy}
+ $sql = "
+{$this->_select} {$this->_from} {$this->_where} {$this->_groupBy}
ORDER BY civicrm_contribution_total_amount_sum DESC
) as abc {$this->_outerCluase}";
$dao = CRM_Core_DAO::executeQuery($sql);
diff --git a/CRM/Report/Form/Event.php b/CRM/Report/Form/Event.php
index 8bc5961f771cc1d4e673b6611a8962209acaa436..e804ba110a7ed383df77b01c6f390b94955e6512 100644
--- a/CRM/Report/Form/Event.php
+++ b/CRM/Report/Form/Event.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -38,7 +37,7 @@ class CRM_Report_Form_Event extends CRM_Report_Form {
/**
* Get a standardized array of <select> options for "Event Title"
* filter values.
- * @return Array
+ * @return Array
*/
function getEventFilterOptions() {
$events = array();
@@ -52,6 +51,6 @@ class CRM_Report_Form_Event extends CRM_Report_Form {
$events[$dao->id] = "{$dao->title} - " . CRM_Utils_Date::customFormat(substr($dao->start_date, 0, 10)) . " (ID {$dao->id})";
}
return $events;
- }
+ }
}
diff --git a/CRM/Report/Form/Event/Income.php b/CRM/Report/Form/Event/Income.php
index 5b5a3298c508363b6c852711336258f3ee3d2b1d..ca67d03ae4234f309aa59be3db0d24c61b3e6115 100644
--- a/CRM/Report/Form/Event/Income.php
+++ b/CRM/Report/Form/Event/Income.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -189,7 +188,7 @@ class CRM_Report_Form_Event_Income extends CRM_Report_Form_Event {
}
}
}
-
+
$rows['Role'] = $roleRows;
//Count the Participant by status ID for Event
diff --git a/CRM/Report/Form/Event/IncomeCountSummary.php b/CRM/Report/Form/Event/IncomeCountSummary.php
index 305e9172f14e4e7af9371df5736ec45082d814e7..a73a1dae3854f99bb5d7922e503d67d5aac0dacf 100644
--- a/CRM/Report/Form/Event/IncomeCountSummary.php
+++ b/CRM/Report/Form/Event/IncomeCountSummary.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -46,7 +45,7 @@ class CRM_Report_Form_Event_IncomeCountSummary extends CRM_Report_Form_Event {
protected $_add2groupSupported = FALSE;
protected $_customGroupExtends = array(
- 'Event');
+ 'Event');
public $_drilldownReport = array('event/participantlist' => 'Link to Detail Report');
@@ -196,13 +195,13 @@ class CRM_Report_Form_Event_IncomeCountSummary extends CRM_Report_Form_Event {
}
function from() {
- $this->_from = "
+ $this->_from = "
FROM civicrm_event {$this->_aliases['civicrm_event']}
- LEFT JOIN civicrm_participant {$this->_aliases['civicrm_participant']}
- ON {$this->_aliases['civicrm_event']}.id = {$this->_aliases['civicrm_participant']}.event_id AND
- {$this->_aliases['civicrm_participant']}.is_test = 0
+ LEFT JOIN civicrm_participant {$this->_aliases['civicrm_participant']}
+ ON {$this->_aliases['civicrm_event']}.id = {$this->_aliases['civicrm_participant']}.event_id AND
+ {$this->_aliases['civicrm_participant']}.is_test = 0
LEFT JOIN civicrm_line_item {$this->_aliases['civicrm_line_item']}
- ON {$this->_aliases['civicrm_participant']}.id ={$this->_aliases['civicrm_line_item']}.entity_id AND
+ ON {$this->_aliases['civicrm_participant']}.id ={$this->_aliases['civicrm_line_item']}.entity_id AND
{$this->_aliases['civicrm_line_item']}.entity_table = 'civicrm_participant' ";
}
diff --git a/CRM/Report/Form/Event/ParticipantListCount.php b/CRM/Report/Form/Event/ParticipantListCount.php
index 42761946a377b1c93b51d595d6fc3087bc9adddc..e02d2ffd0a6f836abf4f16199611c51d37b6ed0e 100644
--- a/CRM/Report/Form/Event/ParticipantListCount.php
+++ b/CRM/Report/Form/Event/ParticipantListCount.php
@@ -1,29 +1,28 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.3 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013 |
+ | Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
- | This file is a part of CiviCRM. |
- | |
+ | 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 |
+ | 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 |
+--------------------------------------------------------------------+
*/
@@ -39,7 +38,7 @@ class CRM_Report_Form_Event_ParticipantListCount extends CRM_Report_Form_Event {
protected $_summary = NULL;
protected $_customGroupExtends = array(
- 'Participant');
+ 'Participant');
public $_drilldownReport = array('event/income' => 'Link to Detail Report');
function __construct() {
@@ -88,15 +87,15 @@ class CRM_Report_Form_Event_ParticipantListCount extends CRM_Report_Form_Event {
),
),
'civicrm_phone' =>
- array(
+ array(
'dao' => 'CRM_Core_DAO_Phone',
'grouping' => 'contact-fields',
- 'fields' => array(
+ 'fields' => array(
'phone' => array(
'title' => ts( 'Phone No' ),
'default' => true,
),
- ),
+ ),
),
'civicrm_address' =>
array(
@@ -264,8 +263,8 @@ class CRM_Report_Form_Event_ParticipantListCount extends CRM_Report_Form_Event {
$statistics = parent::statistics($rows);
$avg = NULL;
$select = " SELECT SUM( {$this->_aliases['civicrm_line_item']}.participant_count ) as count,
- SUM( {$this->_aliases['civicrm_line_item']}.line_total ) as amount
- ";
+ SUM( {$this->_aliases['civicrm_line_item']}.line_total ) as amount
+ ";
$sql = "{$select} {$this->_from} {$this->_where}";
$dao = CRM_Core_DAO::executeQuery($sql);
if ($dao->fetch()) {
@@ -283,7 +282,7 @@ class CRM_Report_Form_Event_ParticipantListCount extends CRM_Report_Form_Event {
'title' => 'Total Income',
'type' => CRM_Utils_Type::T_MONEY,
);
- $statistics['counts']['avg '] = array(
+ $statistics['counts']['avg '] = array(
'value' => $avg,
'title' => 'Average',
'type' => CRM_Utils_Type::T_MONEY,
@@ -346,23 +345,23 @@ class CRM_Report_Form_Event_ParticipantListCount extends CRM_Report_Form_Event {
function from() {
$this->_from = "
- FROM civicrm_participant {$this->_aliases['civicrm_participant']}
- LEFT JOIN civicrm_event {$this->_aliases['civicrm_event']}
- ON ({$this->_aliases['civicrm_event']}.id = {$this->_aliases['civicrm_participant']}.event_id ) AND ({$this->_aliases['civicrm_event']}.is_template IS NULL OR {$this->_aliases['civicrm_event']}.is_template = 0)
- LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
- ON ({$this->_aliases['civicrm_participant']}.contact_id = {$this->_aliases['civicrm_contact']}.id )
- {$this->_aclFrom}
- LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
- ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND
- {$this->_aliases['civicrm_address']}.is_primary = 1
- LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
- ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND
- {$this->_aliases['civicrm_email']}.is_primary = 1)
- LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
+ FROM civicrm_participant {$this->_aliases['civicrm_participant']}
+ LEFT JOIN civicrm_event {$this->_aliases['civicrm_event']}
+ ON ({$this->_aliases['civicrm_event']}.id = {$this->_aliases['civicrm_participant']}.event_id ) AND ({$this->_aliases['civicrm_event']}.is_template IS NULL OR {$this->_aliases['civicrm_event']}.is_template = 0)
+ LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
+ ON ({$this->_aliases['civicrm_participant']}.contact_id = {$this->_aliases['civicrm_contact']}.id )
+ {$this->_aclFrom}
+ LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
+ ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND
+ {$this->_aliases['civicrm_address']}.is_primary = 1
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND
+ {$this->_aliases['civicrm_email']}.is_primary = 1)
+ LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
{$this->_aliases['civicrm_phone']}.is_primary = 1
- LEFT JOIN civicrm_line_item {$this->_aliases['civicrm_line_item']}
- ON {$this->_aliases['civicrm_participant']}.id ={$this->_aliases['civicrm_line_item']}.entity_id AND {$this->_aliases['civicrm_line_item']}.entity_table = 'civicrm_participant'";
+ LEFT JOIN civicrm_line_item {$this->_aliases['civicrm_line_item']}
+ ON {$this->_aliases['civicrm_participant']}.id ={$this->_aliases['civicrm_line_item']}.entity_id AND {$this->_aliases['civicrm_line_item']}.entity_table = 'civicrm_participant'";
}
function where() {
diff --git a/CRM/Report/Form/Event/Summary.php b/CRM/Report/Form/Event/Summary.php
index 2f364c4862c7e87fe69bf4bd813fcc6fd15d7ed8..9268e6e22da95be40428c1678fb4cf904740e8f7 100644
--- a/CRM/Report/Form/Event/Summary.php
+++ b/CRM/Report/Form/Event/Summary.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -47,9 +46,9 @@ class CRM_Report_Form_Event_Summary extends CRM_Report_Form_Event {
protected $_add2groupSupported = FALSE;
protected $_customGroupExtends = array(
- 'Event');
+ 'Event');
public $_drilldownReport = array('event/income' => 'Link to Detail Report');
-
+
function __construct() {
$this->_columns = array(
@@ -182,18 +181,18 @@ class CRM_Report_Form_Event_Summary extends CRM_Report_Form_Event {
$statusType2 = CRM_Event_PseudoConstant::participantStatus(NULL, 'is_counted = 0');
$sql = "
- SELECT civicrm_participant.event_id AS event_id,
- civicrm_participant.status_id AS statusId,
- COUNT( civicrm_participant.id ) AS participant,
+ SELECT civicrm_participant.event_id AS event_id,
+ civicrm_participant.status_id AS statusId,
+ COUNT( civicrm_participant.id ) AS participant,
SUM( civicrm_participant.fee_amount ) AS amount,
civicrm_participant.fee_currency
FROM civicrm_participant
- WHERE civicrm_participant.is_test = 0
+ WHERE civicrm_participant.is_test = 0
$this->_participantWhere
- GROUP BY civicrm_participant.event_id,
+ GROUP BY civicrm_participant.event_id,
civicrm_participant.status_id";
$info = CRM_Core_DAO::executeQuery($sql);
diff --git a/CRM/Report/Form/Extended.php b/CRM/Report/Form/Extended.php
index 274a8c7b6813e3f11ee5485a3573e48539be6c23..8bc77c7c6bffa23ca8e90512b8ca161f300fd0c5 100644
--- a/CRM/Report/Form/Extended.php
+++ b/CRM/Report/Form/Extended.php
@@ -1110,7 +1110,7 @@ FROM civicrm_contribution contribution_civireport_direct
LEFT JOIN civicrm_membership_payment pp ON contribution_civireport_direct.id = pp.contribution_id
LEFT JOIN civicrm_membership p ON pp.membership_id = p.id
LEFT JOIN civicrm_line_item line_item_civireport ON (line_item_civireport.line_total > 0 AND line_item_civireport.entity_id = p.id AND line_item_civireport.entity_table = 'civicrm_membership')
-WHERE line_item_civireport.id IS NOT NULL
+WHERE line_item_civireport.id IS NOT NULL
) as {$this->_aliases['civicrm_line_item']}
ON {$this->_aliases['civicrm_line_item']}.contid = {$this->_aliases['civicrm_contribution']}.id
@@ -1129,7 +1129,7 @@ FROM civicrm_contribution contribution_civireport_direct
LEFT JOIN civicrm_line_item line_item_civireport
ON (line_item_civireport.line_total > 0 AND line_item_civireport.entity_id = contribution_civireport_direct.id AND line_item_civireport.entity_table = 'civicrm_contribution')
-WHERE line_item_civireport.id IS NOT NULL
+WHERE line_item_civireport.id IS NOT NULL
UNION
@@ -1138,7 +1138,7 @@ FROM civicrm_contribution contribution_civireport_direct
LEFT JOIN civicrm_membership_payment pp ON contribution_civireport_direct.id = pp.contribution_id
LEFT JOIN civicrm_membership p ON pp.membership_id = p.id
LEFT JOIN civicrm_line_item line_item_civireport ON (line_item_civireport.line_total > 0 AND line_item_civireport.entity_id = p.id AND line_item_civireport.entity_table = 'civicrm_membership')
-WHERE line_item_civireport.id IS NOT NULL
+WHERE line_item_civireport.id IS NOT NULL
) as {$this->_aliases['civicrm_line_item']}
ON {$this->_aliases['civicrm_line_item']}.contid = {$this->_aliases['civicrm_contribution']}.id
";
diff --git a/CRM/Report/Form/Grant/Detail.php b/CRM/Report/Form/Grant/Detail.php
index 7c9e8c33319e05ee4143aefcbe962cb561cd0210..bb0e82a20a2129281ffbdb62d4858ac0b067a793 100644
--- a/CRM/Report/Form/Grant/Detail.php
+++ b/CRM/Report/Form/Grant/Detail.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Form/Grant/Statistics.php b/CRM/Report/Form/Grant/Statistics.php
index 950a056ee662dffa710b9efc96bc42f3a40d15fc..88515cf2992c6bab0af02982a459b7aa98c3f76b 100644
--- a/CRM/Report/Form/Grant/Statistics.php
+++ b/CRM/Report/Form/Grant/Statistics.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Form/Mailing/Bounce.php b/CRM/Report/Form/Mailing/Bounce.php
index 4c5bd1002d9a0c05f65c495c929c76fb77e6c192..40c397e577de826d414aa3464ab2d536946a8d31 100644
--- a/CRM/Report/Form/Mailing/Bounce.php
+++ b/CRM/Report/Form/Mailing/Bounce.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -52,7 +51,7 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
'barChart' => 'Bar Chart',
'pieChart' => 'Pie Chart',
);
-
+
function __construct() {
$this->_columns = array();
@@ -263,24 +262,24 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
// {$this->_aliases['civicrm_address']}.is_primary = 1 ) ";
$this->_from .= "
- INNER JOIN civicrm_mailing_event_queue
- ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
- INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
- ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id
- INNER JOIN civicrm_mailing_event_bounce {$this->_aliases['civicrm_mailing_event_bounce']}
- ON {$this->_aliases['civicrm_mailing_event_bounce']}.event_queue_id = civicrm_mailing_event_queue.id
- LEFT JOIN civicrm_mailing_bounce_type {$this->_aliases['civicrm_mailing_bounce_type']}
- ON {$this->_aliases['civicrm_mailing_event_bounce']}.bounce_type_id = {$this->_aliases['civicrm_mailing_bounce_type']}.id
- INNER JOIN civicrm_mailing_job
- ON civicrm_mailing_event_queue.job_id = civicrm_mailing_job.id
- INNER JOIN civicrm_mailing {$this->_aliases['civicrm_mailing']}
- ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
- ";
+ INNER JOIN civicrm_mailing_event_queue
+ ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
+ INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id
+ INNER JOIN civicrm_mailing_event_bounce {$this->_aliases['civicrm_mailing_event_bounce']}
+ ON {$this->_aliases['civicrm_mailing_event_bounce']}.event_queue_id = civicrm_mailing_event_queue.id
+ LEFT JOIN civicrm_mailing_bounce_type {$this->_aliases['civicrm_mailing_bounce_type']}
+ ON {$this->_aliases['civicrm_mailing_event_bounce']}.bounce_type_id = {$this->_aliases['civicrm_mailing_bounce_type']}.id
+ INNER JOIN civicrm_mailing_job
+ ON civicrm_mailing_event_queue.job_id = civicrm_mailing_job.id
+ INNER JOIN civicrm_mailing {$this->_aliases['civicrm_mailing']}
+ ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
+ ";
if ($this->_phoneField) {
$this->_from .= "
- LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
- ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
+ LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
+ ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
{$this->_aliases['civicrm_phone']}.is_primary = 1 ";
}
}
diff --git a/CRM/Report/Form/Mailing/Clicks.php b/CRM/Report/Form/Mailing/Clicks.php
index 385cc52025756166de0098ef4f0977509c4ba11f..4cfddc3b477b589734853df3159a99be71a809a3 100644
--- a/CRM/Report/Form/Mailing/Clicks.php
+++ b/CRM/Report/Form/Mailing/Clicks.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -49,7 +48,7 @@ class CRM_Report_Form_Mailing_Clicks extends CRM_Report_Form {
'barChart' => 'Bar Chart',
'pieChart' => 'Pie Chart',
);
-
+
function __construct() {
$this->_columns = array();
@@ -221,24 +220,24 @@ class CRM_Report_Form_Mailing_Clicks extends CRM_Report_Form {
FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}";
$this->_from .= "
- INNER JOIN civicrm_mailing_event_queue
- ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
- INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
- ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id
- INNER JOIN civicrm_mailing_event_trackable_url_open
- ON civicrm_mailing_event_trackable_url_open.event_queue_id = civicrm_mailing_event_queue.id
- INNER JOIN civicrm_mailing_trackable_url {$this->_aliases['civicrm_mailing_trackable_url']}
- ON civicrm_mailing_event_trackable_url_open.trackable_url_id = {$this->_aliases['civicrm_mailing_trackable_url']}.id
- INNER JOIN civicrm_mailing_job
- ON civicrm_mailing_event_queue.job_id = civicrm_mailing_job.id
- INNER JOIN civicrm_mailing {$this->_aliases['civicrm_mailing']}
- ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
- AND civicrm_mailing_job.is_test = 0
- ";
+ INNER JOIN civicrm_mailing_event_queue
+ ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
+ INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id
+ INNER JOIN civicrm_mailing_event_trackable_url_open
+ ON civicrm_mailing_event_trackable_url_open.event_queue_id = civicrm_mailing_event_queue.id
+ INNER JOIN civicrm_mailing_trackable_url {$this->_aliases['civicrm_mailing_trackable_url']}
+ ON civicrm_mailing_event_trackable_url_open.trackable_url_id = {$this->_aliases['civicrm_mailing_trackable_url']}.id
+ INNER JOIN civicrm_mailing_job
+ ON civicrm_mailing_event_queue.job_id = civicrm_mailing_job.id
+ INNER JOIN civicrm_mailing {$this->_aliases['civicrm_mailing']}
+ ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
+ AND civicrm_mailing_job.is_test = 0
+ ";
if ($this->_phoneField) {
$this->_from .= "
- LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
- ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
+ LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
+ ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
{$this->_aliases['civicrm_phone']}.is_primary = 1 ";
}
}
diff --git a/CRM/Report/Form/Mailing/Detail.php b/CRM/Report/Form/Mailing/Detail.php
index d3fad0b98de457c6803f02a3ea7df98305a60629..7b8112b7894e415ac38efe9d3236fa52c007ae82 100644
--- a/CRM/Report/Form/Mailing/Detail.php
+++ b/CRM/Report/Form/Mailing/Detail.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -37,7 +36,7 @@
class CRM_Report_Form_Mailing_Detail extends CRM_Report_Form {
protected $_exposeContactID = FALSE;
-
+
function __construct() {
$this->_columns = array();
@@ -328,17 +327,17 @@ class CRM_Report_Form_Mailing_Detail extends CRM_Report_Form {
FROM civicrm_contact {$this->_aliases['civicrm_contact']}";
$this->_from .= "
- INNER JOIN civicrm_mailing_event_queue
- ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
- INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
- ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id";
+ INNER JOIN civicrm_mailing_event_queue
+ ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
+ INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id";
if (array_key_exists('delivery_id', $this->_params['fields'])) {
$this->_from .= "
LEFT JOIN civicrm_mailing_event_delivered {$this->_aliases['civicrm_mailing_event_delivered']}
ON {$this->_aliases['civicrm_mailing_event_delivered']}.event_queue_id = civicrm_mailing_event_queue.id
- LEFT JOIN civicrm_mailing_event_bounce {$this->_aliases['civicrm_mailing_event_bounce']}
- ON {$this->_aliases['civicrm_mailing_event_bounce']}.event_queue_id = civicrm_mailing_event_queue.id";
+ LEFT JOIN civicrm_mailing_event_bounce {$this->_aliases['civicrm_mailing_event_bounce']}
+ ON {$this->_aliases['civicrm_mailing_event_bounce']}.event_queue_id = civicrm_mailing_event_queue.id";
if (CRM_Utils_Array::value('delivery_status_value', $this->_params) == 'bounced') {
$this->_columns['civicrm_mailing_event_delivered']['filters']['delivery_status']['clause'] = "{$this->_aliases['civicrm_mailing_event_bounce']}.id IS NOT NULL";
}
@@ -425,16 +424,16 @@ class CRM_Report_Form_Mailing_Detail extends CRM_Report_Form {
}
$this->_from .= "
- INNER JOIN civicrm_mailing_job
- ON civicrm_mailing_event_queue.job_id = civicrm_mailing_job.id
- INNER JOIN civicrm_mailing {$this->_aliases['civicrm_mailing']}
- ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
- AND civicrm_mailing_job.is_test = 0";
+ INNER JOIN civicrm_mailing_job
+ ON civicrm_mailing_event_queue.job_id = civicrm_mailing_job.id
+ INNER JOIN civicrm_mailing {$this->_aliases['civicrm_mailing']}
+ ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
+ AND civicrm_mailing_job.is_test = 0";
if ($this->_phoneField) {
$this->_from .= "
- LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
- ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
+ LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
+ ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
{$this->_aliases['civicrm_phone']}.is_primary = 1 ";
}
}
diff --git a/CRM/Report/Form/Mailing/Opened.php b/CRM/Report/Form/Mailing/Opened.php
index 8a55528e39f8fa6211c12691b18ffa9f698e9f06..48eaea49198fab691a1f0f1b89d6e677ec406b4b 100644
--- a/CRM/Report/Form/Mailing/Opened.php
+++ b/CRM/Report/Form/Mailing/Opened.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -49,7 +48,7 @@ class CRM_Report_Form_Mailing_Opened extends CRM_Report_Form {
'barChart' => 'Bar Chart',
'pieChart' => 'Pie Chart',
);
-
+
function __construct() {
$this->_columns = array();
@@ -212,23 +211,23 @@ class CRM_Report_Form_Mailing_Opened extends CRM_Report_Form {
FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}";
$this->_from .= "
- INNER JOIN civicrm_mailing_event_queue
- ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
- INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
- ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id
- INNER JOIN civicrm_mailing_event_opened
- ON civicrm_mailing_event_opened.event_queue_id = civicrm_mailing_event_queue.id
- INNER JOIN civicrm_mailing_job
- ON civicrm_mailing_event_queue.job_id = civicrm_mailing_job.id
- INNER JOIN civicrm_mailing {$this->_aliases['civicrm_mailing']}
- ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
- AND civicrm_mailing_job.is_test = 0
- ";
+ INNER JOIN civicrm_mailing_event_queue
+ ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
+ INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id
+ INNER JOIN civicrm_mailing_event_opened
+ ON civicrm_mailing_event_opened.event_queue_id = civicrm_mailing_event_queue.id
+ INNER JOIN civicrm_mailing_job
+ ON civicrm_mailing_event_queue.job_id = civicrm_mailing_job.id
+ INNER JOIN civicrm_mailing {$this->_aliases['civicrm_mailing']}
+ ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
+ AND civicrm_mailing_job.is_test = 0
+ ";
if ($this->_phoneField) {
$this->_from .= "
- LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
- ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
+ LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
+ ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
{$this->_aliases['civicrm_phone']}.is_primary = 1 ";
}
}
diff --git a/CRM/Report/Form/Mailing/Summary.php b/CRM/Report/Form/Mailing/Summary.php
index 39093c8bd018f1f6f414a0f65937905507d6b184..56cb97fecfd25032bf722270560d8855210c2d74 100644
--- a/CRM/Report/Form/Mailing/Summary.php
+++ b/CRM/Report/Form/Mailing/Summary.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php
index 0aeb0417e06b2166aa39204361fa04610ba6772a..21239a4ea5f29b22dbe2e0c85521fa0eb9278c53 100644
--- a/CRM/Report/Form/Member/ContributionDetail.php
+++ b/CRM/Report/Form/Member/ContributionDetail.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Form/Membership/Summary.php b/CRM/Report/Form/Membership/Summary.php
index 0d53caf92745404c90ad307b2d122783fb707ceb..a070df9afacb3fe33622ebe75ffa91da07cb7d1a 100644
--- a/CRM/Report/Form/Membership/Summary.php
+++ b/CRM/Report/Form/Membership/Summary.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -43,7 +42,7 @@ class CRM_Report_Form_Membership_Summary extends CRM_Report_Form {
'barChart' => 'Bar Chart',
'pieChart' => 'Pie Chart',
);
-
+
function __construct() {
// UI for selecting columns to appear in the report list
// array conatining the columns, group_bys and filters build and provided to Form
@@ -205,11 +204,11 @@ class CRM_Report_Form_Membership_Summary extends CRM_Report_Form {
$this->_from = "
FROM civicrm_contact {$this->_aliases['civicrm_contact']}
-INNER JOIN civicrm_membership {$this->_aliases['civicrm_membership']}
+INNER JOIN civicrm_membership {$this->_aliases['civicrm_membership']}
ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_membership']}.contact_id
-LEFT JOIN civicrm_membership_type {$this->_aliases['civicrm_membership_type']}
+LEFT JOIN civicrm_membership_type {$this->_aliases['civicrm_membership_type']}
ON {$this->_aliases['civicrm_membership']}.membership_type_id = {$this->_aliases['civicrm_membership_type']}.id
-LEFT JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
+LEFT JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
ON {$this->_aliases['civicrm_membership']}.contact_id = {$this->_aliases['civicrm_contribution']}.contact_id
";
// include address field if address column is to be included
diff --git a/CRM/Report/Form/Pledge/Summary.php b/CRM/Report/Form/Pledge/Summary.php
index 179cebb3f8c319e3601df06c12d55006f9632baa..2dbe934676d38676ec114097b9be32ac03ae6846 100644
--- a/CRM/Report/Form/Pledge/Summary.php
+++ b/CRM/Report/Form/Pledge/Summary.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -219,16 +218,16 @@ class CRM_Report_Form_Pledge_Summary extends CRM_Report_Form {
function from() {
$this->_from = "
FROM civicrm_pledge {$this->_aliases['civicrm_pledge']}
- LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
- ON ({$this->_aliases['civicrm_contact']}.id =
+ LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
+ ON ({$this->_aliases['civicrm_contact']}.id =
{$this->_aliases['civicrm_pledge']}.contact_id )
{$this->_aclFrom} ";
// include address field if address column is to be included
if ($this->_addressField) {
$this->_from .= "
- LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
- ON ({$this->_aliases['civicrm_contact']}.id =
+ LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
+ ON ({$this->_aliases['civicrm_contact']}.id =
{$this->_aliases['civicrm_address']}.contact_id) AND
{$this->_aliases['civicrm_address']}.is_primary = 1\n";
}
@@ -236,9 +235,9 @@ class CRM_Report_Form_Pledge_Summary extends CRM_Report_Form {
// include email field if email column is to be included
if ($this->_emailField) {
$this->_from .= "
- LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
- ON ({$this->_aliases['civicrm_contact']}.id =
- {$this->_aliases['civicrm_email']}.contact_id) AND
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ ON ({$this->_aliases['civicrm_contact']}.id =
+ {$this->_aliases['civicrm_email']}.contact_id) AND
{$this->_aliases['civicrm_email']}.is_primary = 1\n";
}
@@ -376,7 +375,7 @@ class CRM_Report_Form_Pledge_Summary extends CRM_Report_Form {
$this->_where = "WHERE ({$this->_aliases['civicrm_pledge']}.is_test=0 ) ";
}
else {
- $this->_where = "WHERE ({$this->_aliases['civicrm_pledge']}.is_test=0 ) AND
+ $this->_where = "WHERE ({$this->_aliases['civicrm_pledge']}.is_test=0 ) AND
" . implode(' AND ', $clauses);
}
diff --git a/CRM/Report/Form/Register.php b/CRM/Report/Form/Register.php
index 018c5774473c99d679093f9a1e2a3e34e6bdafab..3e6259f5b2f3aa05df1f4f0871eaa3c2ab821484 100644
--- a/CRM/Report/Form/Register.php
+++ b/CRM/Report/Form/Register.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Form/Walklist/Walklist.php b/CRM/Report/Form/Walklist/Walklist.php
index 333b3201a01558e569fd440d409c03c1c8c30169..af3e0805a0242e8b1b8dff255ac05e8eedd610e2 100644
--- a/CRM/Report/Form/Walklist/Walklist.php
+++ b/CRM/Report/Form/Walklist/Walklist.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Interface.php b/CRM/Report/Interface.php
index 900c7066d28cc14467dab21889ebcf5b21ee350c..2df0f6fbcd86844a733d307fe8aa8b7f95867804 100644
--- a/CRM/Report/Interface.php
+++ b/CRM/Report/Interface.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Page/Instance.php b/CRM/Report/Page/Instance.php
index 6b357cfe59a143859ce727cde6004f70e28e3a5d..84cb0a54cd909a8941a8d644208422d5592651d0 100644
--- a/CRM/Report/Page/Instance.php
+++ b/CRM/Report/Page/Instance.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Page/InstanceList.php b/CRM/Report/Page/InstanceList.php
index e1c40ecc4668f06f7bfa2b460ba7dfee66a21463..63c2fbf0da813e5f51ae9a22779c50cab8ad4fbf 100644
--- a/CRM/Report/Page/InstanceList.php
+++ b/CRM/Report/Page/InstanceList.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -43,7 +42,7 @@ class CRM_Report_Page_InstanceList extends CRM_Core_Page {
static $_links = NULL;
static $_exceptions = array( 'logging/contact/detail' );
-
+
/**
* Name of component if report list is filtered
*
@@ -87,13 +86,13 @@ class CRM_Report_Page_InstanceList extends CRM_Core_Page {
if ($this->ovID) {
$report .= " AND v.id = {$this->ovID} ";
}
-
+
if ($this->compID) {
if ($this->compID == 99) {
$report .= " AND v.component_id IS NULL ";
$this->_compName = 'Contact';
} else {
- $report .= " AND v.component_id = {$this->compID} ";
+ $report .= " AND v.component_id = {$this->compID} ";
$cmpName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Component', $this->compID,
'name', 'id'
);
@@ -113,9 +112,9 @@ class CRM_Report_Page_InstanceList extends CRM_Core_Page {
g.name = 'report_template'
LEFT JOIN civicrm_report_instance inst
ON v.value = inst.report_id
- LEFT JOIN civicrm_component comp
+ LEFT JOIN civicrm_component comp
ON v.component_id = comp.id
-
+
WHERE v.is_active = 1 {$report}
AND inst.domain_id = %1
ORDER BY v.weight";
diff --git a/CRM/Report/Page/List.php b/CRM/Report/Page/List.php
index b3aa79b3586f34a52a95c1e344d45ed8c0b7929b..4da1e12cb9da06998a1a1b2d05153bfb9ad09c11 100644
--- a/CRM/Report/Page/List.php
+++ b/CRM/Report/Page/List.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -42,14 +41,14 @@ class CRM_Report_Page_List extends CRM_Core_Page {
public static function &info() {
$sql = "
-SELECT v.id, v.value, v.label, v.description, v.component_id,
- inst.id as instance_id, ifnull( SUBSTRING(comp.name, 5), 'Contact' ) as component_name
+SELECT v.id, v.value, v.label, v.description, v.component_id,
+ inst.id as instance_id, ifnull( SUBSTRING(comp.name, 5), 'Contact' ) as component_name
FROM civicrm_option_value v
-INNER JOIN civicrm_option_group g
+INNER JOIN civicrm_option_group g
ON (v.option_group_id = g.id AND g.name = 'report_list')
-LEFT JOIN civicrm_report_instance inst
+LEFT JOIN civicrm_report_instance inst
ON v.value = inst.report_id
-LEFT JOIN civicrm_component comp
+LEFT JOIN civicrm_component comp
ON v.component_id = comp.id
WHERE v.is_active = 1
ORDER BY v.weight";
diff --git a/CRM/Report/Page/Options.php b/CRM/Report/Page/Options.php
index e839f21658cfddf8123aab21ad8c0933d436642f..c255852e61a9dc0e4d629b4637e201cc90b135a5 100644
--- a/CRM/Report/Page/Options.php
+++ b/CRM/Report/Page/Options.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Page/Report.php b/CRM/Report/Page/Report.php
index a9f70b3c0839056f732c250d20ceb7676a2c97d9..3a6848acc82e040f84c2e1d90a5fc23423e87789 100644
--- a/CRM/Report/Page/Report.php
+++ b/CRM/Report/Page/Report.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Page/TemplateList.php b/CRM/Report/Page/TemplateList.php
index b235c2df2d463be54d8e02f70b3847ae9f54bed6..a55d0d479322c5ee9828a3a4dab0fdeb2a9f113c 100644
--- a/CRM/Report/Page/TemplateList.php
+++ b/CRM/Report/Page/TemplateList.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
@@ -48,21 +47,21 @@ class CRM_Report_Page_TemplateList extends CRM_Core_Page {
$compClause = '';
if ($compID) {
if ($compID == 99) {
- $compClause = " AND v.component_id IS NULL ";
+ $compClause = " AND v.component_id IS NULL ";
} else {
- $compClause = " AND v.component_id = {$compID} ";
+ $compClause = " AND v.component_id = {$compID} ";
}
}
$sql = "
-SELECT v.id, v.value, v.label, v.description, v.component_id,
- inst.id as instance_id, ifnull( SUBSTRING(comp.name, 5), 'Contact' ) as component_name
+SELECT v.id, v.value, v.label, v.description, v.component_id,
+ inst.id as instance_id, ifnull( SUBSTRING(comp.name, 5), 'Contact' ) as component_name
FROM civicrm_option_value v
-INNER JOIN civicrm_option_group g
+INNER JOIN civicrm_option_group g
ON (v.option_group_id = g.id AND g.name = 'report_template')
-LEFT JOIN civicrm_report_instance inst
+LEFT JOIN civicrm_report_instance inst
ON v.value = inst.report_id
-LEFT JOIN civicrm_component comp
+LEFT JOIN civicrm_component comp
ON v.component_id = comp.id
";
diff --git a/CRM/Report/Utils/Get.php b/CRM/Report/Utils/Get.php
index f18eaa3426670aebeb97286ebc4eb310b50db2da..35b0c1162c35a6e1ff5088eeeab1cebfada9da8f 100644
--- a/CRM/Report/Utils/Get.php
+++ b/CRM/Report/Utils/Get.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+
diff --git a/CRM/Report/Utils/Report.php b/CRM/Report/Utils/Report.php
index 1aab2e75eaf878babc3ad882d72ef3cad75859a7..75b2fb8b5ef2cd86432cb5dfc0388cddd7e93235 100644
--- a/CRM/Report/Utils/Report.php
+++ b/CRM/Report/Utils/Report.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
+--------------------------------------------------------------------+