X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContribute%2FForm%2FAdditionalInfo.php;h=4b827a1f763e0a232718f42b6cb14ec27a9753c9;hb=8381af809c027065ceb28f18b5530ffb3a51ada3;hp=a7a4ca56ce177b36880175b256f4f03d32a2e8ef;hpb=adc13f865ee7ced5d485e801528f2481fb6da0b0;p=civicrm-core.git

diff --git a/CRM/Contribute/Form/AdditionalInfo.php b/CRM/Contribute/Form/AdditionalInfo.php
index a7a4ca56ce..4b827a1f76 100644
--- a/CRM/Contribute/Form/AdditionalInfo.php
+++ b/CRM/Contribute/Form/AdditionalInfo.php
@@ -154,29 +154,6 @@ class CRM_Contribute_Form_AdditionalInfo {
 
   }
 
-  /**
-   * Function to build the form for Honoree Information.
-   *
-   * @access public
-   *
-   * @return None
-   */
-  static function buildHonoree(&$form) {
-    //Honoree section
-    $form->add('hidden', 'hidden_Honoree', 1);
-    $honor = CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'honor_type_id');
-    $extraOption = array('onclick' => "return enableHonorType();");
-    foreach ($honor as $key => $var) {
-      $honorTypes[$key] = $form->createElement('radio', NULL, NULL, $var, $key, $extraOption);
-    }
-    $form->addGroup($honorTypes, 'honor_type_id', NULL);
-    $form->add('select', 'honor_prefix_id', ts('Prefix'), array('' => ts('- prefix -')) + CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id'));
-    $form->add('text', 'honor_first_name', ts('First Name'));
-    $form->add('text', 'honor_last_name', ts('Last Name'));
-    $form->add('text', 'honor_email', ts('Email'));
-    $form->addRule("honor_email", ts('Email is not valid.'), 'email');
-  }
-
   /**
    * This function is used by  CRM/Pledge/Form/Pledge.php
    *
@@ -203,7 +180,7 @@ class CRM_Contribute_Form_AdditionalInfo {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   static function processPremium(&$params, $contributionID, $premiumID = NULL, &$options = NULL) {
     $dao = new CRM_Contribute_DAO_ContributionProduct();
@@ -218,7 +195,7 @@ class CRM_Contribute_Form_AdditionalInfo {
     $productDetails = array();
     CRM_Contribute_BAO_ManagePremiums::retrieve($premiumParams, $productDetails);
     $dao->financial_type_id = CRM_Utils_Array::value('financial_type_id', $productDetails);
-    if (CRM_Utils_Array::value($params['product_name'][0], $options)) {
+    if (!empty($options[$params['product_name'][0]])) {
       $dao->product_option = $options[$params['product_name'][0]][$params['product_name'][1]];
     }
     if ($premiumID) {
@@ -259,7 +236,7 @@ class CRM_Contribute_Form_AdditionalInfo {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   static function processNote(&$params, $contactID, $contributionID, $contributionNoteID = NULL) {
     //process note
@@ -282,7 +259,7 @@ class CRM_Contribute_Form_AdditionalInfo {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   static function postProcessCommon(&$params, &$formatted, &$form) {
     $fields = array(
@@ -293,37 +270,23 @@ class CRM_Contribute_Form_AdditionalInfo {
       'trxn_id',
       'invoice_id',
       'campaign_id',
-      'honor_type_id',
       'contribution_page_id',
     );
     foreach ($fields as $f) {
       $formatted[$f] = CRM_Utils_Array::value($f, $params);
     }
 
-    if (CRM_Utils_Array::value('thankyou_date', $params) && !CRM_Utils_System::isNull($params['thankyou_date'])) {
+    if (!empty($params['thankyou_date']) && !CRM_Utils_System::isNull($params['thankyou_date'])) {
       $formatted['thankyou_date'] = CRM_Utils_Date::processDate($params['thankyou_date'], $params['thankyou_date_time']);
     }
     else {
       $formatted['thankyou_date'] = 'null';
     }
 
-    if (CRM_Utils_Array::value('is_email_receipt', $params)) {
+    if (!empty($params['is_email_receipt'])) {
       $params['receipt_date'] = $formatted['receipt_date'] = date('YmdHis');
     }
 
-    if (CRM_Utils_Array::value('honor_type_id', $params)) {
-      if ($form->_honorID) {
-        $honorId = CRM_Contribute_BAO_Contribution::createHonorContact($params, $form->_honorID);
-      }
-      else {
-        $honorId = CRM_Contribute_BAO_Contribution::createHonorContact($params);
-      }
-      $formatted["honor_contact_id"] = $honorId;
-    }
-    else {
-      $formatted["honor_contact_id"] = 'null';
-    }
-
     //special case to handle if all checkboxes are unchecked
     $customFields = CRM_Core_BAO_CustomField::getFields('Contribution',
       FALSE,
@@ -348,20 +311,20 @@ class CRM_Contribute_Form_AdditionalInfo {
    * @$ccContribution boolen,  is it credit card contribution.
    * @access public.
    *
-   * @return None.
+   * @return void.
    */
   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',
       $params['financial_type_id']);
