From 1ac462d0596afdaef61e5a81ddf1bfc199eacca6 Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Sun, 14 Apr 2013 18:00:06 -0700 Subject: [PATCH] CRM-12352 ---------------------------------------- * CRM-12352: missing single quotes around arrayed variable reference http://issues.civicrm.org/jira/browse/CRM-12352 --- CRM/Core/Payment/PayPalImpl.php | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php index 935e6a67d8..7a7d3f3586 100644 --- a/CRM/Core/Payment/PayPalImpl.php +++ b/CRM/Core/Payment/PayPalImpl.php @@ -241,7 +241,13 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { //$args['desc'] = 'Recurring Contribution'; $args['totalbillingcycles'] = $params['installments']; $args['version'] = '56.0'; - $args['profilereference'] = "i={$params['invoiceID']}" . "&m=$component" . "&c={$params['contactID']}" . "&r={$params['contributionRecurID']}" . "&b={$params['contributionID']}" . "&p={$params['contributionPageID']}"; + $args['profilereference'] = + "i={$params['invoiceID']}" . + "&m=$component" . + "&c={$params['contactID']}" . + "&r={$params['contributionRecurID']}" . + "&b={$params['contributionID']}" . + "&p={$params['contributionPageID']}"; $result = $this->invokeAPI($args); @@ -316,11 +322,18 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { $args['billingfrequency'] = $params['frequency_interval']; $args['method'] = "CreateRecurringPaymentsProfile"; $args['profilestartdate'] = $start_date; - $args['desc'] = $params['description'] . ": " . $params['amount'] . " Per " . $params['frequency_interval'] . " " . $params['frequency_unit']; + $args['desc'] = + $params['description'] . ": " . + $params['amount'] . " Per " . + $params['frequency_interval'] . " " . + $params['frequency_unit']; $args['amt'] = $params['amount']; $args['totalbillingcycles'] = $params['installments']; $args['version'] = 56.0; - $args['PROFILEREFERENCE'] = "i=" . $params['invoiceID'] . "&m=" . $component . "&c=" . $params['contactID'] . "&r=" . $params['contributionRecurID'] . "&b=" . $params['contributionID'] . "&p=" . $params['contributionPageID']; + $args['PROFILEREFERENCE'] = + "i=" . $params['invoiceID'] . "&m=" . $component . + "&c=" . $params['contactID'] . "&r=" . $params['contributionRecurID'] . + "&b=" . $params['contributionID'] . "&p=" . $params['contributionPageID']; } // Allow further manipulation of the arguments via custom hooks .. @@ -355,7 +368,8 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { function checkConfig() { $error = array(); $paymentProcessorType = CRM_Core_PseudoConstant::paymentProcessorType(false, null, 'name'); - if ($this->_paymentProcessor['payment_processor_type_id'] == CRM_Utils_Array::key('PayPal_Standard', $paymentProcessorType) || + if ( + $this->_paymentProcessor['payment_processor_type_id'] == CRM_Utils_Array::key('PayPal_Standard', $paymentProcessorType) || $this->_paymentProcessor['payment_processor_type_id'] == CRM_Utils_Array::key('PayPal', $paymentProcessorType) ) { if (empty($this->_paymentProcessor['user_name'])) { @@ -512,10 +526,11 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { $cancelUrlString = "$cancel=1&cancel=1&qfKey={$params['qfKey']}"; if (CRM_Utils_Array::value('is_recur', $params)) { - $cancelUrlString .= "&isRecur=1&recurId={$params['contributionRecurID']}&contribId={$params[contributionID]}"; + $cancelUrlString .= "&isRecur=1&recurId={$params['contributionRecurID']}&contribId={$params['contributionID']}"; } - $cancelURL = CRM_Utils_System::url($url, + $cancelURL = CRM_Utils_System::url( + $url, $cancelUrlString, TRUE, NULL, FALSE ); -- 2.25.1