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

Doc Comments +1 added lines, -1 removed lines

@@ -329,7 +329,7 @@
 	/**
 	 * Posts the request to AuthorizeNet & returns response.
 	 *
-	 * @param $payment
+	 * @param EEI_Payment $payment
 	 * @return \EE_AuthorizeNetAIM_Response
 	 */
 	private function _sendRequest($payment) {

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/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
@@ -39,7 +39,7 @@ 
 						<li><?php printf(
 							__('To find the sandbox account\'s credit card, go to %1$s, then "Dashboard", then under Sandbox click "Accounts", then click your account and click "Profile", then in the popup that appears click on the "Funding" tab. Your testing card is listed there.', 'event_espresso'),
 							'<a href="http://developer.paypal.com">developer.paypal.com</a>'); ?></li>
-						<li><?php printf(__('CVV2 should be 115 (see %s PayPal\'s 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 PayPal\'s 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">
@@ -66,7 +66,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_Register_CPTs.core.php

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 ) {

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,
@@ -389,15 +389,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);
 	}
 
 
@@ -411,27 +411,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.
@@ -444,24 +444,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);
 	}
 
 
@@ -469,15 +469,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
@@ -485,7 +485,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);
 	}
 
 
@@ -499,16 +499,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);
 			}
 		}
 	}
@@ -522,8 +522,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);
 	}
 
 
@@ -535,20 +535,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);
 						}
 					}
 				}
@@ -580,7 +580,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;

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
  *

core/EE_Addon.core.php

Braces +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 			//to help avoid memory limit errors
 			//EEH_Debug_Tools::instance()->measure_memory( 'db content initialized for ' . get_class( $this), true );
 			gc_collect_cycles();
