eventespresso / event-espresso-core

admin_pages/events/qtips/EE_Event_List_Table_Tips.lib.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 			0 => array(
 				'content_id' => 'attendee-column-tip',
 				'target' => '.column-attendees .dashicons-groups',
-				'content' => sprintf( __('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence') ),
+				'content' => sprintf(__('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')),
 				'options' => array( 
 					'position' => array(
 						'my' => 'bottom left',
@@ -124,7 +124,7 @@ 
 	 * @param  EE_Datetime constant $status What status is set (by class)
 	 * @return string         The status legend with the related status highlighted
 	 */
-	private function _event_status_legend( $status ) {
+	private function _event_status_legend($status) {
 
 		$status_array = array(
 			'active_status' => EE_Datetime::active,
@@ -136,7 +136,7 @@ 
 			'inactive_status' => EE_Datetime::inactive
 		);
 
-		return EEH_Template::status_legend( $status_array, $status );
+		return EEH_Template::status_legend($status_array, $status);
 	}
 
 }
\ No newline at end of file

admin_pages/messages/Messages_Template_List_Table.class.php

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');
+}
 
 /**
  *

Spacing +39 added lines, -39 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -41,8 +41,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->get_admin_page()->get_message_templates( $this->_per_page, $this->_view, FALSE);
-		$this->_all_data_count = $this->get_admin_page()->get_message_templates( $this->_per_page, $this->_view, TRUE, TRUE );
+		$this->_data = $this->get_admin_page()->get_message_templates($this->_per_page, $this->_view, FALSE);
+		$this->_all_data_count = $this->get_admin_page()->get_message_templates($this->_per_page, $this->_view, TRUE, TRUE);
 	}
 
 
@@ -51,21 +51,21 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __('Message Template Group', 'event_espresso' ),
-			'plural' => __('Message Template', 'event_espresso' ),
+			'singular' => __('Message Template Group', 'event_espresso'),
+			'plural' => __('Message Template', 'event_espresso'),
 			'ajax' => TRUE, //for now,
 			'screen' => $this->get_admin_page()->get_current_screen()->id
 			);
 		$this->_columns = array(
 			//'cb' => '<input type="checkbox" />', //no deleting default (global) templates!
 			'message_type' => __('Message Type', 'event_espresso'),
-			'messenger' => __( 'Messenger', 'event_espresso'),
-			'description' => __( 'Description', 'event_espresso' ),
+			'messenger' => __('Messenger', 'event_espresso'),
+			'description' => __('Description', 'event_espresso'),
 			//'messages_sent' => __( 'Total Sent', 'event_espresso' ) //todo this will come later when we've got message tracking in place.
 			);
 
 		$this->_sortable_columns = array(
-			'messenger' => array( 'MTP_messenger' => TRUE ),
+			'messenger' => array('MTP_messenger' => TRUE),
 			//'message_type' => array( 'MTP_message_type' => FALSE )
 			);
 
@@ -84,16 +84,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		$message_type = $item->message_type_obj();
 		$messenger = $item->messenger_obj();
 
-		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger ) {
+		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
 			echo '';
 			return;
 		}
 
-		parent::single_row( $item );
+		parent::single_row($item);
 	}
 
 
@@ -111,8 +111,8 @@ 
 		);
 
 		//set filters to select inputs if they aren't empty
-		foreach ( $select_inputs as $select_input ) {
-			if ( $select_input ) {
+		foreach ($select_inputs as $select_input) {
+			if ($select_input) {
 				$filters[] = $select_input;
 			}
 		}
@@ -123,20 +123,20 @@ 
 	 * we're just removing the search box for message templates, not needed.
 	 * @return string (empty);
 	 */
-	function search_box( $text, $input_id ) {
+	function search_box($text, $input_id) {
 		return '';
 	}
 
 
 	protected function _add_view_counts() {
-		foreach ( $this->_views as $view => $args )  {
-			$this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates( $this->_per_page, $view, TRUE, TRUE );
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates($this->_per_page, $view, TRUE, TRUE);
 		}
 	}
 
 
 
-	public function column_cb( $item ) {
+	public function column_cb($item) {
 		return '';
 	}
 
@@ -144,8 +144,8 @@ 
 
 
 
-	function column_description( $item ) {
-		return '<p>' . $item->message_type_obj()->description . '</p>';
+	function column_description($item) {
+		return '<p>'.$item->message_type_obj()->description.'</p>';
 	}
 
 
@@ -160,27 +160,27 @@ 
 		$actions = array();
 
 		// edit link but only if item isn't trashed.
-		if ( !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_message_template', 'id'=>$item->GRP_ID() ), EE_MSG_ADMIN_URL );
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template Group', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
+		if ( ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID())) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID()), EE_MSG_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 		}
 
-		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template Group', 'event_espresso' ) . '">' . ucwords( $item->messenger_obj()->label['singular'] ) . '</a>' : ucwords( $item->messenger_obj()->label['singular'] );
+		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'.ucwords($item->messenger_obj()->label['singular']).'</a>' : ucwords($item->messenger_obj()->label['singular']);
 
 		//we want to display the contexts in here so we need to set them up
 		$c_label = $item->context_label();
 		$c_configs = $item->contexts_config();
 		$ctxt = array();
 		$context_templates = $item->context_templates();
-		foreach ( $context_templates as $context => $template_fields ) {
-			$mtp_to = !empty( $context_templates[$context]['to'] ) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
-			$inactive = empty( $mtp_to ) && !empty( $context_templates[$context]['to'] ) ? ' class="mtp-inactive"' : '';
+		foreach ($context_templates as $context => $template_fields) {
+			$mtp_to = ! empty($context_templates[$context]['to']) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
+			$inactive = empty($mtp_to) && ! empty($context_templates[$context]['to']) ? ' class="mtp-inactive"' : '';
 			$context_title = ucwords($c_configs[$context]['label']);
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL );
-			$ctxt[] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? '<a' . $inactive . ' href="'. $edit_link . '" title="' . esc_attr__('Edit Context', 'event_espresso') . '">' . $context_title . '</a>' : $context_title;
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL);
+			$ctxt[] = EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a'.$inactive.' href="'.$edit_link.'" title="'.esc_attr__('Edit Context', 'event_espresso').'">'.$context_title.'</a>' : $context_title;
 		}
 
-		$ctx_content = !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? sprintf( __('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural']) ) . implode(' | ', $ctxt) : '';
+		$ctx_content = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? sprintf(__('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural'])).implode(' | ', $ctxt) : '';
 
 
 		//Return the name contents
