Merge pull request #4925 from KarinG/patch-1

[civicrm-core.git] / CRM / Report / Form / Contribute / Detail.php

diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php
index 337da3216729042c626d8b21f4177ea8b04e5a2f..42b37694d75fc9c08f99622dd34f070fe18f71e3 100644 (file)
--- a/CRM/Report/Form/Contribute/Detail.php
+++ b/CRM/Report/Form/Contribute/Detail.php
@@ -45,10 +45,8 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
   protected $_customGroupExtends = array('Contribution');
 
   /**
-   *
    */
   /**
-   *
    */
   public function __construct() {
 
@@ -101,7 +99,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
               'title' => ts('Last Name, First Name'),
               'default' => '1',
               'default_weight' => '0',
-              'default_order' => 'ASC'
+              'default_order' => 'ASC',
             ),
           ),
           'grouping' => 'contact-fields',
@@ -174,15 +172,15 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
             'net_amount' => NULL,
             'contribution_or_soft' => array(
               'title' => ts('Contribution OR Soft Credit?'),
-              'dbAlias' => "'Contribution'"
+              'dbAlias' => "'Contribution'",
             ),
             'soft_credits' => array(
               'title' => ts('Soft Credits'),
-              'dbAlias' => "NULL"
+              'dbAlias' => "NULL",
             ),
             'soft_credit_for' => array(
               'title' => ts('Soft Credit For'),
-              'dbAlias' => "NULL"
+              'dbAlias' => "NULL",
             ),
           ),
           'filters' => array(
@@ -593,7 +591,7 @@ GROUP BY {$this->_aliases['civicrm_contribution']}.currency";
     ) {
       $tempQuery = "(SELECT * FROM civireport_contribution_detail_temp1)";
     }
-    else if (CRM_Utils_Array::value('contribution_or_soft_value', $this->_params) ==
+    elseif (CRM_Utils_Array::value('contribution_or_soft_value', $this->_params) ==
       'soft_credits_only'
     ) {
       $tempQuery = "(SELECT * FROM civireport_contribution_detail_temp2)";
@@ -890,7 +888,7 @@ WHERE  civicrm_contribution_contribution_id={$row['civicrm_contribution_contribu
         ) {
           $title = '%1 contributions: %2';
         }
-        else if (CRM_Utils_Array::value('contribution_or_soft_value', $this->_params) ==
+        elseif (CRM_Utils_Array::value('contribution_or_soft_value', $this->_params) ==
           'soft_credits_only'
         ) {
           $title = '%1 soft-credits: %2';
@@ -898,7 +896,7 @@ WHERE  civicrm_contribution_contribution_id={$row['civicrm_contribution_contribu
         foreach ($totals as $key => $total) {
           $totalandsum[$key] = ts($title, array(
             1 => $total,
-            2 => CRM_Utils_Money::format($sumcontribs[$key])
+            2 => CRM_Utils_Money::format($sumcontribs[$key]),
           ));
         }
         $this->assign('sectionTotals', $totalandsum);