From b55aa3deabb2f12f4eb2b164cdca31b96f8cfa82 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Fri, 7 Aug 2015 23:03:11 +0530
Subject: [PATCH] CRM-16526, fixed jenkin warnings

----------------------------------------
* CRM-16526: ACLs for Financial Types
  https://issues.civicrm.org/jira/browse/CRM-16526
---
 CRM/Contribute/Form/Contribution.php  | 2 +-
 CRM/Event/Form/EventFees.php          | 4 ++--
 CRM/Financial/BAO/FinancialType.php   | 2 --
 CRM/Report/Form.php                   | 1 +
 CRM/Report/Form/Contribute/Repeat.php | 6 ++----
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index 2eae1df0e4..c00476e403 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -622,7 +622,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
     // Check permissions for financial type first
     CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes, 'add');
     if (empty($financialTypes)) {
-      CRM_Core_Error::statusBounce(ts('You do not have all the permissions needed for this page.')); 
+      CRM_Core_Error::statusBounce(ts('You do not have all the permissions needed for this page.'));
     }
     $financialType = $this->add('select', 'financial_type_id',
       ts('Financial Type'),
diff --git a/CRM/Event/Form/EventFees.php b/CRM/Event/Form/EventFees.php
index e01668180e..c43e2446f8 100644
--- a/CRM/Event/Form/EventFees.php
+++ b/CRM/Event/Form/EventFees.php
@@ -411,8 +411,8 @@ SELECT  id, html_type
         }
       }
       if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()
-        && !CRM_Utils_Array::value('fee',  $form->_values) 
-        && CRM_Utils_Array::value('snippet',  $_REQUEST) == CRM_Core_Smarty::PRINT_NOFORM
+        && !CRM_Utils_Array::value('fee', $form->_values)
+        && CRM_Utils_Array::value('snippet', $_REQUEST) == CRM_Core_Smarty::PRINT_NOFORM
       ) {
         $form->assign('isFTPermissionDenied', TRUE);
         return FALSE;
diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php
index c81e4b3e69..c92b135260 100644
--- a/CRM/Financial/BAO/FinancialType.php
+++ b/CRM/Financial/BAO/FinancialType.php
@@ -38,12 +38,10 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType {
    * Static holder for the default LT.
    */
   static $_defaultContributionType = NULL;
-  
   /**
    * Static cache holder of available financial types for this session
    */
   static $_availableFinancialTypes = array();
-  
   /**
    * Static cache holder of status of ACL-FT enabled/disabled for this session
    */
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index d8e6fed394..737941c94d 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -4533,4 +4533,5 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
     }
     $query->_from .= $from;
   }
+
 }
diff --git a/CRM/Report/Form/Contribute/Repeat.php b/CRM/Report/Form/Contribute/Repeat.php
index a1fc32c310..933f0922a9 100644
--- a/CRM/Report/Form/Contribute/Repeat.php
+++ b/CRM/Report/Form/Contribute/Repeat.php
@@ -356,7 +356,6 @@ LEFT JOIN civicrm_temp_civireport_repeat1 {$this->_aliases['civicrm_contribution
 LEFT JOIN civicrm_temp_civireport_repeat2 {$this->_aliases['civicrm_contribution']}2
        ON $fromAlias.$fromCol = {$this->_aliases['civicrm_contribution']}2.$contriCol";
   }
-  
   /**
    * @param string $replaceAliasWith
    *
@@ -368,11 +367,10 @@ LEFT JOIN civicrm_temp_civireport_repeat2 {$this->_aliases['civicrm_contribution
     $this->_aliases['civicrm_contribution'] = $replaceAliasWith;
     $this->_from = $from;
     $from .= (string) $this->getPermissionedFTQuery($this, 'civicrm_line_item_report', TRUE);
-    $this->_aliases['civicrm_contribution'] = $temp;    
+    $this->_aliases['civicrm_contribution'] = $temp;
     $this->_where = '';
     return $from;
-  }
-  
+  }  
   /**
    * @param string $replaceAliasWith
    *
-- 
2.25.1