eventespresso / event-espresso-core

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

Spacing +14 added lines, -14 removed lines

@@ -10,17 +10,17 @@ 
  * @since 				4.6
  *
  */
-class EE_Simple_HTML_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Simple_HTML_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	/**
 	 * @param null $validation_error_message
 	 */
-	public function __construct( $validation_error_message = NULL ) {
-		if( ! $validation_error_message ){
+	public function __construct($validation_error_message = NULL) {
+		if ( ! $validation_error_message) {
 			$allowedtags = $this->_get_allowed_tags();
-			$validation_error_message = sprintf( __( "Only simple HTML tags are allowed. Eg, %s", "event_espresso" ), implode( ",", array_keys( $allowedtags ) ) );
+			$validation_error_message = sprintf(__("Only simple HTML tags are allowed. Eg, %s", "event_espresso"), implode(",", array_keys($allowedtags)));
 		}
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 
@@ -30,11 +30,11 @@ 
 	 */
 	protected function _get_allowed_tags() {
 		global $allowedtags;
-		$allowedtags[ 'ol' ] = array();
-		$allowedtags[ 'ul' ] = array();
-		$allowedtags[ 'li' ] = array();
-		$allowedtags[ 'br' ] = array();
-		$allowedtags[ 'p' ] = array();
+		$allowedtags['ol'] = array();
+		$allowedtags['ul'] = array();
+		$allowedtags['li'] = array();
+		$allowedtags['br'] = array();
+		$allowedtags['p'] = array();
 		return $allowedtags;
 	}
 
@@ -46,10 +46,10 @@ 
 	 */
 	public function validate($normalized_value) {
 		$allowedtags = $this->_get_allowed_tags();
-		parent::validate( $normalized_value );
-		$normalized_value_sans_tags =  wp_kses( "$normalized_value",$allowedtags );
-		if ( strlen( $normalized_value ) > strlen( $normalized_value_sans_tags ) ) {
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'complex_html_tags' );
+		parent::validate($normalized_value);
+		$normalized_value_sans_tags = wp_kses("$normalized_value", $allowedtags);
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
 		}
 	}
 }
\ No newline at end of file

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 +7 added lines, -7 removed lines

@@ -21,9 +21,9 @@ 
 	 * @param string $context - where/how the line items are being displayed
 	 * @param string $other_line_item_display_strategy
 	 */
-	public function __construct( $context = '', $other_line_item_display_strategy = '' ) {
-		$context = strtolower( $context );
-		switch ( $context ) {
+	public function __construct($context = '', $other_line_item_display_strategy = '') {
+		$context = strtolower($context);
+		switch ($context) {
 			case 'invoice' :
 				$this->strategy = new EE_Invoice_Line_Item_Display_Strategy();
 				break;
@@ -35,8 +35,8 @@ 
 				break;
 			default :
 				if (
-					! empty( $other_line_item_display_strategy ) &&
-					class_exists( $other_line_item_display_strategy )
+					! empty($other_line_item_display_strategy) &&
+					class_exists($other_line_item_display_strategy)
 				) {
 					$this->strategy = new  $other_line_item_display_strategy();
 				} else {
@@ -50,8 +50,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);
 	}
 
 

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 +10 added lines, -10 removed lines

@@ -110,7 +110,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() ) {
 
@@ -225,7 +225,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
@@ -266,7 +266,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
@@ -296,7 +296,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
@@ -336,7 +336,7 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @param string $text
 	 * @param array $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _total_tax_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
 		$html = '';
@@ -361,7 +361,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() ) {
 		$html = '';
@@ -388,7 +388,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 = '';
@@ -412,7 +412,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 = '';
@@ -488,7 +488,7 @@ 
 	 *    _process_billable_total
 	 *
 	 * @param EE_Line_Item $line_item
-	 * @return mixed
+	 * @return integer
 	 */
 	private function _is_billable( EE_Line_Item $line_item ) {
 		$billable = 0;
@@ -532,7 +532,7 @@ 
 	 * 	_separator_row
 	 *
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _separator_row( $options = array() ) {
 		// start of row

Spacing +101 added lines, -101 removed lines

@@ -112,39 +112,39 @@ 
 	 * @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);
 
-		if ( isset( $options['registrations'] )) {
-			$this->_process_billable_registrations( $options[ 'registrations' ] );
+		if (isset($options['registrations'])) {
+			$this->_process_billable_registrations($options['registrations']);
 		}
 
-		switch( $line_item->type() ) {
+		switch ($line_item->type()) {
 
 			case EEM_Line_Item::type_line_item:
-				$options[ 'billable_qty' ] = $this->_is_billable( $line_item );
-				if ( $options[ 'billable_qty' ] ) {
+				$options['billable_qty'] = $this->_is_billable($line_item);
+				if ($options['billable_qty']) {
 					// 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:
@@ -152,34 +152,34 @@ 
 				$sub_total += $line_item->total();
 				$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);
 				}
 				//EEH_Debug_Tools::printr( $line_item->total(), '$line_item->total()', __FILE__, __LINE__ );
 				//EEH_Debug_Tools::printr( $sub_total, '$sub_total', __FILE__, __LINE__ );
-				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);
 				}
 				break;
 
 			case EEM_Line_Item::type_tax:
-				if ( $this->_show_taxes ) {
-					$this->_taxes_html .= $this->_tax_row( $line_item, $options );
+				if ($this->_show_taxes) {
+					$this->_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) {
 					$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);
 					}
 					$this->_total_tax = $line_item->total() * $this->_tax_rate();
-					if ( count( $child_line_items ) > 1 ) {
-						$this->_taxes_html .= $this->_total_tax_row( $line_item, __( 'Tax Total', 'event_espresso' ), $options );
+					if (count($child_line_items) > 1) {
+						$this->_taxes_html .= $this->_total_tax_row($line_item, __('Tax Total', 'event_espresso'), $options);
 					}
 				}
 				break;
@@ -190,21 +190,21 @@ 
 				// get all child line items
 				$children = $line_item->children();
 				// loop thru all non-tax child line items
-				foreach( $children as $child_line_item ) {
-					if ( $child_line_item->type() != EEM_Line_Item::type_tax_sub_total ) {
+				foreach ($children as $child_line_item) {
+					if ($child_line_item->type() != EEM_Line_Item::type_tax_sub_total) {
 						// 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);
 					}
 				}
 				// now loop thru  tax child line items
-				foreach( $children as $child_line_item ) {
-					if ( $child_line_item->type() == EEM_Line_Item::type_tax_sub_total ) {
+				foreach ($children as $child_line_item) {
+					if ($child_line_item->type() == EEM_Line_Item::type_tax_sub_total) {
 						// 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->_taxes_html;
-				$html .= $this->_total_row( $line_item, __('Total', 'event_espresso'), $options );
+				$html .= $this->_total_row($line_item, __('Total', 'event_espresso'), $options);
 				//$html .= $this->_payments_and_amount_owing_rows( $line_item );
 				//echo '<br/><br/><h5 style="color:#2EA2CC;">$this->_billable_total : <span style="color:#E76700">' . $this->_billable_total . '</span><br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h5>';
 				//echo '<h5 style="color:#2EA2CC;">$this->_non_billable_total : <span style="color:#E76700">' . $this->_non_billable_total . '</span><br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h5>';
@@ -227,10 +227,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',
@@ -239,21 +239,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_and_desc .= $line_item->is_taxable() ? ' * ' : '';
 		// 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( $options[ 'billable_qty' ], '',  'item_l jst-rght' );
+		$html .= EEH_HTML::td($options['billable_qty'], '', '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->unit_price() * $options[ 'billable_qty' ], false, false );
-		$html .= EEH_HTML::td( $total, '',  'item_r jst-rght' );
+		$total = EEH_Template::format_currency($line_item->unit_price() * $options['billable_qty'], false, false);
+		$html .= EEH_HTML::td($total, '', 'item_r jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -268,22 +268,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;
@@ -298,20 +298,20 @@ 
 	 * @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 .= '<span class="tiny-text" style="margin:0 0 0 2em;">' . __( ' * taxable items', 'event_espresso' ) . '</span>';
-		$name_and_desc .= $options[ 'show_desc' ] ? '<br/>' . $line_item->desc() : '';
+		$name_and_desc .= '<span class="tiny-text" style="margin:0 0 0 2em;">'.__(' * taxable items', 'event_espresso').'</span>';
+		$name_and_desc .= $options['show_desc'] ? '<br/>'.$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() . '%', '',  ' jst-rght', '' );
+		$html .= EEH_HTML::td($line_item->percent().'%', '', ' jst-rght', '');
 		// total td
 		$total = $line_item->total() * $this->_tax_rate();
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $total, false, false ), '',  'item_r jst-rght' );
+		$html .= EEH_HTML::td(EEH_Template::format_currency($total, false, false), '', 'item_r jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -325,7 +325,7 @@ 
 	 * @return float
 	 */
 	private function _tax_rate() {
-		return $this->_billable_tax_total + $this->_non_billable_tax_total > 0 ? ( $this->_billable_tax_total / ( $this->_billable_tax_total + $this->_non_billable_tax_total ) ) : 1;
+		return $this->_billable_tax_total + $this->_non_billable_tax_total > 0 ? ($this->_billable_tax_total / ($this->_billable_tax_total + $this->_non_billable_tax_total)) : 1;
 	}
 
 
@@ -338,15 +338,15 @@ 
 	 * @param array $options
 	 * @return mixed
 	 */
-	private function _total_tax_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
+	private function _total_tax_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( $this->_total_tax, false, false ), '', 'total jst-rght' );
+			$html .= EEH_HTML::td(EEH_Template::format_currency($this->_total_tax, false, false), '', 'total jst-rght');
 			// end of row
 			$html .= EEH_HTML::trx();
 		}
@@ -363,16 +363,16 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	private function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
+	private function _sub_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
-			$total = $line_item->total() * ( $this->_billable_total / ( $this->_billable_total + $this->_non_billable_total ) );
-			$html .= EEH_HTML::td( EEH_Template::format_currency( $total, false, false ), '', 'total jst-rght' );
+			$total = $line_item->total() * ($this->_billable_total / ($this->_billable_total + $this->_non_billable_total));
+			$html .= EEH_HTML::td(EEH_Template::format_currency($total, false, false), '', 'total jst-rght');
 			// end of row
 			$html .= EEH_HTML::trx();
 		}
@@ -390,16 +390,16 @@ 
 	 * @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( '', '', 'spco-grand-total total_tr odd' );
+			$html = EEH_HTML::tr('', '', 'spco-grand-total 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
 			$this->_grand_total = $this->_billable_total + $this->_total_tax;
-			$html .= EEH_HTML::td( EEH_Template::format_currency( $this->_grand_total, false, false ), '',  'total jst-rght' );
+			$html .= EEH_HTML::td(EEH_Template::format_currency($this->_grand_total, false, false), '', 'total jst-rght');
 			// end of row
 			$html .= EEH_HTML::trx();
 		}
@@ -414,26 +414,26 @@ 
 	 * @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 )) {
-				foreach ( $payments as $payment ) {
-					if ( $payment instanceof EE_Payment ) {
+			if ( ! empty($payments)) {
+				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() != '' ? ' <span class="small-text">(#' . $payment->txn_id_chq_nmbr() . ')</span> ' : '',
+							$payment->txn_id_chq_nmbr() != '' ? ' <span class="small-text">(#'.$payment->txn_id_chq_nmbr().')</span> ' : '',
 							$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();
 					}
@@ -462,17 +462,17 @@ 
 	 * @param EE_Registration[] $registrations_requiring_payment
 	 * @return mixed
 	 */
-	private function _process_billable_registrations( $registrations_requiring_payment = array() ) {
-		if ( is_array( $registrations_requiring_payment ) && self::$_process_registrations ) {
-			foreach ( $registrations_requiring_payment as $registration ) {
-				if ( ! $registration instanceof EE_Registration ) {
+	private function _process_billable_registrations($registrations_requiring_payment = array()) {
+		if (is_array($registrations_requiring_payment) && self::$_process_registrations) {
+			foreach ($registrations_requiring_payment as $registration) {
+				if ( ! $registration instanceof EE_Registration) {
 					break;
 				}
 				//EEH_Debug_Tools::printr( $registration, '$registration', __FILE__, __LINE__ );
-				if ( $registration->owes_monies_and_can_pay() ) {
-					$this->_billable[ $registration->ID() ] = $registration->ticket_ID();
+				if ($registration->owes_monies_and_can_pay()) {
+					$this->_billable[$registration->ID()] = $registration->ticket_ID();
 				} else {
-					$this->_do_not_bill[ $registration->ID() ] = $registration->ticket_ID();
+					$this->_do_not_bill[$registration->ID()] = $registration->ticket_ID();
 				}
 			}
 			//EEH_Debug_Tools::printr( $this->_billable, '$this->_billable', __FILE__, __LINE__ );
@@ -490,36 +490,36 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return mixed
 	 */
-	private function _is_billable( EE_Line_Item $line_item ) {
+	private function _is_billable(EE_Line_Item $line_item) {
 		$billable = 0;
 		// is this a ticket ?
-		if ( $line_item->OBJ_type() == 'Ticket' ) {
+		if ($line_item->OBJ_type() == 'Ticket') {
 			//echo '<br/><h5 style="color:#2EA2CC;">$line_item->name() : <span style="color:#E76700">' . $line_item->name() . '</span><br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h5>';
 			//echo '<h5 style="color:#2EA2CC;">$line_item->OBJ_ID() : <span style="color:#E76700">' . $line_item->OBJ_ID() . '</span><br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h5>';
 
 			// is it in the "do not bill" list?
-			foreach ( $this->_billable as $REG_ID => $TKT_ID ) {
-				if ( $line_item->OBJ_ID() === $TKT_ID ) {
+			foreach ($this->_billable as $REG_ID => $TKT_ID) {
+				if ($line_item->OBJ_ID() === $TKT_ID) {
 					//echo '<h5 style="color:#2EA2CC;">billable : <span style="color:#E76700">' . $line_item->unit_price() . '</span><br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h5>';
 					$this->_billable_total += $line_item->unit_price();
 					//$this->_total_items += $line_item->quantity();
-					if ( $line_item->is_taxable() ) {
+					if ($line_item->is_taxable()) {
 						$this->_billable_tax_total += $line_item->unit_price();
 					}
 					$this->_total_items++;
 					$billable++;
-					unset( $this->_do_not_bill[ $REG_ID ] );
+					unset($this->_do_not_bill[$REG_ID]);
 				}
 			}
 
-			foreach ( $this->_do_not_bill as $REG_ID => $TKT_ID ) {
-				if ( $line_item->OBJ_ID() === $TKT_ID ) {
+			foreach ($this->_do_not_bill as $REG_ID => $TKT_ID) {
+				if ($line_item->OBJ_ID() === $TKT_ID) {
 					//echo '<h5 style="color:#2EA2CC;">non_billable : <span style="color:#E76700">' . $line_item->unit_price() . '</span><br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h5>';
 					$this->_non_billable_total += $line_item->unit_price();
-					if ( $line_item->is_taxable() ) {
+					if ($line_item->is_taxable()) {
 						$this->_non_billable_tax_total += $line_item->unit_price();
 					}
-					unset( $this->_do_not_bill[ $REG_ID ] );
+					unset($this->_do_not_bill[$REG_ID]);
 				}
 			}
 		}
@@ -534,9 +534,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

@@ -5,7 +5,9 @@
  * @subpackage plugin api, 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');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

core/libraries/messages/EE_Registration_Base_message_type.lib.php

Spacing +23 added lines, -23 removed lines

@@ -29,33 +29,33 @@ 
 	}
 
 
-	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 ';
 	}
 
 
 
 
 	protected function _set_data_handler() {
-		if ( is_array( $this->_data ) ) {
-			$data_type = reset( $this->_data );
+		if (is_array($this->_data)) {
+			$data_type = reset($this->_data);
 
-			if ( is_array( $data_type ) ) {
+			if (is_array($data_type)) {
 				//grab the first item and see if its a registration.
-				$maybe_reg = isset( $data_type[0] ) && is_array( $data_type[0] ) ? reset( $data_type[0] ) : reset( $data_type );
-				if ( $maybe_reg instanceof EE_Registration ) {
+				$maybe_reg = isset($data_type[0]) && is_array($data_type[0]) ? reset($data_type[0]) : reset($data_type);
+				if ($maybe_reg instanceof EE_Registration) {
 					//is $data_type itself just an array of registrations?
-					if ( isset( $data_type[1] ) && $data_type[1] instanceof EE_Registration  ) {
+					if (isset($data_type[1]) && $data_type[1] instanceof EE_Registration) {
 						$regs = $data_type;
 					} else {
-						$regs = is_array( $data_type[0] ) ? $data_type[0] : array( $maybe_reg );
+						$regs = is_array($data_type[0]) ? $data_type[0] : array($maybe_reg);
 					}
 
-					foreach ( $regs as $reg ) {
+					foreach ($regs as $reg) {
 						$this->_regs_for_sending[] = $reg->ID();
 					}
-					$this->_data = isset( $this->_data[1] ) ? array( $maybe_reg->transaction(), null, $this->_data[1] ) : array( $maybe_reg->transaction() );
+					$this->_data = isset($this->_data[1]) ? array($maybe_reg->transaction(), null, $this->_data[1]) : array($maybe_reg->transaction());
 					$this->_data_handler = 'Gateways';
 				} else {
 					$this->_data_handler = 'Gateways';
@@ -72,18 +72,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;
 		}
@@ -91,13 +91,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();
 				}
 			}
@@ -125,7 +125,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();
 	}
@@ -133,7 +133,7 @@ 
 
 
 	protected function _primary_attendee_addressees() {
-		if ( $this->_single_message )
+		if ($this->_single_message)
 			return array();
 
 		return parent::_primary_attendee_addressees();

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

core/libraries/messages/EE_messenger.lib.php

Braces +26 added lines, -17 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
@@ -495,8 +496,9 @@ 
 				continue;
 			}
 			$mtp_obj->admin_registered_pages = (array) $mtp_obj->admin_registered_pages;
-			if ( ! in_array( 'events_edit', $mtp_obj->admin_registered_pages ) )
-				continue;
+			if ( ! in_array( 'events_edit', $mtp_obj->admin_registered_pages ) ) {
+							continue;
+			}
 			$stargs = array();
 			$default_value = '';
 			$select_values = array();
@@ -647,8 +649,9 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _validate_and_setup( $message ) {
-		if ( !is_object( $message ) )
-			throw new EE_Error( __('Incoming "$message" must be an object', 'event_espresso' ) );
+		if ( !is_object( $message ) ) {
+					throw new EE_Error( __('Incoming "$message" must be an object', 'event_espresso' ) );
+		}
 
 		//verify we have the required template pack value on the $message object.
 		if ( empty( $message->template_pack ) || ! $message->template_pack instanceof EE_Messages_Template_Pack ) {
@@ -662,8 +665,9 @@ 
 		$template_fields = $this->get_template_fields();
 
 		foreach ( $template_fields as $template => $value ) {
-			if ( $template !== 'extra' )
-				$this->_set_template_value($template, $message->$template);
+			if ( $template !== 'extra' ) {
+							$this->_set_template_value($template, $message->$template);
+			}
 		}
 	}
 
@@ -683,8 +687,9 @@ 
 		$wrapper_template = $this->_tmp_pack->get_wrapper( $this->name, $type );
 
 		//check file exists and is readable
-		if ( !is_readable( $wrapper_template ) )
-			throw new EE_Error( sprintf( __('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso' ), ucwords($this->label['singular']) , $wrapper_template ) );
+		if ( !is_readable( $wrapper_template ) ) {
+					throw new EE_Error( sprintf( __('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso' ), ucwords($this->label['singular']) , $wrapper_template ) );
+		}
 
 		//require template helper
 		EE_Registry::instance()->load_helper( 'Template' );
@@ -753,20 +758,24 @@ 
 	 */
 	public function get_field_label( $field ) {
 		//first let's see if the field requests is in the top level array.
-		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) )
-			return $this->_template[$field]['label'];
+		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) ) {
+					return $this->_template[$field]['label'];
+		}
 
 		//nope so let's look in the extra array to see if it's there HOWEVER if the field exists as a top level index in the extra array then we know the label is in the 'main' index.
-		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  )
-			return $this->_template_fields['extra'][$field]['main']['label'];
+		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  ) {
+					return $this->_template_fields['extra'][$field]['main']['label'];
+		}
 
 		//now it's possible this field may just be existing in any of the extra array items.
 		if ( !empty( $this->_template_fields['extra'] ) && is_array( $this->_template_fields['extra'] ) ) {
 			foreach ( $this->_template_fields['extra'] as $main_field => $subfields ) {
-				if ( !is_array( $subfields ) )
-					continue;
-				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) )
-					return $subfields[$field]['label'];
+				if ( !is_array( $subfields ) ) {
+									continue;
+				}
+				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) ) {
+									return $subfields[$field]['label'];
+				}
 			}
 		}
 

Doc Comments -1 removed lines

@@ -675,7 +675,6 @@
 	 * Utility method for child classes to get the contents of a template file and return
 	 *
 	 * We're assuming the child messenger class has already setup template args!
-	 * @param  string  	$template url for template
 	 * @param  bool 	$preview if true we use the preview wrapper otherwise we use main wrapper.
 	 * @return string
 	 */

Spacing +89 added lines, -89 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -289,7 +289,7 @@ 
 	 * @return void
 	 */
 	public function enqueue_scripts_styles() {
-		do_action( 'AHEE__EE_messenger__enqueue_scripts_styles');
+		do_action('AHEE__EE_messenger__enqueue_scripts_styles');
 	}
 
 
@@ -325,7 +325,7 @@ 
 
 		$this->_supports_labels->template_variation_description = __('These are different styles to choose from for the selected template structure.  Usually these affect things like font style, color, borders etc.  In some cases the styles will also make minor layout changes.');
 
-		$this->_supports_labels = apply_filters( 'FHEE__EE_messenger___set_supports_labels_defaults___supports_labels', $this->_supports_labels, $this );
+		$this->_supports_labels = apply_filters('FHEE__EE_messenger___set_supports_labels_defaults___supports_labels', $this->_supports_labels, $this);
 	}
 
 
@@ -340,10 +340,10 @@ 
 	 * @return stdClass
 	 */
 	public function get_supports_labels() {
-		if ( empty( $this->_supports_labels->template_pack ) || empty( $this->_supports_labels->template_variation) ) {
+		if (empty($this->_supports_labels->template_pack) || empty($this->_supports_labels->template_variation)) {
 			$this->_set_supports_labels_defaults();
 		}
-		return apply_filters( 'FHEE__EE_messenger__get_supports_labels', $this->_supports_labels, $this );
+		return apply_filters('FHEE__EE_messenger__get_supports_labels', $this->_supports_labels, $this);
 	}
 
 
@@ -363,10 +363,10 @@ 
 	 *
 	 * @return string                    path or url for the requested variation.
 	 */
-	public function get_variation( EE_Messages_Template_Pack $pack, $message_type_name, $url = FALSE, $type = 'main', $variation = 'default', $skip_filters = FALSE ) {
+	public function get_variation(EE_Messages_Template_Pack $pack, $message_type_name, $url = FALSE, $type = 'main', $variation = 'default', $skip_filters = FALSE) {
 		$this->_tmp_pack = $pack;
-		$variation_path = apply_filters( 'EE_messenger__get_variation__variation', false, $pack, $this->name, $message_type_name, $url, $type, $variation, $skip_filters );
-		$variation_path = empty( $variation_path ) ? $this->_tmp_pack->get_variation( $this->name, $message_type_name, $type, $variation, $url, '.css', $skip_filters ) : $variation_path;
+		$variation_path = apply_filters('EE_messenger__get_variation__variation', false, $pack, $this->name, $message_type_name, $url, $type, $variation, $skip_filters);
+		$variation_path = empty($variation_path) ? $this->_tmp_pack->get_variation($this->name, $message_type_name, $type, $variation, $url, '.css', $skip_filters) : $variation_path;
 		return $variation_path;
 
 	}
@@ -384,13 +384,13 @@ 
 	 * @return array
 	 */
 	public function get_default_message_types() {
-		$class = get_class( $this );
+		$class = get_class($this);
 
 		//messenger specific filter
-		$default_types = apply_filters( 'FHEE__' . $class . '__get_default_message_types__default_types', $this->_default_message_types, $this );
+		$default_types = apply_filters('FHEE__'.$class.'__get_default_message_types__default_types', $this->_default_message_types, $this);
 
 		//all messengers filter
-		$default_types = apply_filters( 'FHEE__EE_messenger__get_default_message_types__default_types', $default_types, $this );
+		$default_types = apply_filters('FHEE__EE_messenger__get_default_message_types__default_types', $default_types, $this);
 		return $default_types;
 	}
 
@@ -405,14 +405,14 @@ 
 	 * @return array
 	 */
 	public function get_valid_message_types() {
-		$class = get_class( $this );
+		$class = get_class($this);
 
 		//messenger specific filter
 		//messenger specific filter
-		$valid_types = apply_filters( 'FHEE__' . $class . '__get_valid_message_types__valid_types', $this->_valid_message_types, $this );
+		$valid_types = apply_filters('FHEE__'.$class.'__get_valid_message_types__valid_types', $this->_valid_message_types, $this);
 
 		//all messengers filter
-		$valid_types = apply_filters( 'FHEE__EE_messenger__get_valid_message_types__valid_types', $valid_types, $this );
+		$valid_types = apply_filters('FHEE__EE_messenger__get_valid_message_types__valid_types', $valid_types, $this);
 		return $valid_types;
 	}
 
@@ -426,7 +426,7 @@ 
 	 * @access public
 	 * @param array $new_config Whatever is put in here will reset the _validator_config property
 	 */
-	public function set_validator_config( $new_config ) {
+	public function set_validator_config($new_config) {
 		$this->_validator_config = $new_config;
 	}
 
@@ -442,8 +442,8 @@ 
 	public function get_validator_config() {
 		$class = get_class($this);
 
-		$config = apply_filters( 'FHEE__' . $class . '__get_validator_config', $this->_validator_config, $this );
-		$config = apply_filters( 'FHEE__EE_messenger__get_validator_config', $config, $this );
+		$config = apply_filters('FHEE__'.$class.'__get_validator_config', $this->_validator_config, $this);
+		$config = apply_filters('FHEE__EE_messenger__get_validator_config', $config, $this);
 		return $config;
 	}
 
@@ -460,8 +460,8 @@ 
 	 * @access public
 	 * @return string content for page
 	 */
-	public function get_messenger_admin_page_content( $page, $action = null, $extra = array(), $message_types = array() ) {
-		return $this->_get_admin_page_content( $page, $action, $extra, $message_types );
+	public function get_messenger_admin_page_content($page, $action = null, $extra = array(), $message_types = array()) {
+		return $this->_get_admin_page_content($page, $action, $extra, $message_types);
 	}
 
 
@@ -470,76 +470,76 @@ 
 
 
 
-	protected function _get_admin_content_events_edit( $message_types, $extra ) {
+	protected function _get_admin_content_events_edit($message_types, $extra) {
 		//defaults
 		$template_args = array();
 		$custom_templates = array();
 		$selector_rows = '';
 
 		//we don't need message types here so we're just going to ignore. we do, however, expect the event id here. The event id is needed to provide a link to setup a custom template for this event.
-		$event_id = isset( $extra['event'] ) ? $extra['event'] : NULL;
+		$event_id = isset($extra['event']) ? $extra['event'] : NULL;
 
-		$template_wrapper_path = EE_LIBRARIES . 'messages/messenger/admin_templates/event_switcher_wrapper.template.php';
-		$template_row_path = EE_LIBRARIES . 'messages/messenger/admin_templates/event_switcher_row.template.php';
+		$template_wrapper_path = EE_LIBRARIES.'messages/messenger/admin_templates/event_switcher_wrapper.template.php';
+		$template_row_path = EE_LIBRARIES.'messages/messenger/admin_templates/event_switcher_row.template.php';
 
 		//array of template objects for global and custom (non-trashed) (but remember just for this messenger!)
-		$global_templates = EEM_Message_Template_Group::instance()->get_all( array( array('MTP_messenger' => $this->name, 'MTP_is_global' => TRUE, 'MTP_is_active' => TRUE ) ) );
-		$templates_for_event = EEM_Message_Template_Group::instance()->get_all_custom_templates_by_event( $event_id, array( 'MTP_messenger' => $this->name, 'MTP_is_active' => TRUE ) );
-		$templates_for_event = !empty( $templates_for_event ) ? $templates_for_event : array();
+		$global_templates = EEM_Message_Template_Group::instance()->get_all(array(array('MTP_messenger' => $this->name, 'MTP_is_global' => TRUE, 'MTP_is_active' => TRUE)));
+		$templates_for_event = EEM_Message_Template_Group::instance()->get_all_custom_templates_by_event($event_id, array('MTP_messenger' => $this->name, 'MTP_is_active' => TRUE));
+		$templates_for_event = ! empty($templates_for_event) ? $templates_for_event : array();
 
 		//so we need to setup the rows for the selectors and we use the global mtpgs (cause those will the active message template groups)
-		foreach ( $global_templates as $mtpgID => $mtpg ) {
+		foreach ($global_templates as $mtpgID => $mtpg) {
 			//verify this message type is supposed to show on this page
 			$mtp_obj = $mtpg->message_type_obj();
-			if ( ! $mtp_obj instanceof EE_message_type ) {
+			if ( ! $mtp_obj instanceof EE_message_type) {
 				continue;
 			}
 			$mtp_obj->admin_registered_pages = (array) $mtp_obj->admin_registered_pages;
-			if ( ! in_array( 'events_edit', $mtp_obj->admin_registered_pages ) )
+			if ( ! in_array('events_edit', $mtp_obj->admin_registered_pages))
 				continue;
 			$stargs = array();
 			$default_value = '';
 			$select_values = array();
 			$select_values[$mtpgID] = __('Global', 'event_espresso');
-			$default_value = array_key_exists( $mtpgID, $templates_for_event ) && ! $mtpg->get('MTP_is_override' ) ? $mtpgID : NULL;
+			$default_value = array_key_exists($mtpgID, $templates_for_event) && ! $mtpg->get('MTP_is_override') ? $mtpgID : NULL;
 
 			//if the override has been set for the global template, then that means even if there are custom templates already created we ignore them because of the set override.
 
-			if ( ! $mtpg->get('MTP_is_override' ) ) {
+			if ( ! $mtpg->get('MTP_is_override')) {
 				//any custom templates for this message type?
-				$custom_templates = EEM_Message_Template_Group::instance()->get_custom_message_template_by_m_and_mt( $this->name, $mtpg->message_type() );
+				$custom_templates = EEM_Message_Template_Group::instance()->get_custom_message_template_by_m_and_mt($this->name, $mtpg->message_type());
 
-				foreach( $custom_templates as $cmtpgID => $cmtpg ) {
+				foreach ($custom_templates as $cmtpgID => $cmtpg) {
 					$select_values[$cmtpgID] = $cmtpg->name();
-					$default_value = array_key_exists( $cmtpgID, $templates_for_event ) ? $cmtpgID : $default_value;
+					$default_value = array_key_exists($cmtpgID, $templates_for_event) ? $cmtpgID : $default_value;
 				}
 			}
 
 			//if there is no $default_value then we set it as the global
-			$default_value = empty( $default_value ) ? $mtpgID : $default_value;
+			$default_value = empty($default_value) ? $mtpgID : $default_value;
 
-			$edit_url = EEH_URL::add_query_args_and_nonce( array('page' => 'espresso_messages', 'action' => 'edit_message_template', 'id' => $default_value), admin_url('admin.php') );
-			$create_url = EEH_URL::add_query_args_and_nonce( array('page' => 'espresso_messages', 'action' => 'add_new_message_template', 'GRP_ID' => $default_value ), admin_url( 'admin.php' ) );
+			$edit_url = EEH_URL::add_query_args_and_nonce(array('page' => 'espresso_messages', 'action' => 'edit_message_template', 'id' => $default_value), admin_url('admin.php'));
+			$create_url = EEH_URL::add_query_args_and_nonce(array('page' => 'espresso_messages', 'action' => 'add_new_message_template', 'GRP_ID' => $default_value), admin_url('admin.php'));
 
-			$st_args['mt_name'] = ucwords( $mtp_obj->label['singular'] );
+			$st_args['mt_name'] = ucwords($mtp_obj->label['singular']);
 			$st_args['mt_slug'] = $mtpg->message_type();
 			$st_args['messenger_slug'] = $this->name;
-			$st_args['selector'] = EEH_Form_Fields::select_input( 'event_message_templates_relation[' . $mtpgID . ']', $select_values, $default_value, 'data-messenger="' . $this->name . '" data-messagetype="' . $mtpg->message_type() . '"', 'message-template-selector' );
+			$st_args['selector'] = EEH_Form_Fields::select_input('event_message_templates_relation['.$mtpgID.']', $select_values, $default_value, 'data-messenger="'.$this->name.'" data-messagetype="'.$mtpg->message_type().'"', 'message-template-selector');
 
 			//note that  message template group that has override_all_custom set will remove the ability to set a custom message template based off of the global (and that also in turn overrides any other custom templates).
-			$st_args['create_button'] =  $mtpg->get('MTP_is_override') ? '' : '<a data-messenger="' . $this->name . '" data-messagetype="' . $mtpg->message_type() . '" data-grpid="' . $default_value . '" target="_blank" href="' . $create_url . '" class="button button-small create-mtpg-button">' . __('Create New Custom', 'event_espresso') . '</a>';
-			$st_args['create_button'] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'espresso_messsages_add_new_message_template' ) ? $st_args['create_button'] : '';
-			$st_args['edit_button'] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $mtpgID ) ?  '<a data-messagetype="' . $mtpg->message_type() . '" data-grpid="' . $default_value . '" target="_blank" href="' . $edit_url . '" class="button button-small edit-mtpg-button">' . __('Edit', 'event_espresso') . '</a>' : '';
-			$selector_rows .= EEH_Template::display_template( $template_row_path, $st_args, TRUE );
+			$st_args['create_button'] = $mtpg->get('MTP_is_override') ? '' : '<a data-messenger="'.$this->name.'" data-messagetype="'.$mtpg->message_type().'" data-grpid="'.$default_value.'" target="_blank" href="'.$create_url.'" class="button button-small create-mtpg-button">'.__('Create New Custom', 'event_espresso').'</a>';
+			$st_args['create_button'] = EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'espresso_messsages_add_new_message_template') ? $st_args['create_button'] : '';
+			$st_args['edit_button'] = EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $mtpgID) ? '<a data-messagetype="'.$mtpg->message_type().'" data-grpid="'.$default_value.'" target="_blank" href="'.$edit_url.'" class="button button-small edit-mtpg-button">'.__('Edit', 'event_espresso').'</a>' : '';
+			$selector_rows .= EEH_Template::display_template($template_row_path, $st_args, TRUE);
 		}
 
 		//if no selectors present then get out.
-		if ( empty( $selector_rows ) ) {
+		if (empty($selector_rows)) {
 			return '';
 		}
 
 		$template_args['selector_rows'] = $selector_rows;
-		return EEH_Template::display_template( $template_wrapper_path, $template_args, TRUE );
+		return EEH_Template::display_template($template_wrapper_path, $template_args, TRUE);
 	}
 
 
@@ -554,8 +554,8 @@ 
 	 * @return array $this->_template_fields
 	 */
 	public function get_template_fields() {
-		$template_fields = apply_filters( 'FHEE__' . get_class($this) . '__get_template_fields', $this->_template_fields, $this );
-		$template_fields = apply_filters( 'FHEE__EE_messenger__get_template_fields', $template_fields, $this );
+		$template_fields = apply_filters('FHEE__'.get_class($this).'__get_template_fields', $this->_template_fields, $this);
+		$template_fields = apply_filters('FHEE__EE_messenger__get_template_fields', $template_fields, $this);
 		return $template_fields;
 	}
 
@@ -568,9 +568,9 @@ 
 	 * The following method doesn't NEED to be used by child classes but might be modified by the specific messenger
 	 */
 	protected function _set_template_value($item, $value) {
-		if ( array_key_exists($item, $this->_template_fields) ) {
-			$prop = '_' . $item;
-			$this->$prop= $value;
+		if (array_key_exists($item, $this->_template_fields)) {
+			$prop = '_'.$item;
+			$this->$prop = $value;
 		}
 	}
 
@@ -580,8 +580,8 @@ 
 	 * @param EE_message_type $message_type The message type object used in combination with this messenger to generate the provided message.
 	 * @return bool | WP_Error
 	 */
-	public function send_message( $message, EE_message_type $message_type ) {
-		$this->_validate_and_setup( $message );
+	public function send_message($message, EE_message_type $message_type) {
+		$this->_validate_and_setup($message);
 		$this->_incoming_message_type = $message_type;
 		return $this->_send_message();
 	}
@@ -595,26 +595,26 @@ 
 	 * @param  bool   $send    true we will actually use the _send method (for test sends). FALSE we just return preview
 	 * @return string          return the message html content
 	 */
-	public function get_preview( $message, EE_message_type $message_type, $send = FALSE ) {
-		$this->_validate_and_setup( $message );
+	public function get_preview($message, EE_message_type $message_type, $send = FALSE) {
+		$this->_validate_and_setup($message);
 
 		$this->_incoming_message_type = $message_type;
 
-		if ( $send ) {
+		if ($send) {
 			//are we overriding any existing template fields?
 			$settings = $this->get_existing_test_settings();
-			if ( !empty( $settings ) ) {
-				foreach( $settings as $field => $value ) {
-					$this->_set_template_value( $field, $value );
+			if ( ! empty($settings)) {
+				foreach ($settings as $field => $value) {
+					$this->_set_template_value($field, $value);
 				}
 			}
 		}
 
 		//enqueue preview js so that any links/buttons on the page are disabled.
-		if ( ! $send ) {
+		if ( ! $send) {
 			//the below may seem liks duplication.  However, typically if a messenger enqueues scripts/styles, it deregisters all existing wp scripts and styles first.  So the second hook ensures our previewer still gets setup.
-			add_action( 'wp_enqueue_scripts', array( $this, 'add_preview_script' ), 10 );
-			add_action( 'AHEE__EE_messenger__enqueue_scripts_styles', array( $this, 'add_preview_script' ), 10 );
+			add_action('wp_enqueue_scripts', array($this, 'add_preview_script'), 10);
+			add_action('AHEE__EE_messenger__enqueue_scripts_styles', array($this, 'add_preview_script'), 10);
 		}
 
 		return $send ? $this->_send_message() : $this->_preview();
@@ -631,12 +631,12 @@ 
 	 * @return void
 	 */
 	public function add_preview_script() {
-		wp_register_script( 'ee-messages-preview-js', EE_LIBRARIES_URL . 'messages/messenger/assets/js/ee-messages-preview.js', array( 'jquery' ), EVENT_ESPRESSO_VERSION, true );
+		wp_register_script('ee-messages-preview-js', EE_LIBRARIES_URL.'messages/messenger/assets/js/ee-messages-preview.js', array('jquery'), EVENT_ESPRESSO_VERSION, true);
 
 		//error message
 		EE_Registry::$i18n_js_strings['links_disabled'] = __('All the links on this page have been disabled because this is a generated preview message for the purpose of ensuring layout, style, and content setup.  To test generated links, you must trigger an actual message notification.', 'event_espresso');
-		wp_localize_script( 'ee-messages-preview-js', 'eei18n', EE_Registry::$i18n_js_strings );
-		wp_enqueue_script( 'ee-messages-preview-js' );
+		wp_localize_script('ee-messages-preview-js', 'eei18n', EE_Registry::$i18n_js_strings);
+		wp_enqueue_script('ee-messages-preview-js');
 	}
 
 
@@ -647,23 +647,23 @@ 
 	 * @param  object $message message object
 	 * @return void
 	 */
-	protected function _validate_and_setup( $message ) {
-		if ( !is_object( $message ) )
-			throw new EE_Error( __('Incoming "$message" must be an object', 'event_espresso' ) );
+	protected function _validate_and_setup($message) {
+		if ( ! is_object($message))
+			throw new EE_Error(__('Incoming "$message" must be an object', 'event_espresso'));
 
 		//verify we have the required template pack value on the $message object.
-		if ( empty( $message->template_pack ) || ! $message->template_pack instanceof EE_Messages_Template_Pack ) {
-			throw new EE_Error( __('Incoming $message object must have a EE_Messages_Template_Pack object assigned to the template_pack property', 'event_espresso' ) );
+		if (empty($message->template_pack) || ! $message->template_pack instanceof EE_Messages_Template_Pack) {
+			throw new EE_Error(__('Incoming $message object must have a EE_Messages_Template_Pack object assigned to the template_pack property', 'event_espresso'));
 		}
 
 		$this->_tmp_pack = $message->template_pack;
 
-		$this->_variation = !empty ( $message->variation ) ? $message->variation : 'default';
+		$this->_variation = ! empty ($message->variation) ? $message->variation : 'default';
 
 		$template_fields = $this->get_template_fields();
 
-		foreach ( $template_fields as $template => $value ) {
-			if ( $template !== 'extra' )
+		foreach ($template_fields as $template => $value) {
+			if ($template !== 'extra')
 				$this->_set_template_value($template, $message->$template);
 		}
 	}
@@ -679,18 +679,18 @@ 
 	 * @param  bool 	$preview if true we use the preview wrapper otherwise we use main wrapper.
 	 * @return string
 	 */
-	protected function _get_main_template( $preview = FALSE ) {
+	protected function _get_main_template($preview = FALSE) {
 		$type = $preview ? 'preview' : 'main';
 
-		$wrapper_template = $this->_tmp_pack->get_wrapper( $this->name, $type );
+		$wrapper_template = $this->_tmp_pack->get_wrapper($this->name, $type);
 
 		//check file exists and is readable
-		if ( !is_readable( $wrapper_template ) )
-			throw new EE_Error( sprintf( __('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso' ), ucwords($this->label['singular']) , $wrapper_template ) );
+		if ( ! is_readable($wrapper_template))
+			throw new EE_Error(sprintf(__('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso'), ucwords($this->label['singular']), $wrapper_template));
 
 		//require template helper
-		EE_Registry::instance()->load_helper( 'Template' );
-		return EEH_Template::display_template( $wrapper_template, $this->_template_args, TRUE );
+		EE_Registry::instance()->load_helper('Template');
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, TRUE);
 	}
 
 
@@ -726,7 +726,7 @@ 
 	 */
 	public function get_existing_test_settings() {
 		$settings = EEH_MSG_Template::get_active_messengers_in_db();
-		return isset( $settings[$this->name]['test_settings'] ) ? $settings[$this->name]['test_settings'] : array();
+		return isset($settings[$this->name]['test_settings']) ? $settings[$this->name]['test_settings'] : array();
 	}
 
 
@@ -737,10 +737,10 @@ 
 	 * @access public
 	 * @return bool 	success/fail
 	 */
-	public function set_existing_test_settings( $settings ) {
+	public function set_existing_test_settings($settings) {
 		$existing = EEH_MSG_Template::get_active_messengers_in_db();
 		$existing[$this->name]['test_settings'] = $settings;
-		return EEH_MSG_Template::update_active_messengers_in_db( $existing );
+		return EEH_MSG_Template::update_active_messengers_in_db($existing);
 	}
 
 
@@ -753,21 +753,21 @@ 
 	 * @param string $field The field to retrieve the label for
 	 * @return string        	  The label
 	 */
-	public function get_field_label( $field ) {
+	public function get_field_label($field) {
 		//first let's see if the field requests is in the top level array.
-		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) )
+		if (isset($this->_template_fields[$field]) && ! empty($this->_template_fields[$field]['label']))
 			return $this->_template[$field]['label'];
 
 		//nope so let's look in the extra array to see if it's there HOWEVER if the field exists as a top level index in the extra array then we know the label is in the 'main' index.
-		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  )
+		if (isset($this->_template_fields['extra']) && ! empty($this->_template_fields['extra'][$field]) && ! empty($this->_template_fields['extra'][$field]['main']['label']))
 			return $this->_template_fields['extra'][$field]['main']['label'];
 
 		//now it's possible this field may just be existing in any of the extra array items.
-		if ( !empty( $this->_template_fields['extra'] ) && is_array( $this->_template_fields['extra'] ) ) {
-			foreach ( $this->_template_fields['extra'] as $main_field => $subfields ) {
-				if ( !is_array( $subfields ) )
+		if ( ! empty($this->_template_fields['extra']) && is_array($this->_template_fields['extra'])) {
+			foreach ($this->_template_fields['extra'] as $main_field => $subfields) {
+				if ( ! is_array($subfields))
 					continue;
-				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) )
+				if (isset($subfields[$field]) && ! empty($subfields[$field]['label']))
 					return $subfields[$field]['label'];
 			}
 		}
@@ -788,7 +788,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
 		return;
 	}
 

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

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 lname (set later via incoming user_id)
 	public $primary_registration_id;
@@ -149,7 +149,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();
 	}
@@ -165,15 +165,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;

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.