eventespresso / event-espresso-core

payment_methods/Paypal_Express/EEG_Paypal_Express.gateway.php

Spacing +97 added lines, -97 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'); }
 
 /**
  * ----------------------------------------------
@@ -96,7 +96,7 @@ 
 	 *
 *@param array $settings_array
 	 */
-	public function set_settings( $settings_array ) {
+	public function set_settings($settings_array) {
 		parent::set_settings($settings_array);
 		// Redirect URL.
         $this->_base_gateway_url = $this->_debug_mode
@@ -115,19 +115,19 @@ 
      * @return \EE_Payment|\EEI_Payment
      * @throws \EE_Error
      */
-	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( $this->_format_order_description($payment), 0, 127 );
+		$order_description = substr($this->_format_order_description($payment), 0, 127);
 		$primary_registration = $transaction->primary_registration();
 		$primary_attendee = $primary_registration instanceof EE_Registration ? $primary_registration->attendee() : false;
 		$locale = explode('-', get_bloginfo('language'));
@@ -141,37 +141,37 @@ 
 			'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 ( $this->_money->compare_floats( $payment->amount(), $transaction->total(), '==' ) ) {
+		if ($this->_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;
 					}
 					// Item Name.
-					$token_request_dtls['L_PAYMENTREQUEST_0_NAME'.$item_num] = substr($this->_format_line_item_name( $line_item, $payment), 0, 127);
+					$token_request_dtls['L_PAYMENTREQUEST_0_NAME'.$item_num] = substr($this->_format_line_item_name($line_item, $payment), 0, 127);
 					// Item description.
-					$token_request_dtls['L_PAYMENTREQUEST_0_DESC'.$item_num] = substr($this->_format_line_item_desc( $line_item, $payment), 0, 127);
+					$token_request_dtls['L_PAYMENTREQUEST_0_DESC'.$item_num] = substr($this->_format_line_item_desc($line_item, $payment), 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.
@@ -188,16 +188,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 ( $this->_money->compare_floats( $itemized_sum_diff_from_txn_total, 0, '!=' ) ) {
+			if ($this->_money->compare_floats($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] = '';
 				// 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.
@@ -209,11 +209,11 @@ 
 		} else {
 			// Just one Item.
 			// Item Name.
-			$token_request_dtls['L_PAYMENTREQUEST_0_NAME0'] = substr( $this->_format_partial_payment_line_item_name($payment), 0, 127 );
+			$token_request_dtls['L_PAYMENTREQUEST_0_NAME0'] = substr($this->_format_partial_payment_line_item_name($payment), 0, 127);
 			// Item description.
-			$token_request_dtls['L_PAYMENTREQUEST_0_DESC0'] = substr( $this->_format_partial_payment_line_item_desc($payment), 0, 127 );
+			$token_request_dtls['L_PAYMENTREQUEST_0_DESC0'] = substr($this->_format_partial_payment_line_item_desc($payment), 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.
@@ -221,14 +221,14 @@ 
 			// Digital item is sold.
 			$token_request_dtls['L_PAYMENTREQUEST_0_ITEMCATEGORY0'] = 'Physical';
 			// 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 ( $this->_request_shipping_addr && $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 ($this->_request_shipping_addr && $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();
@@ -237,14 +237,14 @@ 
 			$token_request_dtls['PAYMENTREQUEST_0_SHIPTOZIP'] = $primary_attendee->zip();
 			$token_request_dtls['PAYMENTREQUEST_0_EMAIL'] = $primary_attendee->email();
 			$token_request_dtls['PAYMENTREQUEST_0_SHIPTOPHONENUM'] = $primary_attendee->phone();
-		} elseif ( ! $this->_request_shipping_addr ) {
+		} elseif ( ! $this->_request_shipping_addr) {
 			// Do not request shipping details on the PP Checkout page.
 			$token_request_dtls['NOSHIPPING'] = '1';
 			$token_request_dtls['REQCONFIRMSHIPPING'] = '0';
 
 		}
 		// 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;
 		}
 		$token_request_dtls = apply_filters( 
@@ -253,23 +253,23 @@ 
 			$this 
 		);
 		// 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']) && is_array($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']) && is_array($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_details($response_args);
 
 			$gateway_url = $this->_debug_mode ? 'https://www.sandbox.paypal.com' : 'https://www.paypal.com';
-			$payment->set_redirect_url( $gateway_url . '/checkoutnow?useraction=commit&cmd=_express-checkout&token=' . $response_args['TOKEN'] );
+			$payment->set_redirect_url($gateway_url.'/checkoutnow?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;
@@ -285,22 +285,22 @@ 
 	 *  @param EEI_Transaction $transaction
 	 *  @return EEI_Payment
 	 */
-	public function handle_payment_update( $update_info, $transaction ) {
+	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);
 			$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();
             $payment_details = $payment->details();
             // 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;
 			}
 
@@ -309,10 +309,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']) && is_array($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']) && is_array($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',
@@ -323,39 +323,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']) && is_array($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']) && is_array($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']) ? (float) $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']) ? (float) $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;
@@ -370,16 +370,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,
@@ -389,11 +389,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;
 	}
