eventespresso / event-espresso-core

core/data_migration_scripts/EE_DMS_Core_4_9_0.dms.php

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

Spacing +39 added lines, -39 removed lines

@@ -8,13 +8,13 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_9_0_stages/*');
 $class_to_filepath = array();
-foreach($stages as $filepath){
+foreach ($stages as $filepath) {
 	$matches = array();
-	preg_match('~4_9_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+	preg_match('~4_9_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 	$class_to_filepath[$matches[1]] = $filepath;
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_9_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_9_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
 
@@ -30,7 +30,7 @@ 
  * @since                4.6.0
  *
  */
-class EE_DMS_Core_4_9_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_9_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * return EE_DMS_Core_4_9_0
@@ -54,14 +54,14 @@ 
 	 */
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if( $version_string <= '4.9.0' && $version_string >= '4.8.0' ){
+		if ($version_string <= '4.9.0' && $version_string >= '4.8.0') {
 //			echo "$version_string can be migrated from";
 			return true;
-		} elseif( ! $version_string ){
+		} elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -82,18 +82,18 @@ 
 	 * @return bool
 	 */
 	public function schema_changes_before_migration() {
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$now_in_mysql = current_time( 'mysql', true );
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$now_in_mysql = current_time('mysql', true);
 
-		$table_name='esp_answer';
-		$sql=" ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID),
 					KEY REG_ID (REG_ID),
 					KEY QST_ID (QST_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -115,7 +115,7 @@ 
 				KEY ATT_fname (ATT_fname)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-		$table_name='esp_checkin';
+		$table_name = 'esp_checkin';
 		$sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				REG_ID int(10) unsigned NOT NULL,
 				DTT_ID int(10) unsigned NOT NULL,
@@ -143,7 +143,7 @@ 
 				CNT_is_EU tinyint(1) DEFAULT '0',
 				CNT_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CNT_ISO)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_currency';
 		$sql = "CUR_code varchar(6) collate utf8_bin NOT NULL,
@@ -153,7 +153,7 @@ 
 				CUR_dec_plc varchar(1) collate utf8_bin NOT NULL DEFAULT '2',
 				CUR_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_currency_payment_method';
@@ -181,7 +181,7 @@ 
 				KEY DTT_EVT_start (DTT_EVT_start),
 				KEY EVT_ID (EVT_ID),
 				KEY DTT_is_primary (DTT_is_primary)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 		
 		$table_name = "esp_datetime_ticket";
 		$sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -199,7 +199,7 @@ 
 				PRIMARY KEY  (EMT_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY GRP_ID (GRP_ID)";
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_meta';
 		$sql = "EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
@@ -217,9 +217,9 @@ 
 				EVT_donations tinyint(1) NULL,
 				PRIMARY KEY  (EVTM_ID),
 				KEY EVT_ID (EVT_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_event_question_group';
+		$table_name = 'esp_event_question_group';
 		$sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				QSG_ID int(10) unsigned NOT NULL,
@@ -227,17 +227,17 @@ 
 				PRIMARY KEY  (EQG_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY QSG_ID (QSG_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_event_venue';
+		$table_name = 'esp_event_venue';
 		$sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_extra_meta';
+		$table_name = 'esp_extra_meta';
 		$sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
@@ -245,7 +245,7 @@ 
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID),
 				KEY EXM_type (EXM_type,OBJ_ID,EXM_key)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_extra_join';
 		$sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
@@ -258,7 +258,7 @@ 
 				KEY second_model (EXJ_second_model_name,EXJ_second_model_id)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-		$table_name='esp_line_item';
+		$table_name = 'esp_line_item';
 		$sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(11) DEFAULT NULL,
@@ -278,7 +278,7 @@ 
 				PRIMARY KEY  (LIN_ID),
 				KEY LIN_code (LIN_code(191)),
 				KEY TXN_ID (TXN_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_log';
 		$sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
@@ -327,7 +327,7 @@ 
 				KEY STS_ID (STS_ID),
 				KEY MSG_created (MSG_created),
 				KEY MSG_modified (MSG_modified)";
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 		
 		$table_name = 'esp_message_template';
 		$sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -352,7 +352,7 @@ 
 				MTP_is_active tinyint(1) NOT NULL DEFAULT '1',
 				PRIMARY KEY  (GRP_ID),
 				KEY MTP_user_id (MTP_user_id)";
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_payment';
 		$sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -410,7 +410,7 @@ 
 				PRIMARY KEY  (TTM_ID)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question';
+		$table_name = 'esp_question';
 		$sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QST_display_text text NOT NULL,
 				QST_admin_label varchar(255) NOT NULL,
@@ -425,9 +425,9 @@ 
 				QST_deleted tinyint(2) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (QST_ID),
 				KEY QST_order (QST_order)';
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question_group_question';
+		$table_name = 'esp_question_group_question';
 		$sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSG_ID int(10) unsigned NOT NULL,
 				QST_ID int(10) unsigned NOT NULL,
@@ -435,9 +435,9 @@ 
 				PRIMARY KEY  (QGQ_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSG_ID_order (QSG_ID,QGQ_order)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question_option';
+		$table_name = 'esp_question_option';
 		$sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSO_value varchar(255) NOT NULL,
 				QSO_desc text NOT NULL,
@@ -448,7 +448,7 @@ 
 				PRIMARY KEY  (QSO_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSO_order (QSO_order)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_registration';
 		$sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -561,7 +561,7 @@ 
 				PRC_parent int(10) unsigned DEFAULT 0,
 				PRIMARY KEY  (PRC_ID),
 				KEY PRT_ID (PRT_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = "esp_price_type";
 		$sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
@@ -598,7 +598,7 @@ 
 				TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				PRIMARY KEY  (TKT_ID),
 				KEY TKT_start_date (TKT_start_date)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_question_group';
 		$sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -614,7 +614,7 @@ 
 				PRIMARY KEY  (QSG_ID),
 				UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier),
 				KEY QSG_order (QSG_order)';
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		/** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
 		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
@@ -648,5 +648,5 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){}
+	public function migration_page_hooks() {}
 }
\ No newline at end of file

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/db_models/EEM_Message.model.php

Braces +3 added lines, -1 removed lines

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

Spacing +81 added lines, -81 removed lines

@@ -105,42 +105,42 @@ 
 	 *
 	 * @return EEM_Message
 	 */
-	protected function __construct( $timezone = null ) {
-		$this->singular_item = __('Message','event_espresso');
-		$this->plural_item = __('Messages','event_espresso');
+	protected function __construct($timezone = null) {
+		$this->singular_item = __('Message', 'event_espresso');
+		$this->plural_item = __('Messages', 'event_espresso');
 
 		//used for token generator
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 
 		$this->_tables = array(
-			'Message'=>new EE_Primary_Table('esp_message','MSG_ID')
+			'Message'=>new EE_Primary_Table('esp_message', 'MSG_ID')
 		);
 
 		$allowed_priority = array(
-			self::priority_high => __( 'high', 'event_espresso' ),
-			self::priority_medium => __( 'medium', 'event_espresso' ),
-			self::priority_low => __( 'low', 'event_espresso' )
+			self::priority_high => __('high', 'event_espresso'),
+			self::priority_medium => __('medium', 'event_espresso'),
+			self::priority_low => __('low', 'event_espresso')
 		);
 
 		$this->_fields = array(
 			'Message'=>array(
-				'MSG_ID'=>new EE_Primary_Key_Int_Field('MSG_ID', __('Message ID','event_espresso')),
-				'MSG_token' => new EE_Plain_Text_Field( 'MSG_token', __('Unique Token used to represent this row in publicly viewable contexts (eg. a url).', 'event_espresso' ), false, EEH_URL::generate_unique_token() ),
-				'GRP_ID'=>new EE_Foreign_Key_Int_Field( 'GRP_ID', __('Foreign key to the EEM_Message_Template_Group table.', 'event_espresso' ), true, 0, 'Message_Template_Group' ),
-				'TXN_ID' => new EE_Foreign_Key_Int_Field( 'TXN_ID', __( 'Foreign key to the related EE_Transaction.  This is required to give context for regenerating the specific message', 'event_espresso' ), true, 0, 'Transaction' ),
-				'MSG_messenger' => new EE_Plain_Text_Field('MSG_messenger', __( 'Corresponds to the EE_messenger::name used to send this message. This will also be used to attempt any resending of the message.', 'event_espresso' ), false, 'email' ),
-				'MSG_message_type' => new EE_Plain_Text_Field( 'MSG_message_type', __( 'Corresponds to the EE_message_type::name used to generate this message.', 'event_espresso' ), false, 'receipt' ),
-				'MSG_context' => new EE_Plain_Text_Field( 'MSG_context', __( 'Context', 'event_espresso' ), false ),
-				'MSG_recipient_ID' => new EE_Foreign_Key_Int_Field( 'MSG_recipient_ID', __( 'Recipient ID', 'event_espresso' ), true, null, array( 'Registration', 'Attendee', 'WP_User' ) ),
-				'MSG_recipient_type' => new EE_Any_Foreign_Model_Name_Field( 'MSG_recipient_type', __( 'Recipient Type', 'event_espresso' ), true, null, array( 'Registration', 'Attendee', 'WP_User' ) ),
-				'MSG_content' => new EE_Maybe_Serialized_Text_Field( 'MSG_content', __( 'Content', 'event_espresso' ), true, '' ),
-				'MSG_to' => new EE_Maybe_Serialized_Text_Field( 'MSG_to', __( 'Address To', 'event_espresso' ), true ),
-				'MSG_from' => new EE_Maybe_Serialized_Text_Field( 'MSG_from', __( 'Address From', 'event_espresso' ), true ),
-				'MSG_subject' => new EE_Maybe_Serialized_Text_Field( 'MSG_subject', __( 'Subject', 'event_espresso' ), true, '' ),
-				'MSG_priority' => new EE_Enum_Integer_Field( 'MSG_priority', __( 'Priority', 'event_espresso' ), false, self::priority_low, $allowed_priority ),
-				'STS_ID' => new EE_Foreign_Key_String_Field( 'STS_ID', __( 'Status', 'event_espresso' ), false, self::status_incomplete, 'Status' ),
-				'MSG_created' => new EE_Datetime_Field( 'MSG_created', __( 'Created', 'event_espresso' ), false, time() ),
-				'MSG_modified' => new EE_Datetime_Field( 'MSG_modified', __( 'Modified', 'event_espresso' ), true, time() )
+				'MSG_ID'=>new EE_Primary_Key_Int_Field('MSG_ID', __('Message ID', 'event_espresso')),
+				'MSG_token' => new EE_Plain_Text_Field('MSG_token', __('Unique Token used to represent this row in publicly viewable contexts (eg. a url).', 'event_espresso'), false, EEH_URL::generate_unique_token()),
+				'GRP_ID'=>new EE_Foreign_Key_Int_Field('GRP_ID', __('Foreign key to the EEM_Message_Template_Group table.', 'event_espresso'), true, 0, 'Message_Template_Group'),
+				'TXN_ID' => new EE_Foreign_Key_Int_Field('TXN_ID', __('Foreign key to the related EE_Transaction.  This is required to give context for regenerating the specific message', 'event_espresso'), true, 0, 'Transaction'),
+				'MSG_messenger' => new EE_Plain_Text_Field('MSG_messenger', __('Corresponds to the EE_messenger::name used to send this message. This will also be used to attempt any resending of the message.', 'event_espresso'), false, 'email'),
+				'MSG_message_type' => new EE_Plain_Text_Field('MSG_message_type', __('Corresponds to the EE_message_type::name used to generate this message.', 'event_espresso'), false, 'receipt'),
+				'MSG_context' => new EE_Plain_Text_Field('MSG_context', __('Context', 'event_espresso'), false),
+				'MSG_recipient_ID' => new EE_Foreign_Key_Int_Field('MSG_recipient_ID', __('Recipient ID', 'event_espresso'), true, null, array('Registration', 'Attendee', 'WP_User')),
+				'MSG_recipient_type' => new EE_Any_Foreign_Model_Name_Field('MSG_recipient_type', __('Recipient Type', 'event_espresso'), true, null, array('Registration', 'Attendee', 'WP_User')),
+				'MSG_content' => new EE_Maybe_Serialized_Text_Field('MSG_content', __('Content', 'event_espresso'), true, ''),
+				'MSG_to' => new EE_Maybe_Serialized_Text_Field('MSG_to', __('Address To', 'event_espresso'), true),
+				'MSG_from' => new EE_Maybe_Serialized_Text_Field('MSG_from', __('Address From', 'event_espresso'), true),
+				'MSG_subject' => new EE_Maybe_Serialized_Text_Field('MSG_subject', __('Subject', 'event_espresso'), true, ''),
+				'MSG_priority' => new EE_Enum_Integer_Field('MSG_priority', __('Priority', 'event_espresso'), false, self::priority_low, $allowed_priority),
+				'STS_ID' => new EE_Foreign_Key_String_Field('STS_ID', __('Status', 'event_espresso'), false, self::status_incomplete, 'Status'),
+				'MSG_created' => new EE_Datetime_Field('MSG_created', __('Created', 'event_espresso'), false, time()),
+				'MSG_modified' => new EE_Datetime_Field('MSG_modified', __('Modified', 'event_espresso'), true, time())
 			)
 		);
 		$this->_model_relations = array(
@@ -150,7 +150,7 @@ 
 			'Message_Template_Group' => new EE_Belongs_To_Relation(),
 			'Transaction' => new EE_Belongs_To_Relation()
 		);
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -161,8 +161,8 @@ 
 	public function create_default_object() {
 		/** @type EE_Message $message */
 		$message = parent::create_default_object();
-		if ( $message instanceof EE_Message ) {
-			return EE_Message_Factory::set_messenger_and_message_type( $message );
+		if ($message instanceof EE_Message) {
+			return EE_Message_Factory::set_messenger_and_message_type($message);
 		}
 		return null;
 	}
@@ -173,11 +173,11 @@ 
 	 * @param mixed $cols_n_values
 	 * @return \EE_Message
 	 */
-	public function instantiate_class_from_array_or_object( $cols_n_values ) {
+	public function instantiate_class_from_array_or_object($cols_n_values) {
 		/** @type EE_Message $message */
-		$message = parent::instantiate_class_from_array_or_object( $cols_n_values );
-		if ( $message instanceof EE_Message ) {
-			return EE_Message_Factory::set_messenger_and_message_type( $message );
+		$message = parent::instantiate_class_from_array_or_object($cols_n_values);
+		if ($message instanceof EE_Message) {
+			return EE_Message_Factory::set_messenger_and_message_type($message);
 		}
 		return null;
 	}
@@ -190,13 +190,13 @@ 
 	 * @param string $message_type the message type slug
 	 * @return boolean
 	 */
-	public function message_sent_for_attendee( $attendee, $message_type ) {
-		$attendee_ID = EEM_Attendee::instance()->ensure_is_ID( $attendee );
-		return $this->exists( array( array(
+	public function message_sent_for_attendee($attendee, $message_type) {
+		$attendee_ID = EEM_Attendee::instance()->ensure_is_ID($attendee);
+		return $this->exists(array(array(
 			'Attendee.ATT_ID' => $attendee_ID,
 			'MSG_message_type' => $message_type,
-			'STS_ID' => array( 'IN', $this->stati_indicating_sent() )
-		) ) );
+			'STS_ID' => array('IN', $this->stati_indicating_sent())
+		)));
 	}
 
 
@@ -208,13 +208,13 @@ 
 	 * @param string $message_type the message type slug
 	 * @return boolean
 	 */
-	public function message_sent_for_registration( $registration, $message_type ) {
-		$registrationID = EEM_Registration::instance()->ensure_is_ID( $registration );
-		return $this->exists( array( array(
+	public function message_sent_for_registration($registration, $message_type) {
+		$registrationID = EEM_Registration::instance()->ensure_is_ID($registration);
+		return $this->exists(array(array(
 			'Registration.REG_ID' => $registrationID,
 			'MSG_message_type' => $message_type,
-			'STS_ID' => array( 'IN', $this->stati_indicating_sent() )
-		) ) );
+			'STS_ID' => array('IN', $this->stati_indicating_sent())
+		)));
 	}
 
 
@@ -225,10 +225,10 @@ 
 	 * @param string $token
 	 * @return EE_Message
 	 */
-	public function get_one_by_token( $token ) {
-		return $this->get_one( array( array(
+	public function get_one_by_token($token) {
+		return $this->get_one(array(array(
 			'MSG_token' => $token
-		) ) );
+		)));
 	}
 
 
@@ -236,8 +236,8 @@ 
 	 * Returns stati that indicate the message HAS been sent
 	 * @return array of strings for possible stati
 	 */
-	public function stati_indicating_sent(){
-		return apply_filters( 'FHEE__EEM_Message__stati_indicating_sent', array( self::status_sent ) );
+	public function stati_indicating_sent() {
+		return apply_filters('FHEE__EEM_Message__stati_indicating_sent', array(self::status_sent));
 	}
 
 
@@ -248,7 +248,7 @@ 
 	 * @return array of strings for possible stati.
 	 */
 	public function stati_indicating_to_send() {
-		return apply_filters( 'FHEE__EEM_Message__stati_indicating_to_send', array( self::status_idle, self::status_resend ) );
+		return apply_filters('FHEE__EEM_Message__stati_indicating_to_send', array(self::status_idle, self::status_resend));
 	}
 
 
@@ -262,10 +262,10 @@ 
 			self::status_retry,
 		);
 		//if WP_DEBUG is set, then let's include debug_only fails
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$failed_stati[] = self::status_debug_only;
 		}
-		return apply_filters( 'FHEE__EEM_Message__stati_indicating_failed_sending', $failed_stati );
+		return apply_filters('FHEE__EEM_Message__stati_indicating_failed_sending', $failed_stati);
 	}
 
 
@@ -300,11 +300,11 @@ 
 		// the value, matches the corresponding EEM_Base child reference.
 		$expected_vars = $this->_expected_vars_for_query_inject();
 		$query_params[0] = array();
-		foreach ( $expected_vars as $request_key => $model_name ) {
-			$request_value = EE_Registry::instance()->REQ->get( $request_key );
-			if ( $request_value ) {
+		foreach ($expected_vars as $request_key => $model_name) {
+			$request_value = EE_Registry::instance()->REQ->get($request_key);
+			if ($request_value) {
 				//special case
-				switch ( $request_key ) {
+				switch ($request_key) {
 					case '_REG_ID' :
 						$query_params[0]['AND**filter_by']['OR**filter_by_REG_ID'] = array(
 							'Transaction.Registration.REG_ID' => $request_value,
@@ -316,7 +316,7 @@ 
 						);
 						break;
 					default :
-						$query_params[0]['AND**filter_by'][ 'OR**filter_by_' . $request_key ][ $model_name . '.' . $request_key ] = $request_value;
+						$query_params[0]['AND**filter_by']['OR**filter_by_'.$request_key][$model_name.'.'.$request_key] = $request_value;
 						break;
 				}
 			}
@@ -333,53 +333,53 @@ 
 		$expected_vars = $this->_expected_vars_for_query_inject();
 		$pretty_label = '';
 		$label_parts = array();
-		foreach ( $expected_vars as $request_key => $model_name ) {
-			$model = EE_Registry::instance()->load_model( $model_name );
-			if ( $model_field_value = EE_Registry::instance()->REQ->get( $request_key ) ) {
-				switch ( $request_key ) {
+		foreach ($expected_vars as $request_key => $model_name) {
+			$model = EE_Registry::instance()->load_model($model_name);
+			if ($model_field_value = EE_Registry::instance()->REQ->get($request_key)) {
+				switch ($request_key) {
 					case '_REG_ID' :
 						$label_parts[] = sprintf(
-							esc_html__( 'Registration with the ID: %s', 'event_espresso' ),
+							esc_html__('Registration with the ID: %s', 'event_espresso'),
 							$model_field_value
 						);
 						break;
 					case 'ATT_ID' :
 						/** @var EE_Attendee $attendee */
-						$attendee = $model->get_one_by_ID( $model_field_value );
+						$attendee = $model->get_one_by_ID($model_field_value);
 						$label_parts[] = $attendee instanceof EE_Attendee
-							? sprintf( esc_html__( 'Attendee %s', 'event_espresso' ), $attendee->full_name() )
-							: sprintf( esc_html__( 'Attendee ID: %s', 'event_espresso' ), $model_field_value );
+							? sprintf(esc_html__('Attendee %s', 'event_espresso'), $attendee->full_name())
+							: sprintf(esc_html__('Attendee ID: %s', 'event_espresso'), $model_field_value);
 						break;
 					case 'ID' :
 						/** @var EE_WP_User $wpUser */
-						$wpUser = $model->get_one_by_ID( $model_field_value );
+						$wpUser = $model->get_one_by_ID($model_field_value);
 						$label_parts[] = $wpUser instanceof EE_WP_User
-							? sprintf( esc_html__( 'WP User: %s', 'event_espresso' ), $wpUser->name() )
-							: sprintf( esc_html__( 'WP User ID: %s', 'event_espresso' ), $model_field_value );
+							? sprintf(esc_html__('WP User: %s', 'event_espresso'), $wpUser->name())
+							: sprintf(esc_html__('WP User ID: %s', 'event_espresso'), $model_field_value);
 						break;
 					case 'TXN_ID' :
 						$label_parts[] = sprintf(
-							esc_html__( 'Transaction with the ID: %s', 'event_espresso' ),
+							esc_html__('Transaction with the ID: %s', 'event_espresso'),
 							$model_field_value
 						);
 						break;
 					case 'EVT_ID' :
 						/** @var EE_Event $Event */
-						$Event = $model->get_one_by_ID( $model_field_value );
+						$Event = $model->get_one_by_ID($model_field_value);
 						$label_parts[] = $Event instanceof EE_Event
-							? sprintf( esc_html__( 'for the Event: %s', 'event_espresso' ), $Event->name() )
-							: sprintf( esc_html__( 'for the Event with ID: %s', 'event_espresso' ), $model_field_value );
+							? sprintf(esc_html__('for the Event: %s', 'event_espresso'), $Event->name())
+							: sprintf(esc_html__('for the Event with ID: %s', 'event_espresso'), $model_field_value);
 						break;
 				}
 			}
 		}
 
-		if ( $label_parts ) {
+		if ($label_parts) {
 
 			//prepend to the last element of $label_parts an "and".
-			if ( count( $label_parts ) > 1 ) {
-				$label_parts_index_to_prepend                 = count( $label_parts ) - 1;
-				$label_parts[ $label_parts_index_to_prepend ] = 'and' . $label_parts[ $label_parts_index_to_prepend ];
+			if (count($label_parts) > 1) {
+				$label_parts_index_to_prepend                 = count($label_parts) - 1;
+				$label_parts[$label_parts_index_to_prepend] = 'and'.$label_parts[$label_parts_index_to_prepend];
 			}
 
 			$pretty_label .= sprintf(
@@ -388,7 +388,7 @@ 
 					'A label for the messages returned in a query that are filtered by items in the query. This could be Transaction, Event, Attendee, Registration, or WP_User.',
 					'event_espresso'
 				),
-				implode( ', ', $label_parts )
+				implode(', ', $label_parts)
 			);
 		}
 		return $pretty_label;
@@ -438,20 +438,20 @@ 
 	 *
 	 * @return bool         true means Messages is in debug mode.  false means messages system is not in debug mode.
 	 */
-	public static function debug( $set_debug = null ) {
+	public static function debug($set_debug = null) {
 		static $is_debugging = null;
 
 		//initialize (use constant if set).
-		if ( is_null( $set_debug ) && is_null( $is_debugging ) ) {
-			$is_debugging = defined( 'EE_DEBUG_MESSAGES' ) && EE_DEBUG_MESSAGES;
+		if (is_null($set_debug) && is_null($is_debugging)) {
+			$is_debugging = defined('EE_DEBUG_MESSAGES') && EE_DEBUG_MESSAGES;
 		}
 
-		if ( ! is_null( $set_debug ) ) {
-			$is_debugging = filter_var( $set_debug, FILTER_VALIDATE_BOOLEAN );
+		if ( ! is_null($set_debug)) {
+			$is_debugging = filter_var($set_debug, FILTER_VALIDATE_BOOLEAN);
 		}
 
 		//return filtered value
-		return apply_filters( 'FHEE__EEM_Message__debug', $is_debugging );
+		return apply_filters('FHEE__EEM_Message__debug', $is_debugging);
 	}
 
 

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 {

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_site_url() );
+		$url = add_query_arg($query_args, get_site_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__

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 ) {

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

core/libraries/line_item_filters/EE_Line_Item_Filter_Base.class.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');
 }
 /**
  * Class EE_Line_Item_Filter_Base
@@ -24,7 +24,7 @@ 
 	 * @param \EEI_Line_Item $line_item
 	 * @return \EEI_Line_Item
 	 */
-	public function process( EEI_Line_Item $line_item ) {
+	public function process(EEI_Line_Item $line_item) {
 		return $line_item;
 	}
 

core/libraries/messages/EE_messenger.lib.php

Braces +17 added lines, -11 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
@@ -717,8 +718,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' );
@@ -788,20 +790,24 @@ 
 	 */
 	public function get_field_label( $field ) {
 		//first let's see if the field requests is in the top level array.
-		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) )
-			return $this->_template[$field]['label'];
+		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) ) {
+					return $this->_template[$field]['label'];
+		}
 
 		//nope so let's look in the extra array to see if it's there HOWEVER if the field exists as a top level index in the extra array then we know the label is in the 'main' index.
-		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  )
-			return $this->_template_fields['extra'][$field]['main']['label'];
+		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  ) {
+					return $this->_template_fields['extra'][$field]['main']['label'];
+		}
 
 		//now it's possible this field may just be existing in any of the extra array items.
 		if ( !empty( $this->_template_fields['extra'] ) && is_array( $this->_template_fields['extra'] ) ) {
 			foreach ( $this->_template_fields['extra'] as $main_field => $subfields ) {
-				if ( !is_array( $subfields ) )
-					continue;
-				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) )
-					return $subfields[$field]['label'];
+				if ( !is_array( $subfields ) ) {
+									continue;
+				}
+				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) ) {
+									return $subfields[$field]['label'];
+				}
 			}
 		}
 

Doc Comments +2 added lines, -2 removed lines

@@ -503,7 +503,7 @@ 
 	/**
 	 * @param $message_types
 	 * @param array $extra
-	 * @return mixed|string
+	 * @return string
 	 */
 	protected function _get_admin_content_events_edit( $message_types, $extra ) {
 		//defaults
@@ -771,7 +771,7 @@ 
 	 * All this does is set the existing test settings (in the db) for the messenger
 	 *
 	 * @access public
-	 * @param $settings
+	 * @param string $settings
 	 * @return bool success/fail
 	 */
 	public function set_existing_test_settings( $settings ) {

Spacing +97 added lines, -97 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');
 	}
 
 
@@ -359,7 +359,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);
 	}
 
 
@@ -374,10 +374,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);
 	}
 
 
@@ -397,10 +397,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;
 
 	}
@@ -418,13 +418,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;
 	}
 
@@ -439,14 +439,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;
 	}
 
@@ -460,7 +460,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;
 	}
 
@@ -476,8 +476,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;
 	}
 
@@ -494,8 +494,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);
 	}
 
 
@@ -505,20 +505,20 @@ 
 	 * @param array $extra
 	 * @return mixed|string
 	 */
-	protected function _get_admin_content_events_edit( $message_types, $extra ) {
+	protected function _get_admin_content_events_edit($message_types, $extra) {
 		//defaults
 		$template_args = 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 ) )
+			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,
@@ -527,55 +527,55 @@ 
 				'MTP_is_active' => true
 			)
 		);
-		$templates_for_event = !empty( $templates_for_event ) ? $templates_for_event : array();
+		$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 ) {
-			if ( $mtpg instanceof EE_Message_Template_Group ) {
+		foreach ($global_templates as $mtpgID => $mtpg) {
+			if ($mtpg instanceof EE_Message_Template_Group) {
 				//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 ) ) {
+				$mtp_obj->admin_registered_pages = (array) $mtp_obj->admin_registered_pages;
+				if ( ! in_array('events_edit', $mtp_obj->admin_registered_pages)) {
 					continue;
 				}
 				$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;
+				$select_values[$mtpgID] = __('Global', 'event_espresso');
+				$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() );
-					foreach ( $custom_templates as $cmtpgID => $cmtpg ) {
-						$select_values[ $cmtpgID ] = $cmtpg->name();
-						$default_value = array_key_exists( $cmtpgID, $templates_for_event ) ? $cmtpgID : $default_value;
+					$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) {
+						$select_values[$cmtpgID] = $cmtpg->name();
+						$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;
-				$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_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' );
+				$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'));
+				$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');
 				//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_messages_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_messages_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);
 	}
 
 
@@ -590,8 +590,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;
 	}
 
@@ -605,9 +605,9 @@ 
 	 * @param mixed $value
 	 */
 	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;
 		}
 	}
 
@@ -618,8 +618,8 @@ 
 	 * @return bool Very important that all messengers return bool for successful send or not.  Error messages can be
 	 *              added to EE_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();
 	}
@@ -633,28 +633,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( EE_Message $message, EE_message_type $message_type, $send = false ) {
-		$this->_validate_and_setup( $message );
+	public function get_preview(EE_Message $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();
@@ -672,10 +672,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');
 	}
 
 
@@ -686,13 +686,13 @@ 
 	 * @param  EE_Message $message
 	 * @throws EE_Error
 	 */
-	protected function _validate_and_setup( EE_Message $message ) {
+	protected function _validate_and_setup(EE_Message $message) {
 		$template_pack = $message->get_template_pack();
 		$variation = $message->get_template_pack_variation();
 
 		//verify we have the required template pack value on the $message object.
-		if ( ! $template_pack instanceof EE_Messages_Template_Pack ) {
-			throw new EE_Error( __('Incoming $message object must have an EE_Messages_Template_Pack object available.', 'event_espresso' ) );
+		if ( ! $template_pack instanceof EE_Messages_Template_Pack) {
+			throw new EE_Error(__('Incoming $message object must have an EE_Messages_Template_Pack object available.', 'event_espresso'));
 		}
 
 		$this->_tmp_pack = $template_pack;
@@ -701,11 +701,11 @@ 
 
 		$template_fields = $this->get_template_fields();
 
-		foreach ( $template_fields as $template => $value ) {
-			if ( $template !== 'extra' ) {
-				$column_value = $message->get_field_or_extra_meta( 'MSG_' . $template );
+		foreach ($template_fields as $template => $value) {
+			if ($template !== 'extra') {
+				$column_value = $message->get_field_or_extra_meta('MSG_'.$template);
 				$message_template_value = $column_value ? $column_value : null;
-				$this->_set_template_value( $template, $message_template_value );
+				$this->_set_template_value($template, $message_template_value);
 			}
 		}
 	}
@@ -720,19 +720,19 @@ 
 	 * @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;
 
-		return EEH_Template::display_template( $wrapper_template, $this->_template_args, TRUE );
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, TRUE);
 	}
 
 
@@ -768,9 +768,9 @@ 
 	 */
 	public function get_existing_test_settings() {
 		/** @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');
 		$settings = $Message_Resource_Manager->get_active_messengers_option();
-		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();
 	}
 
 
@@ -782,12 +782,12 @@ 
 	 * @param $settings
 	 * @return bool success/fail
 	 */
-	public function set_existing_test_settings( $settings ) {
+	public function set_existing_test_settings($settings) {
 		/** @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');
 		$existing = $Message_Resource_Manager->get_active_messengers_option();
-		$existing[ $this->name ]['test_settings'] = $settings;
-		return $Message_Resource_Manager->update_active_messengers_option( $existing );
+		$existing[$this->name]['test_settings'] = $settings;
+		return $Message_Resource_Manager->update_active_messengers_option($existing);
 	}
 
 
@@ -800,21 +800,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'];
 			}
 		}
@@ -835,7 +835,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
 		return;
 	}