Merge pull request #2020 from dlobo/CRM-13790

[civicrm-core.git] / extern / ipn.php

diff --git a/extern/ipn.php b/extern/ipn.php
index 4aa7f0e17421e1118eea4eb510799d2bf3fa5ef5..8cbea934617181538d46d7447d2e78696d68b160 100644 (file)
--- a/extern/ipn.php
+++ b/extern/ipn.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -40,11 +40,20 @@ require_once '../civicrm.config.php';
 $config = CRM_Core_Config::singleton();
 
 if (empty($_GET)) {
-  $paypalIPN = new CRM_Core_Payment_PayPalProIPN();
+  $paypalIPN = new CRM_Core_Payment_PayPalProIPN($_REQUEST);
 }
 else {
   $paypalIPN = new CRM_Core_Payment_PayPalIPN();
+  // @todo upgrade standard per Pro
+}
+try{
+  $paypalIPN->main();
+}
+catch(CRM_Core_Exception $e) {
+  CRM_Core_Error::debug_log_message($e->getMessage());
+  CRM_Core_Error::debug_var('error data', $e->getErrorData(), TRUE, TRUE);
+  CRM_Core_Error::debug_var('REQUEST', $_REQUEST, TRUE, TRUE);
+  //@todo give better info to logged in user - ie dev
+  echo "The transaction has failed. Please review the log for more detail";
 }
-
-$paypalIPN->main();