eventespresso / event-espresso-core

admin_pages/transactions/qtips/Transactions_List_Table_Tips.lib.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
 	 * @param  EEM_Transaction constant $status What status is set (by class)
 	 * @return string         The status legend with the related status highlighted
 	 */
-	private function _transaction_status_legend( $status ) {
+	private function _transaction_status_legend($status) {
 
 		$status_array = array(
 			'overpaid' => EEM_Transaction::overpaid_status_code,
@@ -92,6 +92,6 @@ 
 			'failed' => EEM_Transaction::failed_status_code,
 		);
 
-		return EEH_Template::status_legend( $status_array, $status );
+		return EEH_Template::status_legend($status_array, $status);
 	}
 }
\ No newline at end of file

core/admin/templates/admin_details_legend.template.php

Spacing +7 added lines, -7 removed lines

@@ -2,25 +2,25 @@
 //this displays any legends with an array of $items that are indexed by id for each item and each item itself is an array of 'icon' and 'desc'.
 
 //figure out the columns based on the count of items (we want a max of 6 items per column).
-$per_col = isset( $per_column ) ? $per_column : 5;
+$per_col = isset($per_column) ? $per_column : 5;
 $count = 1;
 ?>
 <div class="ee-list-table-legend-container">
 	<h4><?php _e('Legend', 'event_espresso'); ?></h4>
 	<dl class="alignleft ee-list-table-legend">
-		<?php foreach ( $items as $item => $details ) : ?>
-			<?php if ( $per_col < $count ) : ?>
+		<?php foreach ($items as $item => $details) : ?>
+			<?php if ($per_col < $count) : ?>
 				</dl>
 				<dl class="alignleft ee-list-table-legend">
 			<?php $count = 1; endif; ?>
 			<dt id="ee-legend-item-<?php echo $item; ?>">
-				<?php $class = ! empty( $details['class'] ) ? $details['class'] : 'ee-legend-img-container'; ?>
-				<?php if ( strpos( $details[ 'class' ], '<span' ) !== false ) {
+				<?php $class = ! empty($details['class']) ? $details['class'] : 'ee-legend-img-container'; ?>
+				<?php if (strpos($details['class'], '<span') !== false) {
 					echo $class;
 				} else { ?>
 				<span class="<?php echo $class; ?>">
-					<?php if ( ! empty( $details[ 'icon' ] ) ) : ?>
-						<img src="<?php echo $details[ 'icon' ]; ?>" class="ee-legend-icon" alt="<?php echo esc_attr( $details[ 'desc' ] ); ?>"/>
+					<?php if ( ! empty($details['icon'])) : ?>
+						<img src="<?php echo $details['icon']; ?>" class="ee-legend-icon" alt="<?php echo esc_attr($details['desc']); ?>"/>
 					<?php endif; ?>
 				</span>
 				<?php } ?>

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_questions.dmsstage.php

Spacing +32 added lines, -32 removed lines

@@ -55,21 +55,21 @@ 
 					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed','event_espresso'), false, false)
 				)
  */
-class EE_DMS_4_1_0_questions extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_questions extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_new_table;
 	private $_option_table;
