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());
 			}
 

Doc Comments +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
 
 	/**
 	 * @param $message
-	 * @param $payment
+	 * @param EEI_Payment $payment
 	 */
 	public function log($message,$payment){
 		if($payment instanceof EEI_Payment){

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/EE_PMT_Paypal_Pro.pm.php

Spacing +31 added lines, -31 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_Paypal_Pro extends EE_PMT_Base{
+class EE_PMT_Paypal_Pro extends EE_PMT_Base {
 
 	/**
 	 * @param EE_Payment_Method $pm_instance
@@ -35,7 +35,7 @@ 
 		require_once($this->file_folder().'EEG_Paypal_Pro.gateway.php');
 		$this->_gateway = new EEG_Paypal_Pro();
 		$this->_pretty_name = __("Paypal Pro", 'event_espresso');
-		$this->_default_description = __( 'Please provide the following billing information.', 'event_espresso' );
+		$this->_default_description = __('Please provide the following billing information.', 'event_espresso');
 		$this->_requires_https = true;
 		parent::__construct($pm_instance);
 	}
@@ -51,21 +51,21 @@ 
 			'extra_meta_inputs'=>array(
 //				'paypal_email'=>new EE_Email_Input(), not actually used
 				'username'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Username %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Username %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'password'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Password %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Password %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'signature'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Signature %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Signature %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'credit_card_types'=>new EE_Checkbox_Multi_Input(
 						$this->card_types_supported(),
 						array(
-							'html_label_text' => __( 'Card Types Supported', 'event_espresso' ),
+							'html_label_text' => __('Card Types Supported', 'event_espresso'),
 							'required' => true )),
 				)
 			)
@@ -79,10 +79,10 @@ 
 	 * @throws \EE_Error
 	 * @return EE_Billing_Info_Form
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
-		$allowed_types = $this->_pm_instance->get_extra_meta( 'credit_card_types', TRUE );
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
+		$allowed_types = $this->_pm_instance->get_extra_meta('credit_card_types', TRUE);
 		//if allowed types is a string or empty array or null...
-		if( empty( $allowed_types )) {
+		if (empty($allowed_types)) {
 			$allowed_types = array();
 		}
 
@@ -93,26 +93,26 @@ 
 //				'html_id'=> 'ee-Paypal_Pro-billing-form',
 				'subsections'=>array(
 					'credit_card'=>new EE_Credit_Card_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Card Number', 'event_espresso' ))
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Number', 'event_espresso'))
 					),
 					'credit_card_type'=>new EE_Select_Input(
 						//the options are set dynamically
-						array_intersect_key( EE_PMT_Paypal_Pro::card_types_supported(), array_flip( $allowed_types )),
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Card Type', 'event_espresso' ))
+						array_intersect_key(EE_PMT_Paypal_Pro::card_types_supported(), array_flip($allowed_types)),
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Type', 'event_espresso'))
 					),
 					'exp_month'=>new EE_Month_Input(
-						TRUE, array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __( 'Expiry Month', 'event_espresso' )  )
+						TRUE, array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __('Expiry Month', 'event_espresso'))
 					),
 					'exp_year'=>new EE_Credit_Card_Year_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Expiry Year', 'event_espresso' )  )
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Expiry Year', 'event_espresso'))
 					),
 					'cvv'=>new EE_CVV_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'CVV', 'event_espresso' ) )
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('CVV', 'event_espresso'))
 					),
 				)
 			)
 		);
-		return $this->apply_billing_form_debug_settings( $billing_form );
+		return $this->apply_billing_form_debug_settings($billing_form);
 	}
 
 
@@ -124,20 +124,20 @@ 
 	 * @param \EE_Billing_Info_Form $billing_form
 	 * @return \EE_Billing_Info_Form
 	 */
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
-		if ( $this->_pm_instance->debug_mode() ) {
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
+		if ($this->_pm_instance->debug_mode()) {
 			$billing_form->add_subsections(
-				array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
+				array('fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html()),
 				'credit_card'
 			);
 			$billing_form->add_subsections(
-				array( 'debug_content' => new EE_Form_Section_HTML_From_Template( dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php' )),
+				array('debug_content' => new EE_Form_Section_HTML_From_Template(dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php')),
 				'first_name'
 			);
-			$billing_form->get_input( 'credit_card' )->set_default( '5424180818927383' );
-			$billing_form->get_input( 'credit_card_type' )->set_default( 'MasterCard' );
-			$billing_form->get_input( 'exp_year' )->set_default( date('Y') + 6 );
-			$billing_form->get_input( 'cvv' )->set_default( '115' );
+			$billing_form->get_input('credit_card')->set_default('5424180818927383');
+			$billing_form->get_input('credit_card_type')->set_default('MasterCard');
+			$billing_form->get_input('exp_year')->set_default(date('Y') + 6);
+			$billing_form->get_input('cvv')->set_default('115');
 		}
 		return $billing_form;
 	}
@@ -149,7 +149,7 @@ 
 	 * Keys are their values, values are their pretty names.
 	 * @return array
 	 */
-	public static function card_types_supported(){
+	public static function card_types_supported() {
 		return array(
 			'Visa'=>  __("Visa", 'event_espresso'),
 			'MasterCard'=>  __("MasterCard", 'event_espresso'),
@@ -165,7 +165,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' => __('PayPal Pro Settings', 'event_espresso'),
@@ -180,10 +180,10 @@ 
 	 * @param EE_Billing_Info_Form $billing_form
 	 * @return array
 	 */
-	protected function _get_billing_values_from_form( $billing_form ){
-		$billing_values = parent::_get_billing_values_from_form( $billing_form );
-		$billing_values[ 'country' ] = $billing_form->get_input_value( 'country' );
-		$billing_values[ 'credit_card_type' ] = $billing_form->get_input_value( 'credit_card_type' );
+	protected function _get_billing_values_from_form($billing_form) {
+		$billing_values = parent::_get_billing_values_from_form($billing_form);
+		$billing_values['country'] = $billing_form->get_input_value('country');
+		$billing_values['credit_card_type'] = $billing_form->get_input_value('credit_card_type');
 		return $billing_values;
 	}
 

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/help_tabs/payment_methods_overview_paypalpro.help_tab.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 <?php _e('Adjust the settings for the PayPal Pro payment gateway.', 'event_espresso'); ?>
 </p>
 <p>
-<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Paypal Pro.', 'event_espresso' ), "<a href='https://www.paypal.com/multicurrency'>","</a>" ); ?>
+<?php printf(__('See %1$shere%2$s for list of currencies supported by Paypal Pro.', 'event_espresso'), "<a href='https://www.paypal.com/multicurrency'>", "</a>"); ?>
 </p>
 <h3><?php _e('PayPal Pro Settings', 'event_espresso'); ?></h3>
 <ul>

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;
 
 

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
  *

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;
 	}
 

core/CPTs/EE_CPT_Venue_Strategy.core.php

Spacing +11 added lines, -11 removed lines

@@ -39,15 +39,15 @@ 
 	 * @param 	array 	$arguments
 	 * @return \EE_CPT_Venue_Strategy
 	 */
-	public function __construct( $arguments = array() ) {
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
-		if ( $WP_Query instanceof WP_Query && ! $WP_Query->is_tag ) {
-			$WP_Query->is_espresso_venue_single = is_singular() && isset( $WP_Query->query->post_type ) && $WP_Query->query->post_type == 'espresso_venues' ? TRUE : FALSE;
+	public function __construct($arguments = array()) {
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
+		if ($WP_Query instanceof WP_Query && ! $WP_Query->is_tag) {
+			$WP_Query->is_espresso_venue_single = is_singular() && isset($WP_Query->query->post_type) && $WP_Query->query->post_type == 'espresso_venues' ? TRUE : FALSE;
 			$WP_Query->is_espresso_venue_archive = is_post_type_archive('espresso_venues') ? TRUE : FALSE;
-			$WP_Query->is_espresso_venue_taxonomy = is_tax( 'espresso_venue_categories' ) ? TRUE : FALSE;
+			$WP_Query->is_espresso_venue_taxonomy = is_tax('espresso_venue_categories') ? TRUE : FALSE;
 		}
-		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
+		add_filter('the_posts', array($this, 'the_posts'), 1, 2);
 	}
 
 
@@ -60,14 +60,14 @@ 
 	 * @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) {
 		// automagically load the EEH_Venue_View helper so that it's functions are available
 		EE_Registry::instance()->load_helper('Venue_View');
-		if ( isset( EE_Registry::instance()->CFG->map_settings->use_google_maps ) && EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-			EE_Registry::instance()->load_helper( 'Maps' );
+		if (isset(EE_Registry::instance()->CFG->map_settings->use_google_maps) && EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+			EE_Registry::instance()->load_helper('Maps');
 			EEH_Maps::espresso_google_map_js();
 		}
-		remove_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
+		remove_filter('the_posts', array($this, 'the_posts'), 1, 2);
 		return $posts;
 	}
 

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
  *