eventespresso / event-espresso-core

core/libraries/line_item_filters/EE_Line_Item_Filter_Collection.class.php

Indentation +13 added lines, -13 removed lines

@@ -3,19 +3,19 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Class EE_Line_Item_Filter_Collection
- *
- * An EE_Object_Collection object that type checks
- * for EEI_Line_Item_Filter objects when adding to the collection
- *
- * @package               Event Espresso
- * @subpackage            core
- * @author                Brent Christensen
- * @since                 4.8.0
- *
- *
- *
- */
+	 * Class EE_Line_Item_Filter_Collection
+	 *
+	 * An EE_Object_Collection object that type checks
+	 * for EEI_Line_Item_Filter objects when adding to the collection
+	 *
+	 * @package               Event Espresso
+	 * @subpackage            core
+	 * @author                Brent Christensen
+	 * @since                 4.8.0
+	 *
+	 *
+	 *
+	 */
 class EE_Line_Item_Filter_Collection extends EE_Object_Collection {
 
 

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Line_Item_Filter_Collection

core/libraries/line_item_filters/EE_Line_Item_Filter_Processor.class.php

Indentation +32 added lines, -32 removed lines

@@ -3,38 +3,38 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Class EE_Line_Item_Filter_Processor
- *
- * Receives an EE_Collection of EE_Line_Item_Filter objects
- * and an EEI_Line_Item grand total object upon construction
- * clones the entire grand total line item tree so that the original will not be affected
- * then process() applies each filter to the cloned grand total line item tree
- *
- * example:
- *
- * 		// make sure to setup autoloaders
- * 		EEH_Autoloader::register_line_item_filter_autoloaders();
- * 		// create a collection to hold our filters
- * 		$line_item_filter_collection = new EE_Line_Item_Filter_Collection();
- * 		$line_item_filter_collection->add( new EE_Billable_Line_Item_Filter( $array_of_EE_Registrations() ) );
- * 		$line_item_filter_collection->add( new EE_Non_Zero_Line_Item_Filter() );
- * 		// create the main processor, and pass it our filter collection, and a grand total line item
- * 		// which will be used to construct a clone of the entire line item tree
- * 		$line_item_filter_processor = new EE_Line_Item_Filter_Processor(
- * 			$line_item_filter_collection,
- * 			$EE_Cart->get_grand_total()
- * 		);
- * 		// then apply filters to the line item tree by calling process()
- * 		$filtered_line_item_tree = $line_item_filter_processor->process();
- * 		// the resultant filtered line item tree can then be passed along
- * 		// to other classes to do what they need to do, such as display
- *
- * @package               Event Espresso
- * @subpackage            core
- * @author                Brent Christensen
- * @since                 4.8.0
- *
- */
+	 * Class EE_Line_Item_Filter_Processor
+	 *
+	 * Receives an EE_Collection of EE_Line_Item_Filter objects
+	 * and an EEI_Line_Item grand total object upon construction
+	 * clones the entire grand total line item tree so that the original will not be affected
+	 * then process() applies each filter to the cloned grand total line item tree
+	 *
+	 * example:
+	 *
+	 * 		// make sure to setup autoloaders
+	 * 		EEH_Autoloader::register_line_item_filter_autoloaders();
+	 * 		// create a collection to hold our filters
+	 * 		$line_item_filter_collection = new EE_Line_Item_Filter_Collection();
+	 * 		$line_item_filter_collection->add( new EE_Billable_Line_Item_Filter( $array_of_EE_Registrations() ) );
+	 * 		$line_item_filter_collection->add( new EE_Non_Zero_Line_Item_Filter() );
+	 * 		// create the main processor, and pass it our filter collection, and a grand total line item
+	 * 		// which will be used to construct a clone of the entire line item tree
+	 * 		$line_item_filter_processor = new EE_Line_Item_Filter_Processor(
+	 * 			$line_item_filter_collection,
+	 * 			$EE_Cart->get_grand_total()
+	 * 		);
+	 * 		// then apply filters to the line item tree by calling process()
+	 * 		$filtered_line_item_tree = $line_item_filter_processor->process();
+	 * 		// the resultant filtered line item tree can then be passed along
+	 * 		// to other classes to do what they need to do, such as display
+	 *
+	 * @package               Event Espresso
+	 * @subpackage            core
+	 * @author                Brent Christensen
+	 * @since                 4.8.0
+	 *
+	 */
 class EE_Line_Item_Filter_Processor {
 
 	/**

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Line_Item_Filter_Processor
@@ -55,12 +55,12 @@ 
 	 * @param \EEI_Line_Item                  $grand_total_line_item
 	 * @throws \EE_Error
 	 */
-	public function __construct( EE_Line_Item_Filter_Collection $line_item_filters, EEI_Line_Item $grand_total_line_item ) {
+	public function __construct(EE_Line_Item_Filter_Collection $line_item_filters, EEI_Line_Item $grand_total_line_item) {
 		$this->line_item_filters = $line_item_filters;
-		if ( $grand_total_line_item->type() !== EEM_Line_Item::type_total ) {
-			throw new EE_Error( __( 'A Line Item of the type total is required', 'event_espresso' ) );
+		if ($grand_total_line_item->type() !== EEM_Line_Item::type_total) {
+			throw new EE_Error(__('A Line Item of the type total is required', 'event_espresso'));
 		}
-		$this->grand_total_line_item = $this->clone_and_reset_line_item_tree( $grand_total_line_item );
+		$this->grand_total_line_item = $this->clone_and_reset_line_item_tree($grand_total_line_item);
 	}
 
 
@@ -71,10 +71,10 @@ 
 	 * @param \EEI_Line_Item $line_item
 	 * @return \EEI_Line_Item
 	 */
-	protected function clone_and_reset_line_item_tree( EEI_Line_Item $line_item ) {
-		$cloned_line_item = $this->clone_and_reset_line_item( $line_item );
-		foreach ( $line_item->children() as $child_line_item ) {
-			$cloned_line_item->add_child_line_item( $this->clone_and_reset_line_item_tree( $child_line_item ) );
+	protected function clone_and_reset_line_item_tree(EEI_Line_Item $line_item) {
+		$cloned_line_item = $this->clone_and_reset_line_item($line_item);
+		foreach ($line_item->children() as $child_line_item) {
+			$cloned_line_item->add_child_line_item($this->clone_and_reset_line_item_tree($child_line_item));
 		}
 		return $cloned_line_item;
 	}
@@ -91,16 +91,16 @@ 
 	 * @param \EEI_Line_Item $line_item
 	 * @return \EEI_Line_Item
 	 */
-	protected function clone_and_reset_line_item( EEI_Line_Item $line_item ) {
+	protected function clone_and_reset_line_item(EEI_Line_Item $line_item) {
 		// we don't actually want to work with the original line item, so clone it
 		$cloned_line_item = clone $line_item;
-		$cloned_line_item->set( 'LIN_ID', null );
-		$cloned_line_item->set( 'LIN_parent', null );
+		$cloned_line_item->set('LIN_ID', null);
+		$cloned_line_item->set('LIN_parent', null);
 		$cloned_line_item->clear_related_line_item_cache();
-		foreach( array_keys( EEM_Line_Item::instance()->relation_settings() ) as $relation_name) {
-			$cloned_line_item->clear_cache( $relation_name, null, true );
+		foreach (array_keys(EEM_Line_Item::instance()->relation_settings()) as $relation_name) {
+			$cloned_line_item->clear_cache($relation_name, null, true);
 		}
-		$cloned_line_item->set_allow_persist( false );
+		$cloned_line_item->set_allow_persist(false);
 		return $cloned_line_item;
 	}
 
@@ -113,8 +113,8 @@ 
 	 */
 	public function process() {
 		$this->line_item_filters->rewind();
-		while ( $this->line_item_filters->valid() ) {
-			$this->grand_total_line_item = $this->line_item_filters->current()->process( $this->grand_total_line_item );
+		while ($this->line_item_filters->valid()) {
+			$this->grand_total_line_item = $this->line_item_filters->current()->process($this->grand_total_line_item);
 			$this->line_item_filters->next();
 		}
 		$this->grand_total_line_item->recalculate_total_including_taxes();

core/libraries/line_item_filters/EE_Non_Zero_Line_Item_Filter.class.php

Indentation +12 added lines, -12 removed lines

@@ -3,18 +3,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Class EE_Non_Zero_Line_Item_Filter
- *
- * Filters line items to remove :
- * 		subtotals with a total of 0
- * 		line items with a quantity of 0
- *
- * @package               Event Espresso
- * @subpackage            core
- * @author                Brent Christensen
- * @since                 $VID:$
- *
- */
+	 * Class EE_Non_Zero_Line_Item_Filter
+	 *
+	 * Filters line items to remove :
+	 * 		subtotals with a total of 0
+	 * 		line items with a quantity of 0
+	 *
+	 * @package               Event Espresso
+	 * @subpackage            core
+	 * @author                Brent Christensen
+	 * @since                 $VID:$
+	 *
+	 */
 class EE_Non_Zero_Line_Item_Filter extends EE_Line_Item_Filter_Base {
 
 	/**

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Non_Zero_Line_Item_Filter
@@ -31,36 +31,36 @@ 
 	 * @param EEI_Line_Item $line_item
 	 * @return \EEI_Line_Item
 	 */
-	public function process( EEI_Line_Item $line_item ) {
-		$non_zero_line_item = $this->_filter_zero_line_item( $line_item );
-		if ( ! $non_zero_line_item instanceof EEI_Line_Item ) {
+	public function process(EEI_Line_Item $line_item) {
+		$non_zero_line_item = $this->_filter_zero_line_item($line_item);
+		if ( ! $non_zero_line_item instanceof EEI_Line_Item) {
 			return null;
 		}
 		//if this is an event subtotal, we want to only include it if it
 		//has a non-zero total and at least one ticket line item child
-		if( $line_item->children() ) {
+		if ($line_item->children()) {
 			$ticket_or_subtotals_with_tkt_children_count = 0;
-			foreach ( $line_item->children() as $child_line_item ) {
+			foreach ($line_item->children() as $child_line_item) {
 				$code = $child_line_item->code();
-				$child_line_item = $this->process( $child_line_item );
-				if( ! $child_line_item instanceof EEI_Line_Item ) {
-					$line_item->delete_child_line_item( $code );
+				$child_line_item = $this->process($child_line_item);
+				if ( ! $child_line_item instanceof EEI_Line_Item) {
+					$line_item->delete_child_line_item($code);
 					continue;
 				}
 				if (
-					( $child_line_item instanceof EEI_Line_Item &&
+					($child_line_item instanceof EEI_Line_Item &&
 					$child_line_item->type() === EEM_Line_Item::type_line_item &&
-					$child_line_item->OBJ_type() === 'Ticket' ) ||
-					( $child_line_item instanceof EEI_Line_Item &&
-					 $child_line_item->type() === EEM_Line_Item::type_sub_total )
+					$child_line_item->OBJ_type() === 'Ticket') ||
+					($child_line_item instanceof EEI_Line_Item &&
+					 $child_line_item->type() === EEM_Line_Item::type_sub_total)
 				) {
 					$ticket_or_subtotals_with_tkt_children_count++;
 				}
 			}
 			// if this is an event subtotal with NO ticket children
 			// we basically want to ignore it
-			return $this->_filter_zero_subtotal_line_item( $non_zero_line_item, $ticket_or_subtotals_with_tkt_children_count );
-		}else{
+			return $this->_filter_zero_subtotal_line_item($non_zero_line_item, $ticket_or_subtotals_with_tkt_children_count);
+		} else {
 			return $non_zero_line_item;
 		}
 	}
@@ -73,7 +73,7 @@ 
 	 * @param EEI_Line_Item $line_item
 	 * @return EEI_Line_Item
 	 */
-	protected function _filter_zero_line_item( EEI_Line_Item $line_item ) {
+	protected function _filter_zero_line_item(EEI_Line_Item $line_item) {
 		if (
 			$line_item->type() === EEM_Line_Item::type_line_item &&
 			$line_item->OBJ_type() === 'Ticket' &&
@@ -93,7 +93,7 @@ 
 	 * @param int           $ticket_children
 	 * @return \EEI_Line_Item
 	 */
-	protected function _filter_zero_subtotal_line_item( EEI_Line_Item $line_item, $ticket_children = 0 ) {
+	protected function _filter_zero_subtotal_line_item(EEI_Line_Item $line_item, $ticket_children = 0) {
 		if (
 			$line_item->type() === EEM_Line_Item::type_sub_total &&
 			$ticket_children === 0

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

core/libraries/line_item_filters/EE_Single_Registration_Line_Item_Filter.class.php

Indentation +12 added lines, -12 removed lines

@@ -3,18 +3,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Class EE_Single_Registration_Line_Item_Filter
- *
- * Filters line items to remove any that aren't for the specified registration.
- * Also, other price modifiers, like discounts or surcharges, must be shared between
- * this registration and others, so this tree should only show this registration's share.
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen / Mike Nelson
- * @since 				4.8.0
- *
- */
+	 * Class EE_Single_Registration_Line_Item_Filter
+	 *
+	 * Filters line items to remove any that aren't for the specified registration.
+	 * Also, other price modifiers, like discounts or surcharges, must be shared between
+	 * this registration and others, so this tree should only show this registration's share.
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	core
+	 * @author 				Brent Christensen / Mike Nelson
+	 * @since 				4.8.0
+	 *
+	 */
 class EE_Single_Registration_Line_Item_Filter extends EE_Specific_Registrations_Line_Item_Filter {
 
 	/**

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Single_Registration_Line_Item_Filter
@@ -21,8 +21,8 @@ 
 	 *
 	 * @param EE_Registration $registration
 	 */
-	public function __construct( $registration ) {
-		parent::__construct( array( $registration ) );
+	public function __construct($registration) {
+		parent::__construct(array($registration));
 	}
 }
 // End of file EE_Single_Registration_Line_Item_Filter.class.php

core/libraries/line_item_filters/EE_Specific_Registrations_Line_Item_Filter.class.php

Indentation +4 added lines, -4 removed lines

@@ -18,10 +18,10 @@
  */
 class EE_Specific_Registrations_Line_Item_Filter extends EE_Line_Item_Filter_Base {
 /**
-	 * array of line item codes and their corresponding quantities for
-	 * registrations that owe money and can pay at this moment
-	 * @type array $_counts_per_line_item_code
-	 */
+ * array of line item codes and their corresponding quantities for
+ * registrations that owe money and can pay at this moment
+ * @type array $_counts_per_line_item_code
+ */
 	protected $_counts_per_line_item_code = array();
 
 	/**

Spacing +40 added lines, -40 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -36,9 +36,9 @@ 
 	 * EE_Billable_Line_Item_Filter constructor.
 	 * @param EE_Registration[] $registrations
 	 */
-	public function __construct( $registrations ) {
+	public function __construct($registrations) {
 		$this->_registrations = $registrations;
-		$this->_calculate_counts_per_line_item_code( $registrations );
+		$this->_calculate_counts_per_line_item_code($registrations);
 	}
 
 	/**
@@ -46,14 +46,14 @@ 
 	 * @param EE_Registration[] $registrations
 	 * @return void
 	 */
-	protected function _calculate_counts_per_line_item_code( $registrations ) {
-		foreach( $registrations as $registration ) {
-			$line_item_code = EEM_Line_Item::instance()->get_var( EEM_Line_Item::instance()->line_item_for_registration_query_params( $registration, array( 'limit' => 1 ) ), 'LIN_code' );
-			if( $line_item_code ) {
-				if( ! isset( $this->_counts_per_line_item_code[ $line_item_code ] ) ) {
-					$this->_counts_per_line_item_code[ $line_item_code ] = 1;
-				}else{
-					$this->_counts_per_line_item_code[ $line_item_code ]++;
+	protected function _calculate_counts_per_line_item_code($registrations) {
+		foreach ($registrations as $registration) {
+			$line_item_code = EEM_Line_Item::instance()->get_var(EEM_Line_Item::instance()->line_item_for_registration_query_params($registration, array('limit' => 1)), 'LIN_code');
+			if ($line_item_code) {
+				if ( ! isset($this->_counts_per_line_item_code[$line_item_code])) {
+					$this->_counts_per_line_item_code[$line_item_code] = 1;
+				} else {
+					$this->_counts_per_line_item_code[$line_item_code]++;
 				}
 			}
 		}
@@ -67,57 +67,57 @@ 
 	 * @param EEI_Line_Item      $line_item
 	 * @return \EEI_Line_Item
 	 */
-	public function process( EEI_Line_Item $line_item ) {
-		$this->_filter_billable_line_item( $line_item );
-		if( ! $line_item->children() ) {
+	public function process(EEI_Line_Item $line_item) {
+		$this->_filter_billable_line_item($line_item);
+		if ( ! $line_item->children()) {
 			return $line_item;
 		}
 		//the original running total (taking ALL tickets into account)
 		$running_total_of_children = 0;
 		//the new running total (only taking the specified ticket quantities into account)
 		$runnign_total_of_children_under_consideration = 0;
-		foreach ( $line_item->children() as $child_line_item ) {
-			if( $child_line_item->is_percent() ) {
+		foreach ($line_item->children() as $child_line_item) {
+			if ($child_line_item->is_percent()) {
 				$original_li_total = $running_total_of_children * $child_line_item->percent() / 100;
-			}else{
+			} else {
 				$original_li_total = $child_line_item->unit_price() * $child_line_item->quantity();
 			}
 
-			$this->process( $child_line_item );
+			$this->process($child_line_item);
 			/*
 			 * If this line item is a normal line item that isn't for a ticket
 			 * we want to modify its total (and unit price if not a percentage line item)
 			 * so it reflects only that portion of the surcharge/discount shared by these
 			 * registrations
 			 */
-			if( $child_line_item->type() === EEM_Line_Item::type_line_item &&
-					$child_line_item->OBJ_type() !== 'Ticket' ) {
-				if( $running_total_of_children ) {
+			if ($child_line_item->type() === EEM_Line_Item::type_line_item &&
+					$child_line_item->OBJ_type() !== 'Ticket') {
+				if ($running_total_of_children) {
 					$percent_of_running_total = $original_li_total / $running_total_of_children;
 				} else {
 					$percent_of_running_total = 0;
 				}
 
-				$child_line_item->set_total( $runnign_total_of_children_under_consideration * $percent_of_running_total );
-				if( ! $child_line_item->is_percent() ) {
-					$child_line_item->set_unit_price( $child_line_item->total() / $child_line_item->quantity() );
+				$child_line_item->set_total($runnign_total_of_children_under_consideration * $percent_of_running_total);
+				if ( ! $child_line_item->is_percent()) {
+					$child_line_item->set_unit_price($child_line_item->total() / $child_line_item->quantity());
 				}
-			}elseif( $line_item->type() === EEM_Line_Item::type_line_item &&
-					$line_item->OBJ_type() === 'Ticket' ) {
+			}elseif ($line_item->type() === EEM_Line_Item::type_line_item &&
+					$line_item->OBJ_type() === 'Ticket') {
 				//make sure this item's quantity matches its parent
-				if( ! $child_line_item->is_percent() ) {
-					$child_line_item->set_quantity( $line_item->quantity() );
-					$child_line_item->set_total( $child_line_item->unit_price() * $child_line_item->quantity() );
+				if ( ! $child_line_item->is_percent()) {
+					$child_line_item->set_quantity($line_item->quantity());
+					$child_line_item->set_total($child_line_item->unit_price() * $child_line_item->quantity());
 				}
 			}
 			$running_total_of_children += $original_li_total;
 			$runnign_total_of_children_under_consideration += $child_line_item->total();
 		}
-		$line_item->set_total( $runnign_total_of_children_under_consideration );
-		if( $line_item->quantity() ) {
-			$line_item->set_unit_price( $runnign_total_of_children_under_consideration / $line_item->quantity() );
+		$line_item->set_total($runnign_total_of_children_under_consideration);
+		if ($line_item->quantity()) {
+			$line_item->set_unit_price($runnign_total_of_children_under_consideration / $line_item->quantity());
 		} else {
-			$line_item->set_unit_price( 0 );
+			$line_item->set_unit_price(0);
 		}
 		return $line_item;
 	}
@@ -130,18 +130,18 @@ 
 	 * @param EEI_Line_Item $line_item
 	 * @return EEI_Line_Item
 	 */
-	protected function _filter_billable_line_item( EEI_Line_Item $line_item ) {
+	protected function _filter_billable_line_item(EEI_Line_Item $line_item) {
 		// is this a ticket ?
-		if ( $line_item->type() === EEM_Line_Item::type_line_item && $line_item->OBJ_type() == 'Ticket' ) {
+		if ($line_item->type() === EEM_Line_Item::type_line_item && $line_item->OBJ_type() == 'Ticket') {
 			// if this ticket is billable at this moment, then we should have a positive quantity
-			if ( isset( $this->_counts_per_line_item_code[ $line_item->code() ] )) {
+			if (isset($this->_counts_per_line_item_code[$line_item->code()])) {
 				// set quantity based on number of billable registrations for this ticket
-				$quantity = $this->_counts_per_line_item_code[ $line_item->code() ];
+				$quantity = $this->_counts_per_line_item_code[$line_item->code()];
 			} else {
 				$quantity = 0;
 			}
-			$line_item->set_quantity( $quantity );
-			$line_item->set_total( $line_item->unit_price() * $line_item->quantity() );
+			$line_item->set_quantity($quantity);
+			$line_item->set_total($line_item->unit_price() * $line_item->quantity());
 		}
 		return $line_item;
 	}

Braces +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 			if( $line_item_code ) {
 				if( ! isset( $this->_counts_per_line_item_code[ $line_item_code ] ) ) {
 					$this->_counts_per_line_item_code[ $line_item_code ] = 1;
-				}else{
+				} else{
 					$this->_counts_per_line_item_code[ $line_item_code ]++;
 				}
 			}
@@ -79,7 +79,7 @@ 
 		foreach ( $line_item->children() as $child_line_item ) {
 			if( $child_line_item->is_percent() ) {
 				$original_li_total = $running_total_of_children * $child_line_item->percent() / 100;
-			}else{
+			} else{
 				$original_li_total = $child_line_item->unit_price() * $child_line_item->quantity();
 			}
 
@@ -102,7 +102,7 @@ 
 				if( ! $child_line_item->is_percent() ) {
 					$child_line_item->set_unit_price( $child_line_item->total() / $child_line_item->quantity() );
 				}
-			}elseif( $line_item->type() === EEM_Line_Item::type_line_item &&
+			} elseif( $line_item->type() === EEM_Line_Item::type_line_item &&
 					$line_item->OBJ_type() === 'Ticket' ) {
 				//make sure this item's quantity matches its parent
 				if( ! $child_line_item->is_percent() ) {

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'];
+				}
 			}
 		}
 

Spacing +91 added lines, -91 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,28 +595,28 @@ 
 	 * @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 like 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( 'admin_enqueue_scripts', 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 );
+			add_action('admin_enqueue_scripts', 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();
@@ -634,10 +634,10 @@ 
 	 */
 	public function add_preview_script() {
 		//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_register_script( 'ee-messages-preview-js', EE_LIBRARIES_URL . 'messages/messenger/assets/js/ee-messages-preview.js', array( 'jquery' ), EVENT_ESPRESSO_VERSION, true );
-		wp_localize_script( 'ee-messages-preview-js', 'eei18n', EE_Registry::$i18n_js_strings );
-		wp_enqueue_script( 'ee-messages-preview-js' );
+		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_register_script('ee-messages-preview-js', EE_LIBRARIES_URL.'messages/messenger/assets/js/ee-messages-preview.js', array('jquery'), EVENT_ESPRESSO_VERSION, true);
+		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
 	 * @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' ) );
+	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);
 		}
 	}
@@ -678,21 +678,21 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	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));
 
 		//add message type to template args
 		$this->_template_args['message_type'] = $this->_incoming_message_type;
 
 		//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);
 	}
 
 
@@ -728,7 +728,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();
 	}
 
 
@@ -739,10 +739,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);
 	}
 
 
@@ -755,21 +755,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'];
 			}
 		}
@@ -790,7 +790,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
 		return;
 	}