INFRA-132 - CRM/ - Fix misc oddball syntax

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

diff --git a/CRM/Contribute/Form/AdditionalInfo.php b/CRM/Contribute/Form/AdditionalInfo.php
index 0965885c783462b4a484fd80f2c5d6d5bf37b35c..ec0dc8ef0b34598d272a11ea2ec7ca1915c7be7b 100644 (file)
--- a/CRM/Contribute/Form/AdditionalInfo.php
+++ b/CRM/Contribute/Form/AdditionalInfo.php
@@ -1,7 +1,7 @@
 <?php
 /*
   +--------------------------------------------------------------------+
-  | CiviCRM version 4.5                                                |
+  | CiviCRM version 4.6                                                |
   +--------------------------------------------------------------------+
   | Copyright CiviCRM LLC (c) 2004-2014                                |
   +--------------------------------------------------------------------+
@@ -37,13 +37,12 @@ class CRM_Contribute_Form_AdditionalInfo {
   /**
    * Build the form object for Premium Information.
    *
-   * @access public
    *
    * @param CRM_Core_Form $form
    *
    * @return void
    */
-  static function buildPremium(&$form) {
+  public static function buildPremium(&$form) {
     //premium section
     $form->add('hidden', 'hidden_Premium', 1);
     $sel1 = $sel2 = array();
@@ -88,13 +87,12 @@ class CRM_Contribute_Form_AdditionalInfo {
   /**
    * Build the form object for Additional Details.
    *
-   * @access public
    *
    * @param CRM_Core_Form $form
    *
    * @return void
    */
-  static function buildAdditionalDetail(&$form) {
+  public static function buildAdditionalDetail(&$form) {
     //Additional information section
     $form->add('hidden', 'hidden_AdditionalDetail', 1);
 
@@ -156,7 +154,7 @@ class CRM_Contribute_Form_AdditionalInfo {
     $form->add('select', 'contribution_page_id',
       ts('Online Contribution Page'),
       array(
-        '' => ts('- select -')
+        '' => ts('- select -'),
       ) +
       CRM_Contribute_PseudoConstant::contributionPage()
     );
@@ -176,13 +174,12 @@ class CRM_Contribute_Form_AdditionalInfo {
    *
    * Build the form object for PaymentReminders Information.
    *
-   * @access public
    *
    * @param CRM_Core_Form $form
    *
    * @return void
    */
-  static function buildPaymentReminders(&$form) {
+  public static function buildPaymentReminders(&$form) {
     //PaymentReminders section
     $form->add('hidden', 'hidden_PaymentReminders', 1);
     $form->add('text', 'initial_reminder_day', ts('Send Initial Reminder'), array('size' => 3));
@@ -194,17 +191,16 @@ class CRM_Contribute_Form_AdditionalInfo {
   }
 
   /**
-   * process the Premium Information
+   * Process the Premium Information
    *
-   * @access public
    *
    * @param array $params
-   * @param $contributionID
-   * @param null $premiumID
-   * @param null $options
+   * @param int $contributionID
+   * @param int $premiumID
+   * @param NULL $options
    * @return void
    */
-  static function processPremium(&$params, $contributionID, $premiumID = NULL, &$options = NULL) {
+  public static function processPremium(&$params, $contributionID, $premiumID = NULL, &$options = NULL) {
     $dao = new CRM_Contribute_DAO_ContributionProduct();
     $dao->contribution_id = $contributionID;
     $dao->product_id = $params['product_name'][0];
@@ -243,7 +239,7 @@ class CRM_Contribute_Form_AdditionalInfo {
         'cost' => CRM_Utils_Array::value('cost', $productDetails),
         'currency' => CRM_Utils_Array::value('currency', $productDetails),
         'financial_type_id' => CRM_Utils_Array::value('financial_type_id', $productDetails),
-        'contributionId' => $contributionID
+        'contributionId' => $contributionID,
       );
       if ($isDeleted) {
         $params['oldPremium']['product_id'] = $premoumDAO->product_id;
@@ -254,18 +250,17 @@ class CRM_Contribute_Form_AdditionalInfo {
   }
 
   /**
-   * process the Note
+   * Process the Note
    *
-   * @access public
    *
    * @param array $params
-   * @param $contactID
-   * @param $contributionID
-   * @param null $contributionNoteID
+   * @param int $contactID
+   * @param int $contributionID
+   * @param int $contributionNoteID
    *
    * @return void
    */
-  static function processNote(&$params, $contactID, $contributionID, $contributionNoteID = NULL) {
+  public static function processNote(&$params, $contactID, $contributionID, $contributionNoteID = NULL) {
     //process note
     $noteParams = array(
       'entity_table' => 'civicrm_contribution',
@@ -282,16 +277,15 @@ class CRM_Contribute_Form_AdditionalInfo {
   }
 
   /**
-   * process the Common data
+   * Process the Common data
    *
-   * @access public
    *
    * @param array $params
    * @param $formatted
    * @param CRM_Core_Form $form
    * @return void
    */
-  static function postProcessCommon(&$params, &$formatted, &$form) {
+  public static function postProcessCommon(&$params, &$formatted, &$form) {
     $fields = array(
       'non_deductible_amount',
       'total_amount',
@@ -334,19 +328,19 @@ class CRM_Contribute_Form_AdditionalInfo {
   }
 
   /**
-   * Function to send email receipt.
+   * Send email receipt.
    *
    * @form object  of Contribution form.
    *
    * @param CRM_Core_Form $form
-   * @param array $params (reference ) an assoc array of name/value pairs.
+   * @param array $params
+   *   (reference ) an assoc array of name/value pairs.
    * @$ccContribution boolen,  is it credit card contribution.
    * @param bool $ccContribution
-   * @access public.
    *
    * @return array
    */
-  static function emailReceipt(&$form, &$params, $ccContribution = FALSE) {
+  public static function emailReceipt(&$form, &$params, $ccContribution = FALSE) {
     $form->assign('receiptType', 'contribution');
     // Retrieve Financial Type Name from financial_type_id
     $params['contributionType_name'] = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialType',
@@ -362,7 +356,7 @@ class CRM_Contribute_Form_AdditionalInfo {
       foreach ($params['soft_credit'] as $key => $softCredit) {
         $softCredits[$key] = array(
           'Name' => $softCredit['contact_name'],
-          'Amount' => CRM_Utils_Money::format($softCredit['amount'], $softCredit['currency'])
+          'Amount' => CRM_Utils_Money::format($softCredit['amount'], $softCredit['currency']),
         );
         $softCreditTypes[$key] = $softCredit['soft_credit_type_label'];
       }
@@ -383,8 +377,7 @@ class CRM_Contribute_Form_AdditionalInfo {
         $params['product_name'] = $productDAO->name;
         $params['product_sku'] = $productDAO->sku;
 
-        if (empty($params['product_option']) && !empty($form->_options
-[$params['product_name'][0]])) {
+        if (empty($params['product_option']) && !empty($form->_options[$params['product_name'][0]])) {
           $params['product_option'] = $form->_options[$params['product_name'][0]][$params['product_name'][1]];
         }
       }
@@ -487,7 +480,7 @@ class CRM_Contribute_Form_AdditionalInfo {
       $form->assign('receive_date', CRM_Utils_Date::processDate($params['receive_date']));
     }
 
-     $template = CRM_Core_Smarty::singleton( );
+     $template = CRM_Core_Smarty::singleton();
      $taxAmt = $template->get_template_vars('dataArray');
      $eventTaxAmt = $template->get_template_vars('totalTaxAmount');
      $prefixValue = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME, 'contribution_invoice_settings');
@@ -509,7 +502,7 @@ class CRM_Contribute_Form_AdditionalInfo {
         'toName' => $contributorDisplayName,
         'toEmail' => $contributorEmail,
         'isTest' => $form->_mode == 'test',
-        'PDFFilename' => ts('receipt').'.pdf',
+        'PDFFilename' => ts('receipt') . '.pdf',
         'isEmailPdf' => $isEmailPdf,
       )
     );
@@ -518,5 +511,3 @@ class CRM_Contribute_Form_AdditionalInfo {
   }
 
 }
-
-