Fix WP_DEBUG notices found in tests. See wpsharks/s2member#97

wpsharks · Apr 24, 2014 · e33b734 · e33b734
1 parent cb764d2
commit e33b734
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php b/s2member-pro/includes/classes/gateways/paypal/paypal-checkout-in.inc.php
@@ -251,7 +251,7 @@ public static function paypal_checkout()
 																		$paypal["TOTALBILLINGCYCLES"] = ($post_vars["attr"]["rr"]) ? (($post_vars["attr"]["rrt"]) ? $post_vars["attr"]["rrt"] : "0") : "1";
 																		$paypal["BILLINGFREQUENCY"] = $post_vars["attr"]["rp"];
 
-																		if($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"]) && ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details)) && empty($paypal_xco_details["__error"]))
+																		if(!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"]) && ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details)) && empty($paypal_xco_details["__error"]))
 																			{
 																				$paypal["TOKEN"] = $paypal_xco_details["TOKEN"];
 																			}
@@ -392,7 +392,7 @@ public static function paypal_checkout()
 																$paypal["TOTALBILLINGCYCLES"] = ($post_vars["attr"]["rr"]) ? (($post_vars["attr"]["rrt"]) ? $post_vars["attr"]["rrt"] : "0") : "1";
 																$paypal["BILLINGFREQUENCY"] = $post_vars["attr"]["rp"];
 
-																if($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"]) && ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details)) && empty($paypal_xco_details["__error"]))
+																if(!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"]) && ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details)) && empty($paypal_xco_details["__error"]))
 																	{
 																		$paypal["TOKEN"] = $paypal_xco_details["TOKEN"];
 																	}
@@ -543,7 +543,7 @@ public static function paypal_checkout()
 
 																if /* Prepare a "Buy Now" transaction. */(!($paypal = array()))
 																	{
-																		if($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"]) && ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details)) && empty($paypal_xco_details["__error"]))
+																		if(!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"]) && ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details)) && empty($paypal_xco_details["__error"]))
 																			{
 																				$paypal["METHOD"] = "DoExpressCheckoutPayment";
 
@@ -678,7 +678,7 @@ public static function paypal_checkout()
 													{
 														if /* Prepare a "Buy Now" transaction. */(!($paypal = array()))
 															{
-																if($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"]) && ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details)) && empty($paypal_xco_details["__error"]))
+																if(!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"]) && ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details)) && empty($paypal_xco_details["__error"]))
 																	{
 																		$paypal["METHOD"] = "DoExpressCheckoutPayment";
 

diff --git a/s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php b/s2member-pro/includes/classes/gateways/paypal/paypal-checkout-pf-in.inc.php
@@ -311,7 +311,7 @@ public static function paypal_checkout()
 																$paypal["PAYPERIOD"] = c_ws_plugin__s2member_paypal_utilities::paypal_payflow_term($post_vars["attr"]["rt"], $post_vars["attr"]["rp"]);
 																$paypal["TERM"] = ($post_vars["attr"]["rr"]) ? (($post_vars["attr"]["rrt"]) ? $post_vars["attr"]["rrt"] : "0") : "1";
 
-																if($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"])
+																if(!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"])
 
 																	&& ($paypal_xco_details = array("TRXTYPE" => "A", "ACTION" => "G", "TENDER" => "P", "TOKEN" => $_GET["token"]))
 																	&& ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_payflow_api_response($paypal_xco_details))
@@ -459,7 +459,7 @@ public static function paypal_checkout()
 																$paypal["PAYPERIOD"] = c_ws_plugin__s2member_paypal_utilities::paypal_payflow_term($post_vars["attr"]["rt"], $post_vars["attr"]["rp"]);
 																$paypal["TERM"] = ($post_vars["attr"]["rr"]) ? (($post_vars["attr"]["rrt"]) ? $post_vars["attr"]["rrt"] : "0") : "1";
 
-																if($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"])
+																if(!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"])
 
 																	&& ($paypal_xco_details = array("TRXTYPE" => "A", "ACTION" => "G", "TENDER" => "P", "TOKEN" => $_GET["token"]))
 																	&& ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_payflow_api_response($paypal_xco_details))
@@ -473,7 +473,7 @@ public static function paypal_checkout()
 																		$paypal["PAYERID"] = $paypal_xco_details["PAYERID"];
 																		$paypal["BAID"] = $paypal_xco_bagree["BAID"];
 																	}
-																else if($_GET["s2member_paypal_xco"] !== "s2member_pro_paypal_checkout_return")
+																else if(empty($_GET["s2member_paypal_xco"]) || $_GET["s2member_paypal_xco"] !== "s2member_pro_paypal_checkout_return")
 																	{
 																		$paypal["TENDER"] = "C";
 																		$paypal["ACCT"] = preg_replace("/[^0-9]/", "", $post_vars["card_number"]);
@@ -633,7 +633,7 @@ public static function paypal_checkout()
 
 														if(!($paypal = array())) // Prepare a "Buy Now" transaction.
 															{
-																if($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"])
+																if(!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"])
 																	&& ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"]))
 																	&& ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details))
 																	&& empty($paypal_xco_details["__error"]))
@@ -758,7 +758,7 @@ public static function paypal_checkout()
 													{
 														if(!($paypal = array())) // Prepare a "Buy Now" transaction.
 															{
-																if($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"])
+																if(!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty($_GET["token"])
 																	&& ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"]))
 																	&& ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details))
 																	&& empty($paypal_xco_details["__error"]))

diff --git a/s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php b/s2member-pro/includes/classes/gateways/paypal/paypal-checkout-rdp-in.inc.php
@@ -258,7 +258,7 @@ public static function paypal_checkout ()
 																if (!($_paypal = array ()) // A first Initial/Trial payment?
 																&& (!$post_vars["attr"]["tp"] || ($post_vars["attr"]["tp"] && $cost_calculations["trial_total"] > 0)))
 																	{
-																		if ($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ($_paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($_paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($_paypal_xco_details)) && empty ($_paypal_xco_details["__error"]))
+																		if (!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ($_paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($_paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($_paypal_xco_details)) && empty ($_paypal_xco_details["__error"]))
 																			{
 																				$_paypal["METHOD"] = "DoExpressCheckoutPayment";
 
@@ -376,7 +376,7 @@ public static function paypal_checkout ()
 																		$paypal["TOTALBILLINGCYCLES"] = ($post_vars["attr"]["rr"]) ? (($post_vars["attr"]["rrt"]) ? $post_vars["attr"]["rrt"] : "0") : "1";
 																		$paypal["BILLINGFREQUENCY"] = $post_vars["attr"]["rp"];
 
-																		if ($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ((!empty ($_paypal_xco_details) && empty ($_paypal_xco_details["__error"]) && ($paypal_xco_details = $_paypal_xco_details)) || (($paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($paypal_xco_details)) && empty ($paypal_xco_details["__error"]))))
+																		if (!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ((!empty ($_paypal_xco_details) && empty ($_paypal_xco_details["__error"]) && ($paypal_xco_details = $_paypal_xco_details)) || (($paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($paypal_xco_details)) && empty ($paypal_xco_details["__error"]))))
 																			{
 																				$paypal["TOKEN"] = $paypal_xco_details["TOKEN"];
 																			}
@@ -506,7 +506,7 @@ public static function paypal_checkout ()
 														if (!($_paypal = array ()) // A first Initial/Trial payment?
 														&& (!$post_vars["attr"]["tp"] || ($post_vars["attr"]["tp"] && $cost_calculations["trial_total"] > 0)))
 															{
-																if ($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ($_paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($_paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($_paypal_xco_details)) && empty ($_paypal_xco_details["__error"]))
+																if (!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ($_paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($_paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($_paypal_xco_details)) && empty ($_paypal_xco_details["__error"]))
 																	{
 																		$_paypal["METHOD"] = "DoExpressCheckoutPayment";
 
@@ -624,7 +624,7 @@ public static function paypal_checkout ()
 																$paypal["TOTALBILLINGCYCLES"] = ($post_vars["attr"]["rr"]) ? (($post_vars["attr"]["rrt"]) ? $post_vars["attr"]["rrt"] : "0") : "1";
 																$paypal["BILLINGFREQUENCY"] = $post_vars["attr"]["rp"];
 
-																if ($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ((!empty ($_paypal_xco_details) && empty ($_paypal_xco_details["__error"]) && ($paypal_xco_details = $_paypal_xco_details)) || (($paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($paypal_xco_details)) && empty ($paypal_xco_details["__error"]))))
+																if (!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ((!empty ($_paypal_xco_details) && empty ($_paypal_xco_details["__error"]) && ($paypal_xco_details = $_paypal_xco_details)) || (($paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($paypal_xco_details)) && empty ($paypal_xco_details["__error"]))))
 																	{
 																		$paypal["TOKEN"] = $paypal_xco_details["TOKEN"];
 																	}
@@ -792,7 +792,7 @@ public static function paypal_checkout ()
 
 																if (!($paypal = array ())) // Prepare a "Buy Now" transaction.
 																	{
-																		if ($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ($paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($paypal_xco_details)) && empty ($paypal_xco_details["__error"]))
+																		if (!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ($paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($paypal_xco_details)) && empty ($paypal_xco_details["__error"]))
 																			{
 																				$paypal["METHOD"] = "DoExpressCheckoutPayment";
 
@@ -927,7 +927,7 @@ public static function paypal_checkout ()
 													{
 														if (!($paypal = array ())) // Prepare a "Buy Now" transaction.
 															{
-																if ($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ($paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($paypal_xco_details)) && empty ($paypal_xco_details["__error"]))
+																if (!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_checkout_return" && !empty ($_GET["token"]) && ($paypal_xco_details = array ("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response ($paypal_xco_details)) && empty ($paypal_xco_details["__error"]))
 																	{
 																		$paypal["METHOD"] = "DoExpressCheckoutPayment";
 

diff --git a/s2member-pro/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php b/s2member-pro/includes/classes/gateways/paypal/paypal-sp-checkout-in.inc.php
@@ -166,7 +166,7 @@ public static function sp_checkout()
 
 														if(!($paypal = array())) // Build a simple "Buy Now" request.
 															{
-																if($_GET["s2member_paypal_xco"] === "s2member_pro_paypal_sp_checkout_return" && !empty($_GET["token"]) && ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details)) && empty($paypal_xco_details["__error"]))
+																if(!empty($_GET["s2member_paypal_xco"]) && $_GET["s2member_paypal_xco"] === "s2member_pro_paypal_sp_checkout_return" && !empty($_GET["token"]) && ($paypal_xco_details = array("METHOD" => "GetExpressCheckoutDetails", "TOKEN" => $_GET["token"])) && ($paypal_xco_details = c_ws_plugin__s2member_paypal_utilities::paypal_api_response($paypal_xco_details)) && empty($paypal_xco_details["__error"]))
 																	{
 																		$paypal["METHOD"] = "DoExpressCheckoutPayment";