eventespresso / event-espresso-core

core/libraries/form_sections/strategies/validation/EE_Validation_Strategy_Base.strategy.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
  * @since 				4.6
  *
  */
-abstract class EE_Validation_Strategy_Base extends EE_Form_Input_Strategy_Base{
+abstract class EE_Validation_Strategy_Base extends EE_Form_Input_Strategy_Base {
 
 
 	protected $_validation_error_message = '';
@@ -18,8 +18,8 @@ 
 	/**
 	 * @param null $validation_error_message
 	 */
-	public function __construct( $validation_error_message = NULL ) {
-		$this->_validation_error_message = $validation_error_message === NULL ? __( 'Input invalid', 'event_espresso' ) : $validation_error_message ;
+	public function __construct($validation_error_message = NULL) {
+		$this->_validation_error_message = $validation_error_message === NULL ? __('Input invalid', 'event_espresso') : $validation_error_message;
 		parent::__construct();
 	}
 
@@ -34,7 +34,7 @@ 
 	 * @param mixed $normalized_value ready for validation. May very well be NULL (which, unless
 	 * this validation strategy is the 'required' validation strategy, most should be OK with a null, empty string, etc)
 	 */
-	function validate($normalized_value){
+	function validate($normalized_value) {
 		//by default, the validation strategy does no validation. this should be implemented
 	}
 
@@ -58,7 +58,7 @@ 
 	 *
 	 * @return array
 	 */
-	function get_jquery_validation_rule_array(){
+	function get_jquery_validation_rule_array() {
 		return array();
 	}
 
@@ -67,7 +67,7 @@ 
 	 * the input is invalid. Used for both frontend and backend validation.
 	 * @return string
 	 */
-	function get_validation_error_message(){
+	function get_validation_error_message() {
 		return $this->_validation_error_message;
 	}
 }
\ No newline at end of file

core/libraries/line_item_display/EE_Line_Item_Display.class.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_Line_Item_Display
- *
- * Description
- *
- * @package         Event Espresso
- * @subpackage    core
- * @author				Brent Christensen
- * @since		 	   $VID:$
- *
- */
+  *
+  * Class EE_Line_Item_Display
+  *
+  * Description
+  *
+  * @package         Event Espresso
+  * @subpackage    core
+  * @author				Brent Christensen
+  * @since		 	   $VID:$
+  *
+  */
 class EE_Line_Item_Display {
 
 	private $strategy = NULL;

Spacing +6 added lines, -6 removed lines

@@ -18,9 +18,9 @@ 
 	/**
 	 * @param $context - where/how the line items are being displayed
 	 */
-	public function __construct( $context ) {
-		$context = strtolower( $context );
-		switch ( $context ) {
+	public function __construct($context) {
+		$context = strtolower($context);
+		switch ($context) {
 			case 'invoice' :
 				$this->strategy = new EE_Invoice_Line_Item_Display_Strategy();
 				break;
@@ -40,8 +40,8 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
-		return $this->strategy->display_line_item( $line_item, $options );
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
+		return $this->strategy->display_line_item($line_item, $options);
 	}
 
 }
@@ -58,7 +58,7 @@ 
 	 * @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());
 
 }
 // End of file EE_Line_Item_Display.class.php

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 {
 

Doc Comments +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
 	/**
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
 
@@ -102,7 +102,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -143,7 +143,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -173,7 +173,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _tax_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -200,7 +200,7 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @param string       $text
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
 		if ( $line_item->total() ) {
@@ -217,7 +217,7 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @param string       $text
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
 		$html = '';
@@ -240,7 +240,7 @@ 
 	 * 	_payments_and_amount_owing_rows
 	 *
 	 * @param EE_Line_Item $line_item
-	 * @return mixed
+	 * @return string
 	 */
 	private function _payments_and_amount_owing_rows( EE_Line_Item $line_item ) {
 		$html = '';
@@ -288,7 +288,7 @@ 
 	 * 	_separator_row
 	 *
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _separator_row( $options = array() ) {
 		// start of row

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

Doc Comments +5 added lines, -5 removed lines

@@ -259,7 +259,7 @@ 
 	 * @param  EE_messenger $active_messenger The active messenger being used
 	 * @param  string $context if present then a message is only being generated for a specific context
 	 * @param  bool   $preview indicate whether a preview is being generated or not.
-	 * @return void
+	 * @return false|null
 	 */
 	public function set_messages($data, EE_messenger $active_messenger, $context = '', $preview = FALSE ) {
 
@@ -501,7 +501,7 @@ 
 	 * @param string $action the page action (to allow for more specific handling - i.e. edit vs. add pages)
 	 * @param array $extra  This is just an extra argument that can be used to pass additional data for setting up page content.
 	 * @access public
-	 * @return void
+	 * @return string
 	 */
 	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).
@@ -560,7 +560,7 @@ 
 	 * The main purpose of this function is to setup the various parameters within the message_type.  $this->addressees, $this->_templates, $this->count, and any extra stuff to the data object that can come from the message_type template options.
 	 * Child classes might overwrite this if they aren't expecting EE_Session as the incoming data object.
 	 *
-	 * @return void
+	 * @return boolean
 	 * @access protected
 	 */
 	protected function _init_data() {
@@ -602,7 +602,7 @@ 
 
 	/**
 	 * processes the data object so we get
-	 * @return void
+	 * @return boolean
 	 */
 	protected function _process_data() {
 		//at a minimum, we NEED EE_Attendee objects.
@@ -753,7 +753,7 @@ 
 	 * Takes care of setting up the addressee object(s) for the primary attendee.
 	 *
 	 * @access protected
-	 * @return array of EE_Addressee objects
+	 * @return EE_Messages_Addressee[] of EE_Addressee objects
 	 */
 	protected function _primary_attendee_addressees() {
 		$aee = $this->_default_addressee_data;

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