@@ -188,7 +188,7 @@ 
 										/* $1%s */ $name_link,
 										/* $2%s */ $item->GRP_ID(),
 										/* %4$s */ $ctx_content,
-										/* $3%s */ $this->row_actions( $actions )
+										/* $3%s */ $this->row_actions($actions)
 		);
 	}
 
@@ -198,7 +198,7 @@ 
 	 * @return string       message_type name
 	 */
 	function column_message_type($item) {
-		return ucwords($item->message_type_obj()->label['singular'] );
+		return ucwords($item->message_type_obj()->label['singular']);
 	}
 
 
@@ -225,16 +225,16 @@ 
 			)
 		);
 
-		foreach ( $active_message_template_groups_grouped_by_messenger as $active_message_template_group ) {
-			if ( $active_message_template_group instanceof EE_Message_Template_Group ) {
+		foreach ($active_message_template_groups_grouped_by_messenger as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
 				$messenger = $active_message_template_group->messenger_obj();
 				$messenger_label = $messenger instanceof EE_messenger
 					? $messenger->label['singular']
 					: $active_message_template_group->messenger();
-				$messenger_options[ $active_message_template_group->messenger() ] = ucwords( $messenger_label );
+				$messenger_options[$active_message_template_group->messenger()] = ucwords($messenger_label);
 			}
 		}
-		return $this->get_admin_page()->get_messengers_select_input( $messenger_options );
+		return $this->get_admin_page()->get_messengers_select_input($messenger_options);
 	}
 
 
@@ -254,16 +254,16 @@ 
 			)
 		);
 
-		foreach ( $active_message_template_groups_grouped_by_message_type as $active_message_template_group ) {
-			if ( $active_message_template_group instanceof EE_Message_Template_Group ) {
+		foreach ($active_message_template_groups_grouped_by_message_type as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
 				$message_type = $active_message_template_group->message_type_obj();
 				$message_type_label = $message_type instanceof EE_message_type
 					? $message_type->label['singular']
 					: $active_message_template_group->message_type();
-				$message_type_options[ $active_message_template_group->message_type() ] = ucwords( $message_type_label );
+				$message_type_options[$active_message_template_group->message_type()] = ucwords($message_type_label);
 			}
 		}
-		return $this->get_admin_page()->get_message_types_select_input( $message_type_options );
+		return $this->get_admin_page()->get_message_types_select_input($message_type_options);
 	}
 
 }

admin_pages/registrations/qtips/Registration_List_Table_Tips.lib.php

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
 
 
 	private function _registration_trash_message() {
-		return '<p>' . __('This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.', 'event_espresso') . '</p>';
+		return '<p>'.__('This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.', 'event_espresso').'</p>';
 	}
 
 
@@ -104,7 +104,7 @@ 
 	 * @param  EEM_Registration constant $status What status is set (by class)
 	 * @return string         The status legend with the related status highlighted
 	 */
-	private function _registration_status_legend( $status ) {
+	private function _registration_status_legend($status) {
 
 		$status_array = array(
 			'approved_status' => EEM_Registration::status_id_approved,
@@ -114,6 +114,6 @@ 
 			'cancelled_status' => EEM_Registration::status_id_cancelled
 			);
 
-		return EEH_Template::status_legend( $status_array, $status );
+		return EEH_Template::status_legend($status_array, $status);
 	}
 }
\ No newline at end of file

admin_pages/transactions/qtips/Transactions_List_Table_Tips.lib.php

Spacing +2 added lines, -2 removed lines

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

core/admin/templates/admin_details_legend.template.php

Spacing +7 added lines, -7 removed lines

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

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

Spacing +32 added lines, -32 removed lines

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

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

Spacing +41 added lines, -41 removed lines

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

core/db_classes/EE_WP_User.class.php

Spacing +11 added lines, -11 removed lines

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

core/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, EE_Datetime_Field::now ),
-				'MSG_modified' => new EE_Datetime_Field( 'MSG_modified', __( 'Modified', 'event_espresso' ), true, EE_Datetime_Field::now )
+				'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, EE_Datetime_Field::now),
+				'MSG_modified' => new EE_Datetime_Field('MSG_modified', __('Modified', 'event_espresso'), true, EE_Datetime_Field::now)
 			)
 		);
 		$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);
 	}