-		}else{
+		} else{
 			//ask the data migration manager to init this addon's data
 			//when migrations are finished because we can't do it now
 			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( $this->name() );

Doc Comments +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
 
 
 	/**
-	 * @param mixed $min_core_version
+	 * @param string $min_core_version
 	 */
 	public function set_min_core_version( $min_core_version = NULL ) {
 		$this->_min_core_version = $min_core_version;
@@ -140,7 +140,7 @@ 
 	/**
 	 * Sets addon_name
 	 * @param string $addon_name
-	 * @return boolean
+	 * @return string
 	 */
 	function set_name( $addon_name ) {
 		return $this->_addon_name = $addon_name;

Spacing +84 added lines, -84 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -95,7 +95,7 @@ 
 	 *    class constructor
 	 */
 	public function __construct() {
-		add_action( 'AHEE__EE_System__load_controllers__load_admin_controllers', array( $this, 'admin_init' ) );
+		add_action('AHEE__EE_System__load_controllers__load_admin_controllers', array($this, 'admin_init'));
 	}
 
 
@@ -103,7 +103,7 @@ 
 	/**
 	 * @param mixed $version
 	 */
-	public function set_version( $version = NULL ) {
+	public function set_version($version = NULL) {
 		$this->_version = $version;
 	}
 
@@ -121,7 +121,7 @@ 
 	/**
 	 * @param mixed $min_core_version
 	 */
-	public function set_min_core_version( $min_core_version = NULL ) {
+	public function set_min_core_version($min_core_version = NULL) {
 		$this->_min_core_version = $min_core_version;
 	}
 
@@ -142,7 +142,7 @@ 
 	 * @param string $addon_name
 	 * @return boolean
 	 */
-	function set_name( $addon_name ) {
+	function set_name($addon_name) {
 		return $this->_addon_name = $addon_name;
 	}
 
@@ -170,7 +170,7 @@ 
 	/**
 	 * @param string $plugin_basename
 	 */
-	public function set_plugin_basename( $plugin_basename ) {
+	public function set_plugin_basename($plugin_basename) {
 
 		$this->_plugin_basename = $plugin_basename;
 	}
@@ -190,7 +190,7 @@ 
 	/**
 	 * @param string $plugin_slug
 	 */
-	public function set_plugin_slug( $plugin_slug ) {
+	public function set_plugin_slug($plugin_slug) {
 
 		$this->_plugin_slug = $plugin_slug;
 	}
@@ -210,7 +210,7 @@ 
 	/**
 	 * @param string $plugin_action_slug
 	 */
-	public function set_plugin_action_slug( $plugin_action_slug ) {
+	public function set_plugin_action_slug($plugin_action_slug) {
 
 		$this->_plugin_action_slug = $plugin_action_slug;
 	}
@@ -230,9 +230,9 @@ 
 	/**
 	 * @param array $plugins_page_row
 	 */
-	public function set_plugins_page_row( $plugins_page_row = array() ) {
+	public function set_plugins_page_row($plugins_page_row = array()) {
 		// sigh.... check for example content that I stupidly merged to master and remove it if found
-		if ( ! is_array( $plugins_page_row ) && strpos( $plugins_page_row, '<h3>Promotions Addon Upsell Info</h3>' ) !== false ) {
+		if ( ! is_array($plugins_page_row) && strpos($plugins_page_row, '<h3>Promotions Addon Upsell Info</h3>') !== false) {
 			$plugins_page_row = '';
 		}
 		$this->_plugins_page_row = $plugins_page_row;
@@ -251,7 +251,7 @@ 
 		do_action("AHEE__{$classname}__new_install");
 		do_action("AHEE__EE_Addon__new_install", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -266,16 +266,16 @@ 
 		do_action("AHEE__{$classname}__reactivation");
 		do_action("AHEE__EE_Addon__reactivation", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
-	public function deactivation(){
+	public function deactivation() {
 		$classname = get_class($this);
 //		echo "Deactivating $classname";die;
 		do_action("AHEE__{$classname}__deactivation");
 		do_action("AHEE__EE_Addon__deactivation", $this);
 		//check if the site no longer needs to be in maintenance mode
-		EE_Register_Addon::deregister( $this->name() );
+		EE_Register_Addon::deregister($this->name());
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 	}
 
@@ -289,16 +289,16 @@ 
 	 * This is a resource-intensive job so we prefer to only do it when necessary
 	 * @return void
 	 */
-	public function initialize_db_if_no_migrations_required( $verify_schema = true ) {
-		if( $verify_schema === '' ) {
+	public function initialize_db_if_no_migrations_required($verify_schema = true) {
+		if ($verify_schema === '') {
 			//wp core bug imo: if no args are passed to `do_action('some_hook_name')` besides the hook's name
 			//(ie, no 2nd or 3rd arguments), instead of calling the registered callbacks with no arguments, it
 			//calls them with an argument of an empty string (ie ""), which evaluates to false
 			//so we need to treat the empty string as if nothing had been passed, and should instead use the default
 			$verify_schema = true;
 		}
-		if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ) {
-			if( $verify_schema ) {
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			if ($verify_schema) {
 				$this->initialize_db();
 			}
 			$this->initialize_default_data();
@@ -311,15 +311,15 @@ 
 			 * other data needs to be verified)
 			 */
 			EEH_Activation::initialize_db_content();
-			update_option( 'ee_flush_rewrite_rules', TRUE );
+			update_option('ee_flush_rewrite_rules', TRUE);
 			//in case there are lots of addons being activated at once, let's force garbage collection
 			//to help avoid memory limit errors
 			//EEH_Debug_Tools::instance()->measure_memory( 'db content initialized for ' . get_class( $this), true );
 			gc_collect_cycles();
-		}else{
+		} else {
 			//ask the data migration manager to init this addon's data
 			//when migrations are finished because we can't do it now
-			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( $this->name() );
+			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for($this->name());
 		}
 	}
 
@@ -333,20 +333,20 @@ 
 	 */
 	public function initialize_db() {
 		//find the migration script that sets the database to be compatible with the code
-		$current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms( $this->name() );
-		if( $current_dms_name ){
-			$current_data_migration_script = EE_Registry::instance()->load_dms( $current_dms_name );
-			$current_data_migration_script->set_migrating( FALSE );
+		$current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms($this->name());
+		if ($current_dms_name) {
+			$current_data_migration_script = EE_Registry::instance()->load_dms($current_dms_name);
+			$current_data_migration_script->set_migrating(FALSE);
 			$current_data_migration_script->schema_changes_before_migration();
 			$current_data_migration_script->schema_changes_after_migration();
-			if ( $current_data_migration_script->get_errors() ) {
-				foreach( $current_data_migration_script->get_errors() as $error ) {
-					EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
+			if ($current_data_migration_script->get_errors()) {
+				foreach ($current_data_migration_script->get_errors() as $error) {
+					EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
 		//if not DMS was found that should be ok. This addon just doesn't require any database changes
-		EE_Data_Migration_Manager::instance()->update_current_database_state_to( array( 'slug' => $this->name(), 'version' => $this->version() ) );
+		EE_Data_Migration_Manager::instance()->update_current_database_state_to(array('slug' => $this->name(), 'version' => $this->version()));
 	}
 
 
@@ -368,7 +368,7 @@ 
 		 * default data)
 		 * @param EE_Addon $addon the addon that called this
 		 */
-		do_action( 'AHEE__EE_Addon__initialize_default_data__begin', $this );
+		do_action('AHEE__EE_Addon__initialize_default_data__begin', $this);
 		//override to insert default data. It is safe to use the models here
 		//because the site should not be in maintenance mode
 	}
@@ -387,7 +387,7 @@ 
 		do_action("AHEE__EE_Addon__upgrade", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 		//also it's possible there is new default data that needs to be added
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -400,7 +400,7 @@ 
 		do_action("AHEE__{$classname}__downgrade");
 		do_action("AHEE__EE_Addon__downgrade", $this);
 		//it's possible there's old default data that needs to be double-checked
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -411,7 +411,7 @@ 
 	 * plugin activation only. In the future, we'll want to do it on plugin updates too
 	 * @return bool
 	 */
-	public function set_db_update_option_name(){
+	public function set_db_update_option_name() {
 		EE_Error::doing_it_wrong(__FUNCTION__, __('EE_Addon::set_db_update_option_name was renamed to EE_Addon::set_activation_indicator_option', 'event_espresso'), '4.3.0.alpha.016');
 		//let's just handle this on the next request, ok? right now we're just not really ready
 		return $this->set_activation_indicator_option();
@@ -439,7 +439,7 @@ 
 	 */
 	public function set_activation_indicator_option() {
 		// let's just handle this on the next request, ok? right now we're just not really ready
-		return update_option( $this->get_activation_indicator_option_name(), TRUE );
+		return update_option($this->get_activation_indicator_option_name(), TRUE);
 	}
 
 
@@ -447,8 +447,8 @@ 
 	 * Gets the name of the wp option which is used to temporarily indicate that this addon was activated
 	 * @return string
 	 */
-	public function get_activation_indicator_option_name(){
-		return 'ee_activation_' . $this->name();
+	public function get_activation_indicator_option_name() {
+		return 'ee_activation_'.$this->name();
 	}
 
 
@@ -458,7 +458,7 @@ 
 	 * Used by EE_System to set the request type of this addon. Should not be used by addon developers
 	 * @param int $req_type
 	 */
-	function set_req_type( $req_type ) {
+	function set_req_type($req_type) {
 		$this->_req_type = $req_type;
 	}
 
@@ -469,7 +469,7 @@ 
 	 * of addons
 	 */
 	function detect_req_type() {
-		if( ! $this->_req_type ){
+		if ( ! $this->_req_type) {
 			$this->detect_activation_or_upgrade();
 		}
 		return $this->_req_type;
@@ -482,36 +482,36 @@ 
 	 * Should only be called once per request
 	 * @return void
 	 */
-	function detect_activation_or_upgrade(){
+	function detect_activation_or_upgrade() {
 		$activation_history_for_addon = $this->get_activation_history();
 //		d($activation_history_for_addon);
 		$request_type = EE_System::detect_req_type_given_activation_history($activation_history_for_addon, $this->get_activation_indicator_option_name(), $this->version());
 		$this->set_req_type($request_type);
 		$classname = get_class($this);
-		switch($request_type){
+		switch ($request_type) {
 			case EE_System::req_type_new_activation:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__new_activation" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__new_activation", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__new_activation");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__new_activation", $this);
 				$this->new_install();
-				$this->update_list_of_installed_versions( $activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_reactivation:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__reactivation" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__reactivation", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__reactivation");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__reactivation", $this);
 				$this->reactivation();
-				$this->update_list_of_installed_versions( $activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_upgrade:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__upgrade" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__upgrade", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__upgrade");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__upgrade", $this);
 				$this->upgrade();
-				$this->update_list_of_installed_versions($activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_downgrade:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__downgrade" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__downgrade", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__downgrade");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__downgrade", $this);
 				$this->downgrade();
-				$this->update_list_of_installed_versions($activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_normal:
 			default:
@@ -519,7 +519,7 @@ 
 				break;
 		}
 
-		do_action( "AHEE__{$classname}__detect_if_activation_or_upgrade__complete" );
+		do_action("AHEE__{$classname}__detect_if_activation_or_upgrade__complete");
 	}
 
 	/**
@@ -528,17 +528,17 @@ 
 	 * @param string $current_version_to_add
 	 * @return boolean success
 	 */
-	public function update_list_of_installed_versions($version_history = NULL,$current_version_to_add = NULL) {
-		if( ! $version_history ) {
+	public function update_list_of_installed_versions($version_history = NULL, $current_version_to_add = NULL) {
+		if ( ! $version_history) {
 			$version_history = $this->get_activation_history();
 		}
-		if( $current_version_to_add == NULL){
+		if ($current_version_to_add == NULL) {
 			$current_version_to_add = $this->version();
 		}
-		$version_history[ $current_version_to_add ][] = date( 'Y-m-d H:i:s',time() );
+		$version_history[$current_version_to_add][] = date('Y-m-d H:i:s', time());
 		// resave
 //		echo "updating list of installed versions:".$this->get_activation_history_option_name();d($version_history);
-		return update_option( $this->get_activation_history_option_name(), $version_history );
+		return update_option($this->get_activation_history_option_name(), $version_history);
 	}
 
 	/**
@@ -546,8 +546,8 @@ 
 	 * of this addon
 	 * @return string
 	 */
-	function get_activation_history_option_name(){
-		return self::ee_addon_version_history_option_prefix . $this->name();
+	function get_activation_history_option_name() {
+		return self::ee_addon_version_history_option_prefix.$this->name();
 	}
 
 
@@ -556,7 +556,7 @@ 
 	 * Gets the wp option which stores the activation history for this addon
 	 * @return array
 	 */
-	function get_activation_history(){
+	function get_activation_history() {
 		return get_option($this->get_activation_history_option_name(), NULL);
 	}
 
@@ -565,8 +565,8 @@ 
 	/**
 	 * @param string $config_section
 	 */
-	public function set_config_section( $config_section = '' ) {
-		$this->_config_section = ! empty( $config_section ) ? $config_section : 'addons';
+	public function set_config_section($config_section = '') {
+		$this->_config_section = ! empty($config_section) ? $config_section : 'addons';
 	}
 	/**
 	 *	filepath to the main file, which can be used for register_activation_hook, register_deactivation_hook, etc.
@@ -579,14 +579,14 @@ 
 	 * Sets the filepath to the main plugin file
 	 * @param string $filepath
 	 */
-	public function set_main_plugin_file( $filepath ) {
+	public function set_main_plugin_file($filepath) {
 		$this->_main_plugin_file = $filepath;
 	}
 	/**
 	 * gets the filepath to teh main file
 	 * @return string
 	 */
-	public function get_main_plugin_file(){
+	public function get_main_plugin_file() {
 		return $this->_main_plugin_file;
 	}
 
@@ -596,15 +596,15 @@ 
 	 * @return string
 	 */
 	public function get_main_plugin_file_basename() {
-		return plugin_basename( $this->get_main_plugin_file() );
+		return plugin_basename($this->get_main_plugin_file());
 	}
 
 	/**
 	 * Gets the folder name which contains the main plugin file
 	 * @return string
 	 */
-	public function get_main_plugin_file_dirname(){
-		return dirname( $this->get_main_plugin_file() );
+	public function get_main_plugin_file_dirname() {
+		return dirname($this->get_main_plugin_file());
 	}
 
 
@@ -613,11 +613,11 @@ 
 	 *
 *@return string
 	 */
-	public function admin_init(){
+	public function admin_init() {
 		// is admin and not in M-Mode ?
-		if ( is_admin() && ! EE_Maintenance_Mode::instance()->level() ) {
-			add_filter( 'plugin_action_links', array( $this, 'plugin_action_links' ), 10, 2 );
-			add_filter( 'after_plugin_row_' . $this->_plugin_basename, array( $this, 'after_plugin_row' ), 10, 3 );
+		if (is_admin() && ! EE_Maintenance_Mode::instance()->level()) {
+			add_filter('plugin_action_links', array($this, 'plugin_action_links'), 10, 2);
+			add_filter('after_plugin_row_'.$this->_plugin_basename, array($this, 'after_plugin_row'), 10, 3);
 		}
 	}
 
@@ -632,10 +632,10 @@ 
 	 * @param $file
 	 * @return array
 	 */
-	public function plugin_action_links( $links, $file ) {
-		if ( $file == $this->plugin_basename() && $this->plugin_action_slug() != '' ) {
+	public function plugin_action_links($links, $file) {
+		if ($file == $this->plugin_basename() && $this->plugin_action_slug() != '') {
 			// before other links
-			array_unshift( $links, '<a href="admin.php?page=' . $this->plugin_action_slug() . '">' . __( 'Settings' ) . '</a>' );
+			array_unshift($links, '<a href="admin.php?page='.$this->plugin_action_slug().'">'.__('Settings').'</a>');
 		}
 		return $links;
 	}
@@ -653,17 +653,17 @@ 
 	 * @param $status
 	 * @return string
 	 */
-	public function after_plugin_row( $plugin_file, $plugin_data, $status ) {
+	public function after_plugin_row($plugin_file, $plugin_data, $status) {
 
 		$after_plugin_row = '';
-		if ( $plugin_file == $this->plugin_basename() && $this->get_plugins_page_row() != '' ) {
+		if ($plugin_file == $this->plugin_basename() && $this->get_plugins_page_row() != '') {
 			$class = $status ? 'active' : 'inactive';
 			$plugins_page_row = $this->get_plugins_page_row();
-			$link_text = isset( $plugins_page_row[ 'link_text' ] ) ? $plugins_page_row[ 'link_text' ] : '';
-			$link_url = isset( $plugins_page_row[ 'link_url' ] ) ? $plugins_page_row[ 'link_url' ] : '';
-			$description = isset( $plugins_page_row[ 'description' ] ) ? $plugins_page_row[ 'description' ] : $plugins_page_row;
-			if ( ! empty( $link_text ) && ! empty( $link_url ) && ! empty( $description )) {
-				$after_plugin_row .= '<tr id="' . sanitize_title( $plugin_file ) . '-ee-addon" class="' . $class . '">';
+			$link_text = isset($plugins_page_row['link_text']) ? $plugins_page_row['link_text'] : '';
+			$link_url = isset($plugins_page_row['link_url']) ? $plugins_page_row['link_url'] : '';
+			$description = isset($plugins_page_row['description']) ? $plugins_page_row['description'] : $plugins_page_row;
+			if ( ! empty($link_text) && ! empty($link_url) && ! empty($description)) {
+				$after_plugin_row .= '<tr id="'.sanitize_title($plugin_file).'-ee-addon" class="'.$class.'">';
 				$after_plugin_row .= '<th class="check-column" scope="row"></th>';
 				$after_plugin_row .= '<td class="ee-addon-upsell-info-title-td plugin-title column-primary">';
 				$after_plugin_row .= '<style>
@@ -705,7 +705,7 @@ 
 </style>';
 				$after_plugin_row .= '
 <p class="ee-addon-upsell-info-dv">
-	<a class="ee-button" href="' . $link_url . '">' . $link_text . ' &nbsp;<span class="dashicons dashicons-arrow-right-alt2" style="margin:0;"></span></a>
+	<a class="ee-button" href="' . $link_url.'">'.$link_text.' &nbsp;<span class="dashicons dashicons-arrow-right-alt2" style="margin:0;"></span></a>
 </p>';
 				$after_plugin_row .= '</td>';
 				$after_plugin_row .= '<td class="ee-addon-upsell-info-desc-td column-description desc">';

core/EE_Base.core.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	 *		@ return void
 	 */	
 	public function __get($a) { return FALSE; }
-	public function __set($a,$b) { return FALSE; }
+	public function __set($a, $b) { return FALSE; }
 	public function __isset($a) { return FALSE; }
 	public function __unset($a) { return FALSE; }
 	public function __clone() { return FALSE; }

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
  *