comments & formatting fixes
[civicrm-core.git] / CRM / Member / BAO / Membership.php
index 9ca03859f79333e90f29393d3f9bdf207b037235..39f92236d8dc3dc418665a0aaaa7ff6b7c0a8638 100644 (file)
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -66,7 +66,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
    */
   static function &add(&$params, &$ids) {
 
-    if (CRM_Utils_Array::value('membership', $ids)) {
+    if (!empty($ids['membership'])) {
       CRM_Utils_Hook::pre('edit', 'Membership', $ids['membership'], $params);
       $oldStatus         = NULL;
       $oldType           = NULL;
@@ -136,7 +136,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
     // reset the group contact cache since smart groups might be affected due to this
     CRM_Contact_BAO_GroupContactCache::remove();
 
-    if (CRM_Utils_Array::value('membership', $ids)) {
+    if (!empty($ids['membership'])) {
       if ($membership->status_id != $oldStatus) {
         $allStatus = CRM_Member_BAO_Membership::buildOptions('status_id', 'get');
         $activityParam = array(
@@ -216,9 +216,13 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
   /**
    * takes an associative array and creates a membership object
    *
-   * @param array    $params      (reference ) an assoc array of name/value pairs
-   * @param array    $ids         the array that holds all the db ids
-   * @param boolean  $callFromAPI Is this function called from API?
+   * @param array $params (reference ) an assoc array of name/value pairs
+   * @param array $ids the array that holds all the db ids
+   * @param bool $skipRedirect
+   * @param string $activityType
+   *
+   * @throws CRM_Core_Exception
+   * @internal param bool $callFromAPI Is this function called from API?
    *
    * @return object CRM_Member_BAO_Membership object
    * @access public
@@ -231,9 +235,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
     // To skip status calculation we should use 'skipStatusCal'.
     // eg pay later membership, membership update cron CRM-3984
 
-    if (!CRM_Utils_Array::value('is_override', $params) &&
-      !CRM_Utils_Array::value('skipStatusCal', $params)
-    ) {
+    if (empty($params['is_override']) && empty($params['skipStatusCal'])) {
       $dates = array('start_date', 'end_date', 'join_date');
       $start_date = $end_date = $join_date = NULL; // declare these out of courtesy as IDEs don't pick up the setting of them below
       foreach ($dates as $date) {
@@ -244,14 +246,12 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
       $excludeIsAdmin = CRM_Utils_Array::value('exclude_is_admin', $params, FALSE);
 
       //CRM-3724 always skip is_admin if is_override != true.
-      if (!$excludeIsAdmin &&
-        !CRM_Utils_Array::value('is_override', $params)
-      ) {
+      if (!$excludeIsAdmin && empty($params['is_override'])) {
         $excludeIsAdmin = TRUE;
       }
 
-      $calcStatus = $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($start_date, $end_date, $join_date,
-        'today', $excludeIsAdmin
+      $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($start_date, $end_date, $join_date,
+        'today', $excludeIsAdmin, CRM_Utils_Array::value('membership_type_id', $params), $params
       );
       if (empty($calcStatus)) {
         // Redirect the form in case of error
@@ -274,7 +274,8 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
     //    CRM_Contact_BAO_Relationship::relatedMemberships()
     if (isset($params['owner_membership_id'])) {
       unset($params['max_related']);
-    } else {
+    }
+    else {
       // if membership allows related, default max_related to value in membership_type
       if (!array_key_exists('max_related', $params) && !empty($params['membership_type_id'])) {
         $membershipType = CRM_Member_BAO_MembershipType::getMembershipTypeDetails($params['membership_type_id']);
@@ -294,8 +295,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
     }
 
     // add custom field values
-    if (CRM_Utils_Array::value('custom', $params)
-      && is_array($params['custom'])
+    if (!empty($params['custom']) && is_array($params['custom'])
     ) {
       CRM_Core_BAO_CustomValueTable::store($params['custom'], 'civicrm_membership', $membership->id);
     }
@@ -310,13 +310,13 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
     }
 
     //record contribution for this membership
-    if (CRM_Utils_Array::value('contribution_status_id', $params) && !CRM_Utils_Array::value('relate_contribution_id', $params)) {
+    if (!empty($params['contribution_status_id']) && empty($params['relate_contribution_id'])) {
       $memInfo = array_merge($params, array('membership_id' => $membership->id));
       $params['contribution'] = self::recordMembershipContribution($memInfo, $ids);
     }
 
     //insert payment record for this membership
-    if (CRM_Utils_Array::value('relate_contribution_id', $params)) {
+    if (!empty($params['relate_contribution_id'])) {
       $mpDAO = new CRM_Member_DAO_MembershipPayment();
       $mpDAO->membership_id = $membership->id;
       $mpDAO->contribution_id = $params['relate_contribution_id'];
@@ -329,11 +329,9 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
 
     // add activity record only during create mode and renew mode
     // also add activity if status changed CRM-3984 and CRM-2521
-    if (!CRM_Utils_Array::value('membership', $ids) ||
-      $activityType == 'Membership Renewal' ||
-      CRM_Utils_Array::value('createActivity', $params)
-    ) {
-      if (CRM_Utils_Array::value('membership', $ids)) {
+    if (empty($ids['membership']) ||
+      $activityType == 'Membership Renewal' || !empty($params['createActivity'])) {
+      if (!empty($ids['membership'])) {
         $data = array();
         CRM_Core_DAO::commonRetrieveAll('CRM_Member_DAO_Membership',
           'id',
@@ -354,7 +352,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
 
       // create activity source = individual, target = org CRM-4027
       $targetContactID = NULL;
-      if (CRM_Utils_Array::value('is_for_organization', $params)) {
+      if (!empty($params['is_for_organization'])) {
         $targetContactID = $membership->contact_id;
         $membership->contact_id = CRM_Utils_Array::value('userId', $ids);
       }
@@ -363,9 +361,9 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
         $membership->contact_id = $realMembershipContactId;
       }
 
-      if (CRM_Utils_Array::value('membership', $ids) && $activityType != 'Membership Signup') {
+      if (!empty($ids['membership']) && $activityType != 'Membership Signup') {
         CRM_Activity_BAO_Activity::addActivity($membership, $activityType, $targetContactID);
-      } elseif (!CRM_Utils_Array::value('membership', $ids)) {
+      } elseif (empty($ids['membership'])) {
         CRM_Activity_BAO_Activity::addActivity($membership, $activityType, $targetContactID);
       }
 
@@ -380,7 +378,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
     self::createRelatedMemberships($params, $membership);
 
     // do not add to recent items for import, CRM-4399
-    if (!CRM_Utils_Array::value('skipRecentView', $params)) {
+    if (empty($params['skipRecentView'])) {
       $url = CRM_Utils_System::url('civicrm/contact/view/membership',
         "action=view&reset=1&id={$membership->id}&cid={$membership->contact_id}&context=home"
       );
@@ -484,10 +482,11 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
    * full featured over a period of time. This is the inverse function of
    * create.  It also stores all the retrieved values in the default array
    *
-   * @param array $params   (reference ) an assoc array of name/value pairs
+   * @param array $params (reference ) an assoc array of name/value pairs
    * @param array $defaults (reference ) an assoc array to hold the name / value pairs
    *                        in a hierarchical manner
-   * @param array $ids      (reference) the array that holds all the db ids
+   *
+   * @internal param array $ids (reference) the array that holds all the db ids
    *
    * @return object CRM_Member_BAO_Membership object
    * @access public
@@ -507,7 +506,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
         'status', 'membership_type') as $fld) {
         $defaults[$fld] = CRM_Utils_Array::value($fld, $statusANDType[$membership->id]);
       }
-      if (CRM_Utils_Array::value('is_current_member', $statusANDType[$membership->id])) {
+      if (!empty($statusANDType[$membership->id]['is_current_member'])) {
         $defaults['active'] = TRUE;
       }
 
@@ -680,7 +679,7 @@ INNER JOIN  civicrm_membership_type type ON ( type.id = membership.membership_ty
     $actives = array();
     if ($status == 'active') {
       foreach ($memberships as $f => $v) {
-        if (CRM_Utils_Array::value('active', $v)) {
+        if (!empty($v['active'])) {
           $actives[$f] = $v;
         }
       }
@@ -688,7 +687,7 @@ INNER JOIN  civicrm_membership_type type ON ( type.id = membership.membership_ty
     }
     elseif ($status == 'inactive') {
       foreach ($memberships as $f => $v) {
-        if (!CRM_Utils_Array::value('active', $v)) {
+        if (empty($v['active'])) {
           $actives[$f] = $v;
         }
       }
@@ -740,14 +739,14 @@ INNER JOIN  civicrm_membership_type type ON ( type.id = membership.membership_ty
             continue;
           }
           foreach ($pField['options'] as $opId => $opValues) {
-            if (!CRM_Utils_Array::value('membership_type_id', $opValues)) {
+            if (empty($opValues['membership_type_id'])) {
               continue;
             }
             $membershipTypeIds[$opValues['membership_type_id']] = $opValues['membership_type_id'];
           }
         }
       }
-      elseif (CRM_Utils_Array::value('membership_types', $membershipBlock)) {
+      elseif (!empty($membershipBlock['membership_types'])) {
         $membershipTypeIds = explode(',', $membershipBlock['membership_types']);
       }
 
@@ -910,7 +909,7 @@ INNER JOIN  civicrm_membership_type type ON ( type.id = membership.membership_ty
     $dao->is_active = 1;
     if ($dao->find(TRUE)) {
       CRM_Core_DAO::storeValues($dao, $membershipBlock);
-      if (CRM_Utils_Array::value('membership_types', $membershipBlock)) {
+      if (!empty($membershipBlock['membership_types'])) {
         $membershipTypes = unserialize($membershipBlock['membership_types']);
         if (!is_array($membershipTypes)) {
           return $membershipBlock;
@@ -1278,7 +1277,7 @@ AND civicrm_membership.is_test = %2";
     if (is_a($result[1], 'CRM_Core_Error')) {
       $errors[1] = CRM_Core_Error::getMessages($result[1]);
     }
-    elseif (CRM_Utils_Array::value(1, $result)) {
+    elseif (!empty($result[1])) {
       // Save the contribution ID so that I can be used in email receipts
       // For example, if you need to generate a tax receipt for the donation only.
       $form->_values['contribution_other_id'] = $result[1]->id;
@@ -1287,7 +1286,7 @@ AND civicrm_membership.is_test = %2";
 
 
     $memBlockDetails = CRM_Member_BAO_Membership::getMembershipBlock($form->_id);
-    if (CRM_Utils_Array::value('is_separate_payment', $memBlockDetails) && !$paymentDone) {
+    if (!empty($memBlockDetails['is_separate_payment']) && !$paymentDone) {
       $form->_lineItem = $form->_memLineItem;
       $contributionType = new CRM_Financial_DAO_FinancialType( );
       $contributionType->id = CRM_Utils_Array::value('financial_type_id', $membershipDetails);
@@ -1298,19 +1297,15 @@ AND civicrm_membership.is_test = %2";
       $invoiceID = md5(uniqid(rand(), TRUE));
       $tempParams['invoiceID'] = $invoiceID;
 
-      //we don't allow recurring membership.CRM-3781.
-      if (CRM_Utils_Array::value('is_recur', $tempParams)) {
-        $tempParams['is_recur'] = 0;
-      }
       $result = NULL;
       if ($form->_values['is_monetary'] && !$form->_params['is_pay_later'] && $minimumFee > 0.0) {
         $payment = CRM_Core_Payment::singleton($form->_mode, $form->_paymentProcessor, $form);
 
         if ($form->_contributeMode == 'express') {
-          $result = &$payment->doExpressCheckout($tempParams);
+          $result = $payment->doExpressCheckout($tempParams);
         }
         else {
-          $result = &$payment->doDirectPayment($tempParams);
+          $result = $payment->doDirectPayment($tempParams);
         }
       }
 
@@ -1356,17 +1351,16 @@ AND civicrm_membership.is_test = %2";
       }
     }
 
-    $index = CRM_Utils_Array::value('is_separate_payment', $memBlockDetails) ? 2 : 1;
-
-    if (!CRM_Utils_Array::value($index, $errors)) {
-      if (isset($membershipParams['onbehalf']) &&
-        CRM_Utils_Array::value('member_campaign_id', $membershipParams['onbehalf'])) {
+    $index = !empty($memBlockDetails['is_separate_payment']) ? 2 : 1;
+    $createdMemberships = array();
+    $membership = NULL;
+    if (empty($errors[$index])) {
+      if (isset($membershipParams['onbehalf']) && !empty($membershipParams['onbehalf']['member_campaign_id'])) {
         $form->_params['campaign_id'] = $membershipParams['onbehalf']['member_campaign_id'];
       }
+      //!!B
       if (is_array($membershipTypeID)) {
         $typesTerms = CRM_Utils_Array::value('types_terms', $membershipParams, array());
-        $createdMemberships = array();
-
         foreach ($membershipTypeID as $memType) {
           $numTerms = CRM_Utils_Array::value($memType, $typesTerms, 1);
           $membership = self::renewMembership($contactID, $memType,
@@ -1375,6 +1369,9 @@ AND civicrm_membership.is_test = %2";
             $customFieldsFormatted, CRM_Utils_Array::value($memType, $typesTerms, 1)
           );
 
+          // update recurring id for membership record
+          self::updateRecurMembership($membership, $contribution[$index]);
+
           $createdMemberships[$memType] = $membership;
           if (isset($contribution[$index])) {
             //insert payment record
@@ -1392,7 +1389,7 @@ AND civicrm_membership.is_test = %2";
         }
         if ($form->_priceSetId && !empty($form->_useForMember) && !empty($form->_lineItem)) {
           foreach ($form->_lineItem[$form->_priceSetId] as & $priceFieldOp) {
-            if (CRM_Utils_Array::value('membership_type_id', $priceFieldOp) &&
+            if (!empty($priceFieldOp['membership_type_id']) &&
               isset($createdMemberships[$priceFieldOp['membership_type_id']])
             ) {
               $membershipOb = $createdMemberships[$priceFieldOp['membership_type_id']];
@@ -1408,11 +1405,15 @@ AND civicrm_membership.is_test = %2";
         }
       }
       else {
-        $membership = self::renewMembership($contactID, $membershipTypeID,
+        $membership = $createdMemberships[$membershipTypeID] = self::renewMembership($contactID, $membershipTypeID,
           $isTest, $form, NULL,
           CRM_Utils_Array::value('cms_contactID', $membershipParams),
           $customFieldsFormatted, CRM_Utils_Array::value('types_terms', $membershipParams, 1)
         );
+
+        // update recurring id for membership record
+        self::updateRecurMembership($membership, $contribution[$index]);
+
         if (isset($contribution[$index])) {
           //insert payment record
           $dao = new CRM_Member_DAO_MembershipPayment();
@@ -1436,24 +1437,22 @@ AND civicrm_membership.is_test = %2";
         }
       }
       $message = ts('Payment Processor Error message') . ': ' . implode('<br/>', $message);
-      // Redirect the form in case of error
-      // @todo this redirect in the BAO layer is really bad & should be moved to the form layer
-      // however since we have no idea how (if) this is triggered we can't safely move / remove it
-      $errorParams = array(
-        'legacy_redirect_path' => 'civicrm/contribute/transact',
-        'legacy_redirect_query' => "_qf_Main_display=true&qfKey={$form->_params['qfKey']}",
+      throw new CRM_Core_Exception($message);
+    }
+    $form->_params['createdMembershipIDs'] = array();
+
+    // CRM-7851 - Moved after processing Payment Errors
+    foreach ($createdMemberships as $createdMembership) {
+      CRM_Core_BAO_CustomValueTable::postProcess(
+        $form->_params,
+        CRM_Core_DAO::$_nullArray,
+        'civicrm_membership',
+        $createdMembership->id,
+        'Membership'
       );
-      throw new CRM_Core_Exception($message, 0, $errorParams);
+      $form->_params['createdMembershipIDs'][] = $createdMembership->id;
     }
 
-    // CRM-7851
-    CRM_Core_BAO_CustomValueTable::postProcess($form->_params,
-      CRM_Core_DAO::$_nullArray,
-      'civicrm_membership',
-      $membership->id,
-      'Membership'
-    );
-
     $form->_params['membershipID'] = $membership->id;
     if ($form->_contributeMode == 'notify') {
       if ($form->_values['is_monetary'] && $form->_amount > 0.0 && !$form->_params['is_pay_later']) {
@@ -1472,7 +1471,7 @@ AND civicrm_membership.is_test = %2";
 
     // Do not send an email if Recurring transaction is done via Direct Mode
     // Email will we sent when the IPN is received.
-    if (CRM_Utils_Array::value('is_recur', $form->_params) && $form->_contributeMode == 'direct') {
+    if (!empty($form->_params['is_recur']) && $form->_contributeMode == 'direct') {
       return TRUE;
     }
 
@@ -1484,6 +1483,32 @@ AND civicrm_membership.is_test = %2";
     );
   }
 
+  /**
+   * Function for updating a membership record's contribution_recur_id
+   *
+   * @param object CRM_Member_BAO_Membership $membership
+   * @param object CRM_Contribute_BAO_Contribution $contribution
+   *
+   * @return void
+   * @static
+   * @access public
+   */
+  static public function updateRecurMembership(CRM_Member_BAO_Membership &$membership,
+    CRM_Contribute_BAO_Contribution &$contribution) {
+
+    if (empty($contribution->contribution_recur_id)) {
+      return;
+    }
+
+    $params = array(
+      1 => array($contribution->contribution_recur_id, 'Integer'),
+      2 => array($membership->id, 'Integer'),
+    );
+
+    $sql = "UPDATE civicrm_membership SET contribution_recur_id = %1 WHERE id = %2";
+    CRM_Core_DAO::executeQuery($sql, $params);
+  }
+
   /**
    * @todo - this form method needs to have the interaction with the form layer removed from it
    * as a BAO function. Note that the api now supports membership renewals & it is not clear this function does anything
@@ -1531,14 +1556,11 @@ AND civicrm_membership.is_test = %2";
     //@todo this is a BAO function & should not inspect the form - the form should do this
     // & pass required params to the BAO
     if (CRM_Utils_Array::value('minimum_fee', $membershipTypeDetails) > 0.0) {
-      if (((isset($form->_contributeMode) && $form->_contributeMode == 'notify') ||
-          CRM_Utils_Array::value('is_pay_later', $form->_params) ||
-          (CRM_Utils_Array::value('is_recur', $form->_params)
-            && $form->_contributeMode == 'direct'
+      if (((isset($form->_contributeMode) && $form->_contributeMode == 'notify') || !empty($form->_params['is_pay_later']) ||
+          (!empty($form->_params['is_recur']) && $form->_contributeMode == 'direct'
           )
         ) &&
-        (($form->_values['is_monetary'] && $form->_amount > 0.0) ||
-         CRM_Utils_Array::value('separate_membership_payment', $form->_params) ||
+        (($form->_values['is_monetary'] && $form->_amount > 0.0) || !empty($form->_params['separate_membership_payment']) ||
          CRM_Utils_Array::value('record_contribution', $form->_params)
         )
       ) {
@@ -1604,7 +1626,7 @@ AND civicrm_membership.is_test = %2";
         }
         CRM_Member_BAO_MembershipLog::add($logParams, CRM_Core_DAO::$_nullArray);
 
-        if (CRM_Utils_Array::value('contributionRecurID', $form->_params)) {
+        if (!empty($form->_params['contributionRecurID'])) {
           CRM_Core_DAO::setFieldValue('CRM_Member_DAO_Membership', $membership->id,
             'contribution_recur_id', $form->_params['contributionRecurID']
           );
@@ -1642,7 +1664,7 @@ AND civicrm_membership.is_test = %2";
         $currentMembership['end_date'] = CRM_Utils_Array::value('end_date', $dates);
         $currentMembership['is_test'] = $is_test;
 
-        if (CRM_Utils_Array::value('membership_source', $form->_params)) {
+        if (!empty($form->_params['membership_source'])) {
           $currentMembership['source'] = $form->_params['membership_source'];
         }
         elseif (isset($form->_values['title']) && !empty($form->_values['title'])) {
@@ -1655,7 +1677,7 @@ AND civicrm_membership.is_test = %2";
           );
         }
 
-        if (CRM_Utils_Array::value('id', $currentMembership)) {
+        if (!empty($currentMembership['id'])) {
           $ids['membership'] = $currentMembership['id'];
         }
         $memParams = $currentMembership;
@@ -1687,10 +1709,10 @@ AND civicrm_membership.is_test = %2";
         //set the log start date.
         $memParams['log_start_date'] = CRM_Utils_Date::customFormat($dates['log_start_date'], $format);
         if (empty($membership->source)) {
-          if (CRM_Utils_Array::value('membership_source', $form->_params)) {
+          if (!empty($form->_params['membership_source'])) {
             $memParams['source'] = $form->_params['membership_source'];
           }
-          elseif (property_exists($form, '_values') && CRM_Utils_Array::value('title', $form->_values)) {
+          elseif (property_exists($form, '_values') && !empty($form->_values['title'])) {
             $memParams['source'] = ts('Online Contribution:') . ' ' . $form->_values['title'];
           }
           else {
@@ -1701,7 +1723,7 @@ AND civicrm_membership.is_test = %2";
           }
         }
 
-        if (CRM_Utils_Array::value('id', $currentMembership)) {
+        if (!empty($currentMembership['id'])) {
           $ids['membership'] = $currentMembership['id'];
         }
       }
@@ -1735,7 +1757,10 @@ AND civicrm_membership.is_test = %2";
           CRM_Utils_Date::customFormat($dates['join_date'],
             $statusFormat
           ),
-          'today', TRUE
+          'today',
+          TRUE,
+          $membershipTypeID,
+          $memParams
         );
         $updateStatusId = CRM_Utils_Array::value('id', $status);
       }
@@ -1744,10 +1769,10 @@ AND civicrm_membership.is_test = %2";
         $updateStatusId = array_search('Pending', $allStatus);
       }
 
-      if (CRM_Utils_Array::value('membership_source', $form->_params)) {
+      if (!empty($form->_params['membership_source'])) {
         $memParams['source'] = $form->_params['membership_source'];
       }
-      elseif (CRM_Utils_Array::value('title', $form->_values)) {
+      elseif (!empty($form->_values['title'])) {
         $memParams['source'] = ts('Online Contribution:') . ' ' . $form->_values['title'];
       }
       $memParams['contribution_recur_id'] = CRM_Utils_Array::value('contributionRecurID', $form->_params);
@@ -1832,7 +1857,9 @@ AND civicrm_membership.is_test = %2";
       CRM_Utils_Array::value('end_date', $currentMembership),
       CRM_Utils_Array::value('join_date', $currentMembership),
       $today,
-      TRUE
+      TRUE,
+      $currentMembership['membership_type_id'],
+      $currentMembership
     );
 
     if (empty($status) ||
@@ -1989,8 +2016,10 @@ WHERE  civicrm_membership.contact_id = civicrm_contact.id
    * function to create memberships for related contacts
    * takes into account the maximum related memberships
    *
-   * @param  array      $params       array of key - value pairs
-   * @param  object     $membership   membership object
+   * @param  array $params array of key - value pairs
+   * @param $dao
+   *
+   * @internal param object $membership membership object
    *
    * @return null|relatedMembership     array of memberships if created
    * @static
@@ -2039,7 +2068,7 @@ WHERE  civicrm_membership.contact_id = civicrm_contact.id
     // remove repeated related contacts, which already inherited membership.
     $relatedContactIds[$membership->contact_id] = TRUE;
     foreach ($allRelatedContacts as $cid => $status) {
-      if (!CRM_Utils_Array::value($cid, $relatedContactIds)) {
+      if (empty($relatedContactIds[$cid])) {
         $relatedContactIds[$cid] = TRUE;
 
         //don't create membership again for owner contact.
@@ -2123,7 +2152,8 @@ WHERE  civicrm_membership.contact_id = civicrm_contact.id
         if (($params['status_id'] == $deceasedStatusId) || ($params['status_id'] == $expiredStatusId)) {
           // related membership is not active so does not count towards maximum
           CRM_Member_BAO_Membership::create($params, $relMemIds);
-        } else {
+        }
+        else {
           // related membership already exists, so this is just an update
           if (isset($params['id'])) {
             if ($available > 0) {
@@ -2669,16 +2699,16 @@ WHERE      civicrm_membership.is_test = 0";
     }
 
     // make entry in batch entity batch table
-    if (CRM_Utils_Array::value('batch_id', $params)) {
+    if (!empty($params['batch_id'])) {
       $contributionParams['batch_id'] = $params['batch_id'];
     }
 
-    if ( CRM_Utils_Array::value('contribution_contact_id', $params) ) {
+    if (!empty($params['contribution_contact_id'])) {
       // deal with possibility of a different person paying for contribution
       $contributionParams['contact_id'] = $params['contribution_contact_id'];
     }
 
-    if (CRM_Utils_Array::value('processPriceSet', $params) &&
+    if (!empty($params['processPriceSet']) &&
       !empty($params['lineItems'])
     ) {
       $contributionParams['line_item'] = CRM_Utils_Array::value('lineItems', $params, NULL);
@@ -2691,13 +2721,11 @@ WHERE      civicrm_membership.is_test = 0";
 
 
     //insert payment record for this membership
-    if (!CRM_Utils_Array::value('contribution', $ids) ||
-      CRM_Utils_Array::value('is_recur', $params)
-    ) {
+    if (empty($ids['contribution']) || !empty($params['is_recur'])) {
       $mpDAO = new CRM_Member_DAO_MembershipPayment();
       $mpDAO->membership_id = $membershipId;
       $mpDAO->contribution_id = $contribution->id;
-      if (CRM_Utils_Array::value('is_recur', $params)) {
+      if (!empty($params['is_recur'])) {
         $mpDAO->find();
       }
 
@@ -2743,7 +2771,7 @@ WHERE      civicrm_membership.is_test = 0";
       $editedResults = array();
       CRM_Price_BAO_PriceFieldValue::retrieve($editedFieldParams, $editedResults);
       $qf->_priceSet['fields'][$fid]['options'][$editedResults['id']] = $priceSets['fields'][$fid]['options'][$editedResults['id']];
-      if (CRM_Utils_Array::value('total_amount', $qf->_params)) {
+      if (!empty($qf->_params['total_amount'])) {
         $qf->_priceSet['fields'][$fid]['options'][$editedResults['id']]['amount'] = $qf->_params['total_amount'];
       }
     }