eventespresso / event-espresso-core

core/libraries/line_item_display/EE_SPCO_Line_Item_Display_Strategy.strategy.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_SPCO_Line_Item_Display_Strategy
- *
- * Description
- *
- * @package         Event Espresso
- * @subpackage    core
- * @author				Brent Christensen
- * @since		 	   $VID:$
- *
- */
+  *
+  * Class EE_SPCO_Line_Item_Display_Strategy
+  *
+  * Description
+  *
+  * @package         Event Espresso
+  * @subpackage    core
+  * @author				Brent Christensen
+  * @since		 	   $VID:$
+  *
+  */
 
 class EE_SPCO_Line_Item_Display_Strategy implements EEI_Line_Item_Display {
 

Spacing +70 added lines, -70 removed lines

@@ -21,73 +21,73 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
 
-		EE_Registry::instance()->load_helper( 'Template' );
-		EE_Registry::instance()->load_helper( 'HTML' );
+		EE_Registry::instance()->load_helper('Template');
+		EE_Registry::instance()->load_helper('HTML');
 
 		$html = '';
 		// set some default options and merge with incoming
 		$default_options = array(
-			'show_desc' => TRUE,  // 	TRUE 		FALSE
+			'show_desc' => TRUE, // 	TRUE 		FALSE
 			'odd' => FALSE
 		);
-		$options = array_merge( $default_options, (array)$options );
+		$options = array_merge($default_options, (array) $options);
 
-		switch( $line_item->type() ) {
+		switch ($line_item->type()) {
 
 			case EEM_Line_Item::type_line_item:
 				// item row
-				$html .= $this->_item_row( $line_item, $options );
+				$html .= $this->_item_row($line_item, $options);
 				// got any kids?
-				foreach( $line_item->children() as $child_line_item ) {
-					$this->display_line_item( $child_line_item, $options );
+				foreach ($line_item->children() as $child_line_item) {
+					$this->display_line_item($child_line_item, $options);
 				}
 				break;
 
 			case EEM_Line_Item::type_sub_line_item:
-				$html .= $this->_sub_item_row( $line_item, $options );
+				$html .= $this->_sub_item_row($line_item, $options);
 				break;
 
 			case EEM_Line_Item::type_sub_total:
 				static $sub_total = 0;
 				$child_line_items = $line_item->children();
 				// loop thru children
-				foreach( $child_line_items as $child_line_item ) {
+				foreach ($child_line_items as $child_line_item) {
 					// recursively feed children back into this method
-					$html .= $this->display_line_item( $child_line_item, $options );
+					$html .= $this->display_line_item($child_line_item, $options);
 				}
-				if ( $line_item->total() != $sub_total && count( $child_line_items ) > 1 ) {
-					$html .= $this->_sub_total_row( $line_item, __('Sub-Total', 'event_espresso'), $options );
+				if ($line_item->total() != $sub_total && count($child_line_items) > 1) {
+					$html .= $this->_sub_total_row($line_item, __('Sub-Total', 'event_espresso'), $options);
 					$sub_total = $line_item->total();
 				}
 				break;
 
 			case EEM_Line_Item::type_tax:
-				if ( $this->_show_taxes ) {
-					$html .= $this->_tax_row( $line_item, $options );
+				if ($this->_show_taxes) {
+					$html .= $this->_tax_row($line_item, $options);
 				}
 				break;
 
 			case EEM_Line_Item::type_tax_sub_total:
-				if ( $this->_show_taxes ) {
+				if ($this->_show_taxes) {
 					// loop thru children
-					foreach( $line_item->children() as $child_line_item ) {
+					foreach ($line_item->children() as $child_line_item) {
 						// recursively feed children back into this method
-						$html .= $this->display_line_item( $child_line_item, $options );
+						$html .= $this->display_line_item($child_line_item, $options);
 					}
-					$html .= $this->_total_row( $line_item, __('Tax Total', 'event_espresso'), $options );
+					$html .= $this->_total_row($line_item, __('Tax Total', 'event_espresso'), $options);
 				}
 				break;
 
 			case EEM_Line_Item::type_total:
 				// loop thru children
-				foreach( $line_item->children() as $child_line_item ) {
+				foreach ($line_item->children() as $child_line_item) {
 					// recursively feed children back into this method
-					$html .= $this->display_line_item( $child_line_item, $options );
+					$html .= $this->display_line_item($child_line_item, $options);
 				}
-				$html .= $this->_total_row( $line_item, __('Total', 'event_espresso'), $options );
-				$html .= $this->_payments_and_amount_owing_rows( $line_item );
+				$html .= $this->_total_row($line_item, __('Total', 'event_espresso'), $options);
+				$html .= $this->_payments_and_amount_owing_rows($line_item);
 				break;
 
 		}
@@ -104,10 +104,10 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
+	private function _item_row(EE_Line_Item $line_item, $options = array()) {
 		// start of row
 		$row_class = $options['odd'] ? 'item odd' : 'item';
-		$html = EEH_HTML::tr( '', '', $row_class );
+		$html = EEH_HTML::tr('', '', $row_class);
 		// name && desc
 		$name_and_desc = apply_filters(
 			'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__name',
@@ -116,21 +116,21 @@ 
 		);
 		$name_and_desc .= apply_filters(
 			'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__desc',
-			( $options['show_desc'] ? ' : ' . $line_item->desc() : '' ),
+			($options['show_desc'] ? ' : '.$line_item->desc() : ''),
 			$line_item,
 			$options
 		);
 		// name td
-		$html .= EEH_HTML::td( $name_and_desc, '',  'item_l' );
+		$html .= EEH_HTML::td($name_and_desc, '', 'item_l');
 		// quantity td
-		$html .= EEH_HTML::td( $line_item->quantity(), '',  'item_l jst-rght' );
+		$html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght');
 		// price td
-		$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '',  'item_c jst-rght' );
+		$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght');
 		// total td
-		$total = EEH_Template::format_currency( $line_item->total(), false, false );
+		$total = EEH_Template::format_currency($line_item->total(), false, false);
 		$total .= $line_item->is_taxable() ? '*' : '';
 		$this->_show_taxes = $line_item->is_taxable() ? TRUE : $this->_show_taxes;
-		$html .= EEH_HTML::td( $total, '',  'item_r jst-rght' );
+		$html .= EEH_HTML::td($total, '', 'item_r jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -145,22 +145,22 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
+	private function _sub_item_row(EE_Line_Item $line_item, $options = array()) {
 		// start of row
-		$html = EEH_HTML::tr( '', 'item sub-item-row' );
+		$html = EEH_HTML::tr('', 'item sub-item-row');
 		// name && desc
 		$name_and_desc = $line_item->name();
-		$name_and_desc .= $options['show_desc'] ? ' : ' . $line_item->desc() : '';
+		$name_and_desc .= $options['show_desc'] ? ' : '.$line_item->desc() : '';
 		// name td
-		$html .= EEH_HTML::td( $name_and_desc, '',  'item_l sub-item' );
+		$html .= EEH_HTML::td($name_and_desc, '', 'item_l sub-item');
 		// discount/surcharge td
-		if ( $line_item->is_percent() ) {
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '',  'item_c' );
+		if ($line_item->is_percent()) {
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c');
 		} else {
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '',  'item_c jst-rght' );
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght');
 		}
 		// total td
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'item_r jst-rght' );
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -175,18 +175,18 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _tax_row( EE_Line_Item $line_item, $options = array() ) {
+	private function _tax_row(EE_Line_Item $line_item, $options = array()) {
 		// start of row
-		$html = EEH_HTML::tr( '', 'item sub-item tax-total' );
+		$html = EEH_HTML::tr('', 'item sub-item tax-total');
 		// name && desc
 		$name_and_desc = $line_item->name();
-		$name_and_desc .= $options['show_desc'] ? ' : ' . $line_item->desc() : '';
+		$name_and_desc .= $options['show_desc'] ? ' : '.$line_item->desc() : '';
 		// name td
-		$html .= EEH_HTML::td( $name_and_desc, '',  'item_l sub-item', '', ' colspan="2"' );
+		$html .= EEH_HTML::td($name_and_desc, '', 'item_l sub-item', '', ' colspan="2"');
 		// percent td
-		$html .= EEH_HTML::td( $line_item->percent() . '%', '',  'item_c', '' );
+		$html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c', '');
 		// total td
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'item_r jst-rght' );
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -202,9 +202,9 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
-		if ( $line_item->total() ) {
-			return $this->_total_row( $line_item, $text, $options);
+	private function _sub_total_row(EE_Line_Item $line_item, $text = '', $options = array()) {
+		if ($line_item->total()) {
+			return $this->_total_row($line_item, $text, $options);
 		}
 		return '';
 	}
@@ -219,15 +219,15 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
+	private function _total_row(EE_Line_Item $line_item, $text = '', $options = array()) {
 		$html = '';
-		if ( $line_item->total() ) {
+		if ($line_item->total()) {
 			// start of row
-			$html = EEH_HTML::tr( '', '', 'total_tr odd' );
+			$html = EEH_HTML::tr('', '', 'total_tr odd');
 			// total td
-			$html .= EEH_HTML::td( $text, '',  'total_currency total jst-rght',  '',  ' colspan="3"' );
+			$html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="3"');
 			// total td
-			$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'total jst-rght' );
+			$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'total jst-rght');
 			// end of row
 			$html .= EEH_HTML::trx();
 		}
@@ -242,38 +242,38 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return mixed
 	 */
-	private function _payments_and_amount_owing_rows( EE_Line_Item $line_item ) {
+	private function _payments_and_amount_owing_rows(EE_Line_Item $line_item) {
 		$html = '';
-		$transaction = EEM_Transaction::instance()->get_one_by_ID( $line_item->TXN_ID() );
-		if ( $transaction instanceof EE_Transaction ) {
+		$transaction = EEM_Transaction::instance()->get_one_by_ID($line_item->TXN_ID());
+		if ($transaction instanceof EE_Transaction) {
 			$payments = $transaction->approved_payments();
-			if ( ! empty( $payments )) {
+			if ( ! empty($payments)) {
 				$owing = $line_item->total();
-				foreach ( $payments as $payment ) {
-					if ( $payment instanceof EE_Payment ) {
+				foreach ($payments as $payment) {
+					if ($payment instanceof EE_Payment) {
 						$owing = $owing - $payment->amount();
 						$payment_desc = sprintf(
 							__('Payment%1$s Received: %2$s', 'event_espresso'),
-							$payment->txn_id_chq_nmbr() != '' ? ' ' . $payment->txn_id_chq_nmbr() : '',
+							$payment->txn_id_chq_nmbr() != '' ? ' '.$payment->txn_id_chq_nmbr() : '',
 							$payment->timestamp()
 						);
 						// start of row
-						$html .= EEH_HTML::tr( '', '', 'total_tr odd' );
+						$html .= EEH_HTML::tr('', '', 'total_tr odd');
 						// payment desc
-						$html .= EEH_HTML::td( $payment_desc, '',  '',  '',  ' colspan="3"' );
+						$html .= EEH_HTML::td($payment_desc, '', '', '', ' colspan="3"');
 						// total td
-						$html .= EEH_HTML::td( EEH_Template::format_currency( $payment->amount(), false, false ), '',  'total jst-rght' );
+						$html .= EEH_HTML::td(EEH_Template::format_currency($payment->amount(), false, false), '', 'total jst-rght');
 						// end of row
 						$html .= EEH_HTML::trx();
 					}
 				}
-				if ( $line_item->total() ) {
+				if ($line_item->total()) {
 					// start of row
-					$html .= EEH_HTML::tr( '', '', 'total_tr odd' );
+					$html .= EEH_HTML::tr('', '', 'total_tr odd');
 					// total td
-					$html .= EEH_HTML::td( __('Amount Owing', 'event_espresso'), '',  'total_currency total jst-rght',  '',  ' colspan="3"' );
+					$html .= EEH_HTML::td(__('Amount Owing', 'event_espresso'), '', 'total_currency total jst-rght', '', ' colspan="3"');
 					// total td
-					$html .= EEH_HTML::td( EEH_Template::format_currency( $owing, false, false ), '',  'total jst-rght' );
+					$html .= EEH_HTML::td(EEH_Template::format_currency($owing, false, false), '', 'total jst-rght');
 					// end of row
 					$html .= EEH_HTML::trx();
 				}
@@ -290,9 +290,9 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _separator_row( $options = array() ) {
+	private function _separator_row($options = array()) {
 		// start of row
-		$html = EEH_HTML::tr( EEH_HTML::td( '<hr>', '',  '',  '',  ' colspan="4"' ));
+		$html = EEH_HTML::tr(EEH_HTML::td('<hr>', '', '', '', ' colspan="4"'));
 		return $html;
 	}
 

core/libraries/messages/EE_Messages_Base.lib.php

Spacing +14 added lines, -14 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -185,14 +185,14 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	protected function _set_existing_admin_settings( $messenger = NULL ) {
+	protected function _set_existing_admin_settings($messenger = NULL) {
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
-		$active_message_types = !empty( $messenger ) ? $active_messengers[$messenger]['settings'][$messenger . '-message_types'] : array();
+		$active_message_types = ! empty($messenger) ? $active_messengers[$messenger]['settings'][$messenger.'-message_types'] : array();
 
 
 		$actives = $this->_messages_item_type == 'messenger' ? $active_messengers : $active_message_types;
 
-		$this->_existing_admin_settings = isset($actives[$this->name]['settings'] ) ? $actives[$this->name]['settings'] : null;
+		$this->_existing_admin_settings = isset($actives[$this->name]['settings']) ? $actives[$this->name]['settings'] : null;
 	}
 
 
@@ -207,10 +207,10 @@ 
 	 * @access public
 	 * @return array          settings
 	 */
-	public function get_existing_admin_settings( $messenger = NULL ) {
+	public function get_existing_admin_settings($messenger = NULL) {
 		// if admin_settings property empty lets try setting it.
-		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) )
-			$this->_set_existing_admin_settings( $messenger );
+		if (method_exists($this, '_set_existing_admin_settings') && empty($this->_existing_admin_settings))
+			$this->_set_existing_admin_settings($messenger);
 
 		return EEH_Class_Tools::has_property($this, '_existing_admin_settings') ? $this->_existing_admin_settings : null;
 	}
@@ -225,10 +225,10 @@ 
 	 * @return array   an array of valid shortcodes.
 	 */
 	public function get_valid_shortcodes() {
-		$valid_shortcodes = apply_filters( 'FHEE__' . get_class($this) . '__get_valid_shortcodes', $this->_valid_shortcodes, $this );
+		$valid_shortcodes = apply_filters('FHEE__'.get_class($this).'__get_valid_shortcodes', $this->_valid_shortcodes, $this);
 
 		//The below filter applies to ALL messengers and message types so use with care!
-		$valid_shortcodes = apply_filters( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this );
+		$valid_shortcodes = apply_filters('FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this);
 		return $valid_shortcodes;
 	}
 
@@ -259,17 +259,17 @@ 
 	 * @access protected
 	 * @return string $content for page.
 	 */
-	protected function _get_admin_page_content( $page, $action, $extra, $actives ) {
+	protected function _get_admin_page_content($page, $action, $extra, $actives) {
 		//we can also further refine the context by action (if present).
-		if ( !empty($action) ) {
-			$page = $page . '_' . $action;
+		if ( ! empty($action)) {
+			$page = $page.'_'.$action;
 		}
 
-		if ( !isset( $this->admin_registered_pages[$page]) )
+		if ( ! isset($this->admin_registered_pages[$page]))
 			return false; //todo: a place to throw an exception?  We need to indicate there is no registered page so this function is not being called correctly.
 
 		//k made it here so let's call the method
-		if ( FALSE === ( $content = call_user_func_array( array( $this, '_get_admin_content_' . $page), array($actives, $extra) ) ) ) {
+		if (FALSE === ($content = call_user_func_array(array($this, '_get_admin_content_'.$page), array($actives, $extra)))) {
 			return false; //todo this needs to be an exception once we've got exceptions in place.
 		}
 		return $content;

Braces +9 added lines, -5 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -209,8 +210,9 @@ 
 	 */
 	public function get_existing_admin_settings( $messenger = NULL ) {
 		// if admin_settings property empty lets try setting it.
-		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) )
-			$this->_set_existing_admin_settings( $messenger );
+		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) ) {
+					$this->_set_existing_admin_settings( $messenger );
+		}
 
 		return EEH_Class_Tools::has_property($this, '_existing_admin_settings') ? $this->_existing_admin_settings : null;
 	}
@@ -265,8 +267,10 @@ 
 			$page = $page . '_' . $action;
 		}
 
-		if ( !isset( $this->admin_registered_pages[$page]) )
-			return false; //todo: a place to throw an exception?  We need to indicate there is no registered page so this function is not being called correctly.
+		if ( !isset( $this->admin_registered_pages[$page]) ) {
+					return false;
+		}
+		//todo: a place to throw an exception?  We need to indicate there is no registered page so this function is not being called correctly.
 
 		//k made it here so let's call the method
 		if ( FALSE === ( $content = call_user_func_array( array( $this, '_get_admin_content_' . $page), array($actives, $extra) ) ) ) {

core/libraries/messages/EE_Payment_Base_message_type.lib.php

Spacing +11 added lines, -11 removed lines

@@ -39,31 +39,31 @@ 
 
 
 
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
 
 		//use the registration to get the transaction.
 		$transaction = $registration->transaction();
 
 		//bail early if no transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			throw new EE_Error( __('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso' ) );
+		if ( ! $transaction instanceof EE_Transaction) {
+			throw new EE_Error(__('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso'));
 		}
 
-		$payment = ! empty( $id ) ? EEM_Payment::instance()->get_one( array( array( 'PAY_ID' => $id, 'TXN_ID' => $transaction->ID() ) ) ) : 0;
+		$payment = ! empty($id) ? EEM_Payment::instance()->get_one(array(array('PAY_ID' => $id, 'TXN_ID' => $transaction->ID()))) : 0;
 
-		return array( $transaction, $payment );
+		return array($transaction, $payment);
 	}
 
 
 
 
 
-	protected function _get_id_for_msg_url( $context, EE_Registration $registration ) {
+	protected function _get_id_for_msg_url($context, EE_Registration $registration) {
 		//there should be a transaction and payment object in the incoming data.
-		if ( $this->_data instanceof EE_Messages_incoming_data  ) {
-			$payment = !empty( $this->_data->payment ) ? $this->_data->payment : NULL;
+		if ($this->_data instanceof EE_Messages_incoming_data) {
+			$payment = ! empty($this->_data->payment) ? $this->_data->payment : NULL;
 
-			if ( $payment instanceof EE_Payment ) {
+			if ($payment instanceof EE_Payment) {
 				return $payment->ID();
 			}
 		}
@@ -72,9 +72,9 @@ 
 
 
 
-	protected function _get_admin_content_events_edit_for_messenger( EE_Messenger $messenger ) {
+	protected function _get_admin_content_events_edit_for_messenger(EE_Messenger $messenger) {
 		//this is just a test
-		return $this->name . ' Message Type for ' . $messenger->name . ' Messenger ';
+		return $this->name.' Message Type for '.$messenger->name.' Messenger ';
 	}
 
 	/**

Braces +3 added lines, -1 removed lines

@@ -6,7 +6,9 @@
  * @subpackage messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * This class contains common methods/properties shared among all payment message types.

core/libraries/messages/EE_Registration_Base_message_type.lib.php

Braces +9 added lines, -5 removed lines

@@ -6,7 +6,9 @@ 
  * @subpackage messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * This class contains common methods/properties shared among all registration message types.
@@ -125,16 +127,18 @@ 
 	 * @return array array of EE_Messages_Addressee objects
 	 */
 	protected function _admin_addressees() {
-		if ( $this->_single_message )
-			return array();
+		if ( $this->_single_message ) {
+					return array();
+		}
 		return parent::_admin_addressees();
 	}
 
 
 
 	protected function _primary_attendee_addressees() {
-		if ( $this->_single_message )
-			return array();
+		if ( $this->_single_message ) {
+					return array();
+		}
 
 		return parent::_primary_attendee_addressees();
 	}

Spacing +14 added lines, -14 removed lines

@@ -29,9 +29,9 @@ 
 	}
 
 
-	protected function _get_admin_content_events_edit_for_messenger( EE_Messenger $messenger ) {
+	protected function _get_admin_content_events_edit_for_messenger(EE_Messenger $messenger) {
 		//this is just a test
-		return $this->name . ' Message Type for ' . $messenger->name . ' Messenger ';
+		return $this->name.' Message Type for '.$messenger->name.' Messenger ';
 	}
 
 
@@ -44,18 +44,18 @@ 
 
 
 
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
-		if ( $context  == 'admin' ) {
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
+		if ($context == 'admin') {
 			//use the registration to get the transaction.
 			$transaction = $registration->transaction();
 
 			//bail early if no transaction
-			if ( ! $transaction instanceof EE_Transaction ) {
-				throw new EE_Error( __('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso' ) );
+			if ( ! $transaction instanceof EE_Transaction) {
+				throw new EE_Error(__('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso'));
 			}
 
-			$payment = !empty( $id ) ? EEM_Payment::instance()->get_one( array( array( 'PAY_ID' => $id, 'TXN_ID' => $transaction->ID() ) ) ) : 0;
-			return array( $transaction, $payment );
+			$payment = ! empty($id) ? EEM_Payment::instance()->get_one(array(array('PAY_ID' => $id, 'TXN_ID' => $transaction->ID()))) : 0;
+			return array($transaction, $payment);
 		} else {
 			return $registration;
 		}
@@ -63,13 +63,13 @@ 
 
 
 
-	protected function _get_id_for_msg_url( $context, EE_Registration $registration ) {
-		if ( $context == 'admin' ) {
+	protected function _get_id_for_msg_url($context, EE_Registration $registration) {
+		if ($context == 'admin') {
 			//there should be a transaction and payment object in the incoming data.
-			if ( $this->_data instanceof EE_Messages_incoming_data && ! $this->_data instanceof EE_Messages_Preview_incoming_data ) {
+			if ($this->_data instanceof EE_Messages_incoming_data && ! $this->_data instanceof EE_Messages_Preview_incoming_data) {
 				$payment = $this->_data->payment;
 
-				if ( $payment instanceof EE_Payment ) {
+				if ($payment instanceof EE_Payment) {
 					return $payment->ID();
 				}
 			}
@@ -97,7 +97,7 @@ 
 	 * @return array array of EE_Messages_Addressee objects
 	 */
 	protected function _admin_addressees() {
-		if ( $this->_single_message )
+		if ($this->_single_message)
 			return array();
 		return parent::_admin_addressees();
 	}
@@ -105,7 +105,7 @@ 
 
 
 	protected function _primary_attendee_addressees() {
-		if ( $this->_single_message )
+		if ($this->_single_message)
 			return array();
 
 		return parent::_primary_attendee_addressees();

core/libraries/messages/EE_message_type.lib.php

Indentation +9 added lines, -9 removed lines

@@ -382,12 +382,12 @@ 
 
 
 	/**
-	* This sets up any action/filter hooks this message type puts in place for a specific messenger.  It's called from the set_messages() method.  Note that by default this does nothing.  Child classes will need to override if they want to add specific hooks for a messenger.
-	*
-	* @since 1.0.0
-	*
-	* @return void
-	*/
+	 * This sets up any action/filter hooks this message type puts in place for a specific messenger.  It's called from the set_messages() method.  Note that by default this does nothing.  Child classes will need to override if they want to add specific hooks for a messenger.
+	 *
+	 * @since 1.0.0
+	 *
+	 * @return void
+	 */
 	protected function _do_messenger_hooks() {
 		return;
 	}
@@ -689,7 +689,7 @@ 
 			//make sure non admin context does not include the event_author shortcodes
 			if ( $context != 'admin' ) {
 				if( ($key = array_search('event_author', $this->_valid_shortcodes[$context] ) ) !== false) {
-				    unset($this->_valid_shortcodes[$context][$key]);
+					unset($this->_valid_shortcodes[$context][$key]);
 				}
 			}
 		}
@@ -697,11 +697,11 @@ 
 		//make sure admin context does not include the recipient_details shortcodes IF we have admin context hooked in message types might not have that context.
 		if ( !empty( $this->_valid_shortcodes['admin'] ) ) {
 			if( ($key = array_search('recipient_details', $this->_valid_shortcodes['admin'] ) ) !== false) {
-				    unset($this->_valid_shortcodes['admin'][$key]);
+					unset($this->_valid_shortcodes['admin'][$key]);
 				}
 			//make sure admin context does not include the recipient_details shortcodes
 			if( ($key = array_search('recipient_list', $this->_valid_shortcodes['admin'] ) ) !== false) {
-				    unset($this->_valid_shortcodes['admin'][$key]);
+					unset($this->_valid_shortcodes['admin'][$key]);
 				}
 		}
 	}

Spacing +96 added lines, -96 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -261,7 +261,7 @@ 
 	 * @param  bool   $preview indicate whether a preview is being generated or not.
 	 * @return void
 	 */
-	public function set_messages($data, EE_messenger $active_messenger, $context = '', $preview = FALSE ) {
+	public function set_messages($data, EE_messenger $active_messenger, $context = '', $preview = FALSE) {
 
 		$this->_active_messenger = $active_messenger;
 
@@ -270,10 +270,10 @@ 
 
 		//this is a special method that allows child message types to trigger an exit from generating messages early (in cases where there may be a delay on send).
 		$exit = $this->_trigger_exit();
-		if ( $exit && ! $this->_preview ) return FALSE;
+		if ($exit && ! $this->_preview) return FALSE;
 
 		//todo: need to move require into registration hook but for now we'll require here.
-		EE_Registry::instance()->load_helper( 'Parse_Shortcodes' );
+		EE_Registry::instance()->load_helper('Parse_Shortcodes');
 		//get shortcode_replace instance- set when _get_messages is called in child...
 		$this->_shortcode_replace = new EEH_Parse_Shortcodes();
 
@@ -284,9 +284,9 @@ 
 		$this->_data_handler = ! $this->_preview ? $this->_data_handler : 'Preview';
 
 		//if there is an incoming context then this is a preview so let's ONLY show the given context!
-		if ( !empty( $context ) ) {
-			$cntxt = ! empty( $this->_contexts[$context] ) ? $this->_contexts[$context] : '';
-			if ( ! empty( $cntxt )  ) {
+		if ( ! empty($context)) {
+			$cntxt = ! empty($this->_contexts[$context]) ? $this->_contexts[$context] : '';
+			if ( ! empty($cntxt)) {
 				$this->_contexts = array();
 				$this->_contexts[$context] = $cntxt;
 			}
@@ -295,7 +295,7 @@ 
 		$exit = $this->_init_data();
 
 		//final check for if we exit or not cause child objects may have run conditionals that cleared out data so no addresees generated.
-		if ( $exit ) return FALSE;
+		if ($exit) return FALSE;
 
 		$this->_get_templates(); //get the templates that have been set with this type and for the given messenger that have been saved in the database.
 		$this->_assemble_messages();
@@ -331,7 +331,7 @@ 
 	 * @param int      $id 		Optional. Integer corresponding to the value for the primary key of a EE_Base_Class_Object
 	 * @return mixed ( EE_Base_Class||EE_Base_Class[] )
 	 */
-	abstract protected function _get_data_for_context( $context, EE_Registration $registration, $id );
+	abstract protected function _get_data_for_context($context, EE_Registration $registration, $id);
 
 
 
@@ -363,7 +363,7 @@ 
 	 *
 	 * @return int
 	 */
-	protected function _get_id_for_msg_url( $context, EE_Registration $registration ) {
+	protected function _get_id_for_msg_url($context, EE_Registration $registration) {
 		return 0;
 	}
 
@@ -396,28 +396,28 @@ 
 	 *
 	 * @return string          generated url
 	 */
-	public function get_url_trigger( $context, $sending_messenger, EE_Registration $registration ) {
+	public function get_url_trigger($context, $sending_messenger, EE_Registration $registration) {
 
 		//validate context
 		//valid context?
-		if ( !isset( $this->_contexts[$context] ) ) {
-			throw new EE_Error( sprintf( __('The context %s is not a valid context for %s.', 'event_espresso'), $context, get_class( $this ) ) );
+		if ( ! isset($this->_contexts[$context])) {
+			throw new EE_Error(sprintf(__('The context %s is not a valid context for %s.', 'event_espresso'), $context, get_class($this)));
 		}
 
 		//valid sending_messenger?
 		$not_valid_msgr = FALSE;
-		foreach ( $this->_with_messengers as $generating => $sendings ) {
-			if ( empty( $sendings ) || array_search( $sending_messenger, $sendings ) === FALSE ) {
+		foreach ($this->_with_messengers as $generating => $sendings) {
+			if (empty($sendings) || array_search($sending_messenger, $sendings) === FALSE) {
 				$not_valid_msgr = TRUE;
 			}
 		}
 
-		if ( $not_valid_msgr ) {
-			throw new EE_Error( sprintf( __('The given sending messenger string (%s) does not match a valid sending messenger with the %s.  If this is incorrect, make sure that the message type has defined this messenger as a sending messenger in its $_with_messengers array.', 'event_espresso'), $sending_messenger, get_class( $this ) ) );
+		if ($not_valid_msgr) {
+			throw new EE_Error(sprintf(__('The given sending messenger string (%s) does not match a valid sending messenger with the %s.  If this is incorrect, make sure that the message type has defined this messenger as a sending messenger in its $_with_messengers array.', 'event_espresso'), $sending_messenger, get_class($this)));
 		}
 
 		EE_Registry::instance()->load_helper('MSG_Template');
-		return EEH_MSG_Template::generate_url_trigger( $sending_messenger, $this->_active_messenger->name, $context, $this->name, $registration, $this->_GRP_ID, $this->_get_id_for_msg_url( $context, $registration ) );
+		return EEH_MSG_Template::generate_url_trigger($sending_messenger, $this->_active_messenger->name, $context, $this->name, $registration, $this->_GRP_ID, $this->_get_id_for_msg_url($context, $registration));
 	}
 
 
@@ -438,19 +438,19 @@ 
 	 *
 	 * @return mixed (EE_Base_Class||EE_Base_Class[])
 	 */
-	public function get_data_for_context( $context, EE_Registration $registration, $id = 0 ) {
+	public function get_data_for_context($context, EE_Registration $registration, $id = 0) {
 		//valid context?
-		if ( !isset( $this->_contexts[$context] ) ) {
-			throw new EE_Error( sprintf( __('The context %s is not a valid context for %s.', 'event_espresso'), $context, get_class( $this ) ) );
+		if ( ! isset($this->_contexts[$context])) {
+			throw new EE_Error(sprintf(__('The context %s is not a valid context for %s.', 'event_espresso'), $context, get_class($this)));
 		}
 
 		//get data and apply global and class specific filters on it.
-		$data = apply_filters( 'FHEE__EE_message_type__get_data_for_context__data', $this->_get_data_for_context( $context, $registration, $id ), $this );
-		$data = apply_filters( 'FHEE__' . get_class( $this ) . '__get_data_for_context__data', $data, $this );
+		$data = apply_filters('FHEE__EE_message_type__get_data_for_context__data', $this->_get_data_for_context($context, $registration, $id), $this);
+		$data = apply_filters('FHEE__'.get_class($this).'__get_data_for_context__data', $data, $this);
 
 		//if empty then something went wrong!
-		if ( empty( $data ) ) {
-			throw new EE_Error( sprintf(  __('There is no data retrieved, it is possible that the id given (%d) does not match any value in the database for the corresponding EE_Base_Class used by the data handler for the %s message type.', 'event_espresso'), $id, $this->name ) );
+		if (empty($data)) {
+			throw new EE_Error(sprintf(__('There is no data retrieved, it is possible that the id given (%d) does not match any value in the database for the corresponding EE_Base_Class used by the data handler for the %s message type.', 'event_espresso'), $id, $this->name));
 		}
 
 		return $data;
@@ -485,7 +485,7 @@ 
 	 */
 	public function with_messengers() {
 
-		return apply_filters( 'FHEE__EE_message_type__get_with_messengers__with_messengers__' . get_class( $this ), $this->_with_messengers);
+		return apply_filters('FHEE__EE_message_type__get_with_messengers__with_messengers__'.get_class($this), $this->_with_messengers);
 	}
 
 
@@ -503,9 +503,9 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function get_message_type_admin_page_content($page, $action = NULL, $extra = array(), $messengers = array() ) {
+	public function get_message_type_admin_page_content($page, $action = NULL, $extra = array(), $messengers = array()) {
 		//we can also further refine the context by action (if present).
-		return $this->_get_admin_page_content( $page, $action, $extra, $messengers );
+		return $this->_get_admin_page_content($page, $action, $extra, $messengers);
 	}
 
 
@@ -549,8 +549,8 @@ 
 	 */
 	public function get_master_templates() {
 		//first class specific filter then filter that by the global filter.
-		$master_templates = apply_filters( 'FHEE__' . get_class( $this ) . '__get_master_templates', $this->_master_templates );
-		return apply_filters( 'FHEE__EE_message_type__get_master_templates', $master_templates, $this );
+		$master_templates = apply_filters('FHEE__'.get_class($this).'__get_master_templates', $this->_master_templates);
+		return apply_filters('FHEE__EE_message_type__get_master_templates', $master_templates, $this);
 	}
 
 
@@ -568,31 +568,31 @@ 
 		/**
 		 * first let's make sure that incoming data isn't empty!
 		 */
-		if ( is_array($this->_data) && empty($this->_data) && !$this->_preview ) {
-			$msg = sprintf( __( '"%s" message type incoming data is empty.  There is nothing to work with so why are you bugging me?', 'event_espresso'), $this->label['singular'] );
-			throw new EE_Error( $msg );
+		if (is_array($this->_data) && empty($this->_data) && ! $this->_preview) {
+			$msg = sprintf(__('"%s" message type incoming data is empty.  There is nothing to work with so why are you bugging me?', 'event_espresso'), $this->label['singular']);
+			throw new EE_Error($msg);
 		}
 
-		if ( empty( $this->_data_handler) ) {
-			$msg = sprintf( __('Hey %s hasn\'t declared a handler for the incoming data, so I\'m stuck', 'event_espresso'), __CLASS__ );
-			throw new EE_Error( $msg );
+		if (empty($this->_data_handler)) {
+			$msg = sprintf(__('Hey %s hasn\'t declared a handler for the incoming data, so I\'m stuck', 'event_espresso'), __CLASS__);
+			throw new EE_Error($msg);
 		}
 
 
 		//setup class name for the data handler
-		$classname = 'EE_Messages_' . $this->_data_handler . '_incoming_data';
+		$classname = 'EE_Messages_'.$this->_data_handler.'_incoming_data';
 
 		//check that the class exists
-		if ( !class_exists( $classname ) ) {
+		if ( ! class_exists($classname)) {
 
 			$msg[] = __('uhoh, Something went wrong and no data handler is found', 'event_espresso');
-			$msg[] = sprintf( __('The %s class has set the "$_data_handler" property but the string included (%s) does not match any existing "EE_Messages_incoming_data" classes (found in "/includes/core/messages/data_class").  Looking for %s.', 'event_espresso'), __CLASS__, $this->_data_handler, $classname );
-			throw new EE_error( implode('||', $msg) );
+			$msg[] = sprintf(__('The %s class has set the "$_data_handler" property but the string included (%s) does not match any existing "EE_Messages_incoming_data" classes (found in "/includes/core/messages/data_class").  Looking for %s.', 'event_espresso'), __CLASS__, $this->_data_handler, $classname);
+			throw new EE_error(implode('||', $msg));
 		}
 
 		//k lets get the prepared data object and replace existing data property with it.
-		$a = new ReflectionClass( $classname );
-		$this->_data = $a->newInstance( $this->_data );
+		$a = new ReflectionClass($classname);
+		$this->_data = $a->newInstance($this->_data);
 
 		$this->_set_default_addressee_data();
 		return $this->_process_data();
@@ -607,15 +607,15 @@ 
 	protected function _process_data() {
 		//at a minimum, we NEED EE_Attendee objects.
 
-		if ( empty( $this->_data->attendees ) )
-			return TRUE;  //EXIT!
+		if (empty($this->_data->attendees))
+			return TRUE; //EXIT!
 
 		//process addressees for each context.  Child classes will have to have methods for each context defined to handle the processing of the data object within them
-		foreach ( $this->_contexts as $context => $details ) {
-			$xpctd_method = '_' . $context . '_addressees';
-			if ( !method_exists( $this, $xpctd_method ) )
-				throw new EE_Error( sprintf( __('The data for %1$s message type cannot be prepared because there is no set method for doing so.  The expected method name is "%2$s" please doublecheck the %1$s message type class and make sure that method is present', 'event_espresso'), $this->label['singular'], $xpctd_method) );
-			 $this->_addressees[$context] = call_user_func( array( $this, $xpctd_method ) );
+		foreach ($this->_contexts as $context => $details) {
+			$xpctd_method = '_'.$context.'_addressees';
+			if ( ! method_exists($this, $xpctd_method))
+				throw new EE_Error(sprintf(__('The data for %1$s message type cannot be prepared because there is no set method for doing so.  The expected method name is "%2$s" please doublecheck the %1$s message type class and make sure that method is present', 'event_espresso'), $this->label['singular'], $xpctd_method));
+			 $this->_addressees[$context] = call_user_func(array($this, $xpctd_method));
 		}
 		return FALSE; //DON'T EXIT
 	}
@@ -650,8 +650,8 @@ 
 			'total_ticket_count' => $this->_data->total_ticket_count
 			);
 
-		if ( is_array( $this->_data->primary_attendee_data ) ) {
-			$this->_default_addressee_data = array_merge( $this->_default_addressee_data, $this->_data->primary_attendee_data );
+		if (is_array($this->_data->primary_attendee_data)) {
+			$this->_default_addressee_data = array_merge($this->_default_addressee_data, $this->_data->primary_attendee_data);
 			$this->_default_addressee_data['primary_att_obj'] = $this->_data->primary_attendee_data['att_obj'];
 			$this->_default_addressee_data['primary_reg_obj'] = $this->_data->primary_attendee_data['reg_obj'];
 		}
@@ -669,26 +669,26 @@ 
 	 * see abstract declaration in parent class for details, children message types can override these valid shortcodes if desired (we include all for all contexts by default).
 	 */
 	protected function _set_valid_shortcodes() {
-		$all_shortcodes = array( 'attendee_list', 'attendee', 'datetime_list', 'datetime', 'event_list', 'event_meta', 'event', 'organization', 'recipient_details', 'recipient_list', 'ticket_list', 'ticket', 'transaction', 'venue', 'primary_registration_details', 'primary_registration_list', 'event_author', 'email', 'messenger' );
+		$all_shortcodes = array('attendee_list', 'attendee', 'datetime_list', 'datetime', 'event_list', 'event_meta', 'event', 'organization', 'recipient_details', 'recipient_list', 'ticket_list', 'ticket', 'transaction', 'venue', 'primary_registration_details', 'primary_registration_list', 'event_author', 'email', 'messenger');
 		$contexts = $this->get_contexts();
-		foreach ( $contexts as $context => $details ) {
+		foreach ($contexts as $context => $details) {
 			$this->_valid_shortcodes[$context] = $all_shortcodes;
 
 			//make sure non admin context does not include the event_author shortcodes
-			if ( $context != 'admin' ) {
-				if( ($key = array_search('event_author', $this->_valid_shortcodes[$context] ) ) !== false) {
+			if ($context != 'admin') {
+				if (($key = array_search('event_author', $this->_valid_shortcodes[$context])) !== false) {
 				    unset($this->_valid_shortcodes[$context][$key]);
 				}
 			}
 		}
 
 		//make sure admin context does not include the recipient_details shortcodes IF we have admin context hooked in message types might not have that context.
-		if ( !empty( $this->_valid_shortcodes['admin'] ) ) {
-			if( ($key = array_search('recipient_details', $this->_valid_shortcodes['admin'] ) ) !== false) {
+		if ( ! empty($this->_valid_shortcodes['admin'])) {
+			if (($key = array_search('recipient_details', $this->_valid_shortcodes['admin'])) !== false) {
 				    unset($this->_valid_shortcodes['admin'][$key]);
 				}
 			//make sure admin context does not include the recipient_details shortcodes
-			if( ($key = array_search('recipient_list', $this->_valid_shortcodes['admin'] ) ) !== false) {
+			if (($key = array_search('recipient_list', $this->_valid_shortcodes['admin'])) !== false) {
 				    unset($this->_valid_shortcodes['admin'][$key]);
 				}
 		}
@@ -701,8 +701,8 @@ 
 	 * @param  array  $new_config array of valid shortcodes (by context)
 	 * @return void               sets valid_shortcodes property
 	 */
-	public function reset_valid_shortcodes_config( $new_config ) {
-		foreach ( $new_config as $context => $shortcodes ) {
+	public function reset_valid_shortcodes_config($new_config) {
+		foreach ($new_config as $context => $shortcodes) {
 			$this->_valid_shortcodes[$context] = $shortcodes;
 		}
 	}
@@ -722,7 +722,7 @@ 
 		$addressees = array();
 
 		//first we need to get the event admin user id for all the events and setup an addressee object for each unique admin user.
-		foreach ( $this->_data->events as $line_ref => $event ) {
+		foreach ($this->_data->events as $line_ref => $event) {
 			$admin_id = $this->_get_event_admin_id($event['ID']);
 			//get the user_id for the event
 			$admin_ids[] = $admin_id;
@@ -734,14 +734,14 @@ 
 		$admin_ids = array_unique($admin_ids);
 
 		//k now we can loop through the event_admins and setup the addressee data.
-		foreach ( $admin_ids as $event_admin ) {
+		foreach ($admin_ids as $event_admin) {
 			$aee = array(
 				'user_id' => $event_admin,
 				'events' => $admin_events[$event_admin],
 				'attendees' => $this->_data->attendees
 				);
-			$aee = array_merge( $this->_default_addressee_data, $aee );
-			$addressees[] = new EE_Messages_Addressee( $aee );
+			$aee = array_merge($this->_default_addressee_data, $aee);
+			$addressees[] = new EE_Messages_Addressee($aee);
 		}
 
 		return $addressees;
@@ -761,7 +761,7 @@ 
 		$aee['attendees'] = $this->_data->attendees;
 
 		//great now we can instantiate the $addressee object and return (as an array);
-		$add[] = new EE_Messages_Addressee( $aee );
+		$add[] = new EE_Messages_Addressee($aee);
 		return $add;
 	}
 
@@ -779,26 +779,26 @@ 
 		//we just have to loop through the attendees.  We'll also set the attached events for each attendee.
 		//use to verify unique attendee emails... we don't want to sent multiple copies to the same attendee do we?
 		$already_processed = array();
-		foreach ( $this->_data->attendees as $att_id => $details ) {
+		foreach ($this->_data->attendees as $att_id => $details) {
 			//set the attendee array to blank on each loop;
 			$aee = array();
 
-			if ( isset( $this->_data->reg_obj ) && ( $this->_data->reg_obj->attendee_ID() != $att_id ) && $this->_single_message ) continue;
+			if (isset($this->_data->reg_obj) && ($this->_data->reg_obj->attendee_ID() != $att_id) && $this->_single_message) continue;
 
-			if ( in_array( $details['attendee_email'], $already_processed ) )
+			if (in_array($details['attendee_email'], $already_processed))
 				continue;
 
 			$already_processed[] = $details['attendee_email'];
 
-			foreach ( $details as $item => $value ) {
+			foreach ($details as $item => $value) {
 				$aee[$item] = $value;
-				if ( $item == 'line_ref' ) {
-					foreach ( $value as $event_id ) {
+				if ($item == 'line_ref') {
+					foreach ($value as $event_id) {
 						$aee['events'][$event_id] = $this->_data->events[$event_id];
 					}
 				}
 
-				if ( $item == 'attendee_email' ) {
+				if ($item == 'attendee_email') {
 					$aee['attendee_email'] = $value;
 				}
 
@@ -813,8 +813,8 @@ 
 			$aee['attendees'] = $this->_data->attendees;
 
 			//merge in the primary attendee data
-			$aee = array_merge( $this->_default_addressee_data, $aee );
-			$add[] = new EE_Messages_Addressee( $aee );
+			$aee = array_merge($this->_default_addressee_data, $aee);
+			$add[] = new EE_Messages_Addressee($aee);
 		}
 
 		return $add;
@@ -839,43 +839,43 @@ 
 		);
 
 		//in vanilla EE we're assuming there's only one event.  However, if there are multiple events then we'll just use the default templates instead of different templates per event (which could create problems).
-		if ( count($this->_data->events) === 1 ) {
-			foreach ( $this->_data->events as $event ) {
+		if (count($this->_data->events) === 1) {
+			foreach ($this->_data->events as $event) {
 				$EVT_ID = $event['ID'];
 			}
 		}
 		// is there a Group ID in the incoming request?
-		EE_Registry::instance()->load_core( 'Request_Handler' );
+		EE_Registry::instance()->load_core('Request_Handler');
 		// if not, set a default value of false
-		$GRP_ID = EE_Registry::instance()->REQ->get( 'GRP_ID', false );
+		$GRP_ID = EE_Registry::instance()->REQ->get('GRP_ID', false);
 		//if this is a preview then we just get whatever message group is for the preview and skip this part!
-		if ( $this->_preview && $GRP_ID ) {
-			$mtpg = EEM_Message_Template_Group::instance()->get_one_by_ID( $GRP_ID );
+		if ($this->_preview && $GRP_ID) {
+			$mtpg = EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
 		} else {
 			//not a preview or test send so lets continue on our way!
 			//is there an evt_id?  If so let's get that. template.
-			if ( !empty( $EVT_ID )  ) {
+			if ( ! empty($EVT_ID)) {
 				$evt_qa = array(
 					'Event.EVT_ID' => $EVT_ID
 				);
-				$qa = array_merge( $template_qa, $evt_qa );
-				$mtpg = EEM_Message_Template_Group::instance()->get_one( array( $qa ) );
+				$qa = array_merge($template_qa, $evt_qa);
+				$mtpg = EEM_Message_Template_Group::instance()->get_one(array($qa));
 			}
 
 			//is there a 'GRP_ID' ? if so let's get that.
 
 			//if global template is NOT an override, and there is a 'GRP_ID' in the request, then we'll assume a specific template has ben requested.
-			if ( $GRP_ID ) {
-				$mtpg = EEM_Message_Template_Group::instance()->get_one_by_ID( $GRP_ID );
+			if ($GRP_ID) {
+				$mtpg = EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
 			}
 
 
 			$template_qa['MTP_is_global'] = TRUE;
 
 			//this gets the current global template (message template group) for the active messenger and message type.
-			$global_mtpg = EEM_Message_Template_Group::instance()->get_one( array( $template_qa ) );
+			$global_mtpg = EEM_Message_Template_Group::instance()->get_one(array($template_qa));
 
-			$mtpg = $mtpg instanceof EE_Message_Template_Group && ! $global_mtpg->get( 'MTP_is_override' ) ? $mtpg : $global_mtpg;
+			$mtpg = $mtpg instanceof EE_Message_Template_Group && ! $global_mtpg->get('MTP_is_override') ? $mtpg : $global_mtpg;
 		}
 
 		$this->_GRP_ID = $mtpg->ID();
@@ -888,8 +888,8 @@ 
 
 
 
-		foreach ( $templates as $context => $template_fields ) {
-			foreach( $template_fields as $template_field=> $template_obj ) {
+		foreach ($templates as $context => $template_fields) {
+			foreach ($template_fields as $template_field=> $template_obj) {
 				$this->_templates[$template_field][$context] = $template_obj->get('MTP_content');
 			}
 		}
@@ -904,11 +904,11 @@ 
 	protected function _assemble_messages() {
 		//make sure any set messages object is cleared
 		$this->messages = array();
-		foreach ( $this->_addressees as $context => $addressees ) {
-			foreach ( $addressees as $addressee ) {
+		foreach ($this->_addressees as $context => $addressees) {
+			foreach ($addressees as $addressee) {
 				$message = $this->_setup_message_object($context, $addressee);
 				//only assign message if everything went okay
-				if ( $message ) {
+				if ($message) {
 					$message->template_pack = $this->_template_pack;
 					$message->variation = $this->_variation;
 					$this->messages[] = $message;
@@ -932,16 +932,16 @@ 
 		$m_shortcodes = $this->_active_messenger->get_valid_shortcodes();
 
 		//if the 'to' field is empty (messages will ALWAYS have a "to" field, then we get out because this context is turned off) EXCEPT if we're previewing
-		if ( ( isset( $this->_templates['to'][$context] ) && empty( $this->_templates['to'][$context] ) ) && !$this->_preview )
+		if ((isset($this->_templates['to'][$context]) && empty($this->_templates['to'][$context])) && ! $this->_preview)
 			return false;
 
-		foreach ( $this->_templates as $field => $ctxt ) {
+		foreach ($this->_templates as $field => $ctxt) {
 			//let's setup the valid shortcodes for the incoming context.
 			$valid_shortcodes = $mt_shortcodes[$context];
 			//merge in valid shortcodes for the field.
 			$shortcodes = isset($m_shortcodes[$field]) ? $m_shortcodes[$field] : $valid_shortcodes;
-			if ( isset( $this->_templates[$field][$context] ) ) {
-				$message->$field = $this->_shortcode_replace->parse_message_template($this->_templates[$field][$context], $addressee, $shortcodes, $this, $this->_active_messenger, $context, $this->_GRP_ID );
+			if (isset($this->_templates[$field][$context])) {
+				$message->$field = $this->_shortcode_replace->parse_message_template($this->_templates[$field][$context], $addressee, $shortcodes, $this, $this->_active_messenger, $context, $this->_GRP_ID);
 			}
 		}
 		return $message;

Braces +24 added lines, -12 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -270,7 +271,9 @@ 
 
 		//this is a special method that allows child message types to trigger an exit from generating messages early (in cases where there may be a delay on send).
 		$exit = $this->_trigger_exit();
-		if ( $exit && ! $this->_preview ) return FALSE;
+		if ( $exit && ! $this->_preview ) {
+			return FALSE;
+		}
 
 		//todo: need to move require into registration hook but for now we'll require here.
 		EE_Registry::instance()->load_helper( 'Parse_Shortcodes' );
@@ -295,7 +298,9 @@ 
 		$exit = $this->_init_data();
 
 		//final check for if we exit or not cause child objects may have run conditionals that cleared out data so no addresees generated.
-		if ( $exit ) return FALSE;
+		if ( $exit ) {
+			return FALSE;
+		}
 
 		$this->_get_templates(); //get the templates that have been set with this type and for the given messenger that have been saved in the database.
 		$this->_assemble_messages();
@@ -607,14 +612,17 @@ 
 	protected function _process_data() {
 		//at a minimum, we NEED EE_Attendee objects.
 
-		if ( empty( $this->_data->attendees ) )
-			return TRUE;  //EXIT!
+		if ( empty( $this->_data->attendees ) ) {
+					return TRUE;
+		}
+		//EXIT!
 
 		//process addressees for each context.  Child classes will have to have methods for each context defined to handle the processing of the data object within them
 		foreach ( $this->_contexts as $context => $details ) {
 			$xpctd_method = '_' . $context . '_addressees';
-			if ( !method_exists( $this, $xpctd_method ) )
-				throw new EE_Error( sprintf( __('The data for %1$s message type cannot be prepared because there is no set method for doing so.  The expected method name is "%2$s" please doublecheck the %1$s message type class and make sure that method is present', 'event_espresso'), $this->label['singular'], $xpctd_method) );
+			if ( !method_exists( $this, $xpctd_method ) ) {
+							throw new EE_Error( sprintf( __('The data for %1$s message type cannot be prepared because there is no set method for doing so.  The expected method name is "%2$s" please doublecheck the %1$s message type class and make sure that method is present', 'event_espresso'), $this->label['singular'], $xpctd_method) );
+			}
 			 $this->_addressees[$context] = call_user_func( array( $this, $xpctd_method ) );
 		}
 		return FALSE; //DON'T EXIT
@@ -783,10 +791,13 @@ 
 			//set the attendee array to blank on each loop;
 			$aee = array();
 
-			if ( isset( $this->_data->reg_obj ) && ( $this->_data->reg_obj->attendee_ID() != $att_id ) && $this->_single_message ) continue;
-
-			if ( in_array( $details['attendee_email'], $already_processed ) )
+			if ( isset( $this->_data->reg_obj ) && ( $this->_data->reg_obj->attendee_ID() != $att_id ) && $this->_single_message ) {
 				continue;
+			}
+
+			if ( in_array( $details['attendee_email'], $already_processed ) ) {
+							continue;
+			}
 
 			$already_processed[] = $details['attendee_email'];
 
@@ -932,8 +943,9 @@ 
 		$m_shortcodes = $this->_active_messenger->get_valid_shortcodes();
 
 		//if the 'to' field is empty (messages will ALWAYS have a "to" field, then we get out because this context is turned off) EXCEPT if we're previewing
-		if ( ( isset( $this->_templates['to'][$context] ) && empty( $this->_templates['to'][$context] ) ) && !$this->_preview )
-			return false;
+		if ( ( isset( $this->_templates['to'][$context] ) && empty( $this->_templates['to'][$context] ) ) && !$this->_preview ) {
+					return false;
+		}
 
 		foreach ( $this->_templates as $field => $ctxt ) {
 			//let's setup the valid shortcodes for the incoming context.

core/libraries/messages/EE_messages.lib.php

Indentation +1 added lines, -1 removed lines

@@ -302,7 +302,7 @@
 	 * @param  string $sending_messenger if included then we ONLY use the specified messenger for delivery.  Otherwise we cycle through all active messengers.
 	 * @param string $generating_messenger if included then this messenger is used for generating the message templates (but not for sending).
 	 * @param string $context If included then only a message type for a specific context will be generated.
-	  * @param bool  $send 			       Default TRUE.  If false, then this will just return the generated EE_Messages objects which might be used by the trigger to setup a batch message (typically html messenger uses it).
+	 * @param bool  $send 			       Default TRUE.  If false, then this will just return the generated EE_Messages objects which might be used by the trigger to setup a batch message (typically html messenger uses it).
 	 * @return bool
 	 */
 	public function send_message( $type, $vars, $sending_messenger = '', $generating_messenger='', $context='', $send = TRUE ) {

Braces +27 added lines, -16 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
@@ -90,7 +91,7 @@ 
 		if( ! isset( $active_messengers[ $messenger_name ] ) ) {
 			$this->activate_messenger( $messenger_name );
 			return FALSE;
-		}else{
+		} else{
 			return TRUE;
 		}
 	}
@@ -207,7 +208,9 @@ 
 	private function _load_files($kind, $actives) {
 		$active_names = array();
 		$base_path = EE_LIBRARIES . 'messages' . DS . $kind . DS;
-		if ( empty($actives) ) return false;
+		if ( empty($actives) ) {
+			return false;
+		}
 
 		//make sure autoloaders are set (failsafe)
 		EED_Messages::set_autoloaders();
@@ -418,8 +421,9 @@ 
 			if ( isset( $this->_active_messengers[$messenger] ) ) {
 
 				//we ONLY continue if the given messenger has that message type active with it (note previews only come from primary messengers so no need to check secondarys)
-				if ( !isset( $this->_active_message_types[$messenger][$type] ) )
-					return false;
+				if ( !isset( $this->_active_message_types[$messenger][$type] ) ) {
+									return false;
+				}
 
 				$message = $installed_message_types[$type];
 				$messenger = $this->_active_messengers[$messenger];
@@ -553,8 +557,9 @@ 
 
 
 		//do we have the necessary objects loaded?
-		if ( empty( $this->_messenger) || empty($this->_message_type) )
-			throw new EE_Error( sprintf( __(' The %s messenger or the %s message_type are not active. Are you sure they exist?', 'event_espresso'), $messenger, $message_type ) );
+		if ( empty( $this->_messenger) || empty($this->_message_type) ) {
+					throw new EE_Error( sprintf( __(' The %s messenger or the %s message_type are not active. Are you sure they exist?', 'event_espresso'), $messenger, $message_type ) );
+		}
 
 		//is given message_type valid for given messenger (if this is not a global save)
 		$types_to_check = array();
@@ -597,8 +602,9 @@ 
 	protected function _create_new_templates($GRP_ID, $is_global) {
 
 		//if we're creating a custom template then we don't need to use the defaults class
-		if ( ! $is_global )
-			return $this->_create_custom_template_group( $GRP_ID );
+		if ( ! $is_global ) {
+					return $this->_create_custom_template_group( $GRP_ID );
+		}
 
 		$DFLT = new EE_Message_Template_Defaults( $this, $this->_messenger->name, $this->_message_type->name, $GRP_ID );
 
@@ -663,14 +669,16 @@ 
 
 		//add new message templates and add relation to.
 		foreach ( $mtts as $mtt ) {
-			if ( ! $mtt instanceof EE_Message_Template )
-				continue;
+			if ( ! $mtt instanceof EE_Message_Template ) {
+							continue;
+			}
 			$nmtt = clone $mtt;
 			$nmtt->set('MTP_ID', 0);
 			$nmtt->set( 'GRP_ID', $new_mtg->ID() ); //relation
 			$nmtt->save();
-			if ( empty( $success['MTP_context'] ) )
-				$success['MTP_context'] = $nmtt->get('MTP_context');
+			if ( empty( $success['MTP_context'] ) ) {
+							$success['MTP_context'] = $nmtt->get('MTP_context');
+			}
 		}
 
 		return $success;
@@ -761,7 +769,9 @@ 
 			$classname = preg_match("/" . $replace . "/", $filename ) ? str_replace($replace, "", $filename) : false;
 
 			//no classname? no match? move along, nothing to see here. note, the stripos is checking to make sure the filename (classname) begins with EE.
-			if ( !$classname || 0 !== stripos($classname, 'EE') ) continue;
+			if ( !$classname || 0 !== stripos($classname, 'EE') ) {
+				continue;
+			}
 
 			//note: I'm not sure if this will work without including the file.  We do have autoloaders so it "may" work.
 			$a = new ReflectionClass($classname);
@@ -786,8 +796,9 @@ 
 		$message_types = array();
 		foreach ( $this->_active_message_types as $messenger => $mtvalues ) {
 			foreach ( $mtvalues as $mt => $config ) {
-				if ( !in_array( $mt, $message_types ) )
-					$message_types[] = $mt;
+				if ( !in_array( $mt, $message_types ) ) {
+									$message_types[] = $mt;
+				}
 			}
 		}
 

Spacing +163 added lines, -163 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -63,17 +63,17 @@ 
 		$actives = is_array($_actives) ? array_keys($_actives) : $_actives;
 		$active_names = $this->_load_files('messenger', $actives);
 
-		if ( is_array($active_names) ) {
-			foreach ( $active_names as $name => $class ) {
-				$a = new ReflectionClass( $class );
+		if (is_array($active_names)) {
+			foreach ($active_names as $name => $class) {
+				$a = new ReflectionClass($class);
 				$active = $a->newInstance();
-				if ( is_wp_error($active) ) {
+				if (is_wp_error($active)) {
 					//we've got an error so let's bubble up the error_object to be caught by caller.
 					//todo: would be better to just catch the errors and then return any aggregated errors later.
 					EE_Error::add_error($active->get_error_message(), __FILE__, __FUNCTION__, __LINE__);
 				}
 				$this->_active_messengers[$name] = $active;
-				$this->_active_message_types[$name] = ! empty( $_actives[$name]['settings'][$name . '-message_types'] ) ? $_actives[$name]['settings'][$name . '-message_types'] : array();
+				$this->_active_message_types[$name] = ! empty($_actives[$name]['settings'][$name.'-message_types']) ? $_actives[$name]['settings'][$name.'-message_types'] : array();
 			}
 		}
 	}
@@ -84,13 +84,13 @@ 
 	 * @param string $messenger_name
 	 * @return boolean TRUE if it was PREVIOUSLY active, and FALSE if it was previously inactive
 	 */
-	public function ensure_messenger_is_active( $messenger_name ){
+	public function ensure_messenger_is_active($messenger_name) {
 		//note: active messengers indexed by their names
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
-		if( ! isset( $active_messengers[ $messenger_name ] ) ) {
-			$this->activate_messenger( $messenger_name );
+		if ( ! isset($active_messengers[$messenger_name])) {
+			$this->activate_messenger($messenger_name);
 			return FALSE;
-		}else{
+		} else {
 			return TRUE;
 		}
 	}
@@ -105,21 +105,21 @@ 
 	 *
 	 * @return boolean true if it got activated (or was active) and false if not.
 	 */
-	public function ensure_message_type_is_active( $message_type, $messenger ) {
+	public function ensure_message_type_is_active($message_type, $messenger) {
 		//first validate that the incoming messenger allows this message type to be activated.
 		$messengers = $this->get_installed_messengers();
-		if ( ! isset( $messengers[$messenger] ) ) {
-			throw new EE_Error( sprintf( __('The messenger sent to %s is not installed', 'event_espresso'), __METHOD__ ) );
+		if ( ! isset($messengers[$messenger])) {
+			throw new EE_Error(sprintf(__('The messenger sent to %s is not installed', 'event_espresso'), __METHOD__));
 		}
 
 		$msgr = $messengers[$messenger];
 		$valid_message_types = $msgr->get_valid_message_types();
-		if ( ! in_array( $message_type, $valid_message_types ) ) {
-			throw new EE_Error( sprint_f( __('The message type ($1%s) sent to $2%s is not valid for the $3%s messenger.  Doublecheck the spelling and verify that message type has been registered as a valid type with the messenger.', 'event_espresso' ), $message_type, __METHOD__, $messenger ) );
+		if ( ! in_array($message_type, $valid_message_types)) {
+			throw new EE_Error(sprint_f(__('The message type ($1%s) sent to $2%s is not valid for the $3%s messenger.  Doublecheck the spelling and verify that message type has been registered as a valid type with the messenger.', 'event_espresso'), $message_type, __METHOD__, $messenger));
 		}
 
 		//all is good so let's just get it active
-		return $this->activate_messenger( $messenger, array( $message_type ) );
+		return $this->activate_messenger($messenger, array($message_type));
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 *                             				they are already setup.)
 	 * @return boolean an array of generated templates or false if nothing generated/activated.
 	 */
-	public function activate_messenger( $messenger_name, $mts = array() ){
+	public function activate_messenger($messenger_name, $mts = array()) {
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
 		$message_types = $this->get_installed_message_types();
 		$installed_messengers = $this->get_installed_messengers();
@@ -138,33 +138,33 @@ 
 		$templates = false;
 
 		//get has_active so we can be sure its kept up to date.
-		$has_activated = get_option( 'ee_has_activated_messenger' );
+		$has_activated = get_option('ee_has_activated_messenger');
 
 		//grab the messenger to work with.
-		$messenger = isset( $installed_messengers[$messenger_name] ) ? $installed_messengers[$messenger_name] : null;
+		$messenger = isset($installed_messengers[$messenger_name]) ? $installed_messengers[$messenger_name] : null;
 
 		//it's inactive. Activate it.
 
-		if( $messenger instanceof EE_messenger ) {
-			$active_messengers[ $messenger->name ][ 'obj' ] = $messenger;
+		if ($messenger instanceof EE_messenger) {
+			$active_messengers[$messenger->name]['obj'] = $messenger;
 
 			/** @var EE_messenger[] $installed_messengers  */
-			$mts_to_activate = ! empty( $mts ) ? $mts :  $messenger->get_default_message_types();
-			foreach ( $mts_to_activate as $message_type ) {
+			$mts_to_activate = ! empty($mts) ? $mts : $messenger->get_default_message_types();
+			foreach ($mts_to_activate as $message_type) {
 				//we need to setup any initial settings for message types
 				/** @var EE_message_type[] $installed_mts */
-				$settings_fields = isset( $message_types[$message_type] ) ? $message_types[ $message_type ]->get_admin_settings_fields() : array();
-				if ( !empty( $settings_fields ) ) {
-					foreach ( $settings_fields as $field => $values ) {
-						$settings[$field] = $values[ 'default' ];
+				$settings_fields = isset($message_types[$message_type]) ? $message_types[$message_type]->get_admin_settings_fields() : array();
+				if ( ! empty($settings_fields)) {
+					foreach ($settings_fields as $field => $values) {
+						$settings[$field] = $values['default'];
 					}
 				} else {
 					$settings = array();
 				}
 
-				$active_messengers[ $messenger->name ][ 'settings' ][ $messenger->name . '-message_types' ][ $message_type ][ 'settings' ] = $settings;
+				$active_messengers[$messenger->name]['settings'][$messenger->name.'-message_types'][$message_type]['settings'] = $settings;
 
-				if (  ! empty( $has_activated[$messenger->name] ) && ! in_array( $message_type, $has_activated[$messenger->name] ) ) {
+				if ( ! empty($has_activated[$messenger->name]) && ! in_array($message_type, $has_activated[$messenger->name])) {
 					$has_activated[$messenger->name][] = $message_type;
 				}
 			}
@@ -172,22 +172,22 @@ 
 			//setup any initial settings for the messenger
 			$msgr_settings = $messenger->get_admin_settings_fields();
 
-			if ( !empty( $msgr_settings ) ) {
-				foreach ( $msgr_settings as $field => $value ) {
-					$active_messengers[ $messenger->name ][ 'settings' ][ $field ] = $value;
+			if ( ! empty($msgr_settings)) {
+				foreach ($msgr_settings as $field => $value) {
+					$active_messengers[$messenger->name]['settings'][$field] = $value;
 				}
 			}
 
-			EEH_MSG_Template::update_active_messengers_in_db( $active_messengers );
-			update_option( 'ee_has_activated_messenger', $has_activated );
+			EEH_MSG_Template::update_active_messengers_in_db($active_messengers);
+			update_option('ee_has_activated_messenger', $has_activated);
 
 			//make sure that the cached active_messengers is set on this object
 			$this->_active_messengers[$messenger->name] = $messenger;
 			$this->_active_message_types[$messenger->name] = $active_messengers[$messenger->name];
 
 			//might need to generate new templates
-			if ( ! empty( $mts_to_activate ) ) {
-				$templates = EEH_MSG_Template::generate_new_templates( $messenger->name, $mts_to_activate, 0, TRUE );
+			if ( ! empty($mts_to_activate)) {
+				$templates = EEH_MSG_Template::generate_new_templates($messenger->name, $mts_to_activate, 0, TRUE);
 			}
 		}
 
@@ -206,8 +206,8 @@ 
 	 */
 	private function _load_files($kind, $actives) {
 		$active_names = array();
-		$base_path = EE_LIBRARIES . 'messages' . DS . $kind . DS;
-		if ( empty($actives) ) return false;
+		$base_path = EE_LIBRARIES.'messages'.DS.$kind.DS;
+		if (empty($actives)) return false;
 
 		//make sure autoloaders are set (failsafe)
 		EED_Messages::set_autoloaders();
@@ -215,18 +215,18 @@ 
 		//make sure $actives is an array
 		$actives = (array) $actives;
 
-		EE_Registry::instance()->load_helper( 'File' );
-		foreach ( $actives as $active ) {
-			$msg_name = 'EE_' . ucwords( str_replace( ' ', '_', $active) ) . '_' . $kind;
-			$filename = $msg_name . '.class.php';
-			$load_file = $base_path . DS . $filename;
-			if ( is_readable($load_file) ) {
+		EE_Registry::instance()->load_helper('File');
+		foreach ($actives as $active) {
+			$msg_name = 'EE_'.ucwords(str_replace(' ', '_', $active)).'_'.$kind;
+			$filename = $msg_name.'.class.php';
+			$load_file = $base_path.DS.$filename;
+			if (is_readable($load_file)) {
 				require_once($load_file);
 				$active_names[$active] = $msg_name;
 			} else {
 				$this->_unset_active($active, $kind);
 				//set WP_Error
-				return EE_Error::add_error( sprintf( __("Missing messages system file set as inactive: (%s) %s has been made inactive.", 'event_espresso'), $load_file, $msg_name), __FILE__, __FUNCTION__, __LINE__ );
+				return EE_Error::add_error(sprintf(__("Missing messages system file set as inactive: (%s) %s has been made inactive.", 'event_espresso'), $load_file, $msg_name), __FILE__, __FUNCTION__, __LINE__);
 			}
 		}
 		return $active_names;
@@ -243,25 +243,25 @@ 
 	 * @param  string $kind        messenger or message_type?
 	 * @return void
 	 */
-	private function _unset_active( $active_name, $kind ) {
+	private function _unset_active($active_name, $kind) {
 		//pluralize
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		if ( $kind == 'messenger' ) {
-			unset( $active_messengers[$active_name] );
-			EEH_MSG_Template::update_to_inactive( $active_name );
-			if ( isset( $this->_active_messengers[$active_name] ) ) {
-				unset( $this->_active_messengers[$active_name] );
+		EE_Registry::instance()->load_helper('MSG_Template');
+		if ($kind == 'messenger') {
+			unset($active_messengers[$active_name]);
+			EEH_MSG_Template::update_to_inactive($active_name);
+			if (isset($this->_active_messengers[$active_name])) {
+				unset($this->_active_messengers[$active_name]);
 			}
 		} else {
-			foreach( $active_messengers as $messenger => $settings ) {
-				if ( ! empty( $settings['settings'][$messenger . '-message_types'][$active_name] ) ) {
-					unset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$active_name] );
+			foreach ($active_messengers as $messenger => $settings) {
+				if ( ! empty($settings['settings'][$messenger.'-message_types'][$active_name])) {
+					unset($active_messengers[$messenger]['settings'][$messenger.'-message_types'][$active_name]);
 				}
 			}
-			EEH_MSG_Template::update_to_inactive( '', $active_name );
-			if ( isset( $this->_active_message_types[$active_name] ) ) {
-				unset( $this->_active_message_types[$active_name] );
+			EEH_MSG_Template::update_to_inactive('', $active_name);
+			if (isset($this->_active_message_types[$active_name])) {
+				unset($this->_active_message_types[$active_name]);
 			}
 		}
 
@@ -279,13 +279,13 @@ 
 	 *
 	 * @return bool true is a generating messenger and can be sent OR FALSE meaning cannot send.
 	 */
-	private function _is_generating_messenger_and_active( EE_messenger $messenger, EE_message_type $message_type ) {
+	private function _is_generating_messenger_and_active(EE_messenger $messenger, EE_message_type $message_type) {
 		$generating_msgrs = array();
 		//get the $messengers the message type says it can be used with.
 		$used_with = $message_type->with_messengers();
 
-		foreach ( $used_with as $generating_msgr => $secondary_msgrs ) {
-			if ( $messenger->name == $generating_msgr && isset( $this->_active_message_types[$generating_msgr][$message_type->name] ) ) {
+		foreach ($used_with as $generating_msgr => $secondary_msgrs) {
+			if ($messenger->name == $generating_msgr && isset($this->_active_message_types[$generating_msgr][$message_type->name])) {
 				return true;
 			}
 		}
@@ -305,17 +305,17 @@ 
 	  * @param bool  $send 			       Default TRUE.  If false, then this will just return the generated EE_Messages objects which might be used by the trigger to setup a batch message (typically html messenger uses it).
 	 * @return bool
 	 */
-	public function send_message( $type, $vars, $sending_messenger = '', $generating_messenger='', $context='', $send = TRUE ) {
+	public function send_message($type, $vars, $sending_messenger = '', $generating_messenger = '', $context = '', $send = TRUE) {
 
 		$error = FALSE;
 		$installed_message_types = $this->get_installed_message_types();
-		$debug_index = 'Messages: ' . $type;
-		foreach ( $vars as $var ) {
-			if ( method_exists( $var, 'ID' ) ) {
-				$debug_index = get_class( $var ) .  ': ' . $var->ID();
+		$debug_index = 'Messages: '.$type;
+		foreach ($vars as $var) {
+			if (method_exists($var, 'ID')) {
+				$debug_index = get_class($var).': '.$var->ID();
 				break;
-			} else if ( is_object( $var )) {
-				$debug_index = spl_object_hash( $var );
+			} else if (is_object($var)) {
+				$debug_index = spl_object_hash($var);
 			}
 		}
 		//EEH_Debug_Tools::log(
@@ -334,34 +334,34 @@ 
 		//);
 
 		// is that a real class ?
-		if ( isset(  $installed_message_types[$type] ) ) {
+		if (isset($installed_message_types[$type])) {
 			//is the messenger specified? If so then let's see if can send.  This is the check where its possible secondary messengers might be in use.
-			if ( !empty ( $sending_messenger ) ) {
-				$generating_messenger =  !empty( $generating_messenger ) && !empty( $this->_active_messengers[$generating_messenger] ) ? $this->_active_messengers[$generating_messenger]: NULL;
-				$generating_messenger = empty( $generating_messenger ) && ! empty( $this->_active_messengers[$sending_messenger] ) ? $this->_active_messengers[$sending_messenger] : $generating_messenger;
+			if ( ! empty ($sending_messenger)) {
+				$generating_messenger = ! empty($generating_messenger) && ! empty($this->_active_messengers[$generating_messenger]) ? $this->_active_messengers[$generating_messenger] : NULL;
+				$generating_messenger = empty($generating_messenger) && ! empty($this->_active_messengers[$sending_messenger]) ? $this->_active_messengers[$sending_messenger] : $generating_messenger;
 
-				if ( !$this->_is_generating_messenger_and_active( $generating_messenger, $installed_message_types[$type] ) ) {
+				if ( ! $this->_is_generating_messenger_and_active($generating_messenger, $installed_message_types[$type])) {
 					return false;
 				}
-				$sending_messenger = ! empty( $this->_active_messengers[$sending_messenger] ) ? $this->_active_messengers[$sending_messenger] : NULL;
+				$sending_messenger = ! empty($this->_active_messengers[$sending_messenger]) ? $this->_active_messengers[$sending_messenger] : NULL;
 
-				$context = !empty( $context ) ? $context : FALSE;
-				$success = $this->_send_message( $generating_messenger, $installed_message_types[$type], $vars, $sending_messenger, $context, $send );
-				if ( ! $send ) {
+				$context = ! empty($context) ? $context : FALSE;
+				$success = $this->_send_message($generating_messenger, $installed_message_types[$type], $vars, $sending_messenger, $context, $send);
+				if ( ! $send) {
 					return $success; //returning generated EE_Messages objects
 				}
 			} else {
 				//no messenger sent so let's just loop through active messengers (this method is only acceptable for primary messengers)
 				$send_messages = array();
-				foreach ( $this->_active_messengers as $active_messenger ) {
+				foreach ($this->_active_messengers as $active_messenger) {
 
 					//we ONLY continue if the given messenger is a primary messenger and is an active messenger for the given message type.  Otherwise we skip.
-					if ( ! $this->_is_generating_messenger_and_active( $active_messenger, $installed_message_types[$type] ) ) {
+					if ( ! $this->_is_generating_messenger_and_active($active_messenger, $installed_message_types[$type])) {
 						continue;
 					}
 
-					$success = $this->_send_message( $active_messenger, $installed_message_types[$type], $vars, $active_messenger );
-					if ( $success === FALSE  ) {
+					$success = $this->_send_message($active_messenger, $installed_message_types[$type], $vars, $active_messenger);
+					if ($success === FALSE) {
 						$error = TRUE;
 					} else {
 						$send_messages[] = $success;
@@ -381,17 +381,17 @@ 
 				//	);
 
 				//return generated EE_Messages objects?
-				if ( ! $send ) {
+				if ( ! $send) {
 					return $send_messages;
 				}
 			}
 		} else {
-			EE_Error::add_error( sprintf( __('Message type: %s does not exist', 'event_espresso'), $type ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(sprintf(__('Message type: %s does not exist', 'event_espresso'), $type), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// add a success message
-		if ( ! $error ) {
-			EE_Error::add_success( sprintf( __( 'The %s message has been successfully sent.', 'event_espresso'), $installed_message_types[$type]->label['singular'] ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $error) {
+			EE_Error::add_success(sprintf(__('The %s message has been successfully sent.', 'event_espresso'), $installed_message_types[$type]->label['singular']), __FILE__, __FUNCTION__, __LINE__);
 		}
 
 		return $error ? FALSE : TRUE; //yeah backwards eh?  Really what we're returning is if there is a total success for all the messages or not.  We'll modify this once we get message recording in place.
@@ -408,35 +408,35 @@ 
 	 * @param bool 	$send true we will do a test send using the messenger delivery, false we just do a regular preview
 	 * @return string          The body of the message.
 	 */
-	public function preview_message( $type, $context, $messenger, $send = FALSE ) {
+	public function preview_message($type, $context, $messenger, $send = FALSE) {
 
 		$installed_message_types = $this->get_installed_message_types();
 
 		//does the given type match an actual message type class.
-		if ( isset(  $installed_message_types[$type] ) ) {
+		if (isset($installed_message_types[$type])) {
 			// valid messenger?
-			if ( isset( $this->_active_messengers[$messenger] ) ) {
+			if (isset($this->_active_messengers[$messenger])) {
 
 				//we ONLY continue if the given messenger has that message type active with it (note previews only come from primary messengers so no need to check secondarys)
-				if ( !isset( $this->_active_message_types[$messenger][$type] ) )
+				if ( ! isset($this->_active_message_types[$messenger][$type]))
 					return false;
 
 				$message = $installed_message_types[$type];
 				$messenger = $this->_active_messengers[$messenger];
 
 				//set data for preview
-				$message->set_messages( array(), $messenger, $context, TRUE );
+				$message->set_messages(array(), $messenger, $context, TRUE);
 
 				//let's GET the message body from the messenger (instead of the normal send_message)
-				return $messenger->get_preview( $message->messages[0], $message, $send );
+				return $messenger->get_preview($message->messages[0], $message, $send);
 
 			} else {
-				EE_Error::add_error( sprintf( __('Messenger: %s does not exist', 'event_espresso'), $messenger ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(sprintf(__('Messenger: %s does not exist', 'event_espresso'), $messenger), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 
 		} else {
-			EE_Error::add_error( sprintf( __('Message type: %s does not exist', 'event_espresso'), $type ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(sprintf(__('Message type: %s does not exist', 'event_espresso'), $type), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -457,22 +457,22 @@ 
 	 *
 	 * @return mixed(bool|std_Class[])
 	 */
-	private function _send_message( EE_messenger $generating_messenger, EE_message_type $message_type, $data, EE_messenger $sending_messenger, $context = FALSE, $send = TRUE ) {
+	private function _send_message(EE_messenger $generating_messenger, EE_message_type $message_type, $data, EE_messenger $sending_messenger, $context = FALSE, $send = TRUE) {
 		//can't even get started yo!
-		if ( $message_type === FALSE || is_wp_error( $message_type ) || $message_type->set_messages( $data, $generating_messenger, $context ) === FALSE ) {
+		if ($message_type === FALSE || is_wp_error($message_type) || $message_type->set_messages($data, $generating_messenger, $context) === FALSE) {
 			return FALSE;
 		}
 		// if the generating messenger and the sending messengers are different...
 		// then are there any hooks that the generating messenger sets for the sending messenger (i.e. css file swap outs etc.)
-		if ( $sending_messenger != $generating_messenger ) {
-			$generating_messenger->do_secondary_messenger_hooks( $sending_messenger->name );
+		if ($sending_messenger != $generating_messenger) {
+			$generating_messenger->do_secondary_messenger_hooks($sending_messenger->name);
 		}
 		//it is possible that the user has the messenger turned off for this type.
-		if ( $message_type->count === 0 ) {
+		if ($message_type->count === 0) {
 			return FALSE;
 		}
 		//are we just sending the EE_Messages stdClass objects back?
-		if ( ! $send ) {
+		if ( ! $send) {
 			return $message_type->messages;
 		}
 		//TODO: check count (at some point we'll use this to decide whether we send to queue or not i.e.
@@ -480,12 +480,12 @@ 
 		//else...
 		$success = TRUE;
 		// $success is a flag for the loop.  If there is NO error then everything is a success (true) otherwise it wasn't a success (false)
-		foreach ( $message_type->messages as $message ) {
+		foreach ($message_type->messages as $message) {
 			//todo: should we do some reporting on messages gone out at some point?  I think we could have the $active_messenger object return bool for whether message was sent or not and we can compile a report based on that.
 			// if messages send successfully then $success retains it's value, but a single fail will toggle it to FALSE
-			$success = $sending_messenger->send_message( $message, $message_type ) === TRUE ? $success : FALSE;
+			$success = $sending_messenger->send_message($message, $message_type) === TRUE ? $success : FALSE;
 		}
-		unset( $message_type );
+		unset($message_type);
 		return $success;
 	}
 
@@ -504,24 +504,24 @@ 
 	 *
 	 * @return bool          success or fail.
 	 */
-	public function send_message_with_messenger_only( $messenger, $message_type, $message ) {
+	public function send_message_with_messenger_only($messenger, $message_type, $message) {
 
 		//get EE_messenger object (which also checks if its active)
-		$msgr =  !empty( $messenger ) && !empty( $this->_active_messengers[$messenger] ) ? $this->_active_messengers[$messenger]: NULL;
+		$msgr = ! empty($messenger) && ! empty($this->_active_messengers[$messenger]) ? $this->_active_messengers[$messenger] : NULL;
 		$installed_message_types = $this->get_installed_message_types();
 
-		if ( ! $msgr instanceof EE_messenger ) {
+		if ( ! $msgr instanceof EE_messenger) {
 			return false; //can't do anything without a valid messenger.
 		}
 
 		//check valid message type
-		$mtype = isset(  $installed_message_types[$message_type] ) ? $installed_message_types[$message_type] : NULL;
+		$mtype = isset($installed_message_types[$message_type]) ? $installed_message_types[$message_type] : NULL;
 
-		if( ! $mtype instanceof EE_message_type ) {
+		if ( ! $mtype instanceof EE_message_type) {
 			return false; //can't do anything without a valid message type.
 		}
 
-		return $msgr->send_message( $message, $mtype );
+		return $msgr->send_message($message, $mtype);
 	}
 
 
@@ -537,7 +537,7 @@ 
 	 */
 	private function _validate_setup($messenger, $message_type, $is_global = FALSE) {
 
-		$message_type = strtolower(str_replace(' ', '_', $message_type) );
+		$message_type = strtolower(str_replace(' ', '_', $message_type));
 		$messenger = strtolower(str_replace(' ', '_', $messenger));
 		$installed_message_types = $this->get_installed_message_types();
 
@@ -553,16 +553,16 @@ 
 
 
 		//do we have the necessary objects loaded?
-		if ( empty( $this->_messenger) || empty($this->_message_type) )
-			throw new EE_Error( sprintf( __(' The %s messenger or the %s message_type are not active. Are you sure they exist?', 'event_espresso'), $messenger, $message_type ) );
+		if (empty($this->_messenger) || empty($this->_message_type))
+			throw new EE_Error(sprintf(__(' The %s messenger or the %s message_type are not active. Are you sure they exist?', 'event_espresso'), $messenger, $message_type));
 
 		//is given message_type valid for given messenger (if this is not a global save)
 		$types_to_check = array();
-		if ( !$is_global ) {
-			$has_active = EEM_Message_Template_Group::instance()->count( array( array( 'MTP_is_active' => TRUE, 'MTP_messenger' => $this->_messenger->name, 'MTP_message_type' => $message_type ) ) );
+		if ( ! $is_global) {
+			$has_active = EEM_Message_Template_Group::instance()->count(array(array('MTP_is_active' => TRUE, 'MTP_messenger' => $this->_messenger->name, 'MTP_message_type' => $message_type)));
 
-			if ( $has_active == 0 ) {
-				EE_Error::add_error( sprintf(__(' The %s message type is not registered with the %s messenger. Please visit the Messenger activation page to assign this message type first if you want to use it.', 'event_espresso'), $message_type, $messenger), __FILE__, __FUNCTION__, __LINE__ );
+			if ($has_active == 0) {
+				EE_Error::add_error(sprintf(__(' The %s message type is not registered with the %s messenger. Please visit the Messenger activation page to assign this message type first if you want to use it.', 'event_espresso'), $message_type, $messenger), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 
@@ -575,17 +575,17 @@ 
 	 * @param  string $message_type message type that the templates are being created for
 	 * @return array|object               if creation is succesful then we return an array of info, otherwise an error_object is returned.
 	 */
-	public function create_new_templates( $messenger, $message_type, $GRP_ID = 0, $is_global = false ) {
+	public function create_new_templates($messenger, $message_type, $GRP_ID = 0, $is_global = false) {
 		$valid_mt = false;
 
 		$valid_mt = $this->_validate_setup($messenger, $message_type, $is_global);
 
-		if ( is_wp_error($valid_mt) && $is_global ) {
+		if (is_wp_error($valid_mt) && $is_global) {
 			//we're setting up a brand new global templates (with messenger activation) so we're assuming that the message types sent in are valid.
 			$valid_mt = true;
 		}
 
-		if ( is_wp_error($valid_mt) ) {
+		if (is_wp_error($valid_mt)) {
 			//if we've still got no valid_mt then bubble up error object
 			return $valid_mt;
 		}
@@ -597,10 +597,10 @@ 
 	protected function _create_new_templates($GRP_ID, $is_global) {
 
 		//if we're creating a custom template then we don't need to use the defaults class
-		if ( ! $is_global )
-			return $this->_create_custom_template_group( $GRP_ID );
+		if ( ! $is_global)
+			return $this->_create_custom_template_group($GRP_ID);
 
-		$DFLT = new EE_Message_Template_Defaults( $this, $this->_messenger->name, $this->_message_type->name, $GRP_ID );
+		$DFLT = new EE_Message_Template_Defaults($this, $this->_messenger->name, $this->_message_type->name, $GRP_ID);
 
 		//generate templates
 		$success = $DFLT->create_new_templates();
@@ -628,16 +628,16 @@ 
 	 *                                     			)
 	 * @access private
 	 */
-	private function _create_custom_template_group( $GRP_ID ) {
+	private function _create_custom_template_group($GRP_ID) {
 		//defaults
-		$success = array( 'GRP_ID' => NULL, 'MTP_context' => '' );
+		$success = array('GRP_ID' => NULL, 'MTP_context' => '');
 
 		//get the template group to use as a template from the db.  If $GRP_ID is empty then we'll assume the base will be the global template matching the messenger and message type.
-		$mtg = empty( $GRP_ID ) ? EEM_Message_Template_Group::instance()->get_one( array( array( 'MTP_messenger' => $this->_messenger->name, 'MTP_message_type' => $this->_message_type->name, 'MTP_is_global' => TRUE ) ) ) : EEM_Message_Template_Group::instance()->get_one_by_ID( $GRP_ID );
+		$mtg = empty($GRP_ID) ? EEM_Message_Template_Group::instance()->get_one(array(array('MTP_messenger' => $this->_messenger->name, 'MTP_message_type' => $this->_message_type->name, 'MTP_is_global' => TRUE))) : EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
 
 		//if we don't have a mtg at this point then we need to bail.
-		if ( ! $mtg instanceof EE_Message_Template_Group ) {
-			EE_Error::add_error( sprintf( __('Something went wrong with generating the custom template from this group id: %s.  This usually happens when there is no matching message template group in the db.', 'event_espresso'), $GRP_ID ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $mtg instanceof EE_Message_Template_Group) {
+			EE_Error::add_error(sprintf(__('Something went wrong with generating the custom template from this group id: %s.  This usually happens when there is no matching message template group in the db.', 'event_espresso'), $GRP_ID), __FILE__, __FUNCTION__, __LINE__);
 			return $success;
 		}
 
@@ -649,27 +649,27 @@ 
 		$new_mtg->set('GRP_ID', 0);
 		$new_mtg->set('MTP_is_global', FALSE);
 
-		$template_name = defined('DOING_AJAX') && !empty( $_POST['templateName'] ) ? $_POST['templateName'] : __('New Custom Template', 'event_espresso');
-		$template_description = defined("DOING_AJAX") && !empty( $_POST['templateDescription'] ) ? $_POST['templateDescription'] : sprintf( __('This is a custom template that was created for the %s messenger and %s message type.', 'event_espresso' ), $new_mtg->messenger_obj()->label['singular'], $new_mtg->message_type_obj()->label['singular'] );
+		$template_name = defined('DOING_AJAX') && ! empty($_POST['templateName']) ? $_POST['templateName'] : __('New Custom Template', 'event_espresso');
+		$template_description = defined("DOING_AJAX") && ! empty($_POST['templateDescription']) ? $_POST['templateDescription'] : sprintf(__('This is a custom template that was created for the %s messenger and %s message type.', 'event_espresso'), $new_mtg->messenger_obj()->label['singular'], $new_mtg->message_type_obj()->label['singular']);
 
 
-		$new_mtg->set('MTP_name', $template_name );
-		$new_mtg->set('MTP_description', $template_description );
+		$new_mtg->set('MTP_name', $template_name);
+		$new_mtg->set('MTP_description', $template_description);
 		//remove ALL relations on this template group so they don't get saved!
-		$new_mtg->_remove_relations( 'Message_Template' );
+		$new_mtg->_remove_relations('Message_Template');
 		$new_mtg->save();
 		$success['GRP_ID'] = $new_mtg->ID();
 		$success['template_name'] = $template_name;
 
 		//add new message templates and add relation to.
-		foreach ( $mtts as $mtt ) {
-			if ( ! $mtt instanceof EE_Message_Template )
+		foreach ($mtts as $mtt) {
+			if ( ! $mtt instanceof EE_Message_Template)
 				continue;
 			$nmtt = clone $mtt;
 			$nmtt->set('MTP_ID', 0);
-			$nmtt->set( 'GRP_ID', $new_mtg->ID() ); //relation
+			$nmtt->set('GRP_ID', $new_mtg->ID()); //relation
 			$nmtt->save();
-			if ( empty( $success['MTP_context'] ) )
+			if (empty($success['MTP_context']))
 				$success['MTP_context'] = $nmtt->get('MTP_context');
 		}
 
@@ -694,14 +694,14 @@ 
 
 
 		//okay now let's assemble an array with the messenger template fields added to the message_type contexts.
-		foreach ( $this->_message_type->get_contexts() as $context => $details ) {
-			foreach ( $this->_messenger->get_template_fields() as $field => $value ) {
+		foreach ($this->_message_type->get_contexts() as $context => $details) {
+			foreach ($this->_messenger->get_template_fields() as $field => $value) {
 				$template_fields[$context][$field] = $value;
 			}
 		}
 
-		if ( empty($template_fields) ) {
-			EE_Error::add_error( __('Something went wrong and we couldn\'t get any templates assembled', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($template_fields)) {
+			EE_Error::add_error(__('Something went wrong and we couldn\'t get any templates assembled', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -716,30 +716,30 @@ 
 	 * @param bool  $set if true then we skip the cache and retrieve via files.
 	 * @return array multidimensional array of messenger and message_type objects (messengers index, and message_type index);
 	 */
-	public function get_installed( $type = 'all', $skip_cache = false ) {
+	public function get_installed($type = 'all', $skip_cache = false) {
 		$installed = array();
 
 		//first let's account for caching
-		if ( $skip_cache ) {
-			$message_base = EE_LIBRARIES . "messages" . DS;
+		if ($skip_cache) {
+			$message_base = EE_LIBRARIES."messages".DS;
 
-			$messenger_files = $type == 'all' || $type == 'messengers' ? scandir( $message_base . "messenger", 1) : NULL;
-			$messagetype_files = $type == 'all' || $type == 'message_types' ? scandir( $message_base . "message_type", 1) : NULL;
+			$messenger_files = $type == 'all' || $type == 'messengers' ? scandir($message_base."messenger", 1) : NULL;
+			$messagetype_files = $type == 'all' || $type == 'message_types' ? scandir($message_base."message_type", 1) : NULL;
 
 
 			//allow plugins to filter in their messenger/message_type files
-			$messenger_files = apply_filters('FHEE__EE_messages__get_installed__messenger_files', $messenger_files, $type );
-			$messagetype_files = apply_filters('FHEE__EE_messages__get_installed__messagetype_files', $messagetype_files, $type );
+			$messenger_files = apply_filters('FHEE__EE_messages__get_installed__messenger_files', $messenger_files, $type);
+			$messagetype_files = apply_filters('FHEE__EE_messages__get_installed__messagetype_files', $messagetype_files, $type);
 
-			$installed['messengers'] = !empty($messenger_files ) ? $this->_get_installed($messenger_files) : '';
-			$installed['message_types'] = !empty($messagetype_files) ? $this->_get_installed($messagetype_files) : '';
+			$installed['messengers'] = ! empty($messenger_files) ? $this->_get_installed($messenger_files) : '';
+			$installed['message_types'] = ! empty($messagetype_files) ? $this->_get_installed($messagetype_files) : '';
 		} else {
 			$installed['messengers'] = $this->get_installed_messengers();
 			$installed['message_types'] = $this->get_installed_message_types();
 		}
 
 
-		if ( $type != 'all' ) {
+		if ($type != 'all') {
 			$installed = $type == 'messengers' ? $installed['messengers'] : $installed['message_types'];
 		}
 
@@ -757,11 +757,11 @@ 
 		$the_goods = array();
 		$filenames = (array) $filenames;
 		$replace = ".class.php";
-		foreach ( $filenames as $filename ) {
-			$classname = preg_match("/" . $replace . "/", $filename ) ? str_replace($replace, "", $filename) : false;
+		foreach ($filenames as $filename) {
+			$classname = preg_match("/".$replace."/", $filename) ? str_replace($replace, "", $filename) : false;
 
 			//no classname? no match? move along, nothing to see here. note, the stripos is checking to make sure the filename (classname) begins with EE.
-			if ( !$classname || 0 !== stripos($classname, 'EE') ) continue;
+			if ( ! $classname || 0 !== stripos($classname, 'EE')) continue;
 
 			//note: I'm not sure if this will work without including the file.  We do have autoloaders so it "may" work.
 			$a = new ReflectionClass($classname);
@@ -784,9 +784,9 @@ 
 	 */
 	public function get_active_message_types() {
 		$message_types = array();
-		foreach ( $this->_active_message_types as $messenger => $mtvalues ) {
-			foreach ( $mtvalues as $mt => $config ) {
-				if ( !in_array( $mt, $message_types ) )
+		foreach ($this->_active_message_types as $messenger => $mtvalues) {
+			foreach ($mtvalues as $mt => $config) {
+				if ( ! in_array($mt, $message_types))
 					$message_types[] = $mt;
 			}
 		}
@@ -806,17 +806,17 @@ 
 	 *
 	 * @return EE_message_type[]    (or empty array if none present)
 	 */
-	public function get_active_message_types_per_messenger( $messenger ) {
+	public function get_active_message_types_per_messenger($messenger) {
 		$messenger = (string) $messenger;
-		if ( empty( $this->_active_message_types[$messenger] ) ) {
+		if (empty($this->_active_message_types[$messenger])) {
 			return array();
 		}
 
 		$mts = array();
 		$message_types = $this->_active_message_types[$messenger];
 		$installed_message_types = $this->get_installed_message_types();
-		foreach ( $message_types as $mt => $settings ) {
-			if ( ! empty( $installed_message_types[$mt] ) )  {
+		foreach ($message_types as $mt => $settings) {
+			if ( ! empty($installed_message_types[$mt])) {
 				$mts[] = $installed_message_types[$mt];
 			}
 		}
@@ -833,9 +833,9 @@ 
 	 *
 	 * @return EE_Message_Type|null
 	 */
-	public function get_active_message_type( $messenger, $message_type ) {
+	public function get_active_message_type($messenger, $message_type) {
 		$installed_message_types = $this->get_installed_message_types();
-		if ( !empty( $this->_active_message_types[$messenger][$message_type] ) && !empty( $installed_message_types[$message_type] ) )  {
+		if ( ! empty($this->_active_message_types[$messenger][$message_type]) && ! empty($installed_message_types[$message_type])) {
 			return $installed_message_types[$message_type];
 		}
 		return NULL;
@@ -844,13 +844,13 @@ 
 
 
 	public function get_installed_message_types() {
-		$this->_installed_message_types = empty( $this->_installed_message_types ) ? $this->get_installed( 'message_types', true ) : $this->_installed_message_types;
+		$this->_installed_message_types = empty($this->_installed_message_types) ? $this->get_installed('message_types', true) : $this->_installed_message_types;
 		return $this->_installed_message_types;
 	}
 
 
 	public function get_installed_messengers() {
-		$this->_installed_messengers = empty( $this->_installed_messengers ) ? $this->get_installed( 'messengers', true ) : $this->_installed_messengers;
+		$this->_installed_messengers = empty($this->_installed_messengers) ? $this->get_installed('messengers', true) : $this->_installed_messengers;
 		return $this->_installed_messengers;
 	}
 }

core/libraries/messages/data_class/EE_Messages_Addressee.class.php

Braces +5 added lines, -3 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
@@ -166,8 +167,9 @@ 
 	protected function _set_properties() {
 
 		foreach ( $this->_data as $prop => $value ) {
-			if( EEH_Class_Tools::has_property( $this, $prop ) )
-				$this->$prop = $value;
+			if( EEH_Class_Tools::has_property( $this, $prop ) ) {
+							$this->$prop = $value;
+			}
 		}
 
 		//if user_id present we'll use this to set the fname and lname and admin_email.

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -34,7 +34,7 @@ 
 	/**
 	 * Identifier properties for the recipient
 	 */
-	public $user_id;  //if available we'll use this to set the fname and lname (admin)
+	public $user_id; //if available we'll use this to set the fname and lname (admin)
 	public $fname; //this will always be the admin fname (set later via incoming user_id)
 	public $lname; //this will always be the admin lnmae (set later via incoming user_id)
 	public $primary_registration_id;
@@ -119,7 +119,7 @@ 
 	 * @param array $addressee_data We're expecting an incoming array of data that will be used to fill the properties for the object.
 	 * @return void
 	 */
-	public function __construct( $addressee_data ) {
+	public function __construct($addressee_data) {
 		$this->_data = $addressee_data;
 		$this->_set_properties();
 	}
@@ -135,15 +135,15 @@ 
 	 */
 	protected function _set_properties() {
 
-		foreach ( $this->_data as $prop => $value ) {
-			if( EEH_Class_Tools::has_property( $this, $prop ) )
+		foreach ($this->_data as $prop => $value) {
+			if (EEH_Class_Tools::has_property($this, $prop))
 				$this->$prop = $value;
 		}
 
 		//if user_id present we'll use this to set the fname and lname and admin_email.
-		if ( !empty( $this->user_id ) ) {
+		if ( ! empty($this->user_id)) {
 			$this->user_id = (int) $this->user_id;
-			$user = get_userdata( $this->user_id );
+			$user = get_userdata($this->user_id);
 			$this->fname = $user->user_firstname;
 			$this->lname = $user->user_lastname;
 			$this->admin_email = $user->user_email;

core/libraries/messages/defaults/EE_Message_Template_Defaults.core.php

Spacing +35 added lines, -35 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -123,7 +123,7 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function __construct( EE_Messages $messages, $messenger_name, $message_type_name, $GRP_ID = 0 ) {
+	public function __construct(EE_Messages $messages, $messenger_name, $message_type_name, $GRP_ID = 0) {
 		$this->_EE_MSG = $messages;
 
 		//set the model object
@@ -135,10 +135,10 @@ 
 		$this->_mt_name = $message_type_name;
 
 		//make sure required props have been set
-		if ( empty( $this->_m_name) || empty( $this->_mt_name ) ) {
+		if (empty($this->_m_name) || empty($this->_mt_name)) {
 			$msg[] = __('Message Templates cannot be generated because the Messenger and Message Types haven\'t been defined for the generator.', 'event_espresso');
 			$msg[] = __('You need to set the "$m_name" and "$mt_name" properties', 'event_espresso');
-			throw new EE_Error( implode( '||', $msg ) );
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		$this->_init();
@@ -154,20 +154,20 @@ 
 	 * @param string $template_pack This corresponds to a template pack class reference which will contain information about where to obtain the templates.
 	 * @return void
 	 */
-	final private function _set_templates( $template_pack ) {
+	final private function _set_templates($template_pack) {
 
 		//get the corresponding template pack object (if present.  If not then we just load the default and add a notice).  The class name should be something like 'EE_Messages_Template_Pack_Default' where "default' would be the incoming template pack reference.
-		$class_name = 'EE_Messages_Template_Pack_' . str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $template_pack ) ) );
+		$class_name = 'EE_Messages_Template_Pack_'.str_replace(' ', '_', ucwords(str_replace('_', ' ', $template_pack)));
 
-		if ( ! class_exists( $class_name ) ) {
-			EE_Error::add_error( sprintf( __('The template pack represented by a class corresponding to "%s" does not exist.  Likely the autoloader for this class has the wrong path or the incoming reference is mispelled.  The default template pack  been used to generate the templates instead.', 'event_espresso'), $class_name ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($class_name)) {
+			EE_Error::add_error(sprintf(__('The template pack represented by a class corresponding to "%s" does not exist.  Likely the autoloader for this class has the wrong path or the incoming reference is mispelled.  The default template pack  been used to generate the templates instead.', 'event_espresso'), $class_name), __FILE__, __FUNCTION__, __LINE__);
 			$class_name = 'EE_Messages_Template_Pack_Default';
 		}
 
 		$template_pack = new $class_name;
 
 		//get all the templates from the template pack.
-		$this->_templates = $template_pack->get_templates( $this->_messenger, $this->_message_type );
+		$this->_templates = $template_pack->get_templates($this->_messenger, $this->_message_type);
 	}
 
 
@@ -185,29 +185,29 @@ 
 		$active_message_types = $this->_EE_MSG->get_installed_message_types();
 
 		//check if messenger is active
-		if ( !isset($active_messengers[$this->_m_name] ) ) {
+		if ( ! isset($active_messengers[$this->_m_name])) {
 			$msg[] = __('Message Templates cannot be generated because the given messenger is not active', 'event_espresso');
-			$msg[] = sprintf( __('The "$_m_name" property has "%s" as its value.  Check the spelling and make sure it matches an available messenger', 'event_espresso'), $this->_m_name );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__('The "$_m_name" property has "%s" as its value.  Check the spelling and make sure it matches an available messenger', 'event_espresso'), $this->_m_name);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		//check if message type is installed
-		if ( !isset($active_messengers[$this->_m_name] ) ) {
+		if ( ! isset($active_messengers[$this->_m_name])) {
 			$msg[] = __('Message Templates cannot be generated because the given message type is not installed', 'event_espresso');
-			$msg[] = sprintf( __('The "$_mt_name" property has "%s" as its value.  Check the spelling and make sure it matches an available message type', 'event_espresso'), $this->_mt_name );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__('The "$_mt_name" property has "%s" as its value.  Check the spelling and make sure it matches an available message type', 'event_espresso'), $this->_mt_name);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		$this->_messenger = $active_messengers[$this->_m_name];
 		$this->_message_type = $active_message_types[$this->_mt_name];
 
 		//verify we have the messenger and message type objects
-		if ( ! $this->_messenger instanceof EE_messenger ) {
-			throw new EE_Error( sprintf( __('The _messenger property must be an instance of EE_messenger by this point.  It isn\'t. Something has gone wrong. Here is the value it holds:<br /> %s', 'event_espresso' ), print_r( $this->_messenger, TRUE ) ) );
+		if ( ! $this->_messenger instanceof EE_messenger) {
+			throw new EE_Error(sprintf(__('The _messenger property must be an instance of EE_messenger by this point.  It isn\'t. Something has gone wrong. Here is the value it holds:<br /> %s', 'event_espresso'), print_r($this->_messenger, TRUE)));
 		}
 
-		if ( ! $this->_message_type instanceof EE_message_type ) {
-			throw new EE_Error( sprintf( __('The _message_type property must be an instance of EE_message_type by this point.  It isn\'t. Something has gone wrong. Here is the value it holds:<br /> %s', 'event_espresso' ), print_r( $this->_message_type, TRUE ) ) );
+		if ( ! $this->_message_type instanceof EE_message_type) {
+			throw new EE_Error(sprintf(__('The _message_type property must be an instance of EE_message_type by this point.  It isn\'t. Something has gone wrong. Here is the value it holds:<br /> %s', 'event_espresso'), print_r($this->_message_type, TRUE)));
 		}
 
 
@@ -235,13 +235,13 @@ 
 	public function create_new_templates() {
 		$template_pack = 'default';
 		//if we have the GRP_ID then let's use that to see if there is a set template pack and use that for the new templates.
-		if ( !empty( $this->_GRP_ID ) ) {
-			$mtpg = EEM_Message_Template_Group::instance()->get_one_by_ID( $this->_GRP_ID );
+		if ( ! empty($this->_GRP_ID)) {
+			$mtpg = EEM_Message_Template_Group::instance()->get_one_by_ID($this->_GRP_ID);
 			$template_pack = $mtpg instanceof EE_Message_Template_Group ? $mtpg->get_template_pack_name() : 'default';
 			//we also need to reset the template variation to default
-			$mtpg->set_template_pack_variation( 'default' );
+			$mtpg->set_template_pack_variation('default');
 		}
-		return $this->_create_new_templates( $template_pack );
+		return $this->_create_new_templates($template_pack);
 	}
 
 
@@ -254,15 +254,15 @@ 
 	 * @param string $template_pack This corresponds to a template pack class reference which will contain information about where to obtain the templates.
 	 * @return mixed (array|bool)            success array or false.
 	 */
-	private function _create_new_templates( $template_pack ) {
+	private function _create_new_templates($template_pack) {
 
-		$this->_set_templates( $template_pack );
+		$this->_set_templates($template_pack);
 
 		//necessary properties are set, let's save the default templates
 
-		if ( empty( $this->_GRP_ID ) ) {
+		if (empty($this->_GRP_ID)) {
 
-			$main_template_data =  array(
+			$main_template_data = array(
 				'MTP_messenger' => $this->_messenger->name,
 				'MTP_message_type' => $this->_message_type->name,
 				'MTP_is_override' => 0,
@@ -274,24 +274,24 @@ 
 
 
 			//let's insert the above and get our GRP_ID, then reset the template data array to just include the GRP_ID
-			$grp_id = $this->_EEM_data->insert( $main_template_data );
+			$grp_id = $this->_EEM_data->insert($main_template_data);
 
-			if ( empty( $grp_id ) ) return $grp_id;
+			if (empty($grp_id)) return $grp_id;
 			$this->_GRP_ID = $grp_id;
 		}
 
-		$template_data = array( 'GRP_ID' => $this->_GRP_ID );
+		$template_data = array('GRP_ID' => $this->_GRP_ID);
 
-		foreach ( $this->_contexts as $context => $details ) {
-			foreach ( $this->_fields as $field => $field_type ) {
-				if ( $field != 'extra' ) {
+		foreach ($this->_contexts as $context => $details) {
+			foreach ($this->_fields as $field => $field_type) {
+				if ($field != 'extra') {
 					$template_data['MTP_context'] = $context;
 					$template_data['MTP_template_field'] = $field;
 					$template_data['MTP_content'] = $this->_templates[$context][$field];
 
 					$MTP = EEM_Message_Template::instance()->insert($template_data);
-					if ( !$MTP ) {
-						EE_Error::add_error( sprintf(__('There was an error in saving new template data for %s messenger, %s message type, %s context and %s template field.', 'event_espresso'), $this->_messenger->name, $this->_message_type->name, $context, $field), __FILE__, __FUNCTION__, __LINE__  );
+					if ( ! $MTP) {
+						EE_Error::add_error(sprintf(__('There was an error in saving new template data for %s messenger, %s message type, %s context and %s template field.', 'event_espresso'), $this->_messenger->name, $this->_message_type->name, $context, $field), __FILE__, __FUNCTION__, __LINE__);
 						return false;
 					}
 				}

Braces +5 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
@@ -276,7 +277,9 @@ 
 			//let's insert the above and get our GRP_ID, then reset the template data array to just include the GRP_ID
 			$grp_id = $this->_EEM_data->insert( $main_template_data );
 
-			if ( empty( $grp_id ) ) return $grp_id;
+			if ( empty( $grp_id ) ) {
+				return $grp_id;
+			}
 			$this->_GRP_ID = $grp_id;
 		}
 

core/libraries/messages/defaults/EE_Messages_Template_Pack.core.php

Spacing +86 added lines, -86 removed lines

@@ -167,48 +167,48 @@ 
 	public function __construct() {
 		$this->_set_props();
 		//make sure classname is correct
-		$classname = get_class( $this );
+		$classname = get_class($this);
 		//make sure required props have been set
 
 		//if label is empty then throw an error because we should have it defined by now.
-		if ( ! isset( $this->label )  ) {
-			throw new EE_Error( sprintf( __('The label property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
+		if ( ! isset($this->label)) {
+			throw new EE_Error(sprintf(__('The label property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
 		}
 
 
 		//the reference for this template pack
-		if ( ! isset( $this->dbref )  ) {
-			throw new EE_Error( sprintf( __('The dbref property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
+		if ( ! isset($this->dbref)) {
+			throw new EE_Error(sprintf(__('The dbref property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
 		}
 
 		//make sure dbref is safe
-		$this->dbref = str_replace( '-', '_', sanitize_key( $this->dbref ) );
+		$this->dbref = str_replace('-', '_', sanitize_key($this->dbref));
 
-		$should_be = 'EE_Messages_Template_Pack_' . str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $this->dbref ) ) );
+		$should_be = 'EE_Messages_Template_Pack_'.str_replace(' ', '_', ucwords(str_replace('_', ' ', $this->dbref)));
 
-		if ( $should_be !== $classname ) {
-			throw new EE_Error( sprintf( __('The name of the template pack instantiated class is "%s".  It should be "%s".  Make sure that the name of the template pack class matches is prepended with "EE_Messages_Template_Pack_" and appended with a sentence case iteration of the value for your template pack\'s dbref property.', 'event_espresso' ), $classname, $should_be ) );
+		if ($should_be !== $classname) {
+			throw new EE_Error(sprintf(__('The name of the template pack instantiated class is "%s".  It should be "%s".  Make sure that the name of the template pack class matches is prepended with "EE_Messages_Template_Pack_" and appended with a sentence case iteration of the value for your template pack\'s dbref property.', 'event_espresso'), $classname, $should_be));
 		}
 
 		//if _base_path is not set then throw an error because a base path string is needed.
-		if ( empty( $this->_base_path ) ) {
-			throw new EE_Error( sprintf( __('The _base_path property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
+		if (empty($this->_base_path)) {
+			throw new EE_Error(sprintf(__('The _base_path property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
 		}
 
 
 		//if _base_url is not set then throw an error because a  string is needed for variations.
-		if ( empty( $this->_base_url ) ) {
-			throw new EE_Error( sprintf( __('The _base_url property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
+		if (empty($this->_base_url)) {
+			throw new EE_Error(sprintf(__('The _base_url property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
 		}
 
 
 		//if $supports is not set then throw an error because that effectively means this template_pack does not have any templates!
-		if ( empty( $this->_supports ) ) {
-			throw new EE_Error( sprintf( __('The supports property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
+		if (empty($this->_supports)) {
+			throw new EE_Error(sprintf(__('The supports property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
 		}
 
 		//load template helper
-		EE_Registry::instance()->load_helper( 'Template' );
+		EE_Registry::instance()->load_helper('Template');
 
 	}
 
@@ -243,8 +243,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_templates( EE_messenger $messenger, EE_message_type $message_type ) {
-		return isset( $this->_templates[$messenger->name][$message_type->name] ) ? $this->_templates[$messenger->name][$message_type->name] : $this->_get_templates( $messenger, $message_type );
+	public function get_templates(EE_messenger $messenger, EE_message_type $message_type) {
+		return isset($this->_templates[$messenger->name][$message_type->name]) ? $this->_templates[$messenger->name][$message_type->name] : $this->_get_templates($messenger, $message_type);
 	}
 
 
@@ -261,7 +261,7 @@ 
 	 * @return array          Returns an multi-level associative array indexed by template context and field in the format:
 	 *                                array( 'context' => array( 'field' => 'value', 'another-field', 'value' ) );
 	 */
-	protected function _get_templates( EE_messenger $messenger, EE_message_type $message_type ) {
+	protected function _get_templates(EE_messenger $messenger, EE_message_type $message_type) {
 		$templates = array();
 
 		/**
@@ -280,28 +280,28 @@ 
 		$contexts = $message_type->get_contexts();
 
 
-		foreach ( $contexts as $context => $details ) {
-			foreach ( $fields as $field => $field_details ) {
-				if ( empty( $field_details ) )
+		foreach ($contexts as $context => $details) {
+			foreach ($fields as $field => $field_details) {
+				if (empty($field_details))
 					continue;
 				/**
 				 * is this a field array (linked to a main field)?
 				 */
-				if ( $field == 'extra'  ) {
-					foreach ( $field_details as $main_field => $sub_fields ) {
-						foreach ( $sub_fields as $sub_field => $sub_field_details ) {
+				if ($field == 'extra') {
+					foreach ($field_details as $main_field => $sub_fields) {
+						foreach ($sub_fields as $sub_field => $sub_field_details) {
 							//make sure that the template_field_ref matches what the main template field is for this template group.
 							$template_field_ref = $sub_field == 'main' ? $main_field : $sub_field;
-							$templates[ $context ][ $main_field ][ $sub_field ] = $this->_get_specific_template( $default_pack, $messenger, $message_type, $template_field_ref, $context );
+							$templates[$context][$main_field][$sub_field] = $this->_get_specific_template($default_pack, $messenger, $message_type, $template_field_ref, $context);
 						}
 					}
 				} else {
-					$templates[ $context ][ $field ] = $this->_get_specific_template( $default_pack, $messenger, $message_type, $field, $context );
+					$templates[$context][$field] = $this->_get_specific_template($default_pack, $messenger, $message_type, $field, $context);
 				}
 			}
 		}
 
-		$templates = apply_filters( 'FHEE__EE_Template_Pack___get_templates__templates', $templates, $messenger, $message_type, $this );
+		$templates = apply_filters('FHEE__EE_Template_Pack___get_templates__templates', $templates, $messenger, $message_type, $this);
 
 		$this->_templates[$messenger->name][$message_type->name] = $templates;
 		 return $templates;
@@ -319,22 +319,22 @@ 
 	 *
 	 * @return string          The template contents.
 	 */
-	protected function _get_specific_template( $default_pack, EE_messenger $messenger, EE_message_type $message_type, $field, $context ) {
+	protected function _get_specific_template($default_pack, EE_messenger $messenger, EE_message_type $message_type, $field, $context) {
 
 		//default templates
-		$default_templates = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_templates( $messenger, $message_type ) : array();
+		$default_templates = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_templates($messenger, $message_type) : array();
 
 		//first we allow for the $_base_path to be filtered.  However, we assign this to a new variable so that we have the original base_path as a fallback.
-		$filtered_base_path = apply_filters( 'FHEE__EE_Template_Pack___get_specific_template__filtered_base_path', $this->_base_path, $messenger, $message_type, $field, $context, $this );
+		$filtered_base_path = apply_filters('FHEE__EE_Template_Pack___get_specific_template__filtered_base_path', $this->_base_path, $messenger, $message_type, $field, $context, $this);
 
 		$master_templates = $message_type->get_master_templates();
-		$master_templates_mt = isset( $master_templates[$messenger->name] ) ? $master_templates[$messenger->name] : $message_type->name;
-		$full_path = $filtered_base_path . $messenger->name . '_' . $message_type->name . '_' . $field . '_' . $context . '.template.php';
-		$fallback_path = $filtered_base_path . $messenger->name . '_' . $message_type->name . '_' . $field . '.template.php';
-		$mt_defined_full_path = $filtered_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '_' . $context . '.template.php';
-		$mt_defined_fallback_path = $filtered_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '.template.php';
-		$base_defined_full_path = $this->_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '_' . $context . '.template.php';
-		$base_defined_fallback_path = $this->_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '.template.php';
+		$master_templates_mt = isset($master_templates[$messenger->name]) ? $master_templates[$messenger->name] : $message_type->name;
+		$full_path = $filtered_base_path.$messenger->name.'_'.$message_type->name.'_'.$field.'_'.$context.'.template.php';
+		$fallback_path = $filtered_base_path.$messenger->name.'_'.$message_type->name.'_'.$field.'.template.php';
+		$mt_defined_full_path = $filtered_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'_'.$context.'.template.php';
+		$mt_defined_fallback_path = $filtered_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'.template.php';
+		$base_defined_full_path = $this->_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'_'.$context.'.template.php';
+		$base_defined_fallback_path = $this->_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'.template.php';
 
 		/**
 		 * Template checks are done hierarchically in the following order:
@@ -348,28 +348,28 @@ 
 		 */
 
 
-		if ( is_readable( $full_path ) ) {
+		if (is_readable($full_path)) {
 			$actual_path = $full_path;
-		} elseif ( is_readable( $fallback_path ) ) {
+		} elseif (is_readable($fallback_path)) {
 			$actual_path = $fallback_path;
-		} elseif ( is_readable( $mt_defined_full_path ) ) {
+		} elseif (is_readable($mt_defined_full_path)) {
 			$actual_path = $mt_defined_full_path;
-		} elseif ( is_readable( $mt_defined_fallback_path ) ) {
+		} elseif (is_readable($mt_defined_fallback_path)) {
 			$actual_path = $mt_defined_fallback_path;
-		} elseif ( is_readable( $base_defined_full_path ) ) {
+		} elseif (is_readable($base_defined_full_path)) {
 			$actual_path = $base_defined_full_path;
-		} elseif ( is_readable( $base_defined_fallback_path ) ) {
+		} elseif (is_readable($base_defined_fallback_path)) {
 			$actual_path = $base_defined_fallback_path;
-		} else  {
+		} else {
 			$actual_path = '';
 		}
-		if ( empty( $actual_path ) ) {
-			$contents = isset( $default_templates[$context][$field] ) ? $default_templates[$context][$field] : '';
+		if (empty($actual_path)) {
+			$contents = isset($default_templates[$context][$field]) ? $default_templates[$context][$field] : '';
 		} else {
-			$contents = EEH_Template::display_template( $actual_path, array(), TRUE );
+			$contents = EEH_Template::display_template($actual_path, array(), TRUE);
 		}
 
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_specific_template__contents', $contents, $actual_path, $messenger, $message_type, $field, $context, $this );
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', $contents, $actual_path, $messenger, $message_type, $field, $context, $this);
 	}
 
 
@@ -384,8 +384,8 @@ 
 	 * @return array
 	 */
 	public function get_supports() {
-		$supports = apply_filters( 'FHEE__' . get_class( $this ) . '__get_supports', $this->_supports );
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_supports', $supports, $this );
+		$supports = apply_filters('FHEE__'.get_class($this).'__get_supports', $this->_supports);
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_supports', $supports, $this);
 	}
 
 
@@ -400,11 +400,11 @@ 
 	 *
 	 * @return array|string
 	 */
-	public function get_default_variation_labels( $messenger = '' ) {
-		$label = empty( $messenger ) ? $this->_default_variation_labels : array();
-		$label = empty( $label ) && ! empty( $this->_default_variation_labels[$messenger] ) ? $this->_default_variation_labels[$messenger] : __('Default', 'event_espresso');
+	public function get_default_variation_labels($messenger = '') {
+		$label = empty($messenger) ? $this->_default_variation_labels : array();
+		$label = empty($label) && ! empty($this->_default_variation_labels[$messenger]) ? $this->_default_variation_labels[$messenger] : __('Default', 'event_espresso');
 
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_default_variation_labels', $label, $this->_default_variation_labels, $messenger );
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_default_variation_labels', $label, $this->_default_variation_labels, $messenger);
 	}
 
 
@@ -420,25 +420,25 @@ 
 	 * @param string $message_type if included then css variations matching the message_type are returned (must have $messenger set).  Otherwise the array of variations per message type are returned.  If message_type is provided but NOT the messenger, then just all variations for all messengers are returned.
 	 * @return array
 	 */
-	public function get_variations( $messenger = '', $message_type = '' ) {
-		$messenger_variations = ! empty( $messenger ) && isset( $this->_variations[$messenger] ) ? $this->_variations[$messenger] : array();
+	public function get_variations($messenger = '', $message_type = '') {
+		$messenger_variations = ! empty($messenger) && isset($this->_variations[$messenger]) ? $this->_variations[$messenger] : array();
 
 		//message_type provided? IF so, then we've requested a specific set of variations, so we need to make sure we set it as empty if that's not present.
-		$variations = !empty( $messenger ) && !empty( $message_type ) && isset( $messenger_variations[$message_type] ) ? $messenger_variations[$message_type] : array();
+		$variations = ! empty($messenger) && ! empty($message_type) && isset($messenger_variations[$message_type]) ? $messenger_variations[$message_type] : array();
 
 		//now let's account for the possibility we just want all the variations for a messenger (which is indicated by providing the messenger but not the message type).
-		$variations = empty( $variations ) && !empty( $messenger ) && empty( $message_type ) ? $messenger_variations : $variations;
+		$variations = empty($variations) && ! empty($messenger) && empty($message_type) ? $messenger_variations : $variations;
 
 		//filter per template pack and globally.
-		$variations = apply_filters( 'FHEE__' . get_class( $this ) . '__get_variations', $variations, $messenger, $message_type );
-		$variations = apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variations', $variations, $messenger, $message_type, $this );
+		$variations = apply_filters('FHEE__'.get_class($this).'__get_variations', $variations, $messenger, $message_type);
+		$variations = apply_filters('FHEE__EE_Messages_Template_Pack__get_variations', $variations, $messenger, $message_type, $this);
 
 		//prepend the _default_variation, but ONLY if we're returning the fully validated array.
-		if ( !empty( $messenger ) && !empty( $message_type ) && ! empty( $variations ) ) {
-			$variations = array( 'default' => $this->get_default_variation_labels( $messenger ) ) + $variations;
+		if ( ! empty($messenger) && ! empty($message_type) && ! empty($variations)) {
+			$variations = array('default' => $this->get_default_variation_labels($messenger)) + $variations;
 		}
 
-		return empty( $variations ) ? array( 'default' => $this->get_default_variation_labels('dft') ): $variations;
+		return empty($variations) ? array('default' => $this->get_default_variation_labels('dft')) : $variations;
 	}
 
 
@@ -459,39 +459,39 @@ 
 	 *
 	 * @return string The variation path or url (typically css reference)
 	 */
-	public function get_variation( $messenger, $message_type, $type, $variation, $url = true, $file_extension = '.css', $skip_filters = FALSE ) {
+	public function get_variation($messenger, $message_type, $type, $variation, $url = true, $file_extension = '.css', $skip_filters = FALSE) {
 
 		$base = $url ? $this->_base_url : $this->_base_path;
 		$base_path = $this->_base_path;
 
-		if ( ! $skip_filters ) {
-			$base =  apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variation__base_path_or_url', $base, $messenger, $message_type, $type, $variation, $url, $file_extension, $this );
-			$base_path = apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variation__base_path', $base_path, $messenger, $message_type, $type, $variation, FALSE, $file_extension, $this );
+		if ( ! $skip_filters) {
+			$base = apply_filters('FHEE__EE_Messages_Template_Pack__get_variation__base_path_or_url', $base, $messenger, $message_type, $type, $variation, $url, $file_extension, $this);
+			$base_path = apply_filters('FHEE__EE_Messages_Template_Pack__get_variation__base_path', $base_path, $messenger, $message_type, $type, $variation, FALSE, $file_extension, $this);
 		}
 
-		$default_pack = get_class( $this ) != 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : $this;
+		$default_pack = get_class($this) != 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : $this;
 
 		//possible variation paths considering whether message type is present or not in the file name.
-		$path_string = 'variations/' . $messenger . '_' . $message_type . '_'  . $type . '_' . $variation . $file_extension;
-		$default_path_string = 'variations/' . $messenger . '_' . $type . '_' . $variation . $file_extension;
+		$path_string = 'variations/'.$messenger.'_'.$message_type.'_'.$type.'_'.$variation.$file_extension;
+		$default_path_string = 'variations/'.$messenger.'_'.$type.'_'.$variation.$file_extension;
 
 		//first see if fully validated file exists.
-		if ( is_readable( $base_path . $path_string ) ) {
-			$variation_path = $base . $path_string;
+		if (is_readable($base_path.$path_string)) {
+			$variation_path = $base.$path_string;
 		//otherwise see if default exists.
-		} elseif ( is_readable( $base_path . $default_path_string ) ) {
-			$variation_path = $base . $default_path_string;
+		} elseif (is_readable($base_path.$default_path_string)) {
+			$variation_path = $base.$default_path_string;
 		} else {
-			$variation_path = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_default_variation( $messenger, $message_type, $type, $url, $file_extension ) : '';
+			$variation_path = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_default_variation($messenger, $message_type, $type, $url, $file_extension) : '';
 		}
 
-		if ( $skip_filters ) {
+		if ($skip_filters) {
 			return $variation_path;
 		}
 
 		//filter result
-		$variation_path = apply_filters( 'FHEE__' . get_class( $this ) . '__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url );
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, $this );
+		$variation_path = apply_filters('FHEE__'.get_class($this).'__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url);
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, $this);
 	}
 
 
@@ -506,19 +506,19 @@ 
 	 *
 	 * @return string returns the path for the requested wrapper template.
 	 */
-	public function get_wrapper( $messenger, $type = 'main' ) {
-		$default_pack = get_class( $this ) !== 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : NULL;
+	public function get_wrapper($messenger, $type = 'main') {
+		$default_pack = get_class($this) !== 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : NULL;
 
-		$path_string = $this->_base_path . $messenger . '_' . $type . '_wrapper.template.php';
+		$path_string = $this->_base_path.$messenger.'_'.$type.'_wrapper.template.php';
 
-		if ( is_readable( $path_string ) ) {
+		if (is_readable($path_string)) {
 			$template = $path_string;
 		} else {
-			$template = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_wrapper( $messenger, $type ) : '';
+			$template = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_wrapper($messenger, $type) : '';
 		}
 
 		//filter
-		$template = apply_filters( 'FHEE__' . get_class( $this ) . '__get_wrapper', $template, $messenger, $type );
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_wrapper', $template, $messenger, $type, $this );
+		$template = apply_filters('FHEE__'.get_class($this).'__get_wrapper', $template, $messenger, $type);
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_wrapper', $template, $messenger, $type, $this);
 	}
 }

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * EE_Template_Packs are classes that contain all the information related to messages templates for a given "template pack".
@@ -282,8 +284,9 @@ 
 
 		foreach ( $contexts as $context => $details ) {
 			foreach ( $fields as $field => $field_details ) {
-				if ( empty( $field_details ) )
-					continue;
+				if ( empty( $field_details ) ) {
+									continue;
+				}
 				/**
 				 * is this a field array (linked to a main field)?
 				 */