X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FPayment%2FPaymentExpressIPN.php;h=207bc59a9b9c7ecc1a14727449d73155ba10f145;hb=6fe7706e511e4237f1c7cafd82524d5e72377c3f;hp=8683a65f853a5933f422e0c093a7aaa471f9fc69;hpb=eeca7960db033b9ee3511f6bf7d1217b1b5caed9;p=civicrm-core.git diff --git a/CRM/Core/Payment/PaymentExpressIPN.php b/CRM/Core/Payment/PaymentExpressIPN.php index 8683a65f85..207bc59a9b 100644 --- a/CRM/Core/Payment/PaymentExpressIPN.php +++ b/CRM/Core/Payment/PaymentExpressIPN.php @@ -145,7 +145,7 @@ class CRM_Core_Payment_PaymentExpressIPN extends CRM_Core_Payment_BaseIPN { if ($contribution->invoice_id != $input['invoice']) { CRM_Core_Error::debug_log_message("Invoice values dont match between database and IPN request"); echo "Failure: Invoice values dont match between database and IPN request

"; - return; + return FALSE; } // lets replace invoice-id with Payment Processor -number because thats what is common and unique @@ -157,7 +157,7 @@ class CRM_Core_Payment_PaymentExpressIPN extends CRM_Core_Payment_BaseIPN { if ($contribution->total_amount != $input['amount']) { CRM_Core_Error::debug_log_message("Amount values dont match between database and IPN request"); echo "Failure: Amount values dont match between database and IPN request. " . $contribution->total_amount . "/" . $input['amount'] . "

"; - return; + return FALSE; } $transaction = new CRM_Core_Transaction(); @@ -307,8 +307,8 @@ class CRM_Core_Payment_PaymentExpressIPN extends CRM_Core_Payment_BaseIPN { if ($response = curl_exec($curl)) { $info = curl_getinfo($curl); if ($info['http_code'] < 200 || $info['http_code'] > 299) { - $log_message = "DPS error: HTTP %1 retrieving %2."; - CRM_Core_Error::fatal(ts($log_message, [1 => $info['http_code'], 2 => $info['url']])); + $log_message = "DPS error: HTTP {$info['http_code']} retrieving {$info['url']}."; + CRM_Core_Error::fatal($log_message); } else { fwrite($message_log, sprintf("\n\r%s:- %s\n", date("D M j G:i:s T Y"), $response)); @@ -343,8 +343,8 @@ class CRM_Core_Payment_PaymentExpressIPN extends CRM_Core_Payment_BaseIPN { require_once 'PaymentExpress/pxaccess.inc.php'; global $pxaccess; $pxaccess = new PxAccess($dps_url, $dps_user, $dps_key, $mac_key); - #getResponse method in PxAccess object returns PxPayResponse object - #which encapsulates all the response data + // GetResponse method in PxAccess object returns PxPayResponse object + // which encapsulates all the response data $rsp = $pxaccess->getResponse($rawPostData); $qfKey = $rsp->getTxnData1();