-	function _migration_step($num_items=50){
+	function _migration_step($num_items = 50) {
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 		$items_actually_migrated = 0;
-		foreach($rows as $question_row){
+		foreach ($rows as $question_row) {
 			$new_id = $this->_insert_new_question($question_row);
 			$this->get_migration_script()->set_mapping($this->_old_table, $question_row['id'], $this->_new_table, $new_id);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -87,14 +87,14 @@ 
 		$this->_option_table = $wpdb->prefix."esp_question_option";
 		parent::__construct();
 	}
-	private function _insert_new_question($old_question){
+	private function _insert_new_question($old_question) {
 		global $wpdb;
 		//if this pretends to be a 'system' question, check if we already have a
 		//system question for that string. If so, pretend THAT new question
 		//is what we just isnerted
-		if($old_question['system_name']){
-			$id_of_new_system_question = intval($wpdb->get_var($wpdb->prepare("SELECT QST_ID FROM {$this->_new_table} WHERE QST_system = %s",$old_question['system_name'])));
-			if($id_of_new_system_question){
+		if ($old_question['system_name']) {
+			$id_of_new_system_question = intval($wpdb->get_var($wpdb->prepare("SELECT QST_ID FROM {$this->_new_table} WHERE QST_system = %s", $old_question['system_name'])));
+			if ($id_of_new_system_question) {
 				return $id_of_new_system_question;
 			}
 			//ok so this must be the first one. Carry on.
@@ -113,27 +113,27 @@ 
 			'QST_deleted'=>false
 		);
 		$datatypes = array(
-			'%s',//QST_display_text
-			'%s',//QST-admin_label
-			'%s',//QST_system
-			'%s',//QST_type
-			'%d',//QST_required
-			'%s',//QST_required_text
-			'%d',//QST_order
-			'%d',//QST_admin_only
-			'%d',//QST_wp_user
-			'%d',//QST_deleted
+			'%s', //QST_display_text
+			'%s', //QST-admin_label
+			'%s', //QST_system
+			'%s', //QST_type
+			'%d', //QST_required
+			'%s', //QST_required_text
+			'%d', //QST_order
+			'%d', //QST_admin_only
+			'%d', //QST_wp_user
+			'%d', //QST_deleted
 		);
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}
 		$new_id = $wpdb->insert_id;
 		//now take care of posisbly adding question options
-		if(in_array($old_question['question_type'],array('DROPDOWN','SINGLE','MULTIPLE'))){
-			$options = explode(",",$old_question['response']);
-			foreach($options as $option){
+		if (in_array($old_question['question_type'], array('DROPDOWN', 'SINGLE', 'MULTIPLE'))) {
+			$options = explode(",", $old_question['response']);
+			foreach ($options as $option) {
 				$this->_insert_question_option($option, $new_id);
 			}
 		}
@@ -146,7 +146,7 @@ 
 	 * @param int $question_id
 	 * @return int
 	 */
-	private function _insert_question_option($option,$question_id){
+	private function _insert_question_option($option, $question_id) {
 		$option = trim($option);
 		global $wpdb;
 		$cols_n_values = array(
@@ -154,14 +154,14 @@ 
 			'QSO_value'=>$option,
 			'QSO_deleted'=>false
 		);
-		$datatypes= array(
-			'%d',//QST_ID
-			'%s',//QSO_value
-			'%d',//QSO_deleted
+		$datatypes = array(
+			'%d', //QST_ID
+			'%s', //QSO_value
+			'%d', //QSO_deleted
 		);
-		$success = $wpdb->insert($this->_option_table,$cols_n_values,$datatypes);
-		if ( ! $success ){
-			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option'=>$option,'new_question_id'=>$question_id), $this->_option_table, $cols_n_values, $datatypes));
+		$success = $wpdb->insert($this->_option_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option'=>$option, 'new_question_id'=>$question_id), $this->_option_table, $cols_n_values, $datatypes));
 			return 0;
 		}
 		return $wpdb->insert_id;

core/data_migration_scripts/4_8_0_stages/EE_DMS_4_8_0_event_subtotals.dmsstage.php

Spacing +41 added lines, -41 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');
 }
 
 /**
@@ -12,68 +12,68 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_DMS_4_8_0_event_subtotals extends EE_Data_Migration_Script_Stage_Table{
-	function __construct(){
+class EE_DMS_4_8_0_event_subtotals extends EE_Data_Migration_Script_Stage_Table {
+	function __construct() {
 		global $wpdb;
-		$this->_old_table = $wpdb->prefix . 'esp_line_item';
+		$this->_old_table = $wpdb->prefix.'esp_line_item';
 		$this->_extra_where_sql = ' WHERE LIN_type="sub-total" AND LIN_code="pre-tax-subtotal"';
 		$this->_pretty_name = __('Event Sub-total line items', 'event_espresso');
 		parent::__construct();
 	}
-	protected function _migrate_old_row( $line_item_row ) {
+	protected function _migrate_old_row($line_item_row) {
 		global $wpdb;
 		//what event is this line item for? this can be found by looking at its transaction's registration's EVT_ID
-		$event_id = $wpdb->get_var( $wpdb->prepare( 'SELECT EVT_ID FROM ' . $wpdb->prefix . 'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row[ 'TXN_ID' ] ) );
+		$event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM '.$wpdb->prefix.'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
 		$new_line_item_data = array(
-					'LIN_code' => 'event-' . $event_id,
-					'TXN_ID' => $line_item_row[ 'TXN_ID' ],
-					'LIN_name' => __( 'Event', 'event_espresso' ),
-					'LIN_desc' => $line_item_row[ 'LIN_desc' ],
-					'LIN_unit_price' => $line_item_row[ 'LIN_unit_price' ],
-					'LIN_percent' => $line_item_row[ 'LIN_percent' ],
-					'LIN_is_taxable' => $line_item_row[ 'LIN_is_taxable' ],
-					'LIN_order' => $line_item_row[ 'LIN_order' ],
-					'LIN_total' => $line_item_row[ 'LIN_total' ],
-					'LIN_quantity' => $line_item_row[ 'LIN_quantity' ],
-					'LIN_parent' => $line_item_row[ 'LIN_ID'],
+					'LIN_code' => 'event-'.$event_id,
+					'TXN_ID' => $line_item_row['TXN_ID'],
+					'LIN_name' => __('Event', 'event_espresso'),
+					'LIN_desc' => $line_item_row['LIN_desc'],
+					'LIN_unit_price' => $line_item_row['LIN_unit_price'],
+					'LIN_percent' => $line_item_row['LIN_percent'],
+					'LIN_is_taxable' => $line_item_row['LIN_is_taxable'],
+					'LIN_order' => $line_item_row['LIN_order'],
+					'LIN_total' => $line_item_row['LIN_total'],
+					'LIN_quantity' => $line_item_row['LIN_quantity'],
+					'LIN_parent' => $line_item_row['LIN_ID'],
 					'LIN_type' => 'sub-total',
 					'OBJ_type' => 'Event',
 					'OBJ_ID' => $event_id,
 				);
 		$new_line_item_datatypes = array(
-					'%s',//LIN_code
-					'%d',//TXN_ID
-					'%s',//LIN_name
-					'%s',//LIN_desc
-					'%f',//LIN_unit_price
-					'%f',//LIN_percent
-					'%d',//LIN_is_taxable
-					'%d',//LIN_order
-					'%f',//LIN_total
-					'%d',//LIN_quantity
-					'%d',//LIN_parent
-					'%s',//LIN_type
-					'%s',//OBJ_type
-					'%d',//OBJ_ID
+					'%s', //LIN_code
+					'%d', //TXN_ID
+					'%s', //LIN_name
+					'%s', //LIN_desc
+					'%f', //LIN_unit_price
+					'%f', //LIN_percent
+					'%d', //LIN_is_taxable
+					'%d', //LIN_order
+					'%f', //LIN_total
+					'%d', //LIN_quantity
+					'%d', //LIN_parent
+					'%s', //LIN_type
+					'%s', //OBJ_type
+					'%d', //OBJ_ID
 				);
 		//insert the new event subtotal line item, pointing to this line item
-		$success = $wpdb->insert( $this->_old_table, $new_line_item_data, $new_line_item_datatypes );
-		if( ! $success ) {
-			$this->add_error( $this->_create_error_message_for_db_insertion( $this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes ) );
+		$success = $wpdb->insert($this->_old_table, $new_line_item_data, $new_line_item_datatypes);
+		if ( ! $success) {
+			$this->add_error($this->_create_error_message_for_db_insertion($this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes));
 		}
 		$new_line_item_id = $wpdb->insert_id;
-		$this->get_migration_script()->set_mapping($this->_old_table, $line_item_row[ 'LIN_ID' ], $this->_old_table, $new_line_item_id );
+		$this->get_migration_script()->set_mapping($this->_old_table, $line_item_row['LIN_ID'], $this->_old_table, $new_line_item_id);
 		$query = $wpdb->prepare(
 					"UPDATE {$this->_old_table} SET LIN_parent=%d WHERE LIN_parent = %d AND LIN_ID != %d LIMIT 100",
 					$new_line_item_id,
-					$line_item_row[ 'LIN_ID' ],
+					$line_item_row['LIN_ID'],
 					$new_line_item_id );
-		$success = $wpdb->query( $query );
-		if( $success === false ) {
+		$success = $wpdb->query($query);
+		if ($success === false) {
 			$this->add_error(
-					sprintf( __( 'Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso' ),
+					sprintf(__('Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso'),
 					$new_line_item_id,
-					$line_item_row[ 'LIN_ID' ],
+					$line_item_row['LIN_ID'],
 					$wpdb->last_error,
 					$query,
 					$success) );

core/db_classes/EE_WP_User.class.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * EE_WP_User class
@@ -22,9 +22,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_WP_User|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -33,8 +33,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_WP_User
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 	/**
@@ -42,8 +42,8 @@ 
 	 * @return WP_User
 	 */
 	public function wp_user_obj() {
-		if( ! $this->_wp_user_obj ) {
-			$this->_wp_user_obj = get_user_by('ID', $this->ID() );
+		if ( ! $this->_wp_user_obj) {
+			$this->_wp_user_obj = get_user_by('ID', $this->ID());
 		}
 		return $this->_wp_user_obj;
 	}
@@ -69,7 +69,7 @@ 
 						$_SERVER['REQUEST_URI']
 					)
 				),
-				get_edit_user_link( $this->ID() )
+				get_edit_user_link($this->ID())
 			)
 		);
 	}
@@ -87,7 +87,7 @@ 
 	 * @return string
 	 */
 	public function get_admin_overview_link() {
-		return admin_url( 'users.php' );
+		return admin_url('users.php');
 	}
 
 

core/helpers/EEH_MSG_Template.helper.php

Indentation +1 added lines, -1 removed lines

@@ -421,7 +421,7 @@
 		if ( ! empty( $sending_messenger ) ) {
 			$with_messengers = $message_type->with_messengers();
 			if ( ! isset( $with_messengers[$message->messenger()] )
-			     || ! in_array( $sending_messenger, $with_messengers[$message->messenger()] ) ) {
+				 || ! in_array( $sending_messenger, $with_messengers[$message->messenger()] ) ) {
 				throw new EE_Error( sprintf( __('The given sending messenger string (%s) does not match a valid sending messenger with the %s.  If this is incorrect, make sure that the message type has defined this messenger as a sending messenger in its $_with_messengers array.', 'event_espresso'), $sending_messenger, get_class( $message_type ) ) );
 			}
 		} else {

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Doc Comments +4 added lines, -3 removed lines

@@ -143,7 +143,7 @@ 
 	 * Updates all message templates matching the incoming messengers and message types to active status.
 	 *
 	 * @static
-	 * @param  array  $messenger_names     Messenger slug
+	 * @param  string[]  $messenger_names     Messenger slug
 	 * @param  array  $message_type_names  Message type slug
 	 * @return  int 						count of updated records.
 	 */
@@ -454,6 +454,7 @@ 
 	 * @param EE_Registration | null $registration  The registration object must be included if this
 	 *                                              is going to be a registration trigger url.
 	 * @param string $sending_messenger             The (optional) sending messenger for the url.
+	 * @param EE_Registration $registration
 	 *
 	 * @return string
 	 * @throws EE_Error
@@ -1008,8 +1009,8 @@ 
 	/**
 	 * @param \EE_messenger    $messenger
 	 * @param \EE_message_type $message_type
-	 * @param                  $GRP_ID
-	 * @param                  $global
+	 * @param                  integer $GRP_ID
+	 * @param                  boolean $global
 	 * @return array|mixed
 	 */
 	protected static function _create_new_templates( EE_messenger $messenger, EE_message_type $message_type, $GRP_ID, $global ) {

Spacing +197 added lines, -197 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -59,24 +59,24 @@ 
 	 *                was not a new generated template but just reactivated (which only happens for global templates that
 	 *                already exist in the database.
 	 */
-	public static function generate_new_templates( $messenger, $message_types, $GRP_ID = 0, $global = false ) {
+	public static function generate_new_templates($messenger, $message_types, $GRP_ID = 0, $global = false) {
 		//make sure message_type is an array.
 		$message_types = (array) $message_types;
 		$templates = array();
 
-		if ( empty( $messenger ) ) {
-			throw new EE_Error( __('We need a messenger to generate templates!', 'event_espresso') );
+		if (empty($messenger)) {
+			throw new EE_Error(__('We need a messenger to generate templates!', 'event_espresso'));
 		}
 
 		//if we STILL have empty $message_types then we need to generate an error message b/c we NEED message types to do the template files.
-		if ( empty( $message_types ) ) {
-			throw new EE_Error( __('We need at least one message type to generate templates!', 'event_espresso') );
+		if (empty($message_types)) {
+			throw new EE_Error(__('We need at least one message type to generate templates!', 'event_espresso'));
 		}
 
 		EEH_MSG_Template::_set_autoloader();
-		foreach ( $message_types as $message_type ) {
+		foreach ($message_types as $message_type) {
 			//if global then let's attempt to get the GRP_ID for this combo IF GRP_ID is empty.
-			if ( $global && empty( $GRP_ID ) ) {
+			if ($global && empty($GRP_ID)) {
 				$GRP_ID = EEM_Message_Template_Group::instance()->get_one(
 					array(
 						array(
@@ -91,7 +91,7 @@ 
 			// if this is global template generation.
 			// First let's determine if we already HAVE global templates for this messenger and message_type combination.
 			//  If we do then NO generation!!
-			if ( $global && EEH_MSG_Template::already_generated( $messenger, $message_type, $GRP_ID ) ) {
+			if ($global && EEH_MSG_Template::already_generated($messenger, $message_type, $GRP_ID)) {
 				$templates[] = array(
 					'GRP_ID' => $GRP_ID,
 					'MTP_context' => '',
@@ -99,9 +99,9 @@ 
 				//we already have generated templates for this so let's go to the next message type.
 				continue;
 			}
-			$new_message_template_group = EEH_MSG_Template::create_new_templates( $messenger, $message_type, $GRP_ID, $global );
+			$new_message_template_group = EEH_MSG_Template::create_new_templates($messenger, $message_type, $GRP_ID, $global);
 
-			if ( ! $new_message_template_group ) {
+			if ( ! $new_message_template_group) {
 				continue;
 			}
 			$templates[] = $new_message_template_group;
@@ -118,10 +118,10 @@ 
 	 * @param  int $GRP_ID        GRP ID ( if a custom template) (if not provided then we're just doing global template check)
 	 * @return bool                true = generated, false = hasn't been generated.
 	 */
-	public static function already_generated( $messenger, $message_type, $GRP_ID = 0 ) {
+	public static function already_generated($messenger, $message_type, $GRP_ID = 0) {
 		EEH_MSG_Template::_set_autoloader();
 		//what method we use depends on whether we have an GRP_ID or not
-		$count = empty( $GRP_ID )
+		$count = empty($GRP_ID)
 			? EEM_Message_Template::instance()->count(
 				array(
 					array(
@@ -131,7 +131,7 @@ 
 					)
 				)
 			)
-			: EEM_Message_Template::instance()->count( array( array( 'GRP_ID' => $GRP_ID ) ) );
+			: EEM_Message_Template::instance()->count(array(array('GRP_ID' => $GRP_ID)));
 
 		return $count > 0;
 	}
@@ -147,15 +147,15 @@ 
 	 * @param  array  $message_type_names  Message type slug
 	 * @return  int 						count of updated records.
 	 */
-	public static function update_to_active( $messenger_names, $message_type_names ) {
-		$messenger_names = is_array( $messenger_names ) ? $messenger_names : array( $messenger_names );
-		$message_type_names = is_array( $message_type_names ) ? $message_type_names : array( $message_type_names );
+	public static function update_to_active($messenger_names, $message_type_names) {
+		$messenger_names = is_array($messenger_names) ? $messenger_names : array($messenger_names);
+		$message_type_names = is_array($message_type_names) ? $message_type_names : array($message_type_names);
 		return EEM_Message_Template_Group::instance()->update(
-			array( 'MTP_is_active' => 1 ),
+			array('MTP_is_active' => 1),
 			array(
 				array(
-					'MTP_messenger' 	=> array( 'IN', $messenger_names ),
-					'MTP_message_type'  => array( 'IN', $message_type_names )
+					'MTP_messenger' 	=> array('IN', $messenger_names),
+					'MTP_message_type'  => array('IN', $message_type_names)
 				)
 			)
 		);
@@ -176,7 +176,7 @@ 
 	 *
 	 * @return int  count of updated records.
 	 */
-	public static function update_to_inactive( $messenger_names = array(), $message_type_names = array() ) {
+	public static function update_to_inactive($messenger_names = array(), $message_type_names = array()) {
 		return EEM_Message_Template_Group::instance()->deactivate_message_template_groups_for(
 			$messenger_names,
 			$message_type_names
@@ -193,9 +193,9 @@ 
 	 * @param string $type
 	 * @return array array consisting of installed messenger objects and installed message type objects.
 	 */
-	public static function get_installed_message_objects( $type = 'all' ) {
+	public static function get_installed_message_objects($type = 'all') {
 		self::_set_autoloader();
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		return array(
 			'messenger' => $message_resource_manager->installed_messengers(),
 			'message_type' => $message_resource_manager->installed_message_types()
@@ -231,74 +231,74 @@ 
 		$context = 'admin',
 		$merged = false
 	) {
-		$messenger_name = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $messenger ) ) );
-		$mt_name = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $message_type ) ) );
+		$messenger_name = str_replace(' ', '_', ucwords(str_replace('_', ' ', $messenger)));
+		$mt_name = str_replace(' ', '_', ucwords(str_replace('_', ' ', $message_type)));
 		/** @var EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		//convert slug to object
-		$messenger = $message_resource_manager->get_messenger( $messenger );
+		$messenger = $message_resource_manager->get_messenger($messenger);
 
 		//if messenger isn't a EE_messenger resource then bail.
-		if ( ! $messenger instanceof EE_messenger ) {
+		if ( ! $messenger instanceof EE_messenger) {
 			return array();
 		}
 
 		//validate class for getting our list of shortcodes
-		$classname = 'EE_Messages_' . $messenger_name . '_' . $mt_name . '_Validator';
-		if ( ! class_exists( $classname ) ) {
-			$msg[] = __( 'The Validator class was unable to load', 'event_espresso' );
+		$classname = 'EE_Messages_'.$messenger_name.'_'.$mt_name.'_Validator';
+		if ( ! class_exists($classname)) {
+			$msg[] = __('The Validator class was unable to load', 'event_espresso');
 			$msg[] = sprintf(
-				__( 'The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class', 'event_espresso' ),
+				__('The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class', 'event_espresso'),
 				$classname
 			);
-			throw new EE_Error( implode( '||', $msg ) );
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		/** @type EE_Messages_Validator $_VLD */
-		$_VLD = new $classname( array(), $context );
+		$_VLD = new $classname(array(), $context);
 		$valid_shortcodes = $_VLD->get_validators();
 
 		//let's make sure we're only getting the shortcode part of the validators
 		$shortcodes = array();
-		foreach ( $valid_shortcodes as $field => $validators ) {
-			$shortcodes[ $field ] = $validators['shortcodes'];
+		foreach ($valid_shortcodes as $field => $validators) {
+			$shortcodes[$field] = $validators['shortcodes'];
 		}
 		$valid_shortcodes = $shortcodes;
 
 		//if not all fields let's make sure we ONLY include the shortcodes for the specified fields.
-		if ( ! empty( $fields ) ) {
+		if ( ! empty($fields)) {
 			$specified_shortcodes = array();
-			foreach ( $fields as $field ) {
-				if ( isset( $valid_shortcodes[ $field ] ) ) {
-					$specified_shortcodes[ $field ] = $valid_shortcodes[ $field ];
+			foreach ($fields as $field) {
+				if (isset($valid_shortcodes[$field])) {
+					$specified_shortcodes[$field] = $valid_shortcodes[$field];
 				}
 			}
 			$valid_shortcodes = $specified_shortcodes;
 		}
 
 		//if not merged then let's replace the fields with the localized fields
-		if ( ! $merged ) {
+		if ( ! $merged) {
 			//let's get all the fields for the set messenger so that we can get the localized label and use that in the returned array.
 			$field_settings = $messenger->get_template_fields();
 			$localized = array();
-			foreach ( $valid_shortcodes as $field => $shortcodes ) {
+			foreach ($valid_shortcodes as $field => $shortcodes) {
 				//get localized field label
-				if ( isset( $field_settings[ $field ] ) ) {
+				if (isset($field_settings[$field])) {
 					//possible that this is used as a main field.
-					if ( empty( $field_settings[ $field ] ) ) {
-						if ( isset( $field_settings['extra'][ $field ] ) ) {
-							$_field = $field_settings['extra'][ $field ]['main']['label'];
+					if (empty($field_settings[$field])) {
+						if (isset($field_settings['extra'][$field])) {
+							$_field = $field_settings['extra'][$field]['main']['label'];
 						} else {
 							$_field = $field;
 						}
 					} else {
-						$_field = $field_settings[ $field ]['label'];
+						$_field = $field_settings[$field]['label'];
 					}
-				} else if ( isset( $field_settings['extra'] ) ) {
+				} else if (isset($field_settings['extra'])) {
 					//loop through extra "main fields" and see if any of their children have our field
-					foreach ( $field_settings['extra'] as $main_field => $fields ) {
-						if ( isset( $fields[ $field ] ) ) {
-							$_field = $fields[ $field ]['label'];
+					foreach ($field_settings['extra'] as $main_field => $fields) {
+						if (isset($fields[$field])) {
+							$_field = $fields[$field]['label'];
 						} else {
 							$_field = $field;
 						}
@@ -306,22 +306,22 @@ 
 				} else {
 					$_field = $field;
 				}
-				if ( isset( $_field ) ) {
-					$localized[ $_field ] = $shortcodes;
+				if (isset($_field)) {
+					$localized[$_field] = $shortcodes;
 				}
 			}
 			$valid_shortcodes = $localized;
 		}
 
 		//if $merged then let's merge all the shortcodes into one list NOT indexed by field.
-		if ( $merged ) {
+		if ($merged) {
 			$merged_codes = array();
-			foreach ( $valid_shortcodes as $field => $shortcode ) {
-				foreach ( $shortcode as $code => $label ) {
-					if ( isset( $merged_codes[ $code ] ) ) {
+			foreach ($valid_shortcodes as $field => $shortcode) {
+				foreach ($shortcode as $code => $label) {
+					if (isset($merged_codes[$code])) {
 						continue;
 					} else {
-						$merged_codes[ $code ] = $label;
+						$merged_codes[$code] = $label;
 					}
 				}
 			}
@@ -341,10 +341,10 @@ 
 	 * @throws \EE_Error
 	 * @return EE_messenger
 	 */
-	public static function messenger_obj( $messenger ) {
+	public static function messenger_obj($messenger) {
 		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-		$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-		return $Message_Resource_Manager->get_messenger( $messenger );
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		return $Message_Resource_Manager->get_messenger($messenger);
 	}
 
 
@@ -357,10 +357,10 @@ 
 	 * @throws \EE_Error
 	 * @return EE_message_type
 	 */
-	public static function message_type_obj( $message_type ) {
+	public static function message_type_obj($message_type) {
 		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-		$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-		return $Message_Resource_Manager->get_message_type( $message_type );
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		return $Message_Resource_Manager->get_message_type($message_type);
 	}
 
 
@@ -374,11 +374,11 @@ 
 	 * @param  string   $message_type message type to check for.
 	 * @return boolean
 	 */
-	public static function is_mt_active( $message_type ) {
+	public static function is_mt_active($message_type) {
 		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-		$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		$active_mts = $Message_Resource_Manager->list_of_active_message_types();
-		return in_array( $message_type, $active_mts );
+		return in_array($message_type, $active_mts);
 	}
 
 
@@ -391,10 +391,10 @@ 
 	 * @param  string  $messenger slug for messenger to check.
 	 * @return boolean
 	 */
-	public static function is_messenger_active( $messenger ) {
+	public static function is_messenger_active($messenger) {
 		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-		$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-		$active_messenger = $Message_Resource_Manager->get_active_messenger( $messenger );
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		$active_messenger = $Message_Resource_Manager->get_active_messenger($messenger);
 		return $active_messenger instanceof EE_messenger ? true : false;
 	}
 
@@ -412,11 +412,11 @@ 
 	public static function get_active_messengers_in_db() {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
-			__( 'Please use EE_Message_Resource_Manager::get_active_messengers_option() instead.', 'event_espresso' ),
+			__('Please use EE_Message_Resource_Manager::get_active_messengers_option() instead.', 'event_espresso'),
 			'4.9.0'
 		);
 		/** @var EE_Message_Resource_Manager $Message_Resource_Manager */
-		$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		return $Message_Resource_Manager->get_active_messengers_option();
 	}
 
@@ -433,15 +433,15 @@ 
 	 *
 	 * @return bool FALSE if not updated, TRUE if updated.
 	 */
-	public static function update_active_messengers_in_db( $data_to_save ) {
+	public static function update_active_messengers_in_db($data_to_save) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
-			__( 'Please use EE_Message_Resource_Manager::update_active_messengers_option() instead.', 'event_espresso' ),
+			__('Please use EE_Message_Resource_Manager::update_active_messengers_option() instead.', 'event_espresso'),
 			'4.9.0'
 		);
 		/** @var EE_Message_Resource_Manager $Message_Resource_Manager */
-		$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-		return $Message_Resource_Manager->update_active_messengers_option( $data_to_save );
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		return $Message_Resource_Manager->update_active_messengers_option($data_to_save);
 	}
 
 
@@ -465,34 +465,34 @@ 
 		$sending_messenger = ''
 	) {
 		//first determine if the url can be to the EE_Message object.
-		if ( ! $message_type->always_generate() ) {
-			return EEH_MSG_Template::generate_browser_trigger( $message );
+		if ( ! $message_type->always_generate()) {
+			return EEH_MSG_Template::generate_browser_trigger($message);
 		}
 
 		//if $registration object is not valid then exit early because there's nothing that can be generated.
-		if ( ! $registration instanceof EE_Registration ) {
+		if ( ! $registration instanceof EE_Registration) {
 			throw new EE_Error(
-				__( 'Incoming value for registration is not a valid EE_Registration object.', 'event_espresso' )
+				__('Incoming value for registration is not a valid EE_Registration object.', 'event_espresso')
 			);
 		}
 
 		//validate given context
 		$contexts = $message_type->get_contexts();
-		if ( $message->context() !== '' && ! isset( $contexts[$message->context()] ) ) {
+		if ($message->context() !== '' && ! isset($contexts[$message->context()])) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The context %s is not a valid context for %s.', 'event_espresso' ),
+					__('The context %s is not a valid context for %s.', 'event_espresso'),
 					$message->context(),
-					get_class( $message_type )
+					get_class($message_type)
 				)
 			);
 		}
 
 		//valid sending messenger but only if sending messenger set.  Otherwise generating messenger is used.
-		if ( ! empty( $sending_messenger ) ) {
+		if ( ! empty($sending_messenger)) {
 			$with_messengers = $message_type->with_messengers();
-			if ( ! isset( $with_messengers[$message->messenger()] )
-			     || ! in_array( $sending_messenger, $with_messengers[$message->messenger()] ) ) {
+			if ( ! isset($with_messengers[$message->messenger()])
+			     || ! in_array($sending_messenger, $with_messengers[$message->messenger()])) {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -500,7 +500,7 @@ 
 							'event_espresso'
 						),
 						$sending_messenger,
-						get_class( $message_type )
+						get_class($message_type)
 					)
 				);
 			}
@@ -523,14 +523,14 @@ 
 	 * @param EE_Message $message
 	 * @return string.
 	 */
-	public static function generate_browser_trigger( EE_Message $message ) {
+	public static function generate_browser_trigger(EE_Message $message) {
 		$query_args = array(
 			'ee' => 'msg_browser_trigger',
 			'token' => $message->MSG_token()
 		);
 		return apply_filters(
 			'FHEE__EEH_MSG_Template__generate_browser_trigger',
-			add_query_arg( $query_args, site_url() ),
+			add_query_arg($query_args, site_url()),
 			$message
 		);
 	}
@@ -545,7 +545,7 @@ 
 	 * @param EE_Message $message
 	 * @return string
 	 */
-	public static function generate_error_display_trigger( EE_Message $message ) {
+	public static function generate_error_display_trigger(EE_Message $message) {
 		return apply_filters(
 			'FHEE__EEH_MSG_Template__generate_error_display_trigger',
 			add_query_arg(
@@ -595,7 +595,7 @@ 
 			'GRP_ID' => $message_template_group,
 			'id' => $data_id
 			);
-		$url = add_query_arg( $query_args, get_home_url() );
+		$url = add_query_arg($query_args, get_home_url());
 
 		//made it here so now we can just get the url and filter it.  Filtered globally and by message type.
 		$url = apply_filters(
@@ -623,9 +623,9 @@ 
 	 * @param string $type  What action to return.
 	 * @return string
 	 */
-	public static function get_message_action_icon( $type ) {
+	public static function get_message_action_icon($type) {
 		$action_icons = self::get_message_action_icons();
-		return isset( $action_icons[ $type ] ) ? $action_icons[ $type ] : '';
+		return isset($action_icons[$type]) ? $action_icons[$type] : '';
 	}
 
 
@@ -637,34 +637,34 @@ 
 	 * @return array
 	 */
 	public static function get_message_action_icons() {
-		return apply_filters( 'FHEE__EEH_MSG_Template__message_action_icons',
+		return apply_filters('FHEE__EEH_MSG_Template__message_action_icons',
 			array(
 				'view' => array(
-					'label' => __( 'View Message', 'event_espresso' ),
+					'label' => __('View Message', 'event_espresso'),
 					'css_class' => 'dashicons dashicons-welcome-view-site',
 				),
 				'error' => array(
-					'label' => __( 'View Error Message', 'event_espresso' ),
+					'label' => __('View Error Message', 'event_espresso'),
 					'css_class' => 'dashicons dashicons-info',
 				),
 				'see_notifications_for' => array(
-					'label' => __( 'View Related Messages', 'event_espresso' ),
+					'label' => __('View Related Messages', 'event_espresso'),
 					'css_class' => 'dashicons dashicons-megaphone',
 				),
 				'generate_now' => array(
-					'label' => __( 'Generate the message now.', 'event_espresso' ),
+					'label' => __('Generate the message now.', 'event_espresso'),
 					'css_class' => 'dashicons dashicons-admin-tools',
 				),
 				'send_now' => array(
-					'label' => __( 'Send Immediately', 'event_espresso' ),
+					'label' => __('Send Immediately', 'event_espresso'),
 					'css_class' => 'dashicons dashicons-controls-forward',
 				),
 				'queue_for_resending' => array(
-					'label' => __( 'Queue for Resending', 'event_espresso' ),
+					'label' => __('Queue for Resending', 'event_espresso'),
 					'css_class' => 'dashicons dashicons-controls-repeat',
 				),
 				'view_transaction' => array(
-					'label' => __( 'View related Transaction', 'event_espresso' ),
+					'label' => __('View related Transaction', 'event_espresso'),
 					'css_class' => 'dashicons dashicons-cart',
 				)
 			)
@@ -683,9 +683,9 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_message_action_url( $type, EE_Message $message = null, $query_params = array() ) {
-		$action_urls = self::get_message_action_urls( $message, $query_params );
-		return isset( $action_urls[ $type ] )  ? $action_urls[ $type ] : '';
+	public static function get_message_action_url($type, EE_Message $message = null, $query_params = array()) {
+		$action_urls = self::get_message_action_urls($message, $query_params);
+		return isset($action_urls[$type]) ? $action_urls[$type] : '';
 	}
 
 
@@ -700,15 +700,15 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_message_action_urls( EE_Message $message = null, $query_params = array() ) {
-		EE_Registry::instance()->load_helper( 'URL' );
+	public static function get_message_action_urls(EE_Message $message = null, $query_params = array()) {
+		EE_Registry::instance()->load_helper('URL');
 		//if $message is not an instance of EE_Message then let's just do a dummy.
-		$message = empty( $message ) ? EE_Message_Factory::create() : $message;
-		$action_urls =  apply_filters(
+		$message = empty($message) ? EE_Message_Factory::create() : $message;
+		$action_urls = apply_filters(
 			'FHEE__EEH_MSG_Template__get_message_action_url',
 			array(
-				'view' => EEH_MSG_Template::generate_browser_trigger( $message ),
-				'error' => EEH_MSG_Template::generate_error_display_trigger( $message ),
+				'view' => EEH_MSG_Template::generate_browser_trigger($message),
+				'error' => EEH_MSG_Template::generate_error_display_trigger($message),
 				'see_notifications_for' => EEH_URL::add_query_args_and_nonce(
 					array_merge(
 						array(
@@ -718,7 +718,7 @@ 
 						),
 						$query_params
 					),
-					admin_url( 'admin.php' )
+					admin_url('admin.php')
 				),
 				'generate_now' => EEH_URL::add_query_args_and_nonce(
 					array(
@@ -726,7 +726,7 @@ 
 						'action' => 'generate_now',
 						'MSG_ID' => $message->ID()
 					),
-					admin_url( 'admin.php' )
+					admin_url('admin.php')
 				),
 				'send_now' => EEH_URL::add_query_args_and_nonce(
 					array(
@@ -734,7 +734,7 @@ 
 						'action' => 'send_now',
 						'MSG_ID' => $message->ID()
 					),
-					admin_url( 'admin.php' )
+					admin_url('admin.php')
 				),
 				'queue_for_resending' => EEH_URL::add_query_args_and_nonce(
 					array(
@@ -742,7 +742,7 @@ 
 						'action' => 'queue_for_resending',
 						'MSG_ID' => $message->ID()
 					),
-					admin_url( 'admin.php' )
+					admin_url('admin.php')
 				),
 			)
 		);
@@ -760,7 +760,7 @@ 
 					'action' => 'view_transaction',
 					'TXN_ID' => $message->TXN_ID()
 				),
-				admin_url( 'admin.php' )
+				admin_url('admin.php')
 			);
 		} else {
 			$action_urls['view_transaction'] = '';
@@ -781,26 +781,26 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_message_action_link( $type, EE_Message $message = null, $query_params = array() ) {
-		$url = EEH_MSG_Template::get_message_action_url( $type, $message, $query_params );
-		$icon_css = EEH_MSG_Template::get_message_action_icon( $type );
-		$title = isset( $icon_css['label'] ) ? 'title="' . $icon_css['label'] . '"' : '';
+	public static function get_message_action_link($type, EE_Message $message = null, $query_params = array()) {
+		$url = EEH_MSG_Template::get_message_action_url($type, $message, $query_params);
+		$icon_css = EEH_MSG_Template::get_message_action_icon($type);
+		$title = isset($icon_css['label']) ? 'title="'.$icon_css['label'].'"' : '';
 
-		if ( empty( $url ) || empty( $icon_css ) || ! isset( $icon_css['css_class'] ) ) {
+		if (empty($url) || empty($icon_css) || ! isset($icon_css['css_class'])) {
 			return '';
 		}
 
 		$icon_css['css_class'] .= esc_attr(
 			apply_filters(
 				'FHEE__EEH_MSG_Template__get_message_action_link__icon_css_class',
-				' js-ee-message-action-link ee-message-action-link-' . $type,
+				' js-ee-message-action-link ee-message-action-link-'.$type,
 				$type,
 				$message,
 				$query_params
 			)
 		);
 
-		return '<a href="' . $url . '"' . $title . '><span class="' . esc_attr( $icon_css['css_class'] ) . '"></span></a>';
+		return '<a href="'.$url.'"'.$title.'><span class="'.esc_attr($icon_css['css_class']).'"></span></a>';
 
 	}
 
@@ -838,9 +838,9 @@ 
 	 * @param $reg_status
 	 * @return string
 	 */
-	public static function convert_reg_status_to_message_type( $reg_status ) {
+	public static function convert_reg_status_to_message_type($reg_status) {
 		$reg_status_array = self::reg_status_to_message_type_array();
-		return isset( $reg_status_array[$reg_status] ) ? $reg_status_array[$reg_status] : '';
+		return isset($reg_status_array[$reg_status]) ? $reg_status_array[$reg_status] : '';
 	}
 
 
@@ -874,9 +874,9 @@ 
 	 * @param $payment_status
 	 * @return string
 	 */
-	public static function convert_payment_status_to_message_type( $payment_status ) {
+	public static function convert_payment_status_to_message_type($payment_status) {
 		$payment_status_array = self::payment_status_to_message_type_array();
-		return isset( $payment_status_array[$payment_status] ) ? $payment_status_array[$payment_status] : '';
+		return isset($payment_status_array[$payment_status]) ? $payment_status_array[$payment_status] : '';
 	}
 
 
@@ -887,32 +887,32 @@ 
 	 *
 	 * @return EE_Messages_Template_Pack
 	 */
-	public static function get_template_pack( $template_pack_name ) {
-		if ( ! self::$_template_pack_collection instanceof EE_Object_Collection ) {
+	public static function get_template_pack($template_pack_name) {
+		if ( ! self::$_template_pack_collection instanceof EE_Object_Collection) {
 			self::$_template_pack_collection = new EE_Messages_Template_Pack_Collection();
 		}
 
 		//first see if in collection already
-		$template_pack = self::$_template_pack_collection->get_by_name( $template_pack_name );
+		$template_pack = self::$_template_pack_collection->get_by_name($template_pack_name);
 
-		if ( $template_pack instanceof EE_Messages_Template_Pack ) {
+		if ($template_pack instanceof EE_Messages_Template_Pack) {
 			return $template_pack;
 		}
 
 		//nope...let's get it.
 		//not set yet so let's attempt to get it.
-		$pack_class_name = 'EE_Messages_Template_Pack_' . str_replace(
+		$pack_class_name = 'EE_Messages_Template_Pack_'.str_replace(
 				' ',
 				'_',
 				ucwords(
-					str_replace( '_', ' ', $template_pack_name )
+					str_replace('_', ' ', $template_pack_name)
 				)
 			);
-		if ( ! class_exists( $pack_class_name ) && $template_pack_name !== 'default' ) {
-			return self::get_template_pack( 'default' );
+		if ( ! class_exists($pack_class_name) && $template_pack_name !== 'default') {
+			return self::get_template_pack('default');
 		} else {
 			$template_pack = new $pack_class_name;
-			self::$_template_pack_collection->add( $template_pack );
+			self::$_template_pack_collection->add($template_pack);
 			return $template_pack;
 		}
 	}
@@ -930,26 +930,26 @@ 
 	 */
 	public static function get_template_pack_collection() {
 		$new_collection = false;
-		if ( ! self::$_template_pack_collection instanceof EE_Messages_Template_Pack_Collection ) {
+		if ( ! self::$_template_pack_collection instanceof EE_Messages_Template_Pack_Collection) {
 			self::$_template_pack_collection = new EE_Messages_Template_Pack_Collection();
 			$new_collection = true;
 		}
 
 		//glob the defaults directory for messages
-		$templates = glob( EE_LIBRARIES . 'messages/defaults/*', GLOB_ONLYDIR );
-		foreach( $templates as $template_path ) {
+		$templates = glob(EE_LIBRARIES.'messages/defaults/*', GLOB_ONLYDIR);
+		foreach ($templates as $template_path) {
 			//grab folder name
-			$template = basename( $template_path );
+			$template = basename($template_path);
 
-			if ( ! $new_collection ) {
+			if ( ! $new_collection) {
 				//already have it?
-				if ( self::$_template_pack_collection->get_by_name( $template ) instanceof EE_Messages_Template_Pack ) {
+				if (self::$_template_pack_collection->get_by_name($template) instanceof EE_Messages_Template_Pack) {
 					continue;
 				}
 			}
 
 			//setup classname.
-			$template_pack_class_name = 'EE_Messages_Template_Pack_' . str_replace(
+			$template_pack_class_name = 'EE_Messages_Template_Pack_'.str_replace(
 					' ',
 					'_',
 					ucwords(
@@ -960,20 +960,20 @@ 
 						)
 					)
 				);
-			if ( ! class_exists( $template_pack_class_name ) ) {
+			if ( ! class_exists($template_pack_class_name)) {
 				continue;
 			}
-			self::$_template_pack_collection->add( new $template_pack_class_name );
+			self::$_template_pack_collection->add(new $template_pack_class_name);
 		}
 
 		/**
 		 * Filter for plugins to add in any additional template packs
 		 * Note the filter name here is for backward compat, this used to be found in EED_Messages.
 		 */
-		$additional_template_packs = apply_filters( 'FHEE__EED_Messages__get_template_packs__template_packs', array() );
-		foreach ( (array) $additional_template_packs as $template_pack ) {
-			if ( ! self::$_template_pack_collection->contains($template_pack ) ) {
-				self::$_template_pack_collection->add( $template_pack );
+		$additional_template_packs = apply_filters('FHEE__EED_Messages__get_template_packs__template_packs', array());
+		foreach ((array) $additional_template_packs as $template_pack) {
+			if ( ! self::$_template_pack_collection->contains($template_pack)) {
+				self::$_template_pack_collection->add($template_pack);
 			}
 		}
 		return self::$_template_pack_collection;
@@ -991,16 +991,16 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function create_new_templates( $messenger_name, $message_type_name, $GRP_ID = 0, $global = false ) {
+	public static function create_new_templates($messenger_name, $message_type_name, $GRP_ID = 0, $global = false) {
 		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-		$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-		$messenger = $Message_Resource_Manager->valid_messenger( $messenger_name );
-		$message_type = $Message_Resource_Manager->valid_message_type( $message_type_name );
-		if ( ! EEH_MSG_Template::message_type_has_active_templates_for_messenger( $messenger, $message_type, $global ) ) {
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		$messenger = $Message_Resource_Manager->valid_messenger($messenger_name);
+		$message_type = $Message_Resource_Manager->valid_message_type($message_type_name);
+		if ( ! EEH_MSG_Template::message_type_has_active_templates_for_messenger($messenger, $message_type, $global)) {
 			return array();
 		}
 		//whew made it this far!  Okay, let's go ahead and create the templates then
-		return EEH_MSG_Template::_create_new_templates( $messenger, $message_type, $GRP_ID, $global );
+		return EEH_MSG_Template::_create_new_templates($messenger, $message_type, $GRP_ID, $global);
 	}
 
 
@@ -1012,15 +1012,15 @@ 
 	 * @param                  $global
 	 * @return array|mixed
 	 */
-	protected static function _create_new_templates( EE_messenger $messenger, EE_message_type $message_type, $GRP_ID, $global ) {
+	protected static function _create_new_templates(EE_messenger $messenger, EE_message_type $message_type, $GRP_ID, $global) {
 		//if we're creating a custom template then we don't need to use the defaults class
-		if ( ! $global ) {
-			return EEH_MSG_Template::_create_custom_template_group( $messenger, $message_type, $GRP_ID );
+		if ( ! $global) {
+			return EEH_MSG_Template::_create_custom_template_group($messenger, $message_type, $GRP_ID);
 		}
 		/** @type EE_Messages_Template_Defaults $Message_Template_Defaults */
 		$Message_Template_Defaults = EE_Registry::factory(
 			'EE_Messages_Template_Defaults',
-			array( $messenger, $message_type, $GRP_ID )
+			array($messenger, $message_type, $GRP_ID)
 		);
 		//generate templates
 		$success = $Message_Template_Defaults->create_new_templates();
@@ -1028,10 +1028,10 @@ 
 		//if creating the template failed.  Then we should deactivate the related message_type for the messenger because
 		//its not active if it doesn't have a template.  Note this is only happening for GLOBAL template creation
 		//attempts.
-		if ( ! $success ) {
+		if ( ! $success) {
 			/** @var EE_Message_Resource_Manager $message_resource_manager */
-			$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-			$message_resource_manager->deactivate_message_type_for_messenger( $message_type->name, $messenger->name );
+			$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+			$message_resource_manager->deactivate_message_type_for_messenger($message_type->name, $messenger->name);
 		}
 
 		/**
@@ -1059,11 +1059,11 @@ 
 	 * 										)
 	 * @access private
 	 */
-	private static function _create_custom_template_group( EE_messenger $messenger, EE_message_type $message_type, $GRP_ID ) {
+	private static function _create_custom_template_group(EE_messenger $messenger, EE_message_type $message_type, $GRP_ID) {
 		//defaults
-		$success = array( 'GRP_ID' => null, 'MTP_context' => '' );
+		$success = array('GRP_ID' => null, 'MTP_context' => '');
 		//get the template group to use as a template from the db.  If $GRP_ID is empty then we'll assume the base will be the global template matching the messenger and message type.
-		$Message_Template_Group = empty( $GRP_ID )
+		$Message_Template_Group = empty($GRP_ID)
 			? EEM_Message_Template_Group::instance()->get_one(
 				array(
 					array(
@@ -1073,9 +1073,9 @@ 
 					)
 				)
 			)
-			: EEM_Message_Template_Group::instance()->get_one_by_ID( $GRP_ID );
+			: EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
 		//if we don't have a mtg at this point then we need to bail.
-		if ( ! $Message_Template_Group instanceof EE_Message_Template_Group ) {
+		if ( ! $Message_Template_Group instanceof EE_Message_Template_Group) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -1094,42 +1094,42 @@ 
 		$message_templates = $Message_Template_Group->message_templates();
 		//now we have what we need to setup the new template
 		$new_mtg = clone $Message_Template_Group;
-		$new_mtg->set( 'GRP_ID', 0 );
-		$new_mtg->set( 'MTP_is_global', false );
-		$template_name = defined( 'DOING_AJAX' ) && ! empty( $_POST[ 'templateName' ] )
-			? $_POST[ 'templateName' ]
+		$new_mtg->set('GRP_ID', 0);
+		$new_mtg->set('MTP_is_global', false);
+		$template_name = defined('DOING_AJAX') && ! empty($_POST['templateName'])
+			? $_POST['templateName']
 			: __(
 				'New Custom Template',
 				'event_espresso'
 			);
-		$template_description = defined( "DOING_AJAX" ) && ! empty( $_POST[ 'templateDescription' ] )
-			? $_POST[ 'templateDescription' ]
+		$template_description = defined("DOING_AJAX") && ! empty($_POST['templateDescription'])
+			? $_POST['templateDescription']
 			: sprintf(
 				__(
 					'This is a custom template that was created for the %s messenger and %s message type.',
 					'event_espresso'
 				),
-				$new_mtg->messenger_obj()->label[ 'singular' ],
-				$new_mtg->message_type_obj()->label[ 'singular' ]
+				$new_mtg->messenger_obj()->label['singular'],
+				$new_mtg->message_type_obj()->label['singular']
 			);
-		$new_mtg->set( 'MTP_name', $template_name );
-		$new_mtg->set( 'MTP_description', $template_description );
+		$new_mtg->set('MTP_name', $template_name);
+		$new_mtg->set('MTP_description', $template_description);
 		//remove ALL relations on this template group so they don't get saved!
-		$new_mtg->_remove_relations( 'Message_Template' );
+		$new_mtg->_remove_relations('Message_Template');
 		$new_mtg->save();
-		$success[ 'GRP_ID' ] = $new_mtg->ID();
-		$success[ 'template_name' ] = $template_name;
+		$success['GRP_ID'] = $new_mtg->ID();
+		$success['template_name'] = $template_name;
 		//add new message templates and add relation to.
-		foreach ( $message_templates as $message_template ) {
-			if ( ! $message_template instanceof EE_Message_Template ) {
+		foreach ($message_templates as $message_template) {
+			if ( ! $message_template instanceof EE_Message_Template) {
 				continue;
 			}
 			$new_message_template = clone $message_template;
-			$new_message_template->set( 'MTP_ID', 0 );
-			$new_message_template->set( 'GRP_ID', $new_mtg->ID() ); //relation
+			$new_message_template->set('MTP_ID', 0);
+			$new_message_template->set('GRP_ID', $new_mtg->ID()); //relation
 			$new_message_template->save();
-			if ( empty( $success[ 'MTP_context' ] ) ) {
-				$success[ 'MTP_context' ] = $new_message_template->get( 'MTP_context' );
+			if (empty($success['MTP_context'])) {
+				$success['MTP_context'] = $new_message_template->get('MTP_context');
 			}
 		}
 		return $success;
@@ -1151,7 +1151,7 @@ 
 		$global = false
 	) {
 		//is given message_type valid for given messenger (if this is not a global save)
-		if ( $global ) {
+		if ($global) {
 			return true;
 		}
 		$active_templates = EEM_Message_Template_Group::instance()->count(
@@ -1163,7 +1163,7 @@ 
 				)
 			)
 		);
-		if ( $active_templates > 0 ) {
+		if ($active_templates > 0) {
 			return true;
 		}
 		EE_Error::add_error(
@@ -1192,24 +1192,24 @@ 
 	 * @param  string $message_type_name name of EE_message_type
 	 * @return array
 	 */
-	public static function get_fields( $messenger_name, $message_type_name ) {
+	public static function get_fields($messenger_name, $message_type_name) {
 		$template_fields = array();
 		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-		$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-		$messenger = $Message_Resource_Manager->valid_messenger( $messenger_name );
-		$message_type = $Message_Resource_Manager->valid_message_type( $message_type_name );
-		if ( ! EEH_MSG_Template::message_type_has_active_templates_for_messenger( $messenger, $message_type ) ) {
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		$messenger = $Message_Resource_Manager->valid_messenger($messenger_name);
+		$message_type = $Message_Resource_Manager->valid_message_type($message_type_name);
+		if ( ! EEH_MSG_Template::message_type_has_active_templates_for_messenger($messenger, $message_type)) {
 			return array();
 		}
 		//okay now let's assemble an array with the messenger template fields added to the message_type contexts.
-		foreach ( $message_type->get_contexts() as $context => $details ) {
-			foreach ( $messenger->get_template_fields() as $field => $value ) {
-				$template_fields[ $context ][ $field ] = $value;
+		foreach ($message_type->get_contexts() as $context => $details) {
+			foreach ($messenger->get_template_fields() as $field => $value) {
+				$template_fields[$context][$field] = $value;
 			}
 		}
-		if ( empty( $template_fields ) ) {
+		if (empty($template_fields)) {
 			EE_Error::add_error(
-				__( 'Something went wrong and we couldn\'t get any templates assembled', 'event_espresso' ),
+				__('Something went wrong and we couldn\'t get any templates assembled', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__

core/interfaces/EEI_Deletable.interface.php

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/interfaces/EEI_Query_Filter.interface.php

Spacing +3 added lines, -3 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');
 }
 
 /**
@@ -12,7 +12,7 @@ 
  * @since      4.9.0
  * @author     Darren Ethier
  */
-interface EEI_Query_Filter  {
+interface EEI_Query_Filter {
 
 
 	/**

core/interfaces/messages/EEI_Has_Sending_Messenger.interface.php

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