-    if (CRM_Utils_Array::value('payment_instrument_id', $params)) {
+    if (!empty($params['payment_instrument_id'])) {
       $paymentInstrument = CRM_Contribute_PseudoConstant::paymentInstrument();
       $params['paidBy'] = $paymentInstrument[$params['payment_instrument_id']];
     }
 
     // retrieve individual prefix value for honoree
-    if (CRM_Utils_Array::value('hidden_Honoree', $params)) {
+    if (!empty($params['hidden_Honoree'])) {
       $individualPrefix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
       $honor = CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'honor_type_id');
       $params['honor_prefix'] = CRM_Utils_Array::value(CRM_Utils_Array::value('honor_prefix_id',
@@ -378,7 +341,7 @@ class CRM_Contribute_Form_AdditionalInfo {
 
     // retrieve premium product name and assigned fulfilled
     // date to template
-    if (CRM_Utils_Array::value('hidden_Premium', $params)) {
+    if (!empty($params['hidden_Premium'])) {
       if (isset($params['product_name']) &&
         is_array($params['product_name']) &&
         !empty($params['product_name'])
@@ -389,16 +352,13 @@ class CRM_Contribute_Form_AdditionalInfo {
         $params['product_name'] = $productDAO->name;
         $params['product_sku'] = $productDAO->sku;
 
-        if (!CRM_Utils_Array::value('product_option', $params) &&
-          CRM_Utils_Array::value($params['product_name'][0],
-            $form->_options
-          )
-        ) {
+        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]];
         }
       }
 
-      if (CRM_Utils_Array::value('fulfilled_date', $params)) {
+      if (!empty($params['fulfilled_date'])) {
         $form->assign('fulfilled_date', CRM_Utils_Date::processDate($params['fulfilled_date']));
       }
     }
@@ -407,7 +367,7 @@ class CRM_Contribute_Form_AdditionalInfo {
     if ($ccContribution) {
       //build the name.
       $name = CRM_Utils_Array::value('billing_first_name', $params);
-      if (CRM_Utils_Array::value('billing_middle_name', $params)) {
+      if (!empty($params['billing_middle_name'])) {
         $name .= " {$params['billing_middle_name']}";
       }
       $name .= ' ' . CRM_Utils_Array::value('billing_last_name', $params);
@@ -442,10 +402,10 @@ class CRM_Contribute_Form_AdditionalInfo {
       // assigned various dates to the templates
       $form->assign('receipt_date', CRM_Utils_Date::processDate($params['receipt_date']));
 
-      if (CRM_Utils_Array::value('cancel_date', $params)) {
+      if (!empty($params['cancel_date'])) {
         $form->assign('cancel_date', CRM_Utils_Date::processDate($params['cancel_date']));
       }
-      if (CRM_Utils_Array::value('thankyou_date', $params)) {
+      if (!empty($params['thankyou_date'])) {
         $form->assign('thankyou_date', CRM_Utils_Date::processDate($params['thankyou_date']));
       }
       if ($form->_action & CRM_Core_Action::UPDATE) {
@@ -454,7 +414,7 @@ class CRM_Contribute_Form_AdditionalInfo {
     }
 
     //handle custom data
-    if (CRM_Utils_Array::value('hidden_custom', $params)) {
+    if (!empty($params['hidden_custom'])) {
       $contribParams = array(array('contribution_id', '=', $params['contribution_id'], 0, 0));
       if ($form->_mode == 'test') {
         $contribParams[] = array('contribution_test', '=', 1, 0, 0);
@@ -488,11 +448,11 @@ class CRM_Contribute_Form_AdditionalInfo {
     $form->assign('contactID', $params['contact_id']);
     $form->assign('contributionID', $params['contribution_id']);
 
-    if (CRM_Utils_Array::value('currency', $params)) {
+    if (!empty($params['currency'])) {
       $form->assign('currency', $params['currency']);
     }
 
-    if (CRM_Utils_Array::value('receive_date', $params)) {
+    if (!empty($params['receive_date'])) {
       $form->assign('receive_date', CRM_Utils_Date::processDate($params['receive_date']));
     }