eventespresso / event-espresso-core

payment_methods/Paypal_Express/EEG_Paypal_Express.gateway.php

Doc Comments -4 removed lines

@@ -404,10 +404,6 @@
 	/**
 	 *  Log a "Cleared" request.
 	 *
-	 *	@param array        $response
-	 *	@param EEI_Payment  $payment
-	 *	@param string  		$info
-	 *	@return void
 	 */
 	private function _log_clean_request( $request_prms, $payment, $info ) {
 		$cleaned_request_data = $request_prms;

Spacing +108 added lines, -108 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit('NO direct script access allowed'); }
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('NO direct script access allowed'); }
 
 /**
  * ----------------------------------------------
@@ -76,10 +76,10 @@ 
 	 *
 	 *  @param type $settings_array
 	 */
-	public function set_settings( $settings_array ) {
+	public function set_settings($settings_array) {
 		parent::set_settings($settings_array);
 		// Redirect URL.
-		if ( $this->_debug_mode ) {
+		if ($this->_debug_mode) {
 			$this->_base_gateway_url = 'https://api-3t.sandbox.paypal.com/nvp';
 		} else {
 			$this->_base_gateway_url = 'https://api-3t.paypal.com/nvp';
@@ -94,19 +94,19 @@ 
 	 *  @param type $return_url
 	 *  @param type $cancel_url
 	 */
-	public function set_redirection_info( $payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL ) {
-		if ( ! $payment instanceof EEI_Payment ) {
-			$payment->set_gateway_response( __( 'Error. No associated payment was found.', 'event_espresso' ) );
-			$payment->set_status( $this->_pay_model->failed_status() );
+	public function set_redirection_info($payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL) {
+		if ( ! $payment instanceof EEI_Payment) {
+			$payment->set_gateway_response(__('Error. No associated payment was found.', 'event_espresso'));
+			$payment->set_status($this->_pay_model->failed_status());
 			return $payment;
 		}
 		$transaction = $payment->transaction();
-		if ( ! $transaction instanceof EEI_Transaction ) {
-			$payment->set_gateway_response( __( 'Could not process this payment because it has no associated transaction.', 'event_espresso' ) );
-			$payment->set_status( $this->_pay_model->failed_status() );
+		if ( ! $transaction instanceof EEI_Transaction) {
+			$payment->set_gateway_response(__('Could not process this payment because it has no associated transaction.', 'event_espresso'));
+			$payment->set_status($this->_pay_model->failed_status());
 			return $payment;
 		}
-		$order_description = substr( sprintf( __('Event Registrations from %s', 'event_espresso'), get_bloginfo('name') ), 0, 127 );
+		$order_description = substr(sprintf(__('Event Registrations from %s', 'event_espresso'), get_bloginfo('name')), 0, 127);
 		$primary_registration = $transaction->primary_registration();
 		$primary_attendee = $primary_registration instanceof EE_Registration ? $primary_registration->attendee() : false;
 		$locale = explode('-', get_bloginfo('language'));
@@ -120,28 +120,28 @@ 
 			'RETURNURL' => $return_url,
 			'CANCELURL' => $cancel_url,
 			'PAYMENTREQUEST_0_PAYMENTACTION' => 'Sale',
-			'SOLUTIONTYPE' => 'Sole',	// Buyer does not need to create a PayPal account to check out. This is referred to as PayPal Account Optional. 
-			'BUTTONSOURCE' => 'EventEspresso_SP',//EE will blow up if you change this
+			'SOLUTIONTYPE' => 'Sole', // Buyer does not need to create a PayPal account to check out. This is referred to as PayPal Account Optional. 
+			'BUTTONSOURCE' => 'EventEspresso_SP', //EE will blow up if you change this
 			'LOCALECODE' => $locale[1]	// Locale of the pages displayed by PayPal during Express Checkout.
 		);
 
 		// Show itemized list.
-		if ( EEH_Money::compare_floats( $payment->amount(), $transaction->total(), '==' ) ) {
+		if (EEH_Money::compare_floats($payment->amount(), $transaction->total(), '==')) {
 			$item_num = 0;
 			$itemized_sum = 0;
 			$total_line_items = $transaction->total_line_item();
 			// Go through each item in the list.
-			foreach ( $total_line_items->get_items() as $line_item ) {
-				if ( $line_item instanceof EE_Line_Item ) {
+			foreach ($total_line_items->get_items() as $line_item) {
+				if ($line_item instanceof EE_Line_Item) {
 					// PayPal doesn't like line items with 0.00 amount, so we may skip those.
-					if ( EEH_Money::compare_floats( $line_item->total(), '0.00', '==' ) ) {
+					if (EEH_Money::compare_floats($line_item->total(), '0.00', '==')) {
 						continue;
 					}
 
 					$unit_price = $line_item->unit_price();
 					$line_item_quantity = $line_item->quantity();
 					// This is a discount.
-					if ( $line_item->is_percent() ) {
+					if ($line_item->is_percent()) {
 						$unit_price = $line_item->total();
 						$line_item_quantity = 1;
 					}
@@ -150,7 +150,7 @@ 
 					// Item description.
 					$token_request_dtls['L_PAYMENTREQUEST_0_DESC'.$item_num] = substr($line_item->desc(), 0, 127);
 					// Cost of individual item.
-					$token_request_dtls['L_PAYMENTREQUEST_0_AMT'.$item_num] = $this->format_currency( $unit_price );
+					$token_request_dtls['L_PAYMENTREQUEST_0_AMT'.$item_num] = $this->format_currency($unit_price);
 					// Item Number.
 					$token_request_dtls['L_PAYMENTREQUEST_0_NUMBER'.$item_num] = $item_num + 1;
 					// Item quantity.
@@ -167,16 +167,16 @@ 
 			$token_request_dtls['PAYMENTREQUEST_0_SHIPPINGAMT'] = '0';
 			$token_request_dtls['PAYMENTREQUEST_0_HANDLINGAMT'] = '0';
 
-			$itemized_sum_diff_from_txn_total = round( $transaction->total() - $itemized_sum - $total_line_items->get_total_tax(), 2 );
+			$itemized_sum_diff_from_txn_total = round($transaction->total() - $itemized_sum - $total_line_items->get_total_tax(), 2);
 			// If we were not able to recognize some item like promotion, surcharge or cancellation, 
 			// add the difference as an extra line item.
-			if ( $itemized_sum_diff_from_txn_total != 0 ) {
+			if ($itemized_sum_diff_from_txn_total != 0) {
 				// Item Name.
-				$token_request_dtls['L_PAYMENTREQUEST_0_NAME'.$item_num] = substr( __( 'Other (promotion/surcharge/cancellation)', 'event_espresso' ), 0, 127 );
+				$token_request_dtls['L_PAYMENTREQUEST_0_NAME'.$item_num] = substr(__('Other (promotion/surcharge/cancellation)', 'event_espresso'), 0, 127);
 				// Item description.
-				$token_request_dtls['L_PAYMENTREQUEST_0_DESC'.$item_num] = substr( $line_item->desc(), 0, 127 );
+				$token_request_dtls['L_PAYMENTREQUEST_0_DESC'.$item_num] = substr($line_item->desc(), 0, 127);
 				// Cost of individual item.
-				$token_request_dtls['L_PAYMENTREQUEST_0_AMT'.$item_num] = $this->format_currency( $itemized_sum_diff_from_txn_total );
+				$token_request_dtls['L_PAYMENTREQUEST_0_AMT'.$item_num] = $this->format_currency($itemized_sum_diff_from_txn_total);
 				// Item Number.
 				$token_request_dtls['L_PAYMENTREQUEST_0_NUMBER'.$item_num] = $item_num + 1;
 				// Item quantity.
@@ -186,11 +186,11 @@ 
 		} else {
 			// Just one Item.
 			// Item Name.
-			$token_request_dtls['L_PAYMENTREQUEST_0_NAME0'] = substr( sprintf( __('Payment for %1$s', 'event_espresso'), $primary_registration->reg_code() ), 0, 127 );
+			$token_request_dtls['L_PAYMENTREQUEST_0_NAME0'] = substr(sprintf(__('Payment for %1$s', 'event_espresso'), $primary_registration->reg_code()), 0, 127);
 			// Item description.
-			$token_request_dtls['L_PAYMENTREQUEST_0_DESC0'] = substr( sprintf( __('Payment of %1$s for %2$s', 'event_espresso'), $payment->amount(), $primary_registration->reg_code() ), 0, 127 );
+			$token_request_dtls['L_PAYMENTREQUEST_0_DESC0'] = substr(sprintf(__('Payment of %1$s for %2$s', 'event_espresso'), $payment->amount(), $primary_registration->reg_code()), 0, 127);
 			// Cost of individual item.
-			$token_request_dtls['L_PAYMENTREQUEST_0_AMT0'] = $this->format_currency( $payment->amount() );
+			$token_request_dtls['L_PAYMENTREQUEST_0_AMT0'] = $this->format_currency($payment->amount());
 			// Item Number.
 			$token_request_dtls['L_PAYMENTREQUEST_0_NUMBER0'] = 1;
 			// Item quantity.
@@ -198,14 +198,14 @@ 
 			// Digital item is sold.
 			$token_request_dtls['L_PAYMENTREQUEST_0_ITEMCATEGORY0'] = 'Digital';
 			// Item's sales S/H and tax amount.
-			$token_request_dtls['PAYMENTREQUEST_0_ITEMAMT'] = $this->format_currency( $payment->amount() );
+			$token_request_dtls['PAYMENTREQUEST_0_ITEMAMT'] = $this->format_currency($payment->amount());
 			$token_request_dtls['PAYMENTREQUEST_0_TAXAMT'] = '0';
 			$token_request_dtls['PAYMENTREQUEST_0_SHIPPINGAMT'] = '0';
 			$token_request_dtls['PAYMENTREQUEST_0_HANDLINGAMT'] = '0';
 		}
 		// Automatically filling out shipping and contact information.
-		if ( $primary_attendee instanceof EEI_Attendee ) {
-			$token_request_dtls['NOSHIPPING'] = '2';	//  If you do not pass the shipping address, PayPal obtains it from the buyer's account profile.
+		if ($primary_attendee instanceof EEI_Attendee) {
+			$token_request_dtls['NOSHIPPING'] = '2'; //  If you do not pass the shipping address, PayPal obtains it from the buyer's account profile.
 			$token_request_dtls['PAYMENTREQUEST_0_SHIPTOSTREET'] = $primary_attendee->address();
 			$token_request_dtls['PAYMENTREQUEST_0_SHIPTOSTREET2'] = $primary_attendee->address2();
 			$token_request_dtls['PAYMENTREQUEST_0_SHIPTOCITY'] = $primary_attendee->city();
@@ -216,25 +216,25 @@ 
 			$token_request_dtls['PAYMENTREQUEST_0_SHIPTOPHONENUM'] = $primary_attendee->phone();
 		}
 		// Used a business/personal logo on the PayPal page.
-		if ( ! empty($this->_image_url) ) {
+		if ( ! empty($this->_image_url)) {
 			$token_request_dtls['LOGOIMG'] = $this->_image_url;
 		}
 		// Request PayPal token.
-		$token_request_response = $this->_ppExpress_request( $token_request_dtls, 'Payment Token', $payment );
-		$token_rstatus = $this->_ppExpress_check_response( $token_request_response );
-		$response_args = ( isset($token_rstatus['args']) ) ? $token_rstatus['args'] : array();
-		if ( $token_rstatus['status'] ) {
+		$token_request_response = $this->_ppExpress_request($token_request_dtls, 'Payment Token', $payment);
+		$token_rstatus = $this->_ppExpress_check_response($token_request_response);
+		$response_args = (isset($token_rstatus['args'])) ? $token_rstatus['args'] : array();
+		if ($token_rstatus['status']) {
 			// We got the Token so we may continue with the payment and redirect the client.
-			$payment->set_details( $response_args );
-			$payment->set_redirect_url( 'https://www.sandbox.paypal.com/cgi-bin/webscr?useraction=commit&cmd=_express-checkout&token=' . $response_args['TOKEN'] );
+			$payment->set_details($response_args);
+			$payment->set_redirect_url('https://www.sandbox.paypal.com/cgi-bin/webscr?useraction=commit&cmd=_express-checkout&token='.$response_args['TOKEN']);
 		} else {
-			if ( isset($response_args['L_ERRORCODE']) ) {
-				$payment->set_gateway_response( $response_args['L_ERRORCODE'] . '; ' . $response_args['L_SHORTMESSAGE'] );
+			if (isset($response_args['L_ERRORCODE'])) {
+				$payment->set_gateway_response($response_args['L_ERRORCODE'].'; '.$response_args['L_SHORTMESSAGE']);
 			} else {
-				$payment->set_gateway_response( __( 'Error occurred while trying to setup the Express Checkout.', 'event_espresso' ) );
+				$payment->set_gateway_response(__('Error occurred while trying to setup the Express Checkout.', 'event_espresso'));
 			}
-			$payment->set_details( $response_args );
-			$payment->set_status( $this->_pay_model->failed_status() );
+			$payment->set_details($response_args);
+			$payment->set_status($this->_pay_model->failed_status());
 		}
 
 		return $payment;
@@ -250,24 +250,24 @@ 
 	 *  @param type $transaction
 	 *  @return EEI_Payment
 	 */
-	public function handle_payment_update( $update_info, $transaction ) {
-		$payment = ( $transaction instanceof EEI_Transaction ) ? $transaction->last_payment() : null;
+	public function handle_payment_update($update_info, $transaction) {
+		$payment = ($transaction instanceof EEI_Transaction) ? $transaction->last_payment() : null;
 
-		if ( $payment instanceof EEI_Payment ) {
-			$this->log( array( 'Return from Authorization' => $update_info ), $payment );
+		if ($payment instanceof EEI_Payment) {
+			$this->log(array('Return from Authorization' => $update_info), $payment);
 
 			$payment_details = $payment->details();
 			$transaction = $payment->transaction();
-			if ( ! $transaction instanceof EEI_Transaction ) {
-				$payment->set_gateway_response( __( 'Could not process this payment because it has no associated transaction.', 'event_espresso' ) );
-				$payment->set_status( $this->_pay_model->failed_status() );
+			if ( ! $transaction instanceof EEI_Transaction) {
+				$payment->set_gateway_response(__('Could not process this payment because it has no associated transaction.', 'event_espresso'));
+				$payment->set_status($this->_pay_model->failed_status());
 				return $payment;
 			}
 			$primary_registrant = $transaction->primary_registration();
 
 			// Check if we still have the token.
-			if ( ! isset($payment_details['TOKEN']) || empty($payment_details['TOKEN']) ) {
-				$payment->set_status( $this->_pay_model->failed_status() );
+			if ( ! isset($payment_details['TOKEN']) || empty($payment_details['TOKEN'])) {
+				$payment->set_status($this->_pay_model->failed_status());
 				return $payment;
 			}
 
@@ -276,10 +276,10 @@ 
 				'TOKEN' => $payment_details['TOKEN']
 			);
 			// Request Customer Details.
-			$cdetails_request_response = $this->_ppExpress_request( $cdetails_request_dtls, 'Customer Details', $payment );
-			$cdetails_rstatus = $this->_ppExpress_check_response( $cdetails_request_response );
-			$cdata_response_args = ( isset($cdetails_rstatus['args']) ) ? $cdetails_rstatus['args'] : array();
-			if ( $cdetails_rstatus['status'] ) {
+			$cdetails_request_response = $this->_ppExpress_request($cdetails_request_dtls, 'Customer Details', $payment);
+			$cdetails_rstatus = $this->_ppExpress_check_response($cdetails_request_response);
+			$cdata_response_args = (isset($cdetails_rstatus['args'])) ? $cdetails_rstatus['args'] : array();
+			if ($cdetails_rstatus['status']) {
 				// We got the PayerID so now we can Complete the transaction.
 				$docheckout_request_dtls = array(
 					'METHOD' => 'DoExpressCheckoutPayment',
@@ -290,39 +290,39 @@ 
 					'PAYMENTREQUEST_0_CURRENCYCODE' => $payment->currency_code()
 				);
 				// Payment Checkout/Capture.
-				$docheckout_request_response = $this->_ppExpress_request( $docheckout_request_dtls, 'Do Payment', $payment );
-				$docheckout_rstatus = $this->_ppExpress_check_response( $docheckout_request_response );
-				$docheckout_response_args = ( isset($docheckout_rstatus['args']) ) ? $docheckout_rstatus['args'] : array();
-				if ( $docheckout_rstatus['status'] ) {
+				$docheckout_request_response = $this->_ppExpress_request($docheckout_request_dtls, 'Do Payment', $payment);
+				$docheckout_rstatus = $this->_ppExpress_check_response($docheckout_request_response);
+				$docheckout_response_args = (isset($docheckout_rstatus['args'])) ? $docheckout_rstatus['args'] : array();
+				if ($docheckout_rstatus['status']) {
 					// All is well, payment approved.
 					$primary_registration_code = $primary_registrant instanceof EE_Registration ? $primary_registrant->reg_code() : '';
-					$payment->set_extra_accntng( $primary_registration_code );
-					$payment->set_amount( isset($docheckout_response_args['PAYMENTINFO_0_AMT']) ? floatval( $docheckout_response_args['PAYMENTINFO_0_AMT'] ) : 0 );
-					$payment->set_txn_id_chq_nmbr( isset( $docheckout_response_args['PAYMENTINFO_0_TRANSACTIONID'] ) ? $docheckout_response_args['PAYMENTINFO_0_TRANSACTIONID'] : null );
-					$payment->set_details( $cdata_response_args );
-					$payment->set_gateway_response( isset( $docheckout_response_args['PAYMENTINFO_0_ACK'] ) ? $docheckout_response_args['PAYMENTINFO_0_ACK'] : '' );
-					$payment->set_status( $this->_pay_model->approved_status() );
+					$payment->set_extra_accntng($primary_registration_code);
+					$payment->set_amount(isset($docheckout_response_args['PAYMENTINFO_0_AMT']) ? floatval($docheckout_response_args['PAYMENTINFO_0_AMT']) : 0);
+					$payment->set_txn_id_chq_nmbr(isset($docheckout_response_args['PAYMENTINFO_0_TRANSACTIONID']) ? $docheckout_response_args['PAYMENTINFO_0_TRANSACTIONID'] : null);
+					$payment->set_details($cdata_response_args);
+					$payment->set_gateway_response(isset($docheckout_response_args['PAYMENTINFO_0_ACK']) ? $docheckout_response_args['PAYMENTINFO_0_ACK'] : '');
+					$payment->set_status($this->_pay_model->approved_status());
 				} else {
-					if ( isset($docheckout_response_args['L_ERRORCODE']) ) {
-						$payment->set_gateway_response( $docheckout_response_args['L_ERRORCODE'] . '; ' . $docheckout_response_args['L_SHORTMESSAGE'] );
+					if (isset($docheckout_response_args['L_ERRORCODE'])) {
+						$payment->set_gateway_response($docheckout_response_args['L_ERRORCODE'].'; '.$docheckout_response_args['L_SHORTMESSAGE']);
 					} else {
-						$payment->set_gateway_response( __( 'Error occurred while trying to Capture the funds.', 'event_espresso' ) );
+						$payment->set_gateway_response(__('Error occurred while trying to Capture the funds.', 'event_espresso'));
 					}
-					$payment->set_details( $docheckout_response_args );
-					$payment->set_status( $this->_pay_model->declined_status() );
+					$payment->set_details($docheckout_response_args);
+					$payment->set_status($this->_pay_model->declined_status());
 				}
 			} else {
-				if ( isset($cdata_response_args['L_ERRORCODE']) ) {
-					$payment->set_gateway_response( $cdata_response_args['L_ERRORCODE'] . '; ' . $cdata_response_args['L_SHORTMESSAGE'] );
+				if (isset($cdata_response_args['L_ERRORCODE'])) {
+					$payment->set_gateway_response($cdata_response_args['L_ERRORCODE'].'; '.$cdata_response_args['L_SHORTMESSAGE']);
 				} else {
-					$payment->set_gateway_response( __( 'Error occurred while trying to get payment Details from PayPal.', 'event_espresso' ) );
+					$payment->set_gateway_response(__('Error occurred while trying to get payment Details from PayPal.', 'event_espresso'));
 				}
-				$payment->set_details( $cdata_response_args );
-				$payment->set_status( $this->_pay_model->failed_status() );
+				$payment->set_details($cdata_response_args);
+				$payment->set_status($this->_pay_model->failed_status());
 			}
 		} else {
-			$payment->set_gateway_response( __( 'Error occurred while trying to process the payment.', 'event_espresso' ) );
-			$payment->set_status( $this->_pay_model->failed_status() );
+			$payment->set_gateway_response(__('Error occurred while trying to process the payment.', 'event_espresso'));
+			$payment->set_status($this->_pay_model->failed_status());
 		}
 
 		return $payment;
@@ -337,16 +337,16 @@ 
 	 *  @param EEI_Payment  $payment
 	 *	@return mixed
 	 */
-	public function _ppExpress_request( $request_params, $request_text, $payment ) {
+	public function _ppExpress_request($request_params, $request_text, $payment) {
 		$request_dtls = array(
 			'VERSION' => '204.0',
-			'USER' => urlencode( $this->_api_username ),
-			'PWD' => urlencode( $this->_api_password ),
-			'SIGNATURE' => urlencode( $this->_api_signature )
+			'USER' => urlencode($this->_api_username),
+			'PWD' => urlencode($this->_api_password),
+			'SIGNATURE' => urlencode($this->_api_signature)
 		);
-		$dtls = array_merge( $request_dtls, $request_params );
+		$dtls = array_merge($request_dtls, $request_params);
 
-		$this->_log_clean_request( $dtls, $payment, $request_text . ' Request' );
+		$this->_log_clean_request($dtls, $payment, $request_text.' Request');
 		// Request Customer Details.
 		$request_response = wp_remote_post(
 			$this->_base_gateway_url,
@@ -356,11 +356,11 @@ 
 				'httpversion' => '1.1',
 				'cookies' => array(),
 				'headers' => array(),
-				'body' => http_build_query( $dtls )
+				'body' => http_build_query($dtls)
 			)
 		);
 		// Log the response.
-		$this->log( array( $request_text . ' Response' => $request_response), $payment );
+		$this->log(array($request_text.' Response' => $request_response), $payment);
 
 		return $request_response;
 	}
@@ -372,31 +372,31 @@ 
 	 *	@param mixed        $request_response
 	 *	@return array
 	 */
-	public function _ppExpress_check_response( $request_response ) {
-		if ( ! is_wp_error( $request_response ) && $request_response['body'] && ! empty($request_response['body'] ) ) {
+	public function _ppExpress_check_response($request_response) {
+		if ( ! is_wp_error($request_response) && $request_response['body'] && ! empty($request_response['body'])) {
 			$response_args = array();
-			parse_str( urldecode($request_response['body']), $response_args );
-			if ( isset($response_args['ACK']) 
+			parse_str(urldecode($request_response['body']), $response_args);
+			if (isset($response_args['ACK']) 
 				&& $response_args['ACK'] === 'Success' 
-				&& ( isset($response_args['PAYERID']) 
+				&& (isset($response_args['PAYERID']) 
 					|| isset($response_args['PAYMENTINFO_0_TRANSACTIONID']) 
-					|| ( isset($response_args['PAYMENTSTATUS']) && $response_args['PAYMENTSTATUS'] === 'Completed' ) 
+					|| (isset($response_args['PAYMENTSTATUS']) && $response_args['PAYMENTSTATUS'] === 'Completed') 
 					|| isset($response_args['TOKEN']) 
 				) 
 			) {
 				// Response status OK, return response parameters for further processing.
 				return array('status' => true, 'args' => $response_args);
 			} else {
-				if ( isset($response_args['ACK']) ) {
+				if (isset($response_args['ACK'])) {
 					$errors = $this->_get_errors($response_args);
-					return array( 'status' => false, 'args' => $errors );
+					return array('status' => false, 'args' => $errors);
 				} else {
-					return array( 'status' => false, 'args' => $request_response );
+					return array('status' => false, 'args' => $request_response);
 				}
 			}
 		} else {
 			// If we got here then there was an error in this request.
-			return array( 'status' => false, 'args' => $request_response );
+			return array('status' => false, 'args' => $request_response);
 		}
 	}
 
@@ -409,12 +409,12 @@ 
 	 *	@param string  		$info
 	 *	@return void
 	 */
-	private function _log_clean_request( $request_prms, $payment, $info ) {
+	private function _log_clean_request($request_prms, $payment, $info) {
 		$cleaned_request_data = $request_prms;
 		unset($cleaned_request_data['PWD']);
 		unset($cleaned_request_data['USER']);
 		unset($cleaned_request_data['SIGNATURE']);
-		$this->log( array($info => $cleaned_request_data), $payment );
+		$this->log(array($info => $cleaned_request_data), $payment);
 	}
 
 
@@ -424,16 +424,16 @@ 
 	 *  @param array	$data_array
 	 *  @return array
 	 */
-	private function _get_errors( $data_array ) {
+	private function _get_errors($data_array) {
 		$errors = array();
 		$n = 0;
-		while ( isset($data_array['L_ERRORCODE' . $n . '']) ) {
-			$l_error_code = isset($data_array['L_ERRORCODE' . $n . '']) ? $data_array['L_ERRORCODE' . $n . ''] : '';
-			$l_severity_code = isset($data_array['L_SEVERITYCODE' . $n . '']) ? $data_array['L_SEVERITYCODE' . $n . ''] : '';
-			$l_short_message = isset($data_array['L_SHORTMESSAGE' . $n . '']) ? $data_array['L_SHORTMESSAGE' . $n . ''] : '';
-			$l_long_message = isset($data_array['L_LONGMESSAGE' . $n . '']) ? $data_array['L_LONGMESSAGE' . $n . ''] : '';
+		while (isset($data_array['L_ERRORCODE'.$n.''])) {
+			$l_error_code = isset($data_array['L_ERRORCODE'.$n.'']) ? $data_array['L_ERRORCODE'.$n.''] : '';
+			$l_severity_code = isset($data_array['L_SEVERITYCODE'.$n.'']) ? $data_array['L_SEVERITYCODE'.$n.''] : '';
+			$l_short_message = isset($data_array['L_SHORTMESSAGE'.$n.'']) ? $data_array['L_SHORTMESSAGE'.$n.''] : '';
+			$l_long_message = isset($data_array['L_LONGMESSAGE'.$n.'']) ? $data_array['L_LONGMESSAGE'.$n.''] : '';
 
-			if ( $n == 0 ) {
+			if ($n == 0) {
 				$errors = array(
 					'L_ERRORCODE' => $l_error_code,
 					'L_SHORTMESSAGE' => $l_short_message,
@@ -441,10 +441,10 @@ 
 					'L_SEVERITYCODE' => $l_severity_code
 				);
 			} else {
-				$errors['L_ERRORCODE'] .= ', ' . $l_error_code;
-				$errors['L_SHORTMESSAGE'] .= ', ' . $l_short_message;
-				$errors['L_LONGMESSAGE'] .= ', ' . $l_long_message;
-				$errors['L_SEVERITYCODE'] .= ', ' . $l_severity_code;
+				$errors['L_ERRORCODE'] .= ', '.$l_error_code;
+				$errors['L_SHORTMESSAGE'] .= ', '.$l_short_message;
+				$errors['L_LONGMESSAGE'] .= ', '.$l_long_message;
+				$errors['L_SEVERITYCODE'] .= ', '.$l_severity_code;
 			}
 
 			$n++;

payment_methods/Paypal_Express/templates/paypal_express_intro.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php printf( __('PayPal Express (Express Checkout) is an off-site payment method for accepting payments via PayPal and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalexpress/" target="_blank">','</a>' ); ?> 
\ No newline at end of file
+<?php printf(__('PayPal Express (Express Checkout) is an off-site payment method for accepting payments via PayPal and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalexpress/" target="_blank">', '</a>'); ?> 
\ No newline at end of file

payment_methods/Paypal_Express/templates/paypal_express_debug_info.template.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { exit('No direct script access allowed'); } ?>
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); } ?>
 
 <div id="ppexpress-sandbox-panel" class="sandbox-panel">
 
@@ -6,13 +6,13 @@ 
 
 	<h4><?php _e('How do I test specific error codes?', 'event_espresso'); ?></h4>
 	<p>
-		<?php _e( 'To trigger an error condition on an amount-related field, 
+		<?php _e('To trigger an error condition on an amount-related field, 
 			specify a error code value as a number with two digits to the right of the decimal point. 
 			For example, specify a value of 107.55 to trigger the 10755 error.', 
-		'event_espresso');?>
+		'event_espresso'); ?>
 	</p>
 	<p>
-		<?php printf( __( 'More details can be found here: %1$s Testing Error Conditions %2$s.', 'event_espresso'), '<a href="https://developer.paypal.com/docs/classic/lifecycle/sb_error-conditions">', '</a>');?>
+		<?php printf(__('More details can be found here: %1$s Testing Error Conditions %2$s.', 'event_espresso'), '<a href="https://developer.paypal.com/docs/classic/lifecycle/sb_error-conditions">', '</a>'); ?>
 	</p>
 
 </div>
\ No newline at end of file

payment_methods/Paypal_Express/help_tabs/payment_methods_overview_paypal_express.help_tab.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <p>
-	<strong><?php _e( 'PayPal Express Checkout', 'event_espresso' ); ?></strong>
+	<strong><?php _e('PayPal Express Checkout', 'event_espresso'); ?></strong>
 </p>
 <p>
 	<?php _e('Adjust the settings for the PayPal Express Checkout.', 'event_espresso'); ?>
@@ -13,21 +13,21 @@ 
 </p>
 <ul>
 	<li>
-		<strong><?php _e( 'API Username', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Your PayPal API Username.'); ?>
+		<strong><?php _e('API Username', 'event_espresso'); ?></strong><br/>
+		<?php _e('Your PayPal API Username.'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'API Password', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Your PayPal API Password.' ); ?>
+		<strong><?php _e('API Password', 'event_espresso'); ?></strong><br/>
+		<?php _e('Your PayPal API Password.'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'API Signature', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Your PayPal Account Signature.' ); ?>
+		<strong><?php _e('API Signature', 'event_espresso'); ?></strong><br/>
+		<?php _e('Your PayPal Account Signature.'); ?>
 	</li>
 </ul>
 <p>
-	<?php printf( __('For testing please use a %1$s PaypPal Sandbox account%2$s.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com">', '</a>' ); ?>
+	<?php printf(__('For testing please use a %1$s PaypPal Sandbox account%2$s.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com">', '</a>'); ?>
 </p>
 <p>
-	<?php printf( __('%1$sClick here%2$s for more information on how to get your API credentials.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com/docs/classic/api/apiCredentials/?mark=api%20signature#creating-an-api-signature">', '</a>' ); ?>
+	<?php printf(__('%1$sClick here%2$s for more information on how to get your API credentials.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com/docs/classic/api/apiCredentials/?mark=api%20signature#creating-an-api-signature">', '</a>'); ?>
 </p>
\ No newline at end of file

payment_methods/Paypal_Express/EE_PMT_Paypal_Express.pm.php

Indentation +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
 class EE_PMT_Paypal_Express extends EE_PMT_Base {
 
 	/**
-     * Class constructor.
-     */
+	 * Class constructor.
+	 */
 	public function __construct( $pm_instance = NULL ) {
 		require_once( $this->file_folder() . 'EEG_Paypal_Express.gateway.php' );
 		$this->_gateway = new EEG_Paypal_Express();

Spacing +17 added lines, -17 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit('NO direct script access allowed'); }
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('NO direct script access allowed'); }
 
 /**
  * ----------------------------------------------
@@ -17,16 +17,16 @@ 
 	/**
      * Class constructor.
      */
-	public function __construct( $pm_instance = NULL ) {
-		require_once( $this->file_folder() . 'EEG_Paypal_Express.gateway.php' );
+	public function __construct($pm_instance = NULL) {
+		require_once($this->file_folder().'EEG_Paypal_Express.gateway.php');
 		$this->_gateway = new EEG_Paypal_Express();
 
-		$this->_pretty_name = __( 'PayPal Express', 'event_espresso' );
-		$this->_template_path = $this->file_folder() . 'templates' . DS;
-		$this->_default_description = __( 'After clicking \'Finalize Registration\', you will be forwarded to PayPal website to Login and make your payment.', 'event_espresso' );
-		$this->_default_button_url = $this->file_url() . 'lib' . DS . 'paypal-express-checkout-logo.png';
+		$this->_pretty_name = __('PayPal Express', 'event_espresso');
+		$this->_template_path = $this->file_folder().'templates'.DS;
+		$this->_default_description = __('After clicking \'Finalize Registration\', you will be forwarded to PayPal website to Login and make your payment.', 'event_espresso');
+		$this->_default_button_url = $this->file_url().'lib'.DS.'paypal-express-checkout-logo.png';
 
-		parent::__construct( $pm_instance );
+		parent::__construct($pm_instance);
 	}
 
 
@@ -58,26 +58,26 @@ 
 				'extra_meta_inputs' => array(
 					'api_username' => new EE_Text_Input(
 						array(
-							'html_label_text'=> sprintf( __( 'API Username %s', 'event_espresso' ), $this->get_help_tab_link() ),
+							'html_label_text'=> sprintf(__('API Username %s', 'event_espresso'), $this->get_help_tab_link()),
 							'required' => true,
 						)
 					),
 					'api_password' => new EE_Text_Input(
 						array(
-							'html_label_text' => sprintf( __( 'API Password %s', 'event_espresso' ), $this->get_help_tab_link() ),
+							'html_label_text' => sprintf(__('API Password %s', 'event_espresso'), $this->get_help_tab_link()),
 							'required' => true
 						)
 					),
 					'api_signature' => new EE_Text_Input(
 						array(
-							'html_label_text' => sprintf( __( 'API Signature %s', 'event_espresso' ), $this->get_help_tab_link() ),
+							'html_label_text' => sprintf(__('API Signature %s', 'event_espresso'), $this->get_help_tab_link()),
 							'required' => true
 						)
 					),
 					'image_url' => new EE_Admin_File_Uploader_Input(
 						array(
-							'html_label_text' => sprintf( __( 'Image URL %s', 'event_espresso' ), $this->get_help_tab_link() ),
-							'html_help_text' => __( 'Used for your business/personal logo on the PayPal page', 'event_espresso' ),
+							'html_label_text' => sprintf(__('Image URL %s', 'event_espresso'), $this->get_help_tab_link()),
+							'html_help_text' => __('Used for your business/personal logo on the PayPal page', 'event_espresso'),
 							'required' => false
 						)
 					),
@@ -94,8 +94,8 @@ 
 	 *	@param \EE_Transaction $transaction
 	 *	@return \EE_Billing_Info_Form
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = null ) {
-		if ( $this->_pm_instance->debug_mode() ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = null) {
+		if ($this->_pm_instance->debug_mode()) {
 			$form = new EE_Billing_Info_Form(
 				$this->_pm_instance,
 				array(
@@ -105,8 +105,8 @@ 
 							array(
 								'layout_strategy' => new EE_Template_Layout(
 									array(
-										'layout_template_file' => $this->_template_path . 'paypal_express_debug_info.template.php',
-										'template_args' => array( 'debug_mode' => $this->_pm_instance->debug_mode() )
+										'layout_template_file' => $this->_template_path.'paypal_express_debug_info.template.php',
+										'template_args' => array('debug_mode' => $this->_pm_instance->debug_mode())
 									)
 								)
 							)

admin_pages/payments/Payments_Admin_Page_Init.core.php

Spacing +22 added lines, -22 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -35,18 +35,18 @@ 
 	 */
 	public function __construct() {
 		//define some page related constants
-		define( 'EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings' );
-		define( 'EE_PAYMENTS_ADMIN_URL', admin_url( 'admin.php?page=' . EE_PAYMENTS_PG_SLUG ));
-		define( 'EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES . 'payments' . DS );
-		define( 'EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN . 'templates' . DS );
-		define( 'EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'payments/assets/' );
+		define('EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings');
+		define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page='.EE_PAYMENTS_PG_SLUG));
+		define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES.'payments'.DS);
+		define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN.'templates'.DS);
+		define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'payments/assets/');
 
 		//check that there are active gateways on all admin page loads. but dont do it just yet
 //		echo "constructing payments admin page";die;
-		add_action('admin_notices',array($this,'check_payment_gateway_setup'));
+		add_action('admin_notices', array($this, 'check_payment_gateway_setup'));
 
 		// Show/hide PP Standard along side PP Express.
-		add_filter( 'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', array( $this, 'unset_pp_standard' ) );
+		add_filter('FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', array($this, 'unset_pp_standard'));
 
 		parent::__construct();
 	}
@@ -56,7 +56,7 @@ 
 	}
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'settings',
 			'menu_order' => 30,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
@@ -72,22 +72,22 @@ 
 	/**
 	 * Checks that there is at least one active gateway. If not, add a notice
 	 */
-	public function check_payment_gateway_setup(){
+	public function check_payment_gateway_setup() {
 		//ONLY do this check if models can query
 		//and avoid a bug where when we nuke EE4's data that this causes a fatal error
 		//because the tables are deleted just before this request runs. see https://events.codebasehq.com/projects/event-espresso/tickets/7539
-		if ( ! EE_Maintenance_Mode::instance()->models_can_query() || ! EEH_Activation::table_exists( EEM_Payment_Method::instance()->table() ) ) {
+		if ( ! EE_Maintenance_Mode::instance()->models_can_query() || ! EEH_Activation::table_exists(EEM_Payment_Method::instance()->table())) {
 			return;
 		}
 
 
 		// ensure Payment_Method model is loaded
-		EE_Registry::instance()->load_model( 'Payment_Method' );
-		$actives = EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart );
-		if( $actives  < 1 ){
+		EE_Registry::instance()->load_model('Payment_Method');
+		$actives = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
+		if ($actives < 1) {
 			$url = EE_Admin_Page::add_query_args_and_nonce(array(), EE_PAYMENTS_ADMIN_URL);
 			echo '<div class="error">
-				 <p>'.  sprintf(__("There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s", "event_espresso"),"<a href='$url'>","</a>").'</p>
+				 <p>'.  sprintf(__("There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s", "event_espresso"), "<a href='$url'>", "</a>").'</p>
 			 </div>';
 		}
 	}
@@ -97,20 +97,20 @@ 
 	/**
 	 * Hide PayPal Standard for "new" users.
 	 */
-	public static function unset_pp_standard( $payment_method_types ) {
-		$pps = EEM_Payment_Method::instance()->get_one_of_type( 'Paypal_Standard' );
-		$ppstandard_active = ( ! empty($pps) ) ? $pps->active() : false;
+	public static function unset_pp_standard($payment_method_types) {
+		$pps = EEM_Payment_Method::instance()->get_one_of_type('Paypal_Standard');
+		$ppstandard_active = ( ! empty($pps)) ? $pps->active() : false;
 		$ppstandard_active_before = false;
-		if ( $pps ) {
+		if ($pps) {
 			// PP Standard used before ?
-			$paypal_id = $pps->get_extra_meta( 'paypal_id', TRUE );
-			if ( $paypal_id && ! empty($paypal_id) ) {
+			$paypal_id = $pps->get_extra_meta('paypal_id', TRUE);
+			if ($paypal_id && ! empty($paypal_id)) {
 				$ppstandard_active_before = true;
 			}
 		}
 
 		// Not using PP Standard? Then display only PayPal Express, no not show PayPal Standard.
-		if ( apply_filters( 'FHEE__EE_PMT_Paypal_Express__register_payment_methods__show_paypal_standard', ! $ppstandard_active && ! $ppstandard_active_before ) ) {
+		if (apply_filters('FHEE__EE_PMT_Paypal_Express__register_payment_methods__show_paypal_standard', ! $ppstandard_active && ! $ppstandard_active_before)) {
 			unset($payment_method_types['paypal_standard']);
 		}
 		return $payment_method_types;