@@ -405,13 +405,13 @@ 
 	 *	@param mixed        $request_response
 	 *	@return array
 	 */
-	public function _ppExpress_check_response( $request_response ) {
-		if ( is_wp_error( $request_response ) || empty($request_response['body']) ) {
+	public function _ppExpress_check_response($request_response) {
+		if (is_wp_error($request_response) || empty($request_response['body'])) {
             // If we got here then there was an error in this request.
             return array('status' => false, 'args' => $request_response);
         }
         $response_args = array();
-        parse_str( urldecode($request_response['body']), $response_args );
+        parse_str(urldecode($request_response['body']), $response_args);
         if ( ! isset($response_args['ACK'])) {
             return array('status' => false, 'args' => $request_response);
         }
@@ -441,10 +441,10 @@ 
 	 * @param string  		$info
 	 * @return void
 	 */
-	private function _log_clean_request($request, $payment, $info ) {
+	private function _log_clean_request($request, $payment, $info) {
 		$cleaned_request_data = $request;
 		unset($cleaned_request_data['PWD'], $cleaned_request_data['USER'], $cleaned_request_data['SIGNATURE']);
-		$this->log( array($info => $cleaned_request_data), $payment );
+		$this->log(array($info => $cleaned_request_data), $payment);
 	}
 
 
@@ -454,10 +454,10 @@ 
 	 *  @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}"]) ) {
+		while (isset($data_array["L_ERRORCODE{$n}"])) {
 			$l_error_code = isset($data_array["L_ERRORCODE{$n}"])
                 ? $data_array["L_ERRORCODE{$n}"]
                 : '';
@@ -471,7 +471,7 @@ 
                 ? $data_array["L_LONGMESSAGE{$n}"]
                 : '';
 
-			if ( $n === 0 ) {
+			if ($n === 0) {
 				$errors = array(
 					'L_ERRORCODE' => $l_error_code,
 					'L_SHORTMESSAGE' => $l_short_message,
@@ -479,10 +479,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++;

Indentation +98 added lines, -100 removed lines

@@ -44,77 +44,76 @@ 
 	 */
 	protected $_image_url;
 
-    /**
-     * gateway URL variable
-     *
-     * @var string
-     */
-    protected $_base_gateway_url = '';
-
-
-
-    /**
-     * EEG_Paypal_Express constructor.
-     */
-    public function __construct()
-    {
-        $this->_currencies_supported = array(
-            'USD',
-            'AUD',
-            'BRL',
-            'CAD',
-            'CZK',
-            'DKK',
-            'EUR',
-            'HKD',
-            'HUF',
-            'ILS',
-            'JPY',
-            'MYR',
-            'MXN',
-            'NOK',
-            'NZD',
-            'PHP',
-            'PLN',
-            'GBP',
-            'RUB',
-            'SGD',
-            'SEK',
-            'CHF',
-            'TWD',
-            'THB',
-            'TRY'
-        );
-        parent::__construct();
-    }
-
-
-
-    /**
-	 * Sets the gateway URL variable based on whether debug mode is enabled or not.
+	/**
+	 * gateway URL variable
+	 *
+	 * @var string
+	 */
+	protected $_base_gateway_url = '';
+
+
+
+	/**
+	 * EEG_Paypal_Express constructor.
+	 */
+	public function __construct()
+	{
+		$this->_currencies_supported = array(
+			'USD',
+			'AUD',
+			'BRL',
+			'CAD',
+			'CZK',
+			'DKK',
+			'EUR',
+			'HKD',
+			'HUF',
+			'ILS',
+			'JPY',
+			'MYR',
+			'MXN',
+			'NOK',
+			'NZD',
+			'PHP',
+			'PLN',
+			'GBP',
+			'RUB',
+			'SGD',
+			'SEK',
+			'CHF',
+			'TWD',
+			'THB',
+			'TRY'
+		);
+		parent::__construct();
+	}
+
 
+
+	/**
+	 * Sets the gateway URL variable based on whether debug mode is enabled or not.
 	 *
 *@param array $settings_array
 	 */
 	public function set_settings( $settings_array ) {
 		parent::set_settings($settings_array);
 		// Redirect URL.
-        $this->_base_gateway_url = $this->_debug_mode
-            ? 'https://api-3t.sandbox.paypal.com/nvp'
-            : 'https://api-3t.paypal.com/nvp';
+		$this->_base_gateway_url = $this->_debug_mode
+			? 'https://api-3t.sandbox.paypal.com/nvp'
+			: 'https://api-3t.paypal.com/nvp';
 	}
 
 
 
-    /**
-     * @param EEI_Payment $payment
-     * @param array       $billing_info
-     * @param string      $return_url
-     * @param string      $notify_url
-     * @param string      $cancel_url
-     * @return \EE_Payment|\EEI_Payment
-     * @throws \EE_Error
-     */
+	/**
+	 * @param EEI_Payment $payment
+	 * @param array       $billing_info
+	 * @param string      $return_url
+	 * @param string      $notify_url
+	 * @param string      $cancel_url
+	 * @return \EE_Payment|\EEI_Payment
+	 * @throws \EE_Error
+	 */
 	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' ) );
@@ -202,9 +201,9 @@ 
 				$token_request_dtls['L_PAYMENTREQUEST_0_NUMBER'.$item_num] = $item_num + 1;
 				// Item quantity.
 				$token_request_dtls['L_PAYMENTREQUEST_0_QTY'.$item_num] = 1;
-                // Digital item is sold.
-                $token_request_dtls['L_PAYMENTREQUEST_0_ITEMCATEGORY'.$item_num] = 'Physical';
-                $item_num++;
+				// Digital item is sold.
+				$token_request_dtls['L_PAYMENTREQUEST_0_ITEMCATEGORY'.$item_num] = 'Physical';
+				$item_num++;
 			}
 		} else {
 			// Just one Item.
@@ -277,7 +276,6 @@ 
 
 
 	/**
-
 	 *  @param array $update_info {
 	 *	  @type string $gateway_txn_id
 	 *	  @type string status an EEMI_Payment status
@@ -297,8 +295,8 @@ 
 				return $payment;
 			}
 			$primary_registrant = $transaction->primary_registration();
-            $payment_details = $payment->details();
-            // Check if we still have the token.
+			$payment_details = $payment->details();
+			// Check if we still have the token.
 			if ( ! isset($payment_details['TOKEN']) || empty($payment_details['TOKEN']) ) {
 				$payment->set_status( $this->_pay_model->failed_status() );
 				return $payment;
@@ -407,36 +405,36 @@ 
 	 */
 	public function _ppExpress_check_response( $request_response ) {
 		if ( is_wp_error( $request_response ) || empty($request_response['body']) ) {
-            // If we got here then there was an error in this request.
-            return array('status' => false, 'args' => $request_response);
-        }
-        $response_args = array();
-        parse_str( urldecode($request_response['body']), $response_args );
-        if ( ! isset($response_args['ACK'])) {
-            return array('status' => false, 'args' => $request_response);
-        }
-        if (
-            $response_args['ACK'] === 'Success'
-            && (
-                isset($response_args['PAYERID'])
-                || isset($response_args['PAYMENTINFO_0_TRANSACTIONID'])
-                || (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 {
-            $errors = $this->_get_errors($response_args);
-            return array('status' => false, 'args' => $errors);
-        }
+			// If we got here then there was an error in this request.
+			return array('status' => false, 'args' => $request_response);
+		}
+		$response_args = array();
+		parse_str( urldecode($request_response['body']), $response_args );
+		if ( ! isset($response_args['ACK'])) {
+			return array('status' => false, 'args' => $request_response);
+		}
+		if (
+			$response_args['ACK'] === 'Success'
+			&& (
+				isset($response_args['PAYERID'])
+				|| isset($response_args['PAYMENTINFO_0_TRANSACTIONID'])
+				|| (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 {
+			$errors = $this->_get_errors($response_args);
+			return array('status' => false, 'args' => $errors);
+		}
 	}
 
 
 	/**
-     *  Log a "Cleared" request.
-     *
-     * @param array $request
+	 *  Log a "Cleared" request.
+	 *
+	 * @param array $request
 	 * @param EEI_Payment  $payment
 	 * @param string  		$info
 	 * @return void
@@ -459,17 +457,17 @@ 
 		$n = 0;
 		while ( isset($data_array["L_ERRORCODE{$n}"]) ) {
 			$l_error_code = isset($data_array["L_ERRORCODE{$n}"])
-                ? $data_array["L_ERRORCODE{$n}"]
-                : '';
+				? $data_array["L_ERRORCODE{$n}"]
+				: '';
 			$l_severity_code = isset($data_array["L_SEVERITYCODE{$n}"])
-                ? $data_array["L_SEVERITYCODE{$n}"]
-                : '';
+				? $data_array["L_SEVERITYCODE{$n}"]
+				: '';
 			$l_short_message = isset($data_array["L_SHORTMESSAGE{$n}"])
-                ? $data_array["L_SHORTMESSAGE{$n}"]
-                : '';
+				? $data_array["L_SHORTMESSAGE{$n}"]
+				: '';
 			$l_long_message = isset($data_array["L_LONGMESSAGE{$n}"])
-                ? $data_array["L_LONGMESSAGE{$n}"]
-                : '';
+				? $data_array["L_LONGMESSAGE{$n}"]
+				: '';
 
 			if ( $n === 0 ) {
 				$errors = array(

core/libraries/form_sections/strategies/normalization/EE_Credit_Card_Normalization.strategy.php

Indentation +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -14,15 +14,15 @@ 
 class EE_Credit_Card_Normalization extends EE_Text_Normalization
 {
 
-    /**
-     * @param string $value_to_normalize
-     * @return mixed
-     */
-    public function normalize($value_to_normalize)
-    {
-        $normalized_by_parent = parent::normalize($value_to_normalize);
-        //we want to make it consistent, so remove whitespace from cc number
-        return preg_replace('/\s+/', '', $normalized_by_parent);
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return mixed
+	 */
+	public function normalize($value_to_normalize)
+	{
+		$normalized_by_parent = parent::normalize($value_to_normalize);
+		//we want to make it consistent, so remove whitespace from cc number
+		return preg_replace('/\s+/', '', $normalized_by_parent);
+	}
 }
 // End of file EE_Credit_Card_Normalization.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 

core/libraries/form_sections/strategies/normalization/EE_Many_Valued_Normalization.strategy.php

Indentation +87 added lines, -87 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -14,91 +14,91 @@ 
 class EE_Many_Valued_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    protected $_individual_item_normalization_strategy = array();
-
-
-
-    /**
-     * @param EE_Normalization_Strategy_Base $individual_item_normalization_strategy
-     */
-    public function __construct($individual_item_normalization_strategy)
-    {
-        $this->_individual_item_normalization_strategy = $individual_item_normalization_strategy;
-        parent::__construct();
-    }
-
-
-
-    /**
-     * Normalizes the input into an array, and normalizes each item according to its
-     * individual item normalization strategy
-     *
-     * @param array | string $value_to_normalize
-     * @return array
-     */
-    public function normalize($value_to_normalize)
-    {
-        if (is_array($value_to_normalize)) {
-            $items_to_normalize = $value_to_normalize;
-        } else if ($value_to_normalize !== null) {
-            $items_to_normalize = array($value_to_normalize);
-        } else {
-            $items_to_normalize = array();
-        }
-        $normalized_array_value = array();
-        foreach ($items_to_normalize as $key => $individual_item) {
-            $normalized_array_value[$key] = $this->normalize_one($individual_item);
-        }
-        return $normalized_array_value;
-    }
-
-
-
-    /**
-     * Normalized the one item (called for each array item in EE_Many_values_Normalization::normalize())
-     *
-     * @param string $individual_value_to_normalize but definitely NOT an array
-     * @return mixed
-     */
-    public function normalize_one($individual_value_to_normalize)
-    {
-        return $this->_individual_item_normalization_strategy->normalize($individual_value_to_normalize);
-    }
-
-
-
-    /**
-     * Converts the array of normalized things to an array of raw html values.
-     *
-     * @param array $normalized_values
-     * @return string[]
-     */
-    public function unnormalize($normalized_values)
-    {
-        if ($normalized_values === null) {
-            $normalized_values = array();
-        }
-        if (! is_array($normalized_values)) {
-            $normalized_values = array($normalized_values);
-        }
-        $non_normal_values = array();
-        foreach ($normalized_values as $key => $value) {
-            $non_normal_values[$key] = $this->unnormalize_one($value);
-        }
-        return $non_normal_values;
-    }
-
-
-
-    /**
-     * Unnormalizes an individual item in the array of values
-     *
-     * @param mixed $individual_value_to_unnormalize but certainly NOT an array
-     * @return string
-     */
-    public function unnormalize_one($individual_value_to_unnormalize)
-    {
-        return $this->_individual_item_normalization_strategy->unnormalize($individual_value_to_unnormalize);
-    }
+	protected $_individual_item_normalization_strategy = array();
+
+
+
+	/**
+	 * @param EE_Normalization_Strategy_Base $individual_item_normalization_strategy
+	 */
+	public function __construct($individual_item_normalization_strategy)
+	{
+		$this->_individual_item_normalization_strategy = $individual_item_normalization_strategy;
+		parent::__construct();
+	}
+
+
+
+	/**
+	 * Normalizes the input into an array, and normalizes each item according to its
+	 * individual item normalization strategy
+	 *
+	 * @param array | string $value_to_normalize
+	 * @return array
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if (is_array($value_to_normalize)) {
+			$items_to_normalize = $value_to_normalize;
+		} else if ($value_to_normalize !== null) {
+			$items_to_normalize = array($value_to_normalize);
+		} else {
+			$items_to_normalize = array();
+		}
+		$normalized_array_value = array();
+		foreach ($items_to_normalize as $key => $individual_item) {
+			$normalized_array_value[$key] = $this->normalize_one($individual_item);
+		}
+		return $normalized_array_value;
+	}
+
+
+
+	/**
+	 * Normalized the one item (called for each array item in EE_Many_values_Normalization::normalize())
+	 *
+	 * @param string $individual_value_to_normalize but definitely NOT an array
+	 * @return mixed
+	 */
+	public function normalize_one($individual_value_to_normalize)
+	{
+		return $this->_individual_item_normalization_strategy->normalize($individual_value_to_normalize);
+	}
+
+
+
+	/**
+	 * Converts the array of normalized things to an array of raw html values.
+	 *
+	 * @param array $normalized_values
+	 * @return string[]
+	 */
+	public function unnormalize($normalized_values)
+	{
+		if ($normalized_values === null) {
+			$normalized_values = array();
+		}
+		if (! is_array($normalized_values)) {
+			$normalized_values = array($normalized_values);
+		}
+		$non_normal_values = array();
+		foreach ($normalized_values as $key => $value) {
+			$non_normal_values[$key] = $this->unnormalize_one($value);
+		}
+		return $non_normal_values;
+	}
+
+
+
+	/**
+	 * Unnormalizes an individual item in the array of values
+	 *
+	 * @param mixed $individual_value_to_unnormalize but certainly NOT an array
+	 * @return string
+	 */
+	public function unnormalize_one($individual_value_to_unnormalize)
+	{
+		return $this->_individual_item_normalization_strategy->unnormalize($individual_value_to_unnormalize);
+	}
 }
 // End of file EE_Many_Valued_Normalization.strategy.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -78,7 +78,7 @@ 
         if ($normalized_values === null) {
             $normalized_values = array();
         }
-        if (! is_array($normalized_values)) {
+        if ( ! is_array($normalized_values)) {
             $normalized_values = array($normalized_values);
         }
         $non_normal_values = array();

core/libraries/form_sections/strategies/normalization/EE_Float_Normalization.strategy.php

Spacing +6 added lines, -6 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -36,9 +36,9 @@ 
             return null;
         }
         if (is_float($value_to_normalize) || is_int($value_to_normalize)) {
-            return (float)$value_to_normalize;
+            return (float) $value_to_normalize;
         }
-        if (! is_string($value_to_normalize)) {
+        if ( ! is_string($value_to_normalize)) {
             throw new EE_Validation_Error(
                 sprintf(
                     __('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
@@ -60,8 +60,8 @@ 
                 // if first match is the negative sign,
                 // then the number needs to be multiplied by -1 to remain negative
                 return $matches[1] === '-'
-                    ? (float)$matches[2] * -1
-                    : (float)$matches[2];
+                    ? (float) $matches[2] * -1
+                    : (float) $matches[2];
             }
         }
         //find if this input has a float validation strategy
@@ -74,7 +74,7 @@ 
         }
         //this really shouldn't ever happen because fields with a float normalization strategy
         //should also have a float validation strategy, but in case it doesn't use the default
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $default_validation_strategy = new EE_Float_Validation_Strategy();
             $validation_error_message = $default_validation_strategy->get_validation_error_message();
         }

Indentation +71 added lines, -71 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -15,85 +15,85 @@ 
 class EE_Float_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /*
+	/*
      * regex pattern that matches for the following:
      *      * optional negative sign
      *      * one or more digits or decimals
      */
-    const REGEX = '/^(-?)([\d.]+)$/';
+	const REGEX = '/^(-?)([\d.]+)$/';
 
 
 
-    /**
-     * @param string $value_to_normalize
-     * @return float
-     * @throws \EE_Validation_Error
-     */
-    public function normalize($value_to_normalize)
-    {
-        if ($value_to_normalize === null) {
-            return null;
-        }
-        if (is_float($value_to_normalize) || is_int($value_to_normalize)) {
-            return (float)$value_to_normalize;
-        }
-        if (! is_string($value_to_normalize)) {
-            throw new EE_Validation_Error(
-                sprintf(
-                    __('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
-                    print_r($value_to_normalize, true),
-                    gettype($value_to_normalize)
-                )
-            );
-        }
-        $normalized_value = filter_var(
-            $value_to_normalize,
-            FILTER_SANITIZE_NUMBER_FLOAT,
-            FILTER_FLAG_ALLOW_FRACTION
-        );
-        if ($normalized_value === '') {
-            return null;
-        }
-        if (preg_match(EE_Float_Normalization::REGEX, $normalized_value, $matches)) {
-            if (count($matches) === 3) {
-                // if first match is the negative sign,
-                // then the number needs to be multiplied by -1 to remain negative
-                return $matches[1] === '-'
-                    ? (float)$matches[2] * -1
-                    : (float)$matches[2];
-            }
-        }
-        //find if this input has a float validation strategy
-        //in which case, use its message
-        $validation_error_message = null;
-        foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
-            if ($validation_strategy instanceof EE_Float_Validation_Strategy) {
-                $validation_error_message = $validation_strategy->get_validation_error_message();
-            }
-        }
-        //this really shouldn't ever happen because fields with a float normalization strategy
-        //should also have a float validation strategy, but in case it doesn't use the default
-        if (! $validation_error_message) {
-            $default_validation_strategy = new EE_Float_Validation_Strategy();
-            $validation_error_message = $default_validation_strategy->get_validation_error_message();
-        }
-        throw new EE_Validation_Error($validation_error_message, 'float_only');
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return float
+	 * @throws \EE_Validation_Error
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if ($value_to_normalize === null) {
+			return null;
+		}
+		if (is_float($value_to_normalize) || is_int($value_to_normalize)) {
+			return (float)$value_to_normalize;
+		}
+		if (! is_string($value_to_normalize)) {
+			throw new EE_Validation_Error(
+				sprintf(
+					__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
+					print_r($value_to_normalize, true),
+					gettype($value_to_normalize)
+				)
+			);
+		}
+		$normalized_value = filter_var(
+			$value_to_normalize,
+			FILTER_SANITIZE_NUMBER_FLOAT,
+			FILTER_FLAG_ALLOW_FRACTION
+		);
+		if ($normalized_value === '') {
+			return null;
+		}
+		if (preg_match(EE_Float_Normalization::REGEX, $normalized_value, $matches)) {
+			if (count($matches) === 3) {
+				// if first match is the negative sign,
+				// then the number needs to be multiplied by -1 to remain negative
+				return $matches[1] === '-'
+					? (float)$matches[2] * -1
+					: (float)$matches[2];
+			}
+		}
+		//find if this input has a float validation strategy
+		//in which case, use its message
+		$validation_error_message = null;
+		foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
+			if ($validation_strategy instanceof EE_Float_Validation_Strategy) {
+				$validation_error_message = $validation_strategy->get_validation_error_message();
+			}
+		}
+		//this really shouldn't ever happen because fields with a float normalization strategy
+		//should also have a float validation strategy, but in case it doesn't use the default
+		if (! $validation_error_message) {
+			$default_validation_strategy = new EE_Float_Validation_Strategy();
+			$validation_error_message = $default_validation_strategy->get_validation_error_message();
+		}
+		throw new EE_Validation_Error($validation_error_message, 'float_only');
+	}
 
 
 
-    /**
-     * Converts a float into a string
-     *
-     * @param float $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        if (empty($normalized_value)) {
-            return '0.00';
-        }
-        return "{$normalized_value}";
-    }
+	/**
+	 * Converts a float into a string
+	 *
+	 * @param float $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		if (empty($normalized_value)) {
+			return '0.00';
+		}
+		return "{$normalized_value}";
+	}
 }
 // End of file EE_Float_Normalization.strategy.php

core/libraries/form_sections/strategies/normalization/EE_Slug_Normalization.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 

Indentation +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -15,26 +15,26 @@ 
 class EE_Slug_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /**
-     * @param string $value_to_normalize
-     * @return string
-     */
-    public function normalize($value_to_normalize)
-    {
-        return sanitize_title($value_to_normalize);
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return string
+	 */
+	public function normalize($value_to_normalize)
+	{
+		return sanitize_title($value_to_normalize);
+	}
 
 
 
-    /**
-     * It's hard to unnormalize this- let's just take a guess
-     *
-     * @param string $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        return str_replace("-", " ", $normalized_value);
-    }
+	/**
+	 * It's hard to unnormalize this- let's just take a guess
+	 *
+	 * @param string $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		return str_replace("-", " ", $normalized_value);
+	}
 }
 // End of file EE_Slug_Normalization.strategy.php

core/libraries/form_sections/strategies/normalization/EE_All_Caps_Normalization.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 

Indentation +23 added lines, -23 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -16,27 +16,27 @@ 
 class EE_All_Caps_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /**
-     * @param string $value_to_normalize
-     * @return string
-     */
-    public function normalize($value_to_normalize)
-    {
-        return strtoupper($value_to_normalize);
-    }
-
-
-
-    /**
-     * It's kinda hard to unnormalize this- we can't determine which parts used to be lowercase
-     * so just return it as-is.
-     *
-     * @param string $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        return $normalized_value;
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return string
+	 */
+	public function normalize($value_to_normalize)
+	{
+		return strtoupper($value_to_normalize);
+	}
+
+
+
+	/**
+	 * It's kinda hard to unnormalize this- we can't determine which parts used to be lowercase
+	 * so just return it as-is.
+	 *
+	 * @param string $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		return $normalized_value;
+	}
 
 }
\ No newline at end of file

core/libraries/form_sections/strategies/normalization/EE_Boolean_Normalization.strategy.php

Indentation +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -18,28 +18,28 @@ 
 class EE_Boolean_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /**
-     * @param string | int | bool $value_to_normalize
-     * @return boolean
-     */
-    public function normalize($value_to_normalize)
-    {
-        return filter_var($value_to_normalize, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * @param string | int | bool $value_to_normalize
+	 * @return boolean
+	 */
+	public function normalize($value_to_normalize)
+	{
+		return filter_var($value_to_normalize, FILTER_VALIDATE_BOOLEAN);
+	}
 
 
 
-    /**
-     * @param boolean $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        if ($normalized_value) {
-            return '1';
-        } else {
-            return '0';
-        }
-    }
+	/**
+	 * @param boolean $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		if ($normalized_value) {
+			return '1';
+		} else {
+			return '0';
+		}
+	}
 }
 // End of file EE_Boolean_Normalization.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 

core/libraries/form_sections/strategies/normalization/EE_Text_Normalization.strategy.php

Indentation +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -15,39 +15,39 @@ 
 class EE_Text_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /**
-     * @param string $value_to_normalize
-     * @return array|mixed|string
-     */
-    public function normalize($value_to_normalize)
-    {
-        if (is_array($value_to_normalize)) {
-            return (string)array_shift($value_to_normalize);
-        }
-        // consider `"null"` values to be equivalent to null.
-        if ($value_to_normalize === '' || $value_to_normalize === null) {
-            return null;
-        }
-        return (string)$value_to_normalize;
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return array|mixed|string
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if (is_array($value_to_normalize)) {
+			return (string)array_shift($value_to_normalize);
+		}
+		// consider `"null"` values to be equivalent to null.
+		if ($value_to_normalize === '' || $value_to_normalize === null) {
+			return null;
+		}
+		return (string)$value_to_normalize;
+	}
 
 
 
-    /**
-     * IF its a string in PHP, it will be a string in the HTML form. easy
-     *
-     * @param string $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        //account for default "select here" option values
-        if ($normalized_value === null) {
-            return '';
-        }
-        //double-check it's a string. It's possible this value was a question option that happened to be a numeric
-        //string, in which case PHP has automatically converted it to an integer!
-        return (string)$normalized_value;
-    }
+	/**
+	 * IF its a string in PHP, it will be a string in the HTML form. easy
+	 *
+	 * @param string $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		//account for default "select here" option values
+		if ($normalized_value === null) {
+			return '';
+		}
+		//double-check it's a string. It's possible this value was a question option that happened to be a numeric
+		//string, in which case PHP has automatically converted it to an integer!
+		return (string)$normalized_value;
+	}
 }
 // End of file EE_Text_Normalization.strategy.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -22,13 +22,13 @@ 
     public function normalize($value_to_normalize)
     {
         if (is_array($value_to_normalize)) {
-            return (string)array_shift($value_to_normalize);
+            return (string) array_shift($value_to_normalize);
         }
         // consider `"null"` values to be equivalent to null.
         if ($value_to_normalize === '' || $value_to_normalize === null) {
             return null;
         }
-        return (string)$value_to_normalize;
+        return (string) $value_to_normalize;
     }
 
 
@@ -47,7 +47,7 @@ 
         }
         //double-check it's a string. It's possible this value was a question option that happened to be a numeric
         //string, in which case PHP has automatically converted it to an integer!
-        return (string)$normalized_value;
+        return (string) $normalized_value;
     }
 }
 // End of file EE_Text_Normalization.strategy.php

core/libraries/form_sections/strategies/normalization/EE_Normalization_Strategy_Base.strategy.php

Indentation +47 added lines, -47 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -14,60 +14,60 @@ 
 abstract class EE_Normalization_Strategy_Base extends EE_Form_Input_Strategy_Base
 {
 
-    /**
-     * Takes the sanitized value for the input and casts it into the correct PHP type.
-     * Eg, turns it into an int, float, string, boolean, datetime, etc. The validation
-     * strategy should be able to depend on the normalized value being of the correct type.
-     * If the normalized value passes validation, the normalized value is what other code
-     * will operate on. If the sanitized value cannot be normalized, this method should either
-     * add a validation error onto the input, or wrangle the input into a format that can be normalized
-     * (eg, for a date input, if the user enters "2014/100/100", you can either add an error stating
-     * "hey! 2014/100/100 is not a valid date!", or simply convert it into a valid date like "2014/12/31".
-     * For this case, I'd prefer the former. But there may be cases where you'd just rather correct it for them)
-     *
-     * @param string $value_to_normalize it should always be a string. If the input receives an array, then the
-     *                                   validation strategy should be called on array elements, not on the entire array
-     * @return mixed the normalized value
-     */
-    abstract public function normalize($value_to_normalize);
+	/**
+	 * Takes the sanitized value for the input and casts it into the correct PHP type.
+	 * Eg, turns it into an int, float, string, boolean, datetime, etc. The validation
+	 * strategy should be able to depend on the normalized value being of the correct type.
+	 * If the normalized value passes validation, the normalized value is what other code
+	 * will operate on. If the sanitized value cannot be normalized, this method should either
+	 * add a validation error onto the input, or wrangle the input into a format that can be normalized
+	 * (eg, for a date input, if the user enters "2014/100/100", you can either add an error stating
+	 * "hey! 2014/100/100 is not a valid date!", or simply convert it into a valid date like "2014/12/31".
+	 * For this case, I'd prefer the former. But there may be cases where you'd just rather correct it for them)
+	 *
+	 * @param string $value_to_normalize it should always be a string. If the input receives an array, then the
+	 *                                   validation strategy should be called on array elements, not on the entire array
+	 * @return mixed the normalized value
+	 */
+	abstract public function normalize($value_to_normalize);
 
 
 
-    /**
-     * Identical to normalize, except normalize_one() CANNOT be passed an array and
-     * never returns an array. Useful if the normalization strategy converts between arrays
-     *
-     * @param string $individual_item_to_normalize
-     * @return mixed
-     */
-    public function normalize_one($individual_item_to_normalize)
-    {
-        return $this->normalize($individual_item_to_normalize);
-    }
+	/**
+	 * Identical to normalize, except normalize_one() CANNOT be passed an array and
+	 * never returns an array. Useful if the normalization strategy converts between arrays
+	 *
+	 * @param string $individual_item_to_normalize
+	 * @return mixed
+	 */
+	public function normalize_one($individual_item_to_normalize)
+	{
+		return $this->normalize($individual_item_to_normalize);
+	}
 
 
 
-    /**
-     * Takes the normalized value (for an Yes_No_Input this could be TRUE or FALSE), and converts it into
-     * the value you would use in the html form (for a Yes_No_Input this could be '1' or '0').
-     *
-     * @param $normalized_value
-     * @return array|string the 'raw' value as used in the form, usually a string or array of strings.
-     */
-    abstract public function unnormalize($normalized_value);
+	/**
+	 * Takes the normalized value (for an Yes_No_Input this could be TRUE or FALSE), and converts it into
+	 * the value you would use in the html form (for a Yes_No_Input this could be '1' or '0').
+	 *
+	 * @param $normalized_value
+	 * @return array|string the 'raw' value as used in the form, usually a string or array of strings.
+	 */
+	abstract public function unnormalize($normalized_value);
 
 
 
-    /**
-     * Normally the same as unnormalize, except it CANNOT be passed an array and
-     * ALWAYS returns a string
-     *
-     * @param mixed $individual_item_to_unnormalize NOT an array
-     * @return string
-     */
-    public function unnormalize_one($individual_item_to_unnormalize)
-    {
-        return $this->unnormalize($individual_item_to_unnormalize);
-    }
+	/**
+	 * Normally the same as unnormalize, except it CANNOT be passed an array and
+	 * ALWAYS returns a string
+	 *
+	 * @param mixed $individual_item_to_unnormalize NOT an array
+	 * @return string
+	 */
+	public function unnormalize_one($individual_item_to_unnormalize)
+	{
+		return $this->unnormalize($individual_item_to_unnormalize);
+	}
 }
 // End of file EE_Normalization_Strategy_Base.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }