eventespresso / event-espresso-core

caffeinated/payment_methods/Aim/EEG_Aim.gateway.php

Indentation +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 			//in which case, we need to generate teh invoice num per request right here...
 			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
+			$this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
 
 
 			if ($this->_test_transactions) {

Braces +3 added lines, -2 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -107,7 +108,7 @@ 
 				foreach($total_line_item->tax_descendants() as $tax_line_item){
 					$this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N');
 				}
-			}else{//partial payment
+			} else{//partial payment
 				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
 			}
 

Spacing +43 added lines, -43 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEG_Aim extends EE_Onsite_Gateway{
+class EEG_Aim extends EE_Onsite_Gateway {
 
 	const LIVE_URL    = 'https://secure2.authorize.net/gateway/transact.dll'; //Authnet URL
 
@@ -157,9 +157,9 @@ 
 	 * @param EEG_Aim $gateway_object
 	 * @return string
 	 */
-	public function possibly_use_deprecated_aim_server( $url, EEG_Aim $gateway_object ) {
-		if(  $gateway_object->_server === 'authorize.net'
-			&& ! $gateway_object->_debug_mode ) {
+	public function possibly_use_deprecated_aim_server($url, EEG_Aim $gateway_object) {
+		if ($gateway_object->_server === 'authorize.net'
+			&& ! $gateway_object->_debug_mode) {
 			return 'https://secure.authorize.net/gateway/transact.dll';
 		} else {
 			return $url;
@@ -182,7 +182,7 @@ 
 	 */
 
 	public function do_direct_payment($payment, $billing_info = null) {
-			add_filter( 'FHEE__EEG_Aim___get_server_url', array( $this, 'possibly_use_deprecated_aim_server' ), 10, 2 );
+			add_filter('FHEE__EEG_Aim___get_server_url', array($this, 'possibly_use_deprecated_aim_server'), 10, 2);
 			// Enable test mode if needed
 			//4007000000027  <-- test successful visa
 			//4222222222222  <-- test failure card number
@@ -193,17 +193,17 @@ 
 			$primary_registrant = $transaction->primary_registration();
 			//if we're are charging for the full amount, show the normal line items
 			//and the itemized total adds up properly
-			if( $this->_can_easily_itemize_transaction_for( $payment ) ){
+			if ($this->_can_easily_itemize_transaction_for($payment)) {
 				$total_line_item = $transaction->total_line_item();
 				foreach ($total_line_item->get_items() as $line_item) {
 					$this->addLineItem($item_num++, $line_item->name(), $line_item->desc(), $line_item->quantity(), $line_item->unit_price(), 'N');
 					$order_description .= $line_item->desc().', ';
 				}
-				foreach($total_line_item->tax_descendants() as $tax_line_item){
+				foreach ($total_line_item->tax_descendants() as $tax_line_item) {
 					$this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N');
 				}
-			}else{//partial payment
-				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
+			} else {//partial payment
+				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"), $payment->amount(), $primary_registrant->reg_code());
 			}
 
 
@@ -212,18 +212,18 @@ 
 			//start transaction
 			//if in debug mode, use authorize.net's sandbox id; otherwise use the Event Espresso partner id
 			$partner_id = $this->_debug_mode ? 'AAA100302' : 'AAA105363';
-			$this->setField( 'solution_id', $partner_id );
+			$this->setField('solution_id', $partner_id);
 			$this->setField('amount', $this->format_currency($payment->amount()));
-			$this->setField('description',substr(rtrim($order_description, ', '), 0, 255));
-			$this->_set_sensitive_billing_data( $billing_info );
+			$this->setField('description', substr(rtrim($order_description, ', '), 0, 255));
+			$this->_set_sensitive_billing_data($billing_info);
 			$this->setField('first_name', $billing_info['first_name']);
 			$this->setField('last_name', $billing_info['last_name']);
 			$this->setField('email', $billing_info['email']);
 			$this->setField('company', $billing_info['company']);
 			$this->setField('address', $billing_info['address'].' '.$billing_info['address2']);
 			$this->setField('city', $billing_info['city']);
-			$this->setField('state', $billing_info['state'] );
-			$this->setField('country', $billing_info['country'] );
+			$this->setField('state', $billing_info['state']);
+			$this->setField('country', $billing_info['country']);
 			$this->setField('zip', $billing_info['zip']);
 			$this->setField('fax', $billing_info['fax']);
 			$this->setField('cust_id', $primary_registrant->ID());
@@ -231,9 +231,9 @@ 
 			//invoice_num would be nice to have it be unique per SPCO page-load, that way if users
 			//press back, they don't submit a duplicate. However, we may be keeping the user on teh same spco page
 			//in which case, we need to generate teh invoice num per request right here...
-			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
+			$this->setField('invoice_num', wp_generate_password(12, false)); //$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
+            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS);
 
 
 			if ($this->_test_transactions) {
@@ -243,7 +243,7 @@ 
 			//Capture response
 			$this->type = "AUTH_CAPTURE";
 			$response = $this->_sendRequest($payment);
-			if (!empty($response)){
+			if ( ! empty($response)) {
 				if ($this->_debug_mode) {
 					$txn_id = $response->invoice_number;
 				} else {
@@ -252,15 +252,15 @@ 
 				$payment_status = $response->approved ? $this->_pay_model->approved_status() : $this->_pay_model->declined_status();
 				$payment->set_status($payment_status);
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
-				$payment->set_amount( (float) $response->amount );
-				$payment->set_gateway_response(sprintf("%s (code: %s)",$response->response_reason_text,$response->response_reason_code));
-				$payment->set_txn_id_chq_nmbr( $txn_id );
+				$payment->set_amount((float) $response->amount);
+				$payment->set_gateway_response(sprintf("%s (code: %s)", $response->response_reason_text, $response->response_reason_code));
+				$payment->set_txn_id_chq_nmbr($txn_id);
 				$payment->set_extra_accntng($primary_registrant->reg_code());
-				$payment->set_details(print_r($response,true));
+				$payment->set_details(print_r($response, true));
 			} else {
 				$payment->set_status($this->_pay_model->failed_status());
 				$payment->set_gateway_response(__("There was no response from Authorize.net", 'event_espresso'));
-				$payment->set_details(print_r($response,true));
+				$payment->set_details(print_r($response, true));
 			}
 		return $payment;
 	}
@@ -271,7 +271,7 @@ 
 	 * what billing data gets sent
 	 * @param array $billing_info
 	 */
-	protected function _set_sensitive_billing_data( $billing_info ) {
+	protected function _set_sensitive_billing_data($billing_info) {
 		$this->setField('card_num', $billing_info['credit_card']);
 		$this->setField('exp_date', $billing_info['exp_month'].$billing_info['exp_year']);
 		$this->setField('card_code', $billing_info['cvv']);
@@ -330,22 +330,22 @@ 
 		$this->_x_post_fields['tran_key'] = $this->_transaction_key;
 		$x_keys = array();
 		foreach ($this->_x_post_fields as $key => $value) {
-			$x_keys[] = "x_$key=" . urlencode($value);
+			$x_keys[] = "x_$key=".urlencode($value);
 		}
 		// Add line items
 		foreach ($this->_additional_line_items as $key => $value) {
-			$x_keys[] =  "x_line_item=" . urlencode($value);
+			$x_keys[] = "x_line_item=".urlencode($value);
 		}
 		$this->_log_clean_request($x_keys, $payment);
 		$post_url = $this->_get_server_url();
 		$curl_request = curl_init($post_url);
-		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&",$x_keys));
+		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&", $x_keys));
 		curl_setopt($curl_request, CURLOPT_HEADER, 0);
 		curl_setopt($curl_request, CURLOPT_TIMEOUT, 45);
 		curl_setopt($curl_request, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($curl_request, CURLOPT_SSL_VERIFYHOST, 2);
 		if ($this->VERIFY_PEER) {
-			curl_setopt($curl_request, CURLOPT_CAINFO, dirname( __DIR__ ) . '/ssl/cert.pem');
+			curl_setopt($curl_request, CURLOPT_CAINFO, dirname(__DIR__).'/ssl/cert.pem');
 		} else {
 			curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false);
 		}
@@ -357,7 +357,7 @@ 
 		$response = curl_exec($curl_request);
 
 		curl_close($curl_request);
-		$response_obj =  new EE_AuthorizeNetAIM_Response($response);
+		$response_obj = new EE_AuthorizeNetAIM_Response($response);
 
 		return $this->_log_and_clean_response($response_obj, $payment);
 	}
@@ -366,18 +366,18 @@ 
 	 * @param array $request_array
 	 * @param EEI_Payment $payment
 	 */
-	protected function _log_clean_request($request_array,$payment){
-		$keys_to_filter_out = array( 'x_card_num', 'x_card_code', 'x_exp_date' );
-		foreach($request_array as $index => $keyvaltogether ) {
-			foreach( $keys_to_filter_out as $key ) {
-				if( strpos( $keyvaltogether, $key ) === 0 ){
+	protected function _log_clean_request($request_array, $payment) {
+		$keys_to_filter_out = array('x_card_num', 'x_card_code', 'x_exp_date');
+		foreach ($request_array as $index => $keyvaltogether) {
+			foreach ($keys_to_filter_out as $key) {
+				if (strpos($keyvaltogether, $key) === 0) {
 					//found it at the first character
 					//so its one of them
-					unset( $request_array[ $index ] );
+					unset($request_array[$index]);
 				}
 			}
 		}
-		$this->log(array('AIM Request sent:'=>$request_array, 'Server URL' => $this->_get_server_url() ),$payment);
+		$this->log(array('AIM Request sent:'=>$request_array, 'Server URL' => $this->_get_server_url()), $payment);
 	}
 
 
@@ -389,9 +389,9 @@ 
 	 * @param EE_Payment                  $payment
 	 * @return \EE_AuthorizeNetAIM_Response
 	 */
-	private function _log_and_clean_response($response_obj,$payment){
+	private function _log_and_clean_response($response_obj, $payment) {
 		$response_obj->account_number = '';
-		$this->log(array('AIM Response received:'=>$response_obj),$payment);
+		$this->log(array('AIM Response received:'=>$response_obj), $payment);
 		return $response_obj;
 	}
 
@@ -490,7 +490,7 @@ 
 			// Split Array
 			$this->response = $response;
 			if ($encap_char) {
-				$this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1));
+				$this->_response_array = explode($encap_char.$delimiter.$encap_char, substr($response, 1, -1));
 			} else {
 				$this->_response_array = explode($delimiter, $response);
 			}
@@ -560,7 +560,7 @@ 
 			$this->held = ($this->response_code === self::HELD);
 
 			if ($this->error || $this->declined || $this->held) {
-				$this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />' . $this->response_reason_text . '<br /><span class="response_code">Response Code: ' . $this->response_code . '<br /></span><span class="response_subcode">Response Subcode: ' . $this->response_subcode . '</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> ';
+				$this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />'.$this->response_reason_text.'<br /><span class="response_code">Response Code: '.$this->response_code.'<br /></span><span class="response_subcode">Response Subcode: '.$this->response_subcode.'</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> ';
 
 
 				/* $this->error_message = "AuthorizeNet Error:
@@ -579,7 +579,7 @@ 
 
 }
 
-if ( ! class_exists( 'AuthorizeNetException' ) ) {
+if ( ! class_exists('AuthorizeNetException')) {
 	/**
 	 * Class AuthorizeNetException
 	 *
@@ -595,8 +595,8 @@ 
 		 * @param Exception $previous [optional] The previous exception used for the exception chaining. Since 5.3.0
 		 * @since 5.1.0
 		 */
-		public function __construct( $message = "", $code = 0, Exception $previous = null ) {
-			parent::__construct( $message, $code, $previous );
+		public function __construct($message = "", $code = 0, Exception $previous = null) {
+			parent::__construct($message, $code, $previous);
 		}
 	}
 }

caffeinated/payment_methods/Aim/templates/authorize_net_aim_debug_info.template.php

Indentation +21 added lines, -21 removed lines

@@ -3,27 +3,27 @@
 if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.3
- *
- * ------------------------------------------------------------------------
- *
- * authorize_net_aim_debug_info
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author			Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.3
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * authorize_net_aim_debug_info
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 ?>
 	<div class="sandbox-panel">
 		<h2>

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * Event Espresso
@@ -27,22 +27,22 @@ 
 ?>
 	<div class="sandbox-panel">
 		<h2>
-			<?php _e( 'Authorize.net AIM Test Mode', 'event_espresso' ); ?>
+			<?php _e('Authorize.net AIM Test Mode', 'event_espresso'); ?>
 		</h2>
 
 		<p>
-			<?php _e( 'Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.', 'event_espresso' ); ?>
+			<?php _e('Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.', 'event_espresso'); ?>
 		</p>
 
 		<p>
-			<strong><?php _e( 'Example Card Numbers:', 'event_espresso' ); ?></strong>
+			<strong><?php _e('Example Card Numbers:', 'event_espresso'); ?></strong>
 		</p>
 
 		<p>
-			370000000000002 (<?php _e( 'American Express', 'event_espresso' ); ?>)<br/>
-			6011000000000012 (<?php _e( 'Discover', 'event_espresso' ); ?>)<br/>
-			5424000000000015 (<?php _e( 'MasterCard', 'event_espresso' ); ?>)<br/>
-			4007000000027 (<?php _e( 'Visa', 'event_espresso' ); ?>)
+			370000000000002 (<?php _e('American Express', 'event_espresso'); ?>)<br/>
+			6011000000000012 (<?php _e('Discover', 'event_espresso'); ?>)<br/>
+			5424000000000015 (<?php _e('MasterCard', 'event_espresso'); ?>)<br/>
+			4007000000027 (<?php _e('Visa', 'event_espresso'); ?>)
 		</p>
 	</div>
 <?php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

caffeinated/payment_methods/Mijireh/EE_PMT_Mijireh.pm.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Mijireh extends EE_PMT_Base{
+class EE_PMT_Mijireh extends EE_PMT_Base {
 
 
 
@@ -38,9 +38,9 @@ 
 		require_once($this->file_folder().'EEG_Mijireh.gateway.php');
 		$this->_gateway = new EEG_Mijireh();
 		$this->_pretty_name = __("Mijireh", 'event_espresso');
-		$this->_default_description = __( 'After clicking "Finalize Registration", you will be able to enter your billing information and complete your payment.', 'event_espresso' );
+		$this->_default_description = __('After clicking "Finalize Registration", you will be able to enter your billing information and complete your payment.', 'event_espresso');
 		parent::__construct($pm_instance);
-		$this->_default_button_url = $this->file_url() . 'lib' . DS . 'mijireh-checkout-logo.png';
+		$this->_default_button_url = $this->file_url().'lib'.DS.'mijireh-checkout-logo.png';
 	}
 
 
@@ -50,7 +50,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 						'title' => __('Mijireh Settings', 'event_espresso'),
@@ -72,20 +72,20 @@ 
 					'access_key' => new EE_Text_Input(
 						array(
 							'html_label_text' => sprintf(
-								__( "Mijireh Access Key %s", 'event_espresso' ),
+								__("Mijireh Access Key %s", 'event_espresso'),
 								$this->get_help_tab_link()
 							),
 							'required'        => true
 						)
 					),
 				),
-				'exclude'           => array( 'PMD_debug_mode' ),
+				'exclude'           => array('PMD_debug_mode'),
 			)
 		);
 		$form->add_subsections(
 			array(
 				'slurper_area' => new EE_Form_Section_HTML_From_Template(
-					$this->file_folder() . DS . 'templates' . DS . 'mijireh_settings_after_form.template.php'
+					$this->file_folder().DS.'templates'.DS.'mijireh_settings_after_form.template.php'
 				)
 			),
 			null, // no specific subsection targeted
@@ -101,7 +101,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return NULL
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
 		return NULL;
 	}
 

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso

caffeinated/payment_methods/Paypal_Pro/EEG_Paypal_Pro.gateway.php

Braces +42 added lines, -31 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -123,7 +124,7 @@ 
 			}
 			$item_amount = $total_line_item->get_items_total();
 			$tax_amount = $total_line_item->get_total_tax();
-		}else{
+		} else{
 			$order_items = array();
 			$item_amount = $payment->amount();
 			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
@@ -248,10 +249,10 @@ 
 				$payment->set_status( $this->_pay_model->failed_status() ) ;
 				$payment->set_gateway_response( __( 'No response received from Paypal Pro', 'event_espresso' ) );
 				$payment->set_details($PayPalResult);
-			}else{
+			} else{
 				if($this->_APICallSuccessful($PayPalResult)){
 					$payment->set_status($this->_pay_model->approved_status());
-				}else{
+				} else{
 					$payment->set_status($this->_pay_model->declined_status());
 				}
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
@@ -263,7 +264,7 @@ 
 				$payment->set_extra_accntng($primary_registration_code);
 				$payment->set_details($PayPalResult);
 			}
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$payment->set_status($this->_pay_model->failed_status());
 			$payment->set_gateway_response($e->getMessage());
 		}
@@ -325,53 +326,62 @@ 
 
 		// DP Fields
 		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
-		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal)
-			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal) {
+					$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+		}
 
 		// CC Details Fields
 		$CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
-		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal)
-			$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
+		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal) {
+					$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
+		}
 
 		// PayerInfo Type Fields
 		$PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
-		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal)
-			$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
+		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal) {
+					$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
+		}
 
 		// Payer Name Fields
 		$PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
-		foreach ($PayerName as $PayerNameVar => $PayerNameVal)
-			$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
+		foreach ($PayerName as $PayerNameVar => $PayerNameVal) {
+					$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
+		}
 
 		// Address Fields (Billing)
 		$BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
-		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal)
-			$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
+		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal) {
+					$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
+		}
 
 		// Payment Details Type Fields
 		$PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
-		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal)
-			$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal) {
+					$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+		}
 
 		// Payment Details Item Type Fields
 		$OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
 		$n = 0;
 		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
 			$CurrentItem = $OrderItems[$OrderItemsVar];
-			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal)
-				$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal) {
+							$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+			}
 			$n++;
 		}
 
 		// Ship To Address Fields
 		$ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
-		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal)
-			$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
+		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal) {
+					$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
+		}
 
 		// 3D Secure Fields
 		$Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
-		foreach ($Secure3D as $Secure3DVar => $Secure3DVal)
-			$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
+		foreach ($Secure3D as $Secure3DVar => $Secure3DVal) {
+					$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
+		}
 
 		// Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
 		$NVPRequest = 'USER=' . $this->_username . '&PWD=' . $this->_password . '&VERSION=64.0' . '&SIGNATURE=' . $this->_signature . $DPFieldsNVP . $CCDetailsNVP . $PayerInfoNVP . $PayerNameNVP . $BillingAddressNVP . $PaymentDetailsNVP . $OrderItemsNVP . $ShippingAddressNVP . $Secure3DNVP;
@@ -500,14 +510,15 @@ 
 			$CurrentError = $Errors[$ErrorVar];
 			foreach ($CurrentError as $CurrentErrorVar => $CurrentErrorVal) {
 				$CurrentVarName = '';
-				if ($CurrentErrorVar == 'L_ERRORCODE')
-					$CurrentVarName = 'Error Code';
-				elseif ($CurrentErrorVar == 'L_SHORTMESSAGE')
-					$CurrentVarName = 'Short Message';
-				elseif ($CurrentErrorVar == 'L_LONGMESSAGE')
-					$CurrentVarName = 'Long Message';
-				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
-					$CurrentVarName = 'Severity Code';
+				if ($CurrentErrorVar == 'L_ERRORCODE') {
+									$CurrentVarName = 'Error Code';
+				} elseif ($CurrentErrorVar == 'L_SHORTMESSAGE') {
+									$CurrentVarName = 'Short Message';
+				} elseif ($CurrentErrorVar == 'L_LONGMESSAGE') {
+									$CurrentVarName = 'Long Message';
+				} elseif ($CurrentErrorVar == 'L_SEVERITYCODE') {
+									$CurrentVarName = 'Severity Code';
+				}
 
 				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
 			}

Spacing +51 added lines, -51 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEG_Paypal_Pro extends EE_Onsite_Gateway{
+class EEG_Paypal_Pro extends EE_Onsite_Gateway {
 	/**
 	 *
 	 * @var $_paypal_api_username string
@@ -88,21 +88,21 @@ 
 	 * } @see parent::do_direct_payment for more info
 	 * @return \EE_Payment|\EEI_Payment
 	 */
-	public function do_direct_payment($payment,$billing_info = null){
+	public function do_direct_payment($payment, $billing_info = null) {
 		$transaction = $payment->transaction();
 		$primary_registrant = $transaction->primary_registration();
-		$order_description  = sprintf(__("Event Registrations from %s", "event_espresso"),get_bloginfo('name'));
+		$order_description  = sprintf(__("Event Registrations from %s", "event_espresso"), get_bloginfo('name'));
 		//charge for the full amount. Show itemized list
-		if( $this->_can_easily_itemize_transaction_for( $payment ) ){
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
 			$item_num = 1;
 			$total_line_item = $transaction->total_line_item();
 			$order_items = array();
 			foreach ($total_line_item->get_items() as $line_item) {
 				$item = array(
 						// Item Name.  127 char max.
-						'l_name' => substr($line_item->name(),0,127),
+						'l_name' => substr($line_item->name(), 0, 127),
 						// Item description.  127 char max.
-						'l_desc' => substr($line_item->desc(),0,127),
+						'l_desc' => substr($line_item->desc(), 0, 127),
 						// Cost of individual item.
 						'l_amt' => $line_item->unit_price(),
 						// Item Number.  127 char max.
@@ -123,14 +123,14 @@ 
 			}
 			$item_amount = $total_line_item->get_items_total();
 			$tax_amount = $total_line_item->get_total_tax();
-		}else{
+		} else {
 			$order_items = array();
 			$item_amount = $payment->amount();
-			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
+			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"), $payment->amount(), $primary_registrant->reg_code());
 			$tax_amount = 0;
-			array_push($order_items,array(
+			array_push($order_items, array(
 				// Item Name.  127 char max.
-				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'),$primary_registrant->reg_code()),
+				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'), $primary_registrant->reg_code()),
 				// Item description.  127 char max.
 				'l_desc' => $single_item_desc,
 				// Cost of individual item.
@@ -177,11 +177,11 @@ 
 			// Payer's salutation.  20 char max.
 			'salutation' => '',
 			// Payer's first name.  25 char max.
-			'firstname' => substr($billing_info['first_name'],0,25),
+			'firstname' => substr($billing_info['first_name'], 0, 25),
 			// Payer's middle name.  25 char max.
 			'middlename' => '',
 			// Payer's last name.  25 char max.
-			'lastname' => substr($billing_info['last_name'],0,25),
+			'lastname' => substr($billing_info['last_name'], 0, 25),
 			// Payer's suffix.  12 char max.
 			'suffix' => ''
 		);
@@ -194,13 +194,13 @@ 
 			// Required.  Name of City.
 			'city' => $billing_info['city'],
 			// Required. Name of State or Province.
-			'state' => substr( $billing_info['state'], 0, 40 ),
+			'state' => substr($billing_info['state'], 0, 40),
 			// Required.  Country code.
 			'countrycode' => $billing_info['country'],
 			// Required.  Postal code of payer.
 			'zip' => $billing_info['zip'],
 			// Phone Number of payer.  20 char max.
-			'shiptophonenum' => substr($billing_info['phone'],0,20)
+			'shiptophonenum' => substr($billing_info['phone'], 0, 20)
 		);
 
 
@@ -210,7 +210,7 @@ 
 			// Required.  Three-letter currency code.  Default is USD.
 			'currencycode' => $payment->currency_code(),
 			// Required if you include itemized cart details. (L_AMTn, etc.)  Subtotal of items not including S&H, or tax.
-			'itemamt' => $this->format_currency($item_amount),//
+			'itemamt' => $this->format_currency($item_amount), //
 			// Total shipping costs for the order.  If you specify shippingamt, you must also specify itemamt.
 			'shippingamt' => '',
 			// Total handling costs for the order.  If you specify handlingamt, you must also specify itemamt.
@@ -222,10 +222,10 @@ 
 			// Free-form field for your own use.  256 char max.
 			'custom' => $primary_registrant ? $primary_registrant->ID() : '',
 			// Your own invoice or tracking number
-			'invnum' => wp_generate_password(12,false),//$transaction->ID(),
+			'invnum' => wp_generate_password(12, false), //$transaction->ID(),
 			// URL for receiving Instant Payment Notifications.  This overrides what your profile is set to use.
 			'notifyurl' => '',
-			'buttonsource' => 'EventEspresso_SP',//EE will blow up if you change this
+			'buttonsource' => 'EventEspresso_SP', //EE will blow up if you change this
 		);
 		// Wrap all data arrays into a single, "master" array which will be passed into the class function.
 		$PayPalRequestData = array(
@@ -238,32 +238,32 @@ 
 				'OrderItems' => $order_items,
 		);
 		$this->_log_clean_request($PayPalRequestData, $payment);
-		try{
+		try {
 			$PayPalResult = $this->prep_and_curl_request($PayPalRequestData);
 			//remove PCI-sensitive data so it doesn't get stored
-			$PayPalResult = $this->_log_clean_response($PayPalResult,$payment);
+			$PayPalResult = $this->_log_clean_response($PayPalResult, $payment);
 
 			$message = isset($PayPalResult['L_LONGMESSAGE0']) ? $PayPalResult['L_LONGMESSAGE0'] : $PayPalResult['ACK'];
-			if( empty($PayPalResult[ 'RAWRESPONSE' ] ) ) {
-				$payment->set_status( $this->_pay_model->failed_status() ) ;
-				$payment->set_gateway_response( __( 'No response received from Paypal Pro', 'event_espresso' ) );
+			if (empty($PayPalResult['RAWRESPONSE'])) {
+				$payment->set_status($this->_pay_model->failed_status());
+				$payment->set_gateway_response(__('No response received from Paypal Pro', 'event_espresso'));
 				$payment->set_details($PayPalResult);
-			}else{
-				if($this->_APICallSuccessful($PayPalResult)){
+			} else {
+				if ($this->_APICallSuccessful($PayPalResult)) {
 					$payment->set_status($this->_pay_model->approved_status());
-				}else{
+				} else {
 					$payment->set_status($this->_pay_model->declined_status());
 				}
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
-				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval( $PayPalResult['AMT'] ) : 0);
+				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval($PayPalResult['AMT']) : 0);
 				$payment->set_gateway_response($message);
-				$payment->set_txn_id_chq_nmbr(isset( $PayPalResult['TRANSACTIONID'] )? $PayPalResult['TRANSACTIONID'] : null);
+				$payment->set_txn_id_chq_nmbr(isset($PayPalResult['TRANSACTIONID']) ? $PayPalResult['TRANSACTIONID'] : null);
 
 				$primary_registration_code = $primary_registrant instanceof EE_Registration ? $primary_registrant->reg_code() : '';
 				$payment->set_extra_accntng($primary_registration_code);
 				$payment->set_details($PayPalResult);
 			}
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$payment->set_status($this->_pay_model->failed_status());
 			$payment->set_gateway_response($e->getMessage());
 		}
@@ -280,7 +280,7 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array
 	 */
-	private function _log_clean_request($request,$payment){
+	private function _log_clean_request($request, $payment) {
 		$cleaned_request_data = $request;
 		unset($cleaned_request_data['CCDetails']['acct']);
 		unset($cleaned_request_data['CCDetails']['cvv2']);
@@ -296,13 +296,13 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array cleaned
 	 */
-	private function _log_clean_response($response,$payment){
+	private function _log_clean_response($response, $payment) {
 		unset($response['REQUESTDATA']['CREDITCARDTYPE']);
 		unset($response['REQUESTDATA']['ACCT']);
 		unset($response['REQUESTDATA']['EXPDATE']);
 		unset($response['REQUESTDATA']['CVV2']);
 		unset($response['RAWREQUEST']);
-		$this->log(array('Paypal Response'=>$response),$payment);
+		$this->log(array('Paypal Response'=>$response), $payment);
 		return $response;
 	}
 
@@ -327,32 +327,32 @@ 
 		// DP Fields
 		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
 		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal)
-			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+			$DPFieldsNVP .= '&'.strtoupper($DPFieldsVar).'='.urlencode($DPFieldsVal);
 
 		// CC Details Fields
 		$CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
 		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal)
-			$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
+			$CCDetailsNVP .= '&'.strtoupper($CCDetailsVar).'='.urlencode($CCDetailsVal);
 
 		// PayerInfo Type Fields
 		$PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
 		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal)
-			$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
+			$PayerInfoNVP .= '&'.strtoupper($PayerInfoVar).'='.urlencode($PayerInfoVal);
 
 		// Payer Name Fields
 		$PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
 		foreach ($PayerName as $PayerNameVar => $PayerNameVal)
-			$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
+			$PayerNameNVP .= '&'.strtoupper($PayerNameVar).'='.urlencode($PayerNameVal);
 
 		// Address Fields (Billing)
 		$BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
 		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal)
-			$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
+			$BillingAddressNVP .= '&'.strtoupper($BillingAddressVar).'='.urlencode($BillingAddressVal);
 
 		// Payment Details Type Fields
 		$PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
 		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal)
-			$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+			$PaymentDetailsNVP .= '&'.strtoupper($PaymentDetailsVar).'='.urlencode($PaymentDetailsVal);
 
 		// Payment Details Item Type Fields
 		$OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
@@ -360,22 +360,22 @@ 
 		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
 			$CurrentItem = $OrderItems[$OrderItemsVar];
 			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal)
-				$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+				$OrderItemsNVP .= '&'.strtoupper($CurrentItemVar).$n.'='.urlencode($CurrentItemVal);
 			$n++;
 		}
 
 		// Ship To Address Fields
 		$ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
 		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal)
-			$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
+			$ShippingAddressNVP .= '&'.strtoupper($ShippingAddressVar).'='.urlencode($ShippingAddressVal);
 
 		// 3D Secure Fields
 		$Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
 		foreach ($Secure3D as $Secure3DVar => $Secure3DVal)
-			$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
+			$Secure3DNVP .= '&'.strtoupper($Secure3DVar).'='.urlencode($Secure3DVal);
 
 		// Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
-		$NVPRequest = 'USER=' . $this->_username . '&PWD=' . $this->_password . '&VERSION=64.0' . '&SIGNATURE=' . $this->_signature . $DPFieldsNVP . $CCDetailsNVP . $PayerInfoNVP . $PayerNameNVP . $BillingAddressNVP . $PaymentDetailsNVP . $OrderItemsNVP . $ShippingAddressNVP . $Secure3DNVP;
+		$NVPRequest = 'USER='.$this->_username.'&PWD='.$this->_password.'&VERSION=64.0'.'&SIGNATURE='.$this->_signature.$DPFieldsNVP.$CCDetailsNVP.$PayerInfoNVP.$PayerNameNVP.$BillingAddressNVP.$PaymentDetailsNVP.$OrderItemsNVP.$ShippingAddressNVP.$Secure3DNVP;
 		$NVPResponse = $this->_CURLRequest($NVPRequest);
 		$NVPRequestArray = $this->_NVPToArray($NVPRequest);
 		$NVPResponseArray = $this->_NVPToArray($NVPResponse);
@@ -399,7 +399,7 @@ 
 	private function _CURLRequest($Request) {
 		$EndPointURL = $this->_debug_mode ? 'https://api-3t.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp';
 		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE ) );
+		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE));
 		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
 		curl_setopt($curl, CURLOPT_TIMEOUT, 60);
 		curl_setopt($curl, CURLOPT_URL, $EndPointURL);
@@ -449,9 +449,9 @@ 
 	private function _APICallSuccessful($PayPalResult) {
 		$approved = false;
 		// check main response message from PayPal
-		if (isset($PayPalResult['ACK']) && !empty($PayPalResult['ACK'])) {
+		if (isset($PayPalResult['ACK']) && ! empty($PayPalResult['ACK'])) {
 			$ack = strtoupper($PayPalResult['ACK']);
-			$approved = ( $ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS' ) ? true : false;
+			$approved = ($ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS') ? true : false;
 		}
 
 		return $approved;
@@ -467,11 +467,11 @@ 
 
 		$Errors = array();
 		$n = 0;
-		while (isset($DataArray['L_ERRORCODE' . $n . ''])) {
-			$LErrorCode = isset($DataArray['L_ERRORCODE' . $n . '']) ? $DataArray['L_ERRORCODE' . $n . ''] : '';
-			$LShortMessage = isset($DataArray['L_SHORTMESSAGE' . $n . '']) ? $DataArray['L_SHORTMESSAGE' . $n . ''] : '';
-			$LLongMessage = isset($DataArray['L_LONGMESSAGE' . $n . '']) ? $DataArray['L_LONGMESSAGE' . $n . ''] : '';
-			$LSeverityCode = isset($DataArray['L_SEVERITYCODE' . $n . '']) ? $DataArray['L_SEVERITYCODE' . $n . ''] : '';
+		while (isset($DataArray['L_ERRORCODE'.$n.''])) {
+			$LErrorCode = isset($DataArray['L_ERRORCODE'.$n.'']) ? $DataArray['L_ERRORCODE'.$n.''] : '';
+			$LShortMessage = isset($DataArray['L_SHORTMESSAGE'.$n.'']) ? $DataArray['L_SHORTMESSAGE'.$n.''] : '';
+			$LLongMessage = isset($DataArray['L_LONGMESSAGE'.$n.'']) ? $DataArray['L_LONGMESSAGE'.$n.''] : '';
+			$LSeverityCode = isset($DataArray['L_SEVERITYCODE'.$n.'']) ? $DataArray['L_SEVERITYCODE'.$n.''] : '';
 
 			$CurrentItem = array(
 					'L_ERRORCODE' => $LErrorCode,
@@ -511,7 +511,7 @@ 
 				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
 					$CurrentVarName = 'Severity Code';
 
-				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
+				$error .= '<br />'.$CurrentVarName.': '.$CurrentErrorVal;
 			}
 		}
 		return $error;

caffeinated/payment_methods/Paypal_Pro/templates/paypal_pro_debug_info.template.php

Indentation +23 added lines, -23 removed lines

@@ -3,30 +3,30 @@
 if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.3
- *
- * ------------------------------------------------------------------------
- *
- * paypal_pro_billing_form
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author			Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.3
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * paypal_pro_billing_form
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 /**
- * @var $form_section EE_Billing_Attendee_Info_Form
- */
+	 * @var $form_section EE_Billing_Attendee_Info_Form
+	 */
 ?><div class="sandbox-panel">
 					<h2 class="section-title"><?php _e('PayPal Sandbox Mode', 'event_espresso'); ?></h2>
 					<h3 style="color:#ff0000;"><?php _e('Debug Mode Is Turned On. Payments will not be processed', 'event_espresso'); ?></h3>

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * Event Espresso
@@ -37,7 +37,7 @@ 
 					<ul style="margin:1em 2em 1.5em; line-height:1.2em;">
 						<li><?php _e('While testing, use the credit card number listed below. Other numbers will produce an error.', 'event_espresso'); ?></li>
 						<li><?php _e('Expiry Date can be any valid date in the future', 'event_espresso'); ?></li>
-						<li><?php printf(__('CVV2 should be 115 (see %s paypals documentation for other special codes %s)', 'event_espresso'),'<a href="https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions#id108HH0RJ0TS" target="_blank">','</a>'); ?></li>
+						<li><?php printf(__('CVV2 should be 115 (see %s paypals documentation for other special codes %s)', 'event_espresso'), '<a href="https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions#id108HH0RJ0TS" target="_blank">', '</a>'); ?></li>
 					</ul>
 
 					<p class="test-credit-cards-info-pg">
@@ -64,7 +64,7 @@ 
 
 					<p class="test-credit-cards-info-pg">
 						<strong><?php _e('Testing Result Code Responses', 'event_espresso'); ?></strong><br/>
-						<span class="small-text"><?php printf(__('You can use the amount of the transaction to generate a particular result code (see %s Paypal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox paypal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this paypal doc %s', 'event_espresso'),"<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>","</a>", "<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>","</a>","<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>","</a>"); ?></span>
+						<span class="small-text"><?php printf(__('You can use the amount of the transaction to generate a particular result code (see %s Paypal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox paypal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this paypal doc %s', 'event_espresso'), "<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>", "</a>", "<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>", "</a>", "<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>", "</a>"); ?></span>
 					</p>
 
 					<div class="tbl-wrap">

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

core/CPTs/EE_CPT_Attendee_Strategy.core.php

Spacing +4 added lines, -4 removed lines

@@ -39,9 +39,9 @@ 
 	 * @param 	array 	$arguments
 	 * @return \EE_CPT_Attendee_Strategy
 	 */
-	public function __construct( $arguments = array() ) {
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
+	public function __construct($arguments = array()) {
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
 //		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
 	}
 
@@ -55,7 +55,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    void
 	 */
-	public function the_posts( $posts, WP_Query $wp_query) {
+	public function the_posts($posts, WP_Query $wp_query) {
 		//$EVT = EE_Registry::instance()->load_model( 'Event' );
 //		EEH_Debug_Tools::printr( $EVT, '$EVT  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		$EVT_IDs = array();

Braces +3 added lines, -1 removed lines

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

core/CPTs/EE_CPT_Strategy.core.php

Indentation +4 added lines, -4 removed lines

@@ -24,10 +24,10 @@
 class EE_CPT_Strategy extends EE_BASE {
 
    /**
-     * 	EE_CPT_Strategy Object
-     * 	@private _instance
-	 * 	@private 	protected
-     */
+    * 	EE_CPT_Strategy Object
+    * 	@private _instance
+    * 	@private 	protected
+    */
 	private static $_instance = NULL;
 
 

Spacing +105 added lines, -105 removed lines

@@ -78,7 +78,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_CPT_Strategy ) {
+		if ( ! self::$_instance instanceof EE_CPT_Strategy) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -101,7 +101,7 @@ 
 //		d( $this->_CPT_endpoints );
 //		d( $this->_CPT_taxonomies );
 
-		add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 5 );
+		add_action('pre_get_posts', array($this, 'pre_get_posts'), 5);
 	}
 
 
@@ -114,9 +114,9 @@ 
 	 */
 	private function _set_CPT_endpoints() {
 		$_CPT_endpoints = array();
-		if ( is_array( $this->_CPTs )) {
-			foreach ( $this->_CPTs as $CPT_type => $CPT ) {
-				$_CPT_endpoints [ $CPT['plural_slug'] ] = $CPT_type;
+		if (is_array($this->_CPTs)) {
+			foreach ($this->_CPTs as $CPT_type => $CPT) {
+				$_CPT_endpoints [$CPT['plural_slug']] = $CPT_type;
 			}
 		}
 		return $_CPT_endpoints;
@@ -131,7 +131,7 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return void
 	 */
-	private function _set_EE_tags_on_WP_Query( WP_Query $WP_Query) {
+	private function _set_EE_tags_on_WP_Query(WP_Query $WP_Query) {
 		$WP_Query->is_espresso_event_single = FALSE;
 		$WP_Query->is_espresso_event_archive = FALSE;
 		$WP_Query->is_espresso_event_taxonomy = FALSE;
@@ -158,16 +158,16 @@ 
 	 */
 	private function _set_CPT_taxonomies() {
 		// check if taxonomies have already been set
-		if ( empty( $this->_CPT_taxonomies )) {
+		if (empty($this->_CPT_taxonomies)) {
 			// and that this CPT has taxonomies registered for it
-			if ( isset( $this->CPT['args'] ) && isset( $this->CPT['args']['taxonomies'] )) {
+			if (isset($this->CPT['args']) && isset($this->CPT['args']['taxonomies'])) {
 				// if so then grab them, but we want the taxonomy name as the key
-				$taxonomies = array_flip( $this->CPT['args']['taxonomies'] );
+				$taxonomies = array_flip($this->CPT['args']['taxonomies']);
 				// then grab the list of ALL taxonomies
 				$all_taxonomies = EE_Register_CPTs::get_taxonomies();
-				foreach ( $taxonomies as $taxonomy => $details ) {
+				foreach ($taxonomies as $taxonomy => $details) {
 					// add details to our taxonomies if they exist
-					$taxonomies[ $taxonomy ] = isset( $all_taxonomies[ $taxonomy ] ) ? $all_taxonomies[ $taxonomy ] : NULL;
+					$taxonomies[$taxonomy] = isset($all_taxonomies[$taxonomy]) ? $all_taxonomies[$taxonomy] : NULL;
 				}
 				$this->_CPT_taxonomies = $taxonomies;
 			}
@@ -192,11 +192,11 @@ 
 	 * @return void
 	 */
 	private function _set_CPT_terms() {
-		if ( empty( $this->_CPT_terms )) {
+		if (empty($this->_CPT_terms)) {
 			$terms = EEM_Term::instance()->get_all_CPT_post_tags();
-			foreach ( $terms as $term ) {
-				if ( $term instanceof EE_Term ) {
-					$this->_CPT_terms[ $term->slug() ] = $term;
+			foreach ($terms as $term) {
+				if ($term instanceof EE_Term) {
+					$this->_CPT_terms[$term->slug()] = $term;
 				}
 			}
 		}
@@ -211,24 +211,24 @@ 
 	 * @param $WP_Query
 	 * @return void
 	 */
-	private function _set_post_type_for_terms( WP_Query $WP_Query ) {
+	private function _set_post_type_for_terms(WP_Query $WP_Query) {
 		// is a tag set ?
-		if ( isset( $WP_Query->query['tag'] )) {
+		if (isset($WP_Query->query['tag'])) {
 			// set post_tags
 			$this->_set_CPT_terms();
 			// is this tag archive term in the list of terms used by our CPTs ?
-			$term = isset ( $this->_CPT_terms[ $WP_Query->query['tag'] ] ) ? $this->_CPT_terms[ $WP_Query->query['tag'] ] : NULL;
+			$term = isset ($this->_CPT_terms[$WP_Query->query['tag']]) ? $this->_CPT_terms[$WP_Query->query['tag']] : NULL;
 			// verify the term
-			if ( $term instanceof EE_Term ) {
-				$term->post_type  = array_merge( array( 'post', 'page' ), (array)$term->post_type );
-				$term->post_type = apply_filters( 'FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type', $term->post_type, $term );
+			if ($term instanceof EE_Term) {
+				$term->post_type = array_merge(array('post', 'page'), (array) $term->post_type);
+				$term->post_type = apply_filters('FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type', $term->post_type, $term);
 				// if a post type is already set
-				if ( isset( $WP_Query->query_vars['post_type'] )) {
+				if (isset($WP_Query->query_vars['post_type'])) {
 						// add to existing array
-						$term->post_type = array_merge ( (array)$WP_Query->query_vars['post_type'], $term->post_type );
+						$term->post_type = array_merge((array) $WP_Query->query_vars['post_type'], $term->post_type);
 				}
 				// just set post_type to our CPT
-				$WP_Query->set( 'post_type', $term->post_type );
+				$WP_Query->set('post_type', $term->post_type);
 			}
 		}
 	}
@@ -243,17 +243,17 @@ 
 	 * in order for is_archive() and is_single() methods to work properly.
 	 * @return void
 	 */
-	public function _possibly_set_ee_request_var(){
+	public function _possibly_set_ee_request_var() {
 		// check if ee action var has been set
-		if ( ! EE_Registry::instance()->REQ->is_set( 'ee' )) {
+		if ( ! EE_Registry::instance()->REQ->is_set('ee')) {
 			// check that route exists for CPT archive slug
-			if ( is_archive() && EE_Config::get_route( $this->CPT['plural_slug'] )) {
+			if (is_archive() && EE_Config::get_route($this->CPT['plural_slug'])) {
 				// ie: set "ee" to "events"
-				EE_Registry::instance()->REQ->set( 'ee', $this->CPT['plural_slug'] );
+				EE_Registry::instance()->REQ->set('ee', $this->CPT['plural_slug']);
 			// or does it match a single page CPT like /event/
-			} else if ( is_single() && EE_Config::get_route( $this->CPT['singular_slug'] )) {
+			} else if (is_single() && EE_Config::get_route($this->CPT['singular_slug'])) {
 				// ie: set "ee" to "event"
-				EE_Registry::instance()->REQ->set( 'ee', $this->CPT['singular_slug'] );
+				EE_Registry::instance()->REQ->set('ee', $this->CPT['singular_slug']);
 			}
 		}
 	}
@@ -267,11 +267,11 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return void
 	 */
-	public function _set_paging( $WP_Query ) {
-		if ( $WP_Query->is_main_query() && apply_filters( 'FHEE__EE_CPT_Strategy___set_paging', TRUE )) {
-			$page = ( get_query_var('page') ) ? get_query_var('page') : NULL;
-			$paged = ( get_query_var('paged') ) ? get_query_var('paged') : $page;
-			$WP_Query->set( 'paged', $paged );
+	public function _set_paging($WP_Query) {
+		if ($WP_Query->is_main_query() && apply_filters('FHEE__EE_CPT_Strategy___set_paging', TRUE)) {
+			$page = (get_query_var('page')) ? get_query_var('page') : NULL;
+			$paged = (get_query_var('paged')) ? get_query_var('paged') : $page;
+			$WP_Query->set('paged', $paged);
 		}
 	}
 
@@ -288,35 +288,35 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return void
 	 */
-	public function pre_get_posts( $WP_Query ) {
+	public function pre_get_posts($WP_Query) {
 		// check that post-type is set
-		if ( ! $WP_Query instanceof WP_Query ) {
+		if ( ! $WP_Query instanceof WP_Query) {
 			return;
 		}
 
 		// add our conditionals
-		$this->_set_EE_tags_on_WP_Query( $WP_Query );
+		$this->_set_EE_tags_on_WP_Query($WP_Query);
 		// check for terms
-		$this->_set_post_type_for_terms( $WP_Query );
+		$this->_set_post_type_for_terms($WP_Query);
 		// make sure paging is always set
-		$this->_set_paging( $WP_Query );
+		$this->_set_paging($WP_Query);
 
 		// is a taxonomy set ?
-		if ( $WP_Query->is_tax ) {
+		if ($WP_Query->is_tax) {
 			// loop thru our taxonomies
-			foreach ( $this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details ) {
+			foreach ($this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details) {
 				// check if one of our taxonomies is set as a query var
-				if ( isset( $WP_Query->query[ $CPT_taxonomy ] )) {
+				if (isset($WP_Query->query[$CPT_taxonomy])) {
 					// but which CPT does that correspond to??? hmmm... guess we gotta go looping
-					foreach ( $this->_CPTs as $post_type => $CPT ) {
+					foreach ($this->_CPTs as $post_type => $CPT) {
 						// verify our CPT has args, is public and has taxonomies set
-						if ( isset( $CPT['args'] ) && $CPT['args']['public'] && ! empty( $CPT['args']['taxonomies'] )) {
+						if (isset($CPT['args']) && $CPT['args']['public'] && ! empty($CPT['args']['taxonomies'])) {
 							// does the captured taxonomy belong to this CPT ?
-							if ( in_array( $CPT_taxonomy, $CPT['args']['taxonomies'] )) {
+							if (in_array($CPT_taxonomy, $CPT['args']['taxonomies'])) {
 								// if so, then add this CPT post_type to the current query's array of post_types'
-								$WP_Query->query_vars['post_type'] = isset( $WP_Query->query_vars['post_type'] ) ? (array)$WP_Query->query_vars['post_type'] : array();
+								$WP_Query->query_vars['post_type'] = isset($WP_Query->query_vars['post_type']) ? (array) $WP_Query->query_vars['post_type'] : array();
 								$WP_Query->query_vars['post_type'][] = $post_type;
-								switch( $post_type ) {
+								switch ($post_type) {
 									case 'espresso_events' :
 										$WP_Query->is_espresso_event_taxonomy = TRUE;
 										break;
@@ -337,27 +337,27 @@ 
 //		d( $CPT_taxonomy );
 //		d( $WP_Query );
 
-		if ( isset( $WP_Query->query_vars['post_type'] )) {
+		if (isset($WP_Query->query_vars['post_type'])) {
 			// loop thru post_types as array
-			foreach ( (array)$WP_Query->query_vars['post_type'] as $post_type ) {
+			foreach ((array) $WP_Query->query_vars['post_type'] as $post_type) {
 
 				// is current query for an EE CPT ?
-				if ( isset( $this->_CPTs[ $post_type ] )) {
+				if (isset($this->_CPTs[$post_type])) {
 					// is EE on or off ?
-					if ( EE_Maintenance_Mode::instance()->level() ) {
+					if (EE_Maintenance_Mode::instance()->level()) {
 						// reroute CPT template view to maintenance_mode.template.php
-						if( ! has_filter( 'template_include',array( 'EE_Maintenance_Mode', 'template_include' ))){
-							add_filter( 'template_include', array( 'EE_Maintenance_Mode', 'template_include' ), 99999 );
+						if ( ! has_filter('template_include', array('EE_Maintenance_Mode', 'template_include'))) {
+							add_filter('template_include', array('EE_Maintenance_Mode', 'template_include'), 99999);
 						}
-						if( has_filter( 'the_content',array( EE_Maintenance_Mode::instance(), 'the_content' ) ) ) {
-							add_filter( 'the_content', array( $this, 'inject_EE_shortcode_placeholder' ), 1 );
+						if (has_filter('the_content', array(EE_Maintenance_Mode::instance(), 'the_content'))) {
+							add_filter('the_content', array($this, 'inject_EE_shortcode_placeholder'), 1);
 						}
 						return;
 					}
 					// load EE_Request_Handler (this was added as a result of https://events.codebasehq.com/projects/event-espresso/tickets/9037
-					EE_Registry::instance()->load_core( 'Request_Handler' );
+					EE_Registry::instance()->load_core('Request_Handler');
 					// grab details for the CPT the current query is for
-					$this->CPT = $this->_CPTs[ $post_type ];
+					$this->CPT = $this->_CPTs[$post_type];
 					// set post type
 					$this->CPT['post_type'] = $post_type;
 					// set taxonomies
@@ -365,27 +365,27 @@ 
 					// the post or category or term that is triggering EE
 					$this->CPT['espresso_page'] = EE_Registry::instance()->REQ->is_espresso_page();
 					// requested post name
-					$this->CPT['post_name'] = EE_Registry::instance()->REQ->get( 'post_name' );
+					$this->CPT['post_name'] = EE_Registry::instance()->REQ->get('post_name');
 					//d( $this->CPT );
 					// add support for viewing 'private', 'draft', or 'pending' posts
-					if ( is_user_logged_in() && isset( $WP_Query->query_vars['p'] ) && $WP_Query->query_vars['p'] != 0 && current_user_can( 'edit_post', $WP_Query->query_vars['p'] )) {
+					if (is_user_logged_in() && isset($WP_Query->query_vars['p']) && $WP_Query->query_vars['p'] != 0 && current_user_can('edit_post', $WP_Query->query_vars['p'])) {
 						// we can just inject directly into the WP_Query object
-						$WP_Query->query['post_status'] = array( 'publish', 'private', 'draft', 'pending' );
+						$WP_Query->query['post_status'] = array('publish', 'private', 'draft', 'pending');
 						// now set the main 'ee' request var so that the appropriate module can load the appropriate template(s)
-						EE_Registry::instance()->REQ->set( 'ee', $this->CPT['singular_slug'] );
+						EE_Registry::instance()->REQ->set('ee', $this->CPT['singular_slug']);
 					}
 					$this->_possibly_set_ee_request_var();
 					// convert post_type to model name
-					$model_name = str_replace( 'EE_', '', $this->CPT['class_name'] );
+					$model_name = str_replace('EE_', '', $this->CPT['class_name']);
 					// get CPT table data via CPT Model
-					$this->CPT_model = EE_Registry::instance()->load_model( $model_name );
+					$this->CPT_model = EE_Registry::instance()->load_model($model_name);
 					$this->CPT['tables'] = $this->CPT_model->get_tables();
 					// is there a Meta Table for this CPT?
-					$this->CPT['meta_table'] = isset( $this->CPT['tables'][ $model_name . '_Meta' ] ) ? $this->CPT['tables'][ $model_name . '_Meta' ] : FALSE;
+					$this->CPT['meta_table'] = isset($this->CPT['tables'][$model_name.'_Meta']) ? $this->CPT['tables'][$model_name.'_Meta'] : FALSE;
 					// creates classname like:  CPT_Event_Strategy
-					$CPT_Strategy_class_name = 'CPT_' . $model_name . '_Strategy';
+					$CPT_Strategy_class_name = 'CPT_'.$model_name.'_Strategy';
 					// load and instantiate
-					 $CPT_Strategy = EE_Registry::instance()->load_core ( $CPT_Strategy_class_name, array( 'WP_Query' => $WP_Query, 'CPT' => $this->CPT ));
+					 $CPT_Strategy = EE_Registry::instance()->load_core($CPT_Strategy_class_name, array('WP_Query' => $WP_Query, 'CPT' => $this->CPT));
 
 					// !!!!!!!!!!  IMPORTANT !!!!!!!!!!!!
 					// here's the list of available filters in the WP_Query object
@@ -397,13 +397,13 @@ 
 					// 'post_limits'
 					// 'posts_fields'
 					// 'posts_join'
-					add_filter( 'posts_fields', array( $this, 'posts_fields' ));
-					add_filter( 'posts_join',	array( $this, 'posts_join' ));
-					add_filter( 'get_' . $this->CPT['post_type'] . '_metadata', array( $CPT_Strategy, 'get_EE_post_type_metadata' ), 1, 4 );
-					add_filter( 'the_posts',	array( $this, 'the_posts' ), 1, 1 );
-					add_filter( 'get_edit_post_link', array( $this, 'get_edit_post_link' ), 10, 2 );
+					add_filter('posts_fields', array($this, 'posts_fields'));
+					add_filter('posts_join', array($this, 'posts_join'));
+					add_filter('get_'.$this->CPT['post_type'].'_metadata', array($CPT_Strategy, 'get_EE_post_type_metadata'), 1, 4);
+					add_filter('the_posts', array($this, 'the_posts'), 1, 1);
+					add_filter('get_edit_post_link', array($this, 'get_edit_post_link'), 10, 2);
 
-					$this->_do_template_filters( $WP_Query );
+					$this->_do_template_filters($WP_Query);
 				}
 			}
 		}
@@ -418,13 +418,13 @@ 
 	 * @param $SQL
 	 * @return    string
 	 */
-	public function posts_fields( $SQL ) {
+	public function posts_fields($SQL) {
 		// does this CPT have a meta table ?
-		if ( ! empty( $this->CPT['meta_table'] )) {
+		if ( ! empty($this->CPT['meta_table'])) {
 			// adds something like ", wp_esp_event_meta.* " to WP Query SELECT statement
-			$SQL .= ', ' . $this->CPT['meta_table']->get_table_name() . '.* ' ;
+			$SQL .= ', '.$this->CPT['meta_table']->get_table_name().'.* ';
 		}
-		remove_filter( 'posts_fields', array( $this, 'posts_fields' ));
+		remove_filter('posts_fields', array($this, 'posts_fields'));
 		return $SQL;
 	}
 
@@ -452,14 +452,14 @@ 
 	 * @param $SQL
 	 * @return    string
 	 */
-	public function posts_join( $SQL ) {
+	public function posts_join($SQL) {
 		// does this CPT have a meta table ?
-		if ( ! empty( $this->CPT['meta_table'] )) {
+		if ( ! empty($this->CPT['meta_table'])) {
 			global $wpdb;
 			// adds something like " LEFT JOIN wp_esp_event_meta ON ( wp_esp_event_meta.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
-			$SQL .= ' LEFT JOIN ' . $this->CPT['meta_table']->get_table_name() . ' ON ( ' . $this->CPT['meta_table']->get_table_name() . '.' . $this->CPT['meta_table']->get_fk_on_table() . ' = ' . $wpdb->posts . '.ID ) ';
+			$SQL .= ' LEFT JOIN '.$this->CPT['meta_table']->get_table_name().' ON ( '.$this->CPT['meta_table']->get_table_name().'.'.$this->CPT['meta_table']->get_fk_on_table().' = '.$wpdb->posts.'.ID ) ';
 		}
-		remove_filter( 'posts_join',	array( $this, 'posts_join' ));
+		remove_filter('posts_join', array($this, 'posts_join'));
 		return $SQL;
 	}
 
@@ -472,18 +472,18 @@ 
 	 * @param 	\WP_Post[] 	$posts
 	 * @return 	\WP_Post[]
 	 */
-	public function the_posts( $posts ) {
+	public function the_posts($posts) {
 //		d( $posts );
 		$CPT_class = $this->CPT['class_name'];
 		// loop thru posts
-		if ( is_array( $posts )) {
-			foreach( $posts as $key => $post ) {
-				if ( isset( $this->_CPTs[ $post->post_type ] )) {
-					$post->{$CPT_class} = $this->CPT_model->instantiate_class_from_post_object( $post );
+		if (is_array($posts)) {
+			foreach ($posts as $key => $post) {
+				if (isset($this->_CPTs[$post->post_type])) {
+					$post->{$CPT_class} = $this->CPT_model->instantiate_class_from_post_object($post);
 				}
 			}
 		}
-		remove_filter( 'the_posts',	array( $this, 'the_posts' ), 1 );
+		remove_filter('the_posts', array($this, 'the_posts'), 1);
 		return $posts;
 	}
 
@@ -494,17 +494,17 @@ 
 	 * @param $ID
 	 * @return string
 	 */
-	function get_edit_post_link( $url, $ID ) {
+	function get_edit_post_link($url, $ID) {
 		//need to make sure we only edit links if our cpt
 		global $post;
-		if ( ! isset( $this->_CPTs[ $post->post_type ] )) {
+		if ( ! isset($this->_CPTs[$post->post_type])) {
 			return $url;
 		}
 		//k made it here so all is good.
 		$scheme = is_ssl() ? 'https' : 'http';
-		$url = get_admin_url( EE_Config::instance()->core->current_blog_id, 'admin.php', $scheme );
+		$url = get_admin_url(EE_Config::instance()->core->current_blog_id, 'admin.php', $scheme);
 		// http://example.com/wp-admin/admin.php?page=espresso_events&action=edit&post=205&edit_nonce=0d403530d6
-		return wp_nonce_url( add_query_arg( array( 'page' => $post->post_type, 'post' =>$ID, 'action' =>'edit' ), $url ), 'edit', 'edit_nonce' );
+		return wp_nonce_url(add_query_arg(array('page' => $post->post_type, 'post' =>$ID, 'action' =>'edit'), $url), 'edit', 'edit_nonce');
 	}
 
 
@@ -518,11 +518,11 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return void
 	 */
-	protected function _do_template_filters( WP_Query $WP_Query ) {
+	protected function _do_template_filters(WP_Query $WP_Query) {
 		// if it's the main query  and requested cpt supports page_templates,
-		if ( $WP_Query->is_main_query() && ! empty( $this->CPT['args']['page_templates'] ) ) {
+		if ($WP_Query->is_main_query() && ! empty($this->CPT['args']['page_templates'])) {
 			// then let's hook into the appropriate query_template hook
-			add_filter( 'single_template', array( $this, 'single_cpt_template' ) );
+			add_filter('single_template', array($this, 'single_cpt_template'));
 		}
 	}
 
@@ -536,17 +536,17 @@ 
 	 * @param string $current_template Existing default template path derived for this page call.
 	 * @return string the path to the full template file.
 	 */
-	public function single_cpt_template( $current_template ) {
+	public function single_cpt_template($current_template) {
 		$object = get_queried_object();
 		//does this called object HAVE a page template set that is something other than the default.
-		$template = get_post_meta( $object->ID, '_wp_page_template', true );
+		$template = get_post_meta($object->ID, '_wp_page_template', true);
 
 		//exit early if default or not set or invalid path (accounts for theme changes)
-		if ( $template == 'default' || empty( $template ) || ! is_readable( get_stylesheet_directory() . '/' . $template ) ) {
+		if ($template == 'default' || empty($template) || ! is_readable(get_stylesheet_directory().'/'.$template)) {
 			return $current_template;
 		}
 		//made it here so we SHOULD be able to just locate the template and then return it.
-		$template = locate_template( array($template)  );
+		$template = locate_template(array($template));
 
 		return $template;
 	}
@@ -594,9 +594,9 @@ 
 	 * @param 	array 	$arguments
 	 * @return 	\EE_CPT_Default_Strategy
 	 */
-	public function __construct( $arguments = array() ) {
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
+	public function __construct($arguments = array()) {
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
 		//EEH_Debug_Tools::printr( $this->CPT, '$this->CPT  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		add_filter( 'pre_get_posts', array( $this, 'pre_get_posts' ), 999 );
 //		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
@@ -611,9 +611,9 @@ 
 	 * @param 	\WP_Query $WP_Query
 	 * @return 	\WP_Query
 	 */
-	public function pre_get_posts(  WP_Query $WP_Query  ) {
+	public function pre_get_posts(WP_Query $WP_Query) {
 		//EEH_Debug_Tools::printr( $WP_Query, '$WP_Query  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive() ) {
+		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
 			return $WP_Query;
 		}
 //		$WP_Query->set( 'post_type', array( $this->CPT['post_type'] ));
@@ -631,7 +631,7 @@ 
 	 * @param 	\WP_Query $WP_Query
 	 * @return 	\WP_Post[]
 	 */
-	public function the_posts(  $posts, WP_Query $WP_Query ) {
+	public function the_posts($posts, WP_Query $WP_Query) {
 		return $posts;
 	}
 
@@ -647,7 +647,7 @@ 
 	 * @param 	string 	$single
 	 * @return 	mixed
 	 */
-	public function get_EE_post_type_metadata( $meta_value = NULL, $post_id, $meta_key, $single ) {
+	public function get_EE_post_type_metadata($meta_value = NULL, $post_id, $meta_key, $single) {
 		return $meta_value;
 	}
 

Braces +3 added lines, -1 removed lines

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

core/CPTs/EE_Register_CPTs.core.php

Spacing +94 added lines, -94 removed lines

@@ -23,37 +23,37 @@ 
 	 * 	constructor
 	 * instantiated at init priority 5
 	 */
-	function __construct(){
+	function __construct() {
 		// register taxonomies
 		$taxonomies = self::get_taxonomies();
-		foreach ( $taxonomies as $taxonomy =>  $tax ) {
-			$this->register_taxonomy( $taxonomy, $tax['singular_name'], $tax['plural_name'], $tax['args'] );
+		foreach ($taxonomies as $taxonomy =>  $tax) {
+			$this->register_taxonomy($taxonomy, $tax['singular_name'], $tax['plural_name'], $tax['args']);
 		}
 		// register CPTs
-		$CPTs =self::get_CPTs();
-		foreach ( $CPTs as $CPT_name =>  $CPT ) {
-			$this->register_CPT( $CPT_name, $CPT['singular_name'], $CPT['plural_name'], $CPT['args'], $CPT['singular_slug'], $CPT['plural_slug'] );
+		$CPTs = self::get_CPTs();
+		foreach ($CPTs as $CPT_name =>  $CPT) {
+			$this->register_CPT($CPT_name, $CPT['singular_name'], $CPT['plural_name'], $CPT['args'], $CPT['singular_slug'], $CPT['plural_slug']);
 		}
 		// setup default terms in any of our taxonomies (but only if we're in admin).
 		// Why not added via register_activation_hook?
 		// Because it's possible that in future iterations of EE we may add new defaults for specialized taxonomies (think event_types) and register_activation_hook only reliably runs when a user manually activates the plugin.
 		// Keep in mind that this will READ these terms if they are deleted by the user.  Hence MUST use terms.
-		if ( is_admin() ) {
+		if (is_admin()) {
 			$this->set_must_use_event_types();
 		}
 		//set default terms
-		$this->set_default_term( 'espresso_event_type', 'single-event', array('espresso_events') );
+		$this->set_default_term('espresso_event_type', 'single-event', array('espresso_events'));
 
 
-		add_action( 'AHEE__EE_System__initialize_last', array( __CLASS__,  'maybe_flush_rewrite_rules' ), 10 );
+		add_action('AHEE__EE_System__initialize_last', array(__CLASS__, 'maybe_flush_rewrite_rules'), 10);
 
 		//hook into save_post so that we can make sure that the default terms get saved on publish of registered cpts IF they don't have a term for that taxonomy set.
-		add_action('save_post', array( $this, 'save_default_term' ), 100, 2 );
+		add_action('save_post', array($this, 'save_default_term'), 100, 2);
 
 		//remove no html restrictions from core wp saving of term descriptions.  Note. this will affect only registered EE taxonomies.
 		$this->_allow_html_descriptions_for_ee_taxonomies();
 
-		do_action( 'AHEE__EE_Register_CPTs__construct_end', $this );
+		do_action('AHEE__EE_Register_CPTs__construct_end', $this);
 	}
 
 
@@ -66,9 +66,9 @@ 
 	 * @return void
 	 */
 	public static function  maybe_flush_rewrite_rules() {
-		if ( get_option( 'ee_flush_rewrite_rules', TRUE )) {
+		if (get_option('ee_flush_rewrite_rules', TRUE)) {
 			flush_rewrite_rules();
-			update_option( 'ee_flush_rewrite_rules', FALSE );
+			update_option('ee_flush_rewrite_rules', FALSE);
 		}
 	}
 
@@ -83,7 +83,7 @@ 
 	protected function _allow_html_descriptions_for_ee_taxonomies() {
 		//first remove default filter for term description but we have to do this earlier before wp sets their own filter
 		//because they just set a global filter on all term descriptions before the custom term description filter. Really sux.
-		add_filter( 'pre_term_description', array( $this, 'ee_filter_ee_term_description_not_wp' ), 1, 2 );
+		add_filter('pre_term_description', array($this, 'ee_filter_ee_term_description_not_wp'), 1, 2);
 	}
 
 
@@ -93,16 +93,16 @@ 
 	 * @param string $taxonomy      The taxonomy name for the taxonomy being filtered.
 	 * @return string
 	 */
-	public function ee_filter_ee_term_description_not_wp( $description, $taxonomy ) {
+	public function ee_filter_ee_term_description_not_wp($description, $taxonomy) {
 		//get a list of EE taxonomies
-		$ee_taxonomies = array_keys( self::get_taxonomies() );
+		$ee_taxonomies = array_keys(self::get_taxonomies());
 
 		//only do our own thing if the taxonomy listed is an ee taxonomy.
-		if ( in_array( $taxonomy, $ee_taxonomies ) ) {
+		if (in_array($taxonomy, $ee_taxonomies)) {
 			//remove default wp filter
-			remove_filter( 'pre_term_description', 'wp_filter_kses' );
+			remove_filter('pre_term_description', 'wp_filter_kses');
 			//sanitize THIS content.
-			$description = wp_kses( $description, wp_kses_allowed_html( 'post' ) );
+			$description = wp_kses($description, wp_kses_allowed_html('post'));
 		}
 		return $description;
 	}
@@ -116,9 +116,9 @@ 
 	 *  @access 	public
 	 *  @return 	array
 	 */
-	public static function get_taxonomies(){
+	public static function get_taxonomies() {
 		// define taxonomies
-		return apply_filters( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array(
+		return apply_filters('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array(
 			'espresso_event_categories' => array(
 				'singular_name' => __("Event Category", "event_espresso"),
 				'plural_name' => __("Event Categories", "event_espresso"),
@@ -131,7 +131,7 @@ 
 						'delete_terms' => 'ee_delete_event_category',
 						'assign_terms' => 'ee_assign_event_category'
 						),
-					'rewrite' => array( 'slug' => __( 'event-category', 'event_espresso' ))
+					'rewrite' => array('slug' => __('event-category', 'event_espresso'))
 				)),
 			'espresso_venue_categories' => array(
 				'singular_name' => __("Venue Category", "event_espresso"),
@@ -145,7 +145,7 @@ 
 						'delete_terms' => 'ee_delete_venue_category',
 						'assign_terms' => 'ee_assign_venue_category'
 						),
-					'rewrite' => array( 'slug' => __( 'venue-category', 'event_espresso' ))
+					'rewrite' => array('slug' => __('venue-category', 'event_espresso'))
 				)),
 			'espresso_event_type' => array(
 				'singular_name' => __("Event Type", "event_espresso"),
@@ -159,10 +159,10 @@ 
 						'delete_terms' => 'ee_delete_event_type',
 						'assign_terms' => 'ee_assign_event_type'
 						),
-					'rewrite' => array( 'slug' => __( 'event-type', 'event_espresso' )),
+					'rewrite' => array('slug' => __('event-type', 'event_espresso')),
 					'hierarchical'=>true
 				))
-			) );
+			));
 	}
 
 
@@ -180,26 +180,26 @@ 
 	 * @return array 	       Empty array if no matching model names for the given slug or an array of model
 	 *                                         names indexed by post type slug.
 	 */
-	public static function get_cpt_model_names( $post_type_slug = '' ) {
+	public static function get_cpt_model_names($post_type_slug = '') {
 		$cpts = self::get_CPTs();
 
 		//first if slug passed in...
-		if ( ! empty( $post_type_slug )  ) {
+		if ( ! empty($post_type_slug)) {
 			//match?
-			if ( ! isset( $cpts[$post_type_slug] ) || ( isset( $cpts[$post_type_slug] ) && empty( $cpts[$post_type_slug]['class_name'] ) ) ) {
+			if ( ! isset($cpts[$post_type_slug]) || (isset($cpts[$post_type_slug]) && empty($cpts[$post_type_slug]['class_name']))) {
 				return array();
 			}
 
 			//k let's get the model name for this cpt.
-			return array( $post_type_slug => str_replace( 'EE', 'EEM', $cpts[$post_type_slug]['class_name'] ) );
+			return array($post_type_slug => str_replace('EE', 'EEM', $cpts[$post_type_slug]['class_name']));
 		}
 
 
 		//if we made it here then we're returning an array of cpt model names indexed by post_type_slug.
 		$cpt_models = array();
-		foreach ( $cpts as $slug => $args ) {
-			if ( ! empty( $args['class_name'] ) ) {
-				$cpt_models[$slug] = str_replace( 'EE', 'EEM', $args['class_name'] );
+		foreach ($cpts as $slug => $args) {
+			if ( ! empty($args['class_name'])) {
+				$cpt_models[$slug] = str_replace('EE', 'EEM', $args['class_name']);
 			}
 		}
 		return $cpt_models;
@@ -220,12 +220,12 @@ 
 	 * @return EEM_CPT_Base[]   successful instantiation will return an array of successfully instantiated EEM
 	 *                                     	  models  indexed by post slug.
 	 */
-	public static function instantiate_cpt_models( $post_type_slug = '' ) {
-		$cpt_model_names = self::get_cpt_model_names( $post_type_slug );
+	public static function instantiate_cpt_models($post_type_slug = '') {
+		$cpt_model_names = self::get_cpt_model_names($post_type_slug);
 		$instantiated = array();
-		foreach ( $cpt_model_names as $slug => $model_name ) {
-			$instance = EE_Registry::instance()->load_model( str_replace( 'EEM_', '', $model_name ) );
-			if ( $instance instanceof EEM_CPT_Base ) {
+		foreach ($cpt_model_names as $slug => $model_name) {
+			$instance = EE_Registry::instance()->load_model(str_replace('EEM_', '', $model_name));
+			if ($instance instanceof EEM_CPT_Base) {
 				$instantiated[$slug] = $instance;
 			}
 		}
@@ -242,10 +242,10 @@ 
 	 *  @access 	public
 	 *  @return 	array
 	 */
-	public static function get_CPTs(){
+	public static function get_CPTs() {
 		// define CPTs
 		// NOTE the ['args']['page_templates'] array index is something specific to our CPTs and not part of the WP custom post type api.
-		return apply_filters( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', array(
+		return apply_filters('FHEE__EE_Register_CPTs__get_CPTs__cpts', array(
 			'espresso_events' => array(
 				'singular_name' => __("Event", "event_espresso"),
 				'plural_name' => __("Events", "event_espresso"),
@@ -320,7 +320,7 @@ 
 					'publicly_queryable'=> FALSE,
 					'hierarchical'=> FALSE,
 					'has_archive' => FALSE,
-					'taxonomies' => array( 'post_tag' ),
+					'taxonomies' => array('post_tag'),
 					'capability_type' => 'contact',
 					'capabilities' => array(
 						'edit_post' => 'ee_edit_contact',
@@ -337,9 +337,9 @@ 
 						'edit_private_posts' => 'ee_edit_contacts',
 						'edit_published_posts' => 'ee_edit_contacts'
 						),
-					'supports' => array( 'editor', 'thumbnail', 'excerpt', 'custom-fields', 'comments' ),
+					'supports' => array('editor', 'thumbnail', 'excerpt', 'custom-fields', 'comments'),
 				))
-			) );
+			));
 	}
 
 
@@ -352,9 +352,9 @@ 
 	public static function get_private_CPTs() {
 		$CPTs = self::get_CPTs();
 		$private_CPTs = array();
-		foreach ( $CPTs as $CPT => $details ) {
-			if ( empty( $details['args']['public'] ) )
-				$private_CPTs[ $CPT ] = $details;
+		foreach ($CPTs as $CPT => $details) {
+			if (empty($details['args']['public']))
+				$private_CPTs[$CPT] = $details;
 		}
 		return $private_CPTs;
 	}
@@ -372,7 +372,7 @@ 
 	 * @param string $plural_name internationalized plural name
 	 * @param array $override_args like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
 	 */
-	function register_taxonomy( $taxonomy_name, $singular_name, $plural_name, $override_args = array() ){
+	function register_taxonomy($taxonomy_name, $singular_name, $plural_name, $override_args = array()) {
 
 		$args = array(
 		'hierarchical'      => true,
@@ -388,15 +388,15 @@ 
 		//'rewrite'           => array( 'slug' => 'genre' ),
 	);
 
-	  if($override_args){
-		  if(isset($override_args['labels'])){
-			  $labels = array_merge($args['labels'],$override_args['labels']);
+	  if ($override_args) {
+		  if (isset($override_args['labels'])) {
+			  $labels = array_merge($args['labels'], $override_args['labels']);
 			  $args['labels'] = $labels;
 		  }
-		  $args = array_merge($args,$override_args);
+		  $args = array_merge($args, $override_args);
 
 	  }
-		register_taxonomy($taxonomy_name,null, $args);
+		register_taxonomy($taxonomy_name, null, $args);
 	}
 
 
@@ -410,27 +410,27 @@ 
 	 * The default values set in this function will be overridden by whatever you set in $override_args
 	 * @return void, but registers the custom post type
 	 */
-	function register_CPT($post_type, $singular_name,$plural_name,$override_args = array(), $singular_slug = '', $plural_slug = '' ) {
+	function register_CPT($post_type, $singular_name, $plural_name, $override_args = array(), $singular_slug = '', $plural_slug = '') {
 
 	  $labels = array(
 		'name' => $plural_name,
 		'singular_name' => $singular_name,
-		'add_new' => sprintf(__("Add %s", "event_espresso"),$singular_name),
-		'add_new_item' => sprintf(__("Add New %s", "event_espresso"),$singular_name),
-		'edit_item' => sprintf(__("Edit %s", "event_espresso"),$singular_name),
-		'new_item' => sprintf(__("New %s", "event_espresso"),$singular_name),
-		'all_items' => sprintf(__("All %s", "event_espresso"),$plural_name),
-		'view_item' => sprintf(__("View %s", "event_espresso"),$singular_name),
-		'search_items' => sprintf(__("Search %s", "event_espresso"),$plural_name),
-		'not_found' => sprintf(__("No %s found", "event_espresso"),$plural_name),
-		'not_found_in_trash' => sprintf(__("No %s found in Trash", "event_espresso"),$plural_name),
+		'add_new' => sprintf(__("Add %s", "event_espresso"), $singular_name),
+		'add_new_item' => sprintf(__("Add New %s", "event_espresso"), $singular_name),
+		'edit_item' => sprintf(__("Edit %s", "event_espresso"), $singular_name),
+		'new_item' => sprintf(__("New %s", "event_espresso"), $singular_name),
+		'all_items' => sprintf(__("All %s", "event_espresso"), $plural_name),
+		'view_item' => sprintf(__("View %s", "event_espresso"), $singular_name),
+		'search_items' => sprintf(__("Search %s", "event_espresso"), $plural_name),
+		'not_found' => sprintf(__("No %s found", "event_espresso"), $plural_name),
+		'not_found_in_trash' => sprintf(__("No %s found in Trash", "event_espresso"), $plural_name),
 		'parent_item_colon' => '',
-		'menu_name' => sprintf(__("%s", "event_espresso"),$plural_name)
+		'menu_name' => sprintf(__("%s", "event_espresso"), $plural_name)
 	  );
 
 	  //verify plural slug and singular slug, if they aren't we'll use $singular_name and $plural_name
-	  $singular_slug = ! empty( $singular_slug ) ? $singular_slug : $singular_name;
-	  $plural_slug = ! empty( $plural_slug ) ? $plural_slug : $plural_name;
+	  $singular_slug = ! empty($singular_slug) ? $singular_slug : $singular_name;
+	  $plural_slug = ! empty($plural_slug) ? $plural_slug : $plural_name;
 
 
 	  //note the page_templates arg in the supports index is something specific to EE.  WordPress doesn't actually have that in their register_post_type api.
@@ -442,24 +442,24 @@ 
 		'show_in_menu' => false,
 		'show_in_nav_menus' => false,
 		'query_var' => true,
-		'rewrite' => apply_filters( 'FHEE__EE_Register_CPTs__register_CPT__rewrite', array( 'slug' => $plural_slug ), $post_type ),
+		'rewrite' => apply_filters('FHEE__EE_Register_CPTs__register_CPT__rewrite', array('slug' => $plural_slug), $post_type),
 		'capability_type' => 'post',
 		'map_meta_cap' => true,
 		'has_archive' => true,
 		'hierarchical' => true,
 		'menu_position' => null,
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments' )
+		'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments')
 	  );
 
-	  if($override_args){
-		  if(isset($override_args['labels'])){
-			  $labels = array_merge($args['labels'],$override_args['labels']);
+	  if ($override_args) {
+		  if (isset($override_args['labels'])) {
+			  $labels = array_merge($args['labels'], $override_args['labels']);
 		  }
-		  $args = array_merge($args,$override_args);
+		  $args = array_merge($args, $override_args);
 		  $args['labels'] = $labels;
 	  }
 
-	  register_post_type( $post_type, $args );
+	  register_post_type($post_type, $args);
 	}
 
 
@@ -467,15 +467,15 @@ 
 
 	function set_must_use_event_types() {
 		$term_details = array(
-			'single-event' => array( __('Single Event', 'event_espresso'), __('A single event that spans one or more consecutive days. Attendee\'s register for the first date-time only', 'event_espresso') ), //example: a party or two-day long workshop
+			'single-event' => array(__('Single Event', 'event_espresso'), __('A single event that spans one or more consecutive days. Attendee\'s register for the first date-time only', 'event_espresso')), //example: a party or two-day long workshop
 
-			'multi-event' => array( __('Multi Event', 'event_espresso'), __('Multiple, separate, but related events that occur on consecutive days. Attendee\'s can register for any of the date-times', 'event_espresso') ), //example: a three day music festival or week long conference
+			'multi-event' => array(__('Multi Event', 'event_espresso'), __('Multiple, separate, but related events that occur on consecutive days. Attendee\'s can register for any of the date-times', 'event_espresso')), //example: a three day music festival or week long conference
 
-			'event-series' => array( __('Event Series', 'event_espresso'), __(' Multiple events that occur over multiple non-consecutive days. Attendee\'s register for the first date-time only', 'event_espresso') ), //example: an 8 week introduction to basket weaving course
+			'event-series' => array(__('Event Series', 'event_espresso'), __(' Multiple events that occur over multiple non-consecutive days. Attendee\'s register for the first date-time only', 'event_espresso')), //example: an 8 week introduction to basket weaving course
 
-			'recurring-event' => array( __('Recurring Event', 'event_espresso'), __('Multiple events that occur over multiple non-consecutive days. Attendee\'s can register for any of the date-times.', 'event_espresso') ), //example: a yoga class
+			'recurring-event' => array(__('Recurring Event', 'event_espresso'), __('Multiple events that occur over multiple non-consecutive days. Attendee\'s can register for any of the date-times.', 'event_espresso')), //example: a yoga class
 
-			'ongoing' => array( __('Ongoing Event', 'event_espresso'), __('An "event" that people can purchase tickets to gain access for anytime for this event regardless of date times on the event', 'event_espresso') ) //example: access to a museum
+			'ongoing' => array(__('Ongoing Event', 'event_espresso'), __('An "event" that people can purchase tickets to gain access for anytime for this event regardless of date times on the event', 'event_espresso')) //example: access to a museum
 
 			//'walk-in' => array( __('Walk In', 'event_espresso'), __('Single datetime and single entry recurring events. Attendees register for one or multiple datetimes individually.', 'event_espresso') ),
 			//'reservation' => array( __('Reservation', 'event_espresso'), __('Reservations are created by specifying available datetimes and quantities. Attendees choose from the available datetimes and specify the quantity available (if the maximum is greater than 1)') ), //@TODO to avoid confusion we'll implement this in a later iteration > EE4.1
@@ -483,7 +483,7 @@ 
 			//'appointment' => array( __('Appointments', 'event_espresso'), __('Time slotted events where datetimes are generally in hours or minutes. For example, attendees can register for a single 15 minute or 1 hour time slot and this type of availability frequently reoccurs.', 'event_espresso') )
 
 			);
-		$this->set_must_use_terms( 'espresso_event_type', $term_details );
+		$this->set_must_use_terms('espresso_event_type', $term_details);
 	}
 
 
@@ -497,16 +497,16 @@ 
 	 *
 	 * @return void
 	 */
-	function set_must_use_terms( $taxonomy, $term_details ) {
+	function set_must_use_terms($taxonomy, $term_details) {
 		$term_details = (array) $term_details;
 
-		foreach ( $term_details as $slug => $details ) {
-			if ( !term_exists( $slug, $taxonomy ) ) {
+		foreach ($term_details as $slug => $details) {
+			if ( ! term_exists($slug, $taxonomy)) {
 				$insert_arr = array(
 					'slug' => $slug,
 					'description' => $details[1]
 					);
-				wp_insert_term( $details[0], $taxonomy, $insert_arr );
+				wp_insert_term($details[0], $taxonomy, $insert_arr);
 			}
 		}
 	}
@@ -520,8 +520,8 @@ 
 	 * @param string $term_slug The slug of the term that will be the default.
 	 * @param array $cpt_slugs  An array of custom post types we want the default assigned to
 	 */
-	function set_default_term( $taxonomy, $term_slug, $cpt_slugs = array() ) {
-		$this->_default_terms[][$term_slug] = new EE_Default_Term( $taxonomy, $term_slug, $cpt_slugs );
+	function set_default_term($taxonomy, $term_slug, $cpt_slugs = array()) {
+		$this->_default_terms[][$term_slug] = new EE_Default_Term($taxonomy, $term_slug, $cpt_slugs);
 	}
 
 
@@ -533,20 +533,20 @@ 
 	 * @param  object $post    Post object
 	 * @return void
 	 */
-	function save_default_term( $post_id, $post ) {
-		if ( empty( $this->_default_terms ) )
+	function save_default_term($post_id, $post) {
+		if (empty($this->_default_terms))
 			return; //no default terms set so lets just exit.
 
-		foreach ( $this->_default_terms as $defaults ) {
-			foreach ( $defaults as $default_obj ) {
-				if ( $post->post_status == 'publish' && in_array( $post->post_type, $default_obj->cpt_slugs ) ) {
+		foreach ($this->_default_terms as $defaults) {
+			foreach ($defaults as $default_obj) {
+				if ($post->post_status == 'publish' && in_array($post->post_type, $default_obj->cpt_slugs)) {
 
 					//note some error proofing going on here to save unnecessary db queries
-					$taxonomies = get_object_taxonomies( $post->post_type );
-					foreach ( (array) $taxonomies as $taxonomy ) {
-						$terms = wp_get_post_terms( $post_id, $taxonomy);
-						if ( empty( $terms ) && $taxonomy == $default_obj->taxonomy ) {
-							wp_set_object_terms( $post_id, array( $default_obj->term_slug ), $taxonomy );
+					$taxonomies = get_object_taxonomies($post->post_type);
+					foreach ((array) $taxonomies as $taxonomy) {
+						$terms = wp_get_post_terms($post_id, $taxonomy);
+						if (empty($terms) && $taxonomy == $default_obj->taxonomy) {
+							wp_set_object_terms($post_id, array($default_obj->term_slug), $taxonomy);
 						}
 					}
 				}
@@ -578,7 +578,7 @@ 
 	 * @param string $term_slug The slug of the term that will be the default.
 	 * @param array $cpt_slugs  The custom post type the default term gets saved with
 	 */
-	public function __construct( $taxonomy, $term_slug, $cpt_slugs = array() ) {
+	public function __construct($taxonomy, $term_slug, $cpt_slugs = array()) {
 		$this->taxonomy = $taxonomy;
 		$this->cpt_slugs = (array) $cpt_slugs;
 		$this->term_slug = $term_slug;

Braces +10 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  *
  * EE_Register_CPTs
@@ -353,8 +355,9 @@ 
 		$CPTs = self::get_CPTs();
 		$private_CPTs = array();
 		foreach ( $CPTs as $CPT => $details ) {
-			if ( empty( $details['args']['public'] ) )
-				$private_CPTs[ $CPT ] = $details;
+			if ( empty( $details['args']['public'] ) ) {
+							$private_CPTs[ $CPT ] = $details;
+			}
 		}
 		return $private_CPTs;
 	}
@@ -534,8 +537,10 @@ 
 	 * @return void
 	 */
 	function save_default_term( $post_id, $post ) {
-		if ( empty( $this->_default_terms ) )
-			return; //no default terms set so lets just exit.
+		if ( empty( $this->_default_terms ) ) {
+					return;
+		}
+		//no default terms set so lets just exit.
 
 		foreach ( $this->_default_terms as $defaults ) {
 			foreach ( $defaults as $default_obj ) {

core/EED_Module.module.php

Spacing +7 added lines, -7 removed lines

@@ -73,7 +73,7 @@ 
 	 *  @var 			WP $WP
 	 *  @return 	void
 	 */
-	public abstract function run( $WP );
+	public abstract function run($WP);
 
 
 
@@ -96,12 +96,12 @@ 
 	 * @param $module_name
 	 * @return EED_Module
 	 */
-	protected static function get_instance( $module_name = '' ) {
-		$module_name = ! empty( $module_name ) ? $module_name : get_called_class();
-		if ( ! isset(  EE_Registry::instance()->modules->{$module_name} ) || ! EE_Registry::instance()->modules->{$module_name} instanceof EED_Module ) {
-			EE_Registry::instance()->add_module( $module_name );
+	protected static function get_instance($module_name = '') {
+		$module_name = ! empty($module_name) ? $module_name : get_called_class();
+		if ( ! isset(EE_Registry::instance()->modules->{$module_name} ) || ! EE_Registry::instance()->modules->{$module_name} instanceof EED_Module) {
+			EE_Registry::instance()->add_module($module_name);
 		}
-		return EE_Registry::instance()->get_module( $module_name );
+		return EE_Registry::instance()->get_module($module_name);
 	}
 
 
@@ -113,7 +113,7 @@ 
 	 * @return    string
 	 */
 	public function module_name() {
-		return get_class( $this );
+		return get_class($this);
 	}
 
 

Braces +3 added lines, -1 removed lines

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