eventespresso / event-espresso-core

admin_pages/transactions/Transactions_Admin_Page_Init.core.php

Spacing +11 added lines, -11 removed lines

@@ -32,16 +32,16 @@ 
 	 */
 	public function __construct() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		if ( ! defined( 'TXN_PG_SLUG' ) ) {
-			define( 'TXN_PG_SLUG', 'espresso_transactions' );
-			define( 'TXN_PG_NAME', ucwords( str_replace( '_', '', TXN_PG_SLUG ) ) );
-			define( 'TXN_ADMIN', EE_ADMIN_PAGES . 'transactions' . DS );
-			define( 'TXN_ADMIN_URL', admin_url( 'admin.php?page=' . TXN_PG_SLUG ) );
-			define( 'TXN_ASSETS_PATH', TXN_ADMIN . 'assets' . DS );
-			define( 'TXN_ASSETS_URL', str_replace( '\\', '/', EE_ADMIN_PAGES_URL . 'transactions/assets' . DS ) );
-			define( 'TXN_TEMPLATE_PATH', TXN_ADMIN . 'templates' . DS );
-			define( 'TXN_TEMPLATE_URL', str_replace( '\\', '/', EE_ADMIN_PAGES_URL . 'transactions/templates' . DS ) );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! defined('TXN_PG_SLUG')) {
+			define('TXN_PG_SLUG', 'espresso_transactions');
+			define('TXN_PG_NAME', ucwords(str_replace('_', '', TXN_PG_SLUG)));
+			define('TXN_ADMIN', EE_ADMIN_PAGES.'transactions'.DS);
+			define('TXN_ADMIN_URL', admin_url('admin.php?page='.TXN_PG_SLUG));
+			define('TXN_ASSETS_PATH', TXN_ADMIN.'assets'.DS);
+			define('TXN_ASSETS_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL.'transactions/assets'.DS));
+			define('TXN_TEMPLATE_PATH', TXN_ADMIN.'templates'.DS);
+			define('TXN_TEMPLATE_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL.'transactions/templates'.DS));
 		}
 		parent::__construct();
 	}
@@ -63,7 +63,7 @@ 
 	 * @return void
 	 */
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'main',
 			'menu_order' => 50,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,

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
  *

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

caffeinated/admin/extend/registrations/EE_Event_Registrations_List_Table.class.php

Indentation +4 added lines, -4 removed lines

@@ -202,7 +202,7 @@ 
 
 	/**
 	 * 		column_REG_att_checked_in
-	*/
+	 */
 	function column__REG_att_checked_in(EE_Registration $item){
 		$attendee = $item->attendee();
 		$attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
@@ -288,7 +288,7 @@ 
 
 	/**
 	 * 		column_REG_final_price
-	*/
+	 */
 	function column__REG_final_price(EE_Registration $item){
 		return '<span class="reg-pad-rght">' .  ' ' . $item->pretty_final_price() . '</span>';
 	}
@@ -299,7 +299,7 @@ 
 
 	/**
 	 * 		column_TXN_paid
-	*/
+	 */
 	function column_TXN_paid(EE_Registration $item){
 
 		if ( $item->count() == 1 ) {
@@ -326,7 +326,7 @@ 
 
 	/**
 	 * 		column_TXN_total
-	*/
+	 */
 	function column_TXN_total(EE_Registration $item){
 		$txn = $item->transaction();
 		$view_txn_url = add_query_arg( array('action' => 'view_transaction', 'TXN_ID' => $txn->ID() ), TXN_ADMIN_URL );

Spacing +79 added lines, -79 removed lines

@@ -16,7 +16,7 @@ 
 
 
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
 		$this->_status = $this->_admin_page->get_registration_status_array();
 	}
@@ -25,15 +25,15 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_event_attendees( $this->_per_page ) : $this->_admin_page->get_event_attendees( $this->_per_page, FALSE, TRUE );
-		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_event_attendees(  $this->_per_page, TRUE ) : $this->_admin_page->get_event_attendees(  $this->_per_page, TRUE, TRUE);
+		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_event_attendees($this->_per_page) : $this->_admin_page->get_event_attendees($this->_per_page, FALSE, TRUE);
+		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_event_attendees($this->_per_page, TRUE) : $this->_admin_page->get_event_attendees($this->_per_page, TRUE, TRUE);
 	}
 
 
 
 
 	protected function _set_properties() {
-		$evt_id = isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : NULL;
+		$evt_id = isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : NULL;
 
 		$this->_wp_list_args = array(
 			'singular' => __('registrant', 'event_espresso'),
@@ -44,7 +44,7 @@ 
 
 		$columns = array();
 		//$columns['_Reg_Status'] = '';
-		if ( !empty( $evt_id ) ) {
+		if ( ! empty($evt_id)) {
 			$columns['cb'] = '<input type="checkbox" />'; //Render a checkbox instead of text
 			$this->_has_checkbox_column = true;
 		}
@@ -60,43 +60,43 @@ 
 				'TXN_total' => __('Total', 'event_espresso')
 			);
 
-		$this->_columns = array_merge( $columns, $this->_columns);
+		$this->_columns = array_merge($columns, $this->_columns);
 
 		$this->_primary_column = '_REG_att_checked_in';
 
-		if ( !empty( $evt_id ) && EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'espresso_registrations_registrations_reports', $evt_id )  ) {
+		if ( ! empty($evt_id) && EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'espresso_registrations_registrations_reports', $evt_id)) {
 			$this->_bottom_buttons = array(
 				'report'=> array(
 					'route' => 'registrations_report',
 					'extra_request' => 
 						array( 
 							'EVT_ID'=> $evt_id, 
-							'return_url' => urlencode( "//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}") )
+							'return_url' => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}") )
 				)
 			);
 		}
 
 		$this->_sortable_columns = array(
 			 //true means its already sorted
-			'ATT_name' => array( 'ATT_name' => TRUE ),
-			'Event' => array( 'Event.EVT.Name' => FALSE )
+			'ATT_name' => array('ATT_name' => TRUE),
+			'Event' => array('Event.EVT.Name' => FALSE)
 		);
 
 		$this->_hidden_columns = array();
 
 		$this->_evt = EEM_Event::instance()->get_one_by_ID($evt_id);
-		$this->_dtts_for_event = !empty($evt_id) ? $this->_evt->datetimes_ordered() : array();
+		$this->_dtts_for_event = ! empty($evt_id) ? $this->_evt->datetimes_ordered() : array();
 
 	}
 
 
 
 
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip reg-status-' . $item->status_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip reg-status-'.$item->status_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -108,42 +108,42 @@ 
 		$filters = $where = array();
 
 
-		if ( empty( $this->_dtts_for_event ) ) {
+		if (empty($this->_dtts_for_event)) {
 			//this means we don't have an event so let's setup a filter dropdown for all the events to select
 			//note possible capability restrictions
-			if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_events', 'get_events') ) {
-				$where['status**'] =  array( '!=', 'private' );
+			if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_events', 'get_events')) {
+				$where['status**'] = array('!=', 'private');
 			}
 
-			if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
-				$where['EVT_wp_user'] =  get_current_user_id();
+			if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) {
+				$where['EVT_wp_user'] = get_current_user_id();
 			}
 
-			$events = EEM_Event::instance()->get_all(array( $where, 'order_by' => array( 'Datetime.DTT_EVT_start' => 'DESC' ) ) );
-			$evts[] = array('id' => 0, 'text' => __('To toggle Check-in status, select an event', 'event_espresso') );
-			foreach ( $events as $evt ) {
+			$events = EEM_Event::instance()->get_all(array($where, 'order_by' => array('Datetime.DTT_EVT_start' => 'DESC')));
+			$evts[] = array('id' => 0, 'text' => __('To toggle Check-in status, select an event', 'event_espresso'));
+			foreach ($events as $evt) {
 				//any registrations for this event?
-				if ( ! $evt->get_count_of_all_registrations() )
+				if ( ! $evt->get_count_of_all_registrations())
 					continue;
 				$evts[] = array(
 					'id' => $evt->ID(),
-					'text' => $evt->get( 'EVT_name' ),
+					'text' => $evt->get('EVT_name'),
 					'class' => $evt->is_expired() ? 'ee-expired-event' : ''
 				);
 			}
 			$event_filter = '<div class="ee-event-filter">';
-			$event_filter .= EEH_Form_Fields::select_input( 'event_id', $evts );
-			$event_filter .= '<br><span class="ee-event-filter-toggle"><input type="checkbox" id="js-ee-hide-expired-events" checked>' . ' ' . __( 'Hide Expired Events', 'event_espresso' ) . '</span>';
+			$event_filter .= EEH_Form_Fields::select_input('event_id', $evts);
+			$event_filter .= '<br><span class="ee-event-filter-toggle"><input type="checkbox" id="js-ee-hide-expired-events" checked>'.' '.__('Hide Expired Events', 'event_espresso').'</span>';
 			$event_filter .= '</div>';
 			$filters[] = $event_filter;
 
 		} else {
 			//DTT datetimes filter
-			$cur_dtt = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : $this->_evt->primary_datetime()->ID();
+			$cur_dtt = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : $this->_evt->primary_datetime()->ID();
 			$dtts = array();
-			foreach ( $this->_dtts_for_event as $dtt ) {
-				$datetime_string = $dtt->start_date_and_time() . ' - ' . $dtt->end_date_and_time();
-				$dtts[] = array('id' => $dtt->ID(), 'text' => $datetime_string );
+			foreach ($this->_dtts_for_event as $dtt) {
+				$datetime_string = $dtt->start_date_and_time().' - '.$dtt->end_date_and_time();
+				$dtts[] = array('id' => $dtt->ID(), 'text' => $datetime_string);
 			}
 			$filters[] = EEH_Form_Fields::select_input('DTT_ID', $dtts, $cur_dtt);
 		}
@@ -164,19 +164,19 @@ 
 
 
 	protected function _get_total_event_attendees() {
-		$EVT_ID = isset($this->_req_data['event_id']) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE;
+		$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
 		$query_params = array();
-		if ($EVT_ID){
-			$query_params[0]['EVT_ID']=$EVT_ID;
+		if ($EVT_ID) {
+			$query_params[0]['EVT_ID'] = $EVT_ID;
 		}
 		//if DTT is included we do multiple datetimes.  Otherwise we just do primary datetime
-		if ( $DTT_ID ) {
+		if ($DTT_ID) {
 			$query_params[0]['Ticket.Datetime.DTT_ID'] = $DTT_ID;
 		}
-		$status_ids_array = apply_filters( 'FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array( EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved ) );
+		$status_ids_array = apply_filters('FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array(EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved));
 
-		$query_params[0]['STS_ID']= array('IN', $status_ids_array );
+		$query_params[0]['STS_ID'] = array('IN', $status_ids_array);
 
 		return EEM_Registration::instance()->count($query_params);
 	}
@@ -187,8 +187,8 @@ 
 
 
 
-	function column__Reg_Status( EE_Registration $item ) {
-		return '<span class="ee-status-strip ee-status-strip-td reg-status-' . $item->status_ID() . '"></span>';
+	function column__Reg_Status(EE_Registration $item) {
+		return '<span class="ee-status-strip ee-status-strip-td reg-status-'.$item->status_ID().'"></span>';
 	}
 
 
@@ -196,7 +196,7 @@ 
 
 
 	function column_cb($item) {
-		return sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', $item->ID() );
+		return sprintf('<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', $item->ID());
 	}
 
 
@@ -209,18 +209,18 @@ 
 	/**
 	 * 		column_REG_att_checked_in
 	*/
-	function column__REG_att_checked_in(EE_Registration $item){
+	function column__REG_att_checked_in(EE_Registration $item) {
 		$attendee = $item->attendee();
 		$attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
-		$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0;
+		$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0;
 		$checkinstatus = $item->check_in_status_for_datetime($DTT_ID);
 		$nonce = wp_create_nonce('checkin_nonce');
-		$evt_id = isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : NULL;
-		$toggle_active = !empty ( $evt_id ) && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_checkin', 'espresso_registrations_toggle_checkin_status', $item->ID() ) ? ' clickable trigger-checkin' : '';
+		$evt_id = isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : NULL;
+		$toggle_active = ! empty ($evt_id) && EE_Registry::instance()->CAP->current_user_can('ee_edit_checkin', 'espresso_registrations_toggle_checkin_status', $item->ID()) ? ' clickable trigger-checkin' : '';
 
-		$mobile_view_content = ' <span class="show-on-mobile-view-only">' . $attendee_name . '</span>';
+		$mobile_view_content = ' <span class="show-on-mobile-view-only">'.$attendee_name.'</span>';
 
-		 return '<span class="checkin-icons checkedin-status-' . $checkinstatus . $toggle_active . '" data-_regid="' . $item->ID() . '" data-dttid="' . $DTT_ID . '" data-nonce="' . $nonce . '"></span>' . $mobile_view_content;
+		 return '<span class="checkin-icons checkedin-status-'.$checkinstatus.$toggle_active.'" data-_regid="'.$item->ID().'" data-dttid="'.$DTT_ID.'" data-nonce="'.$nonce.'"></span>'.$mobile_view_content;
 	}
 
 
@@ -229,43 +229,43 @@ 
 
 	function column_ATT_name(EE_Registration $item) {
 		$attendee = $item->attendee();
-		if ( ! $attendee instanceof EE_Attendee ) {
+		if ( ! $attendee instanceof EE_Attendee) {
 			return __('No contact record for this registration.', 'event_espresso');
 		}
 
 		// edit attendee link
-		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
-		$name_link = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_contacts', 'espresso_registrations_edit_attendee' ) ?  '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Contact', 'event_espresso' ) . '">' . $item->attendee()->full_name() . '</a>' : $item->attendee()->full_name();
+		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
+		$name_link = EE_Registry::instance()->CAP->current_user_can('ee_edit_contacts', 'espresso_registrations_edit_attendee') ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Contact', 'event_espresso').'">'.$item->attendee()->full_name().'</a>' : $item->attendee()->full_name();
 		$name_link .= $item->count() == 1 ? '&nbsp;<sup><div class="dashicons dashicons-star-filled lt-blue-icon ee-icon-size-8"></div></sup>	' : '';
 
 		//add group details
-		$name_link .= '&nbsp;' . sprintf(__( '(%s of %s)', 'event_espresso' ),$item->count(), $item->group_size());
+		$name_link .= '&nbsp;'.sprintf(__('(%s of %s)', 'event_espresso'), $item->count(), $item->group_size());
 
 		//add regcode
-		$link = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $item->ID() ), REG_ADMIN_URL );
+		$link = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $item->ID()), REG_ADMIN_URL);
 		$name_link .= '<br>';
-		$name_link .= EE_Registry::instance()->instance()->CAP->current_user_can('ee_read_registration', 'view_registration', $item->ID() )
-			? '<a href="' . $link . '" title="' . esc_attr__('View Registration Details', 'event_espresso') .'">' . $item->reg_code() . '</a>'
+		$name_link .= EE_Registry::instance()->instance()->CAP->current_user_can('ee_read_registration', 'view_registration', $item->ID())
+			? '<a href="'.$link.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'.$item->reg_code().'</a>'
 			: $item->reg_code();
 
 		//status
-		$name_link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+		$name_link .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->status_ID(), false, 'sentence').'</span>';
 
 		$actions = array();
-		$DTT_ID = !empty( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
-		$DTT_ID = empty( $DTT_ID ) && !empty( $this->_req_data['event_id'] ) ? EEM_Event::instance()->get_one_by_ID( $this->_req_data['event_id'] )->primary_datetime()->ID() : $DTT_ID;
+		$DTT_ID = ! empty($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
+		$DTT_ID = empty($DTT_ID) && ! empty($this->_req_data['event_id']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['event_id'])->primary_datetime()->ID() : $DTT_ID;
 
-		if ( !empty($DTT_ID) && EE_Registry::instance()->CAP->current_user_can( 'ee_read_checkins', 'espresso_registrations_registration_checkins' ) ) {
-			$checkin_list_url = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'registration_checkins', '_REGID' => $item->ID(), 'DTT_ID' => $DTT_ID));
-			$actions['checkin'] = '<a href="' . $checkin_list_url . '" title="' . esc_attr__('View all the check-ins/checkouts for this registrant', 'event_espresso' ) . '">' . __('View', 'event_espresso') . '</a>';
+		if ( ! empty($DTT_ID) && EE_Registry::instance()->CAP->current_user_can('ee_read_checkins', 'espresso_registrations_registration_checkins')) {
+			$checkin_list_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'registration_checkins', '_REGID' => $item->ID(), 'DTT_ID' => $DTT_ID));
+			$actions['checkin'] = '<a href="'.$checkin_list_url.'" title="'.esc_attr__('View all the check-ins/checkouts for this registrant', 'event_espresso').'">'.__('View', 'event_espresso').'</a>';
 		}
 
-		return !empty( $DTT_ID ) ? sprintf( '%1$s %2$s', $name_link, $this->row_actions($actions) ) : $name_link;
+		return ! empty($DTT_ID) ? sprintf('%1$s %2$s', $name_link, $this->row_actions($actions)) : $name_link;
 	}
 
 
 
-	function column_ATT_email( EE_Registration $item ) {
+	function column_ATT_email(EE_Registration $item) {
 		$attendee = $item->attendee();
 		return $attendee instanceof EE_Attendee ? $attendee->email() : '';
 		return $item->get_first_related('Attendee')->email();
@@ -277,8 +277,8 @@ 
 
 	function column_Event(EE_Registration $item) {
 		$event = $this->_evt instanceof EE_Event ? $this->_evt : $item->event();
-		$chkin_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'event_registrations', 'event_id'=>$event->ID() ), REG_ADMIN_URL );
-		$event_label = EE_Registry::instance()->CAP->current_user_can( 'ee_read_checkins', 'espresso_registrations_registration_checkins' ) ?  '<a href="'.$chkin_lnk_url.'" title="' . esc_attr__( 'View Checkins for this Event', 'event_espresso' ) . '">' . $event->name() . '</a>' : $event->name();
+		$chkin_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'event_registrations', 'event_id'=>$event->ID()), REG_ADMIN_URL);
+		$event_label = EE_Registry::instance()->CAP->current_user_can('ee_read_checkins', 'espresso_registrations_registration_checkins') ? '<a href="'.$chkin_lnk_url.'" title="'.esc_attr__('View Checkins for this Event', 'event_espresso').'">'.$event->name().'</a>' : $event->name();
 		return $event_label;
 	}
 
@@ -286,7 +286,7 @@ 
 
 
 
-	function column_PRC_name(EE_Registration $item){
+	function column_PRC_name(EE_Registration $item) {
 		return $item->ticket() instanceof EE_Ticket ? $item->ticket()->name() : __("Unknown", "event_espresso");
 	}
 
@@ -298,8 +298,8 @@ 
 	/**
 	 * 		column_REG_final_price
 	*/
-	function column__REG_final_price(EE_Registration $item){
-		return '<span class="reg-pad-rght">' .  ' ' . $item->pretty_final_price() . '</span>';
+	function column__REG_final_price(EE_Registration $item) {
+		return '<span class="reg-pad-rght">'.' '.$item->pretty_final_price().'</span>';
 	}
 
 
@@ -309,20 +309,20 @@ 
 	/**
 	 * 		column_TXN_paid
 	*/
-	function column_TXN_paid(EE_Registration $item){
+	function column_TXN_paid(EE_Registration $item) {
 
-		if ( $item->count() == 1 ) {
+		if ($item->count() == 1) {
 
-			if ( $item->transaction()->paid() >= $item->transaction()->total() ) {
+			if ($item->transaction()->paid() >= $item->transaction()->total()) {
 				return '<span class="reg-pad-rght"><div class="dashicons dashicons-yes green-icon"></div></span>';
 			} else {
-				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID() ), TXN_ADMIN_URL );
-				return EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ?  '
+				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID()), TXN_ADMIN_URL);
+				return EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '
 				<span class="reg-pad-rght">
-					<a class="status-'. $item->transaction()->status_ID() .'" href="'.$view_txn_lnk_url.'"  title="' . esc_attr__( 'View Transaction', 'event_espresso' ) . '">
-						' . $item->transaction()->pretty_paid(). '
+					<a class="status-'. $item->transaction()->status_ID().'" href="'.$view_txn_lnk_url.'"  title="'.esc_attr__('View Transaction', 'event_espresso').'">
+						' . $item->transaction()->pretty_paid().'
 					</a>
-				<span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_paid() . '</span>';
+				<span>' : '<span class="reg-pad-rght">'.$item->transaction()->pretty_paid().'</span>';
 			}
 		} else {
 			return '<span class="reg-pad-rght"></span>';
@@ -336,13 +336,13 @@ 
 	/**
 	 * 		column_TXN_total
 	*/
-	function column_TXN_total(EE_Registration $item){
+	function column_TXN_total(EE_Registration $item) {
 		$txn = $item->transaction();
-		$view_txn_url = add_query_arg( array('action' => 'view_transaction', 'TXN_ID' => $txn->ID() ), TXN_ADMIN_URL );
-		if ( $item->get('REG_count') == 1 ) {
+		$view_txn_url = add_query_arg(array('action' => 'view_transaction', 'TXN_ID' => $txn->ID()), TXN_ADMIN_URL);
+		if ($item->get('REG_count') == 1) {
 			$line_total_obj = $txn->total_line_item();
 			$txn_total = $line_total_obj instanceof EE_Line_Item ? $line_total_obj->get_pretty('LIN_total') : __('View Transaction', 'event_espresso');
-			return EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ?  '<a href="' . $view_txn_url . '" title="' . esc_attr__('View Transaction', 'event_espresso') . '"><span class="reg-pad-rght">'. $txn_total  .'</span></a>' : '<span class="reg-pad-rght">' . $txn_total . '</span>';
+			return EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '<a href="'.$view_txn_url.'" title="'.esc_attr__('View Transaction', 'event_espresso').'"><span class="reg-pad-rght">'.$txn_total.'</span></a>' : '<span class="reg-pad-rght">'.$txn_total.'</span>';
 		} else {
 			return '<span class="reg-pad-rght"></span>';
 		}

Braces +6 added lines, -3 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');
+}
 
 
 class EE_Event_Registrations_List_Table extends EE_Admin_List_Table {
@@ -123,8 +125,9 @@ 
 			$evts[] = array('id' => 0, 'text' => __('To toggle Check-in status, select an event', 'event_espresso') );
 			foreach ( $events as $evt ) {
 				//any registrations for this event?
-				if ( ! $evt->get_count_of_all_registrations() )
-					continue;
+				if ( ! $evt->get_count_of_all_registrations() ) {
+									continue;
+				}
 				$evts[] = array(
 					'id' => $evt->ID(),
 					'text' => $evt->get( 'EVT_name' ),

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

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 	/**
 	 * @param array $props_n_values
-	 * @return EE_WP_User|mixed
+	 * @return EE_Base_Class
 	 */
 	public static function new_instance( $props_n_values = array() ) {
 		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );

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

modules/messages/EED_Messages.module.php

Indentation +5 added lines, -5 removed lines

@@ -912,11 +912,11 @@
 				sprintf(
 					_n(
 						'%d message successfully queued for resending.',
-				        '%d messages successfully queued for resending.',
-				        $queue_count,
-				        'event_espresso'
-				    ),
-				    $queue_count
+						'%d messages successfully queued for resending.',
+						$queue_count,
+						'event_espresso'
+					),
+					$queue_count
 				)
 			);
 		} else {

Doc Comments +2 added lines, -2 removed lines

@@ -541,7 +541,7 @@ 
 	 *
 	 * @param string  $payment_status The payment status being matched.
 	 *
-	 * @return string|bool The payment message type slug matching the status or false if no match.
+	 * @return string|false The payment message type slug matching the status or false if no match.
 	 */
 	protected static function _get_payment_message_type( $payment_status ) {
 		EE_Registry::instance()->load_helper( 'MSG_Template' );
@@ -871,7 +871,7 @@ 
 	 * @since 4.9.0
 	 * @param $message_ids
 	 *
-	 * @return bool | EE_Messages_Queue  false if no messages sent.
+	 * @return EE_Messages_Queue | EE_Messages_Queue  false if no messages sent.
 	 */
 	public static function send_now( $message_ids ) {
 		self::_load_controller();

Spacing +182 added lines, -182 removed lines

@@ -69,7 +69,7 @@ 
 	 * @return EED_Module
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -84,11 +84,11 @@ 
 	 */
 	public static function set_hooks() {
 		//actions
-		add_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', array( 'EED_Messages', 'payment' ), 10, 2 );
-		add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array( 'EED_Messages', 'maybe_registration' ), 10, 2 );
+		add_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', array('EED_Messages', 'payment'), 10, 2);
+		add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array('EED_Messages', 'maybe_registration'), 10, 2);
 		//filters
-		add_filter( 'FHEE__EE_Registration__receipt_url__receipt_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
-		add_filter( 'FHEE__EE_Registration__invoice_url__invoice_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
+		add_filter('FHEE__EE_Registration__receipt_url__receipt_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
+		add_filter('FHEE__EE_Registration__invoice_url__invoice_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
 		//register routes
 		self::_register_routes();
 	}
@@ -101,16 +101,16 @@ 
 	 */
 	public static function set_hooks_admin() {
 		//actions
-		add_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', array( 'EED_Messages', 'payment' ), 10, 2 );
-		add_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', array( 'EED_Messages', 'payment_reminder' ), 10 );
-		add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array( 'EED_Messages', 'maybe_registration' ), 10, 3 );
-		add_action( 'AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send__with_registrations', array( 'EED_Messages', 'send_newsletter_message' ), 10, 2 );
-		add_action( 'AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', array( 'EED_Messages', 'cancelled_registration' ), 10 );
-		add_action( 'AHEE__EE_Admin_Page___process_admin_payment_notification', array( 'EED_Messages', 'process_admin_payment' ), 10, 1 );
+		add_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', array('EED_Messages', 'payment'), 10, 2);
+		add_action('AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', array('EED_Messages', 'payment_reminder'), 10);
+		add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array('EED_Messages', 'maybe_registration'), 10, 3);
+		add_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send__with_registrations', array('EED_Messages', 'send_newsletter_message'), 10, 2);
+		add_action('AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', array('EED_Messages', 'cancelled_registration'), 10);
+		add_action('AHEE__EE_Admin_Page___process_admin_payment_notification', array('EED_Messages', 'process_admin_payment'), 10, 1);
 		//filters
-		add_filter( 'FHEE__EE_Admin_Page___process_resend_registration__success', array( 'EED_Messages', 'process_resend' ), 10, 2 );
-		add_filter( 'FHEE__EE_Registration__receipt_url__receipt_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
-		add_filter( 'FHEE__EE_Registration__invoice_url__invoice_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
+		add_filter('FHEE__EE_Admin_Page___process_resend_registration__success', array('EED_Messages', 'process_resend'), 10, 2);
+		add_filter('FHEE__EE_Registration__receipt_url__receipt_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
+		add_filter('FHEE__EE_Registration__invoice_url__invoice_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
 	}
 
 
@@ -124,11 +124,11 @@ 
 	 * @return void
 	 */
 	protected static function _register_routes() {
-		EE_Config::register_route( 'msg_url_trigger', 'Messages', 'run' );
-		EE_Config::register_route( 'msg_cron_trigger', 'Messages', 'execute_batch_request' );
-		EE_Config::register_route( 'msg_browser_trigger', 'Messages', 'browser_trigger' );
-		EE_Config::register_route( 'msg_browser_error_trigger', 'Messages', 'browser_error_trigger' );
-		do_action( 'AHEE__EED_Messages___register_routes' );
+		EE_Config::register_route('msg_url_trigger', 'Messages', 'run');
+		EE_Config::register_route('msg_cron_trigger', 'Messages', 'execute_batch_request');
+		EE_Config::register_route('msg_browser_trigger', 'Messages', 'browser_trigger');
+		EE_Config::register_route('msg_browser_error_trigger', 'Messages', 'browser_error_trigger');
+		do_action('AHEE__EED_Messages___register_routes');
 	}
 
 
@@ -139,18 +139,18 @@ 
 	 * @since 4.9.0
 	 * @param WP $WP
 	 */
-	public function browser_trigger( $WP ) {
+	public function browser_trigger($WP) {
 		//ensure controller is loaded
 		self::_load_controller();
-		$token = EE_Registry::instance()->REQ->get( 'token' );
+		$token = EE_Registry::instance()->REQ->get('token');
 		try {
-			$mtg = new EE_Message_Generated_From_Token( $token, 'html', self::$_message_resource_manager );
-			self::$_MSG_PROCESSOR->generate_and_send_now( $mtg );
-		} catch( EE_Error $e ) {
-			$error_msg = __( 'Please note that a system message failed to send due to a technical issue.', 'event_espresso' );
+			$mtg = new EE_Message_Generated_From_Token($token, 'html', self::$_message_resource_manager);
+			self::$_MSG_PROCESSOR->generate_and_send_now($mtg);
+		} catch (EE_Error $e) {
+			$error_msg = __('Please note that a system message failed to send due to a technical issue.', 'event_espresso');
 			// add specific message for developers if WP_DEBUG in on
-			$error_msg .= '||' . $e->getMessage();
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$error_msg .= '||'.$e->getMessage();
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -166,20 +166,20 @@ 
 	 * @since 4.9.0
 	 * @param $WP
 	 */
-	public function browser_error_trigger( $WP ) {
-		$token = EE_Registry::instance()->REQ->get( 'token' );
-		if ( $token ) {
-			$message = EEM_Message::instance()->get_one_by_token( $token );
-			if ( $message instanceof EE_Message ) {
-				header( 'HTTP/1.1 200 OK' );
-				$error_msg = nl2br( $message->error_message() );
+	public function browser_error_trigger($WP) {
+		$token = EE_Registry::instance()->REQ->get('token');
+		if ($token) {
+			$message = EEM_Message::instance()->get_one_by_token($token);
+			if ($message instanceof EE_Message) {
+				header('HTTP/1.1 200 OK');
+				$error_msg = nl2br($message->error_message());
 				?>
 				<!DOCTYPE html>
 				<html>
 					<head></head>
 					<body>
-						<?php echo empty( $error_msg )
-						? esc_html__( 'Unfortunately, we were unable to capture the error message for this message.', 'event_espresso' )
+						<?php echo empty($error_msg)
+						? esc_html__('Unfortunately, we were unable to capture the error message for this message.', 'event_espresso')
 						: wp_kses(
 							$error_msg,
 							array(
@@ -214,19 +214,19 @@ 
 	 * @throws EE_Error
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		//ensure controller is loaded
 		self::_load_controller();
 		// attempt to process message
 		try {
 			/** @type EE_Message_To_Generate_From_Request $message_to_generate */
-			$message_to_generate = EE_Registry::instance()->load_lib( 'Message_To_Generate_From_Request' );
-			self::$_MSG_PROCESSOR->generate_and_send_now( $message_to_generate );
-		} catch ( EE_Error $e ) {
-			$error_msg = __( 'Please note that a system message failed to send due to a technical issue.', 'event_espresso' );
+			$message_to_generate = EE_Registry::instance()->load_lib('Message_To_Generate_From_Request');
+			self::$_MSG_PROCESSOR->generate_and_send_now($message_to_generate);
+		} catch (EE_Error $e) {
+			$error_msg = __('Please note that a system message failed to send due to a technical issue.', 'event_espresso');
 			// add specific message for developers if WP_DEBUG in on
-			$error_msg .= '||' . $e->getMessage();
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$error_msg .= '||'.$e->getMessage();
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -235,9 +235,9 @@ 
 	 * This is triggered by the 'msg_cron_trigger' route.
 	 * @param WP $WP
 	 */
-	public function execute_batch_request( $WP ) {
+	public function execute_batch_request($WP) {
 		$this->run_cron();
-		header( 'HTTP/1.1 200 OK' );
+		header('HTTP/1.1 200 OK');
 		exit();
 	}
 
@@ -251,35 +251,35 @@ 
 	public function run_cron() {
 		self::_load_controller();
 		//get required vars
-		$cron_type = EE_Registry::instance()->REQ->get( 'type' );
-		$transient_key = EE_Registry::instance()->REQ->get( 'key' );
+		$cron_type = EE_Registry::instance()->REQ->get('type');
+		$transient_key = EE_Registry::instance()->REQ->get('key');
 
 		//now let's verify transient, if not valid exit immediately
-		if ( ! get_transient( $transient_key ) ) {
+		if ( ! get_transient($transient_key)) {
 			/**
 			 * trigger error so this gets in the error logs.  This is important because it happens on a non-user request.
 			 */
-			trigger_error( esc_attr__( 'Invalid Request (Transient does not exist)', 'event_espresso' ) );
+			trigger_error(esc_attr__('Invalid Request (Transient does not exist)', 'event_espresso'));
 		}
 
 		//if made it here, lets' delete the transient to keep the db clean
-		delete_transient( $transient_key );
+		delete_transient($transient_key);
 
-		if ( apply_filters( 'FHEE__EED_Messages__run_cron__use_wp_cron', true ) ) {
+		if (apply_filters('FHEE__EED_Messages__run_cron__use_wp_cron', true)) {
 
-			$method = 'batch_' . $cron_type . '_from_queue';
-			if ( method_exists( self::$_MSG_PROCESSOR, $method ) ) {
+			$method = 'batch_'.$cron_type.'_from_queue';
+			if (method_exists(self::$_MSG_PROCESSOR, $method)) {
 				self::$_MSG_PROCESSOR->$method();
 			} else {
 				//no matching task
 				/**
 				 * trigger error so this gets in the error logs.  This is important because it happens on a non user request.
 				 */
-				trigger_error( esc_attr( sprintf( __( 'There is no task corresponding to this route %s', 'event_espresso' ), $cron_type ) ) );
+				trigger_error(esc_attr(sprintf(__('There is no task corresponding to this route %s', 'event_espresso'), $cron_type)));
 			}
 		}
 
-		do_action( 'FHEE__EED_Messages__run_cron__end' );
+		do_action('FHEE__EED_Messages__run_cron__end');
 	}
 
 
@@ -295,9 +295,9 @@ 
 	 *
 	 * @return EE_Messages_Template_Pack
 	 */
-	public static function get_template_pack( $template_pack_name ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::get_template_pack( $template_pack_name );
+	public static function get_template_pack($template_pack_name) {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::get_template_pack($template_pack_name);
 	}
 
 
@@ -311,14 +311,14 @@ 
 	 * @return EE_Messages_Template_Pack[]
 	 */
 	public static function get_template_packs() {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
 		//for backward compat, let's make sure this returns in the same format as originally.
 		$template_pack_collection = EEH_MSG_Template::get_template_pack_collection();
 		$template_pack_collection->rewind();
 		$template_packs = array();
-		while ( $template_pack_collection->valid() ) {
-			$template_packs[ $template_pack_collection->current()->dbref ] = $template_pack_collection->current();
+		while ($template_pack_collection->valid()) {
+			$template_packs[$template_pack_collection->current()->dbref] = $template_pack_collection->current();
 			$template_pack_collection->next();
 		}
 		return $template_packs;
@@ -334,14 +334,14 @@ 
 	 * @return void
 	 */
 	public static function set_autoloaders() {
-		if ( empty( self::$_MSG_PATHS ) ) {
+		if (empty(self::$_MSG_PATHS)) {
 			self::_set_messages_paths();
-			foreach ( self::$_MSG_PATHS as $path ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $path );
+			foreach (self::$_MSG_PATHS as $path) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($path);
 			}
 			// add aliases
-			EEH_Autoloader::add_alias( 'EE_messages', 'EE_messages' );
-			EEH_Autoloader::add_alias( 'EE_messenger', 'EE_messenger' );
+			EEH_Autoloader::add_alias('EE_messages', 'EE_messages');
+			EEH_Autoloader::add_alias('EE_messenger', 'EE_messenger');
 		}
 	}
 
@@ -369,10 +369,10 @@ 
 			'shortcodes',
 			);
 		$paths = array();
-		foreach ( $dir_ref as $index => $dir ) {
-			$paths[ $index ] = EE_LIBRARIES . $dir;
+		foreach ($dir_ref as $index => $dir) {
+			$paths[$index] = EE_LIBRARIES.$dir;
 		}
-		self::$_MSG_PATHS = apply_filters( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', $paths );
+		self::$_MSG_PATHS = apply_filters('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', $paths);
 	}
 
 
@@ -383,12 +383,12 @@ 
 	 * @return void
 	 */
 	protected static function _load_controller() {
-		if ( ! self::$_MSG_PROCESSOR instanceof EE_Messages_Processor ) {
-			EE_Registry::instance()->load_core( 'Request_Handler' );
+		if ( ! self::$_MSG_PROCESSOR instanceof EE_Messages_Processor) {
+			EE_Registry::instance()->load_core('Request_Handler');
 			self::set_autoloaders();
-			self::$_EEMSG = EE_Registry::instance()->load_lib( 'messages' );
-			self::$_MSG_PROCESSOR = EE_Registry::instance()->load_lib( 'Messages_Processor' );
-			self::$_message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+			self::$_EEMSG = EE_Registry::instance()->load_lib('messages');
+			self::$_MSG_PROCESSOR = EE_Registry::instance()->load_lib('Messages_Processor');
+			self::$_message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		}
 	}
 
@@ -397,10 +397,10 @@ 
 	/**
 	 * @param EE_Transaction $transaction
 	 */
-	public static function payment_reminder( EE_Transaction $transaction ) {
+	public static function payment_reminder(EE_Transaction $transaction) {
 		self::_load_controller();
-		$data = array( $transaction, null );
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'payment_reminder', $data );
+		$data = array($transaction, null);
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('payment_reminder', $data);
 	}
 
 
@@ -411,14 +411,14 @@ 
 	 * @param  EE_Payment object
 	 * @return void
 	 */
-	public static function payment( EE_Transaction $transaction, EE_Payment $payment ) {
+	public static function payment(EE_Transaction $transaction, EE_Payment $payment) {
 		self::_load_controller();
-		$data = array( $transaction, $payment );
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		$message_type = EEH_MSG_Template::convert_payment_status_to_message_type( $payment->STS_ID() );
+		$data = array($transaction, $payment);
+		EE_Registry::instance()->load_helper('MSG_Template');
+		$message_type = EEH_MSG_Template::convert_payment_status_to_message_type($payment->STS_ID());
 		//if payment amount is less than 0 then switch to payment_refund message type.
 		$message_type = $payment->amount() < 0 ? 'payment_refund' : $message_type;
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( $message_type, $data );
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers($message_type, $data);
 	}
 
 
@@ -426,10 +426,10 @@ 
 	/**
 	 * @param EE_Transaction $transaction
 	 */
-	public static function cancelled_registration( EE_Transaction $transaction ) {
+	public static function cancelled_registration(EE_Transaction $transaction) {
 		self::_load_controller();
-		$data = array( $transaction, null );
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'cancelled_registration', $data );
+		$data = array($transaction, null);
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('cancelled_registration', $data);
 	}
 
 
@@ -442,9 +442,9 @@ 
 	 * @param array $extra_details
 	 * @return void
 	 */
-	public static function maybe_registration( EE_Registration $registration, $extra_details = array() ) {
+	public static function maybe_registration(EE_Registration $registration, $extra_details = array()) {
 
-		if ( ! self::_verify_registration_notification_send( $registration, $extra_details ) ) {
+		if ( ! self::_verify_registration_notification_send($registration, $extra_details)) {
 			//no messages please
 			return;
 		}
@@ -459,22 +459,22 @@ 
 		$mtgs = array();
 
 		//loop through registrations and trigger messages once per status.
-		foreach ( $all_registrations as $reg ) {
+		foreach ($all_registrations as $reg) {
 
 			//already triggered?
-			if ( in_array( $reg->status_ID(), $statuses_sent ) ) {
+			if (in_array($reg->status_ID(), $statuses_sent)) {
 				continue;
 			}
 
-			$message_type = EEH_MSG_Template::convert_reg_status_to_message_type( $reg->status_ID() );
-			$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers( $message_type, array( $registration->transaction(), null, $reg->status_ID() ) );
+			$message_type = EEH_MSG_Template::convert_reg_status_to_message_type($reg->status_ID());
+			$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers($message_type, array($registration->transaction(), null, $reg->status_ID()));
 			$statuses_sent[] = $reg->status_ID();
 		}
 
-		$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers( 'registration_summary', array( $registration->transaction(), null ) );
+		$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers('registration_summary', array($registration->transaction(), null));
 
 		//batch queue and initiate request
-		self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist( $mtgs );
+		self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist($mtgs);
 		self::$_MSG_PROCESSOR->get_queue()->initiate_request_by_priority();
 	}
 
@@ -489,39 +489,39 @@ 
 	 *
 	 * @return bool          true = send away, false = nope halt the presses.
 	 */
-	protected static function _verify_registration_notification_send( EE_Registration $registration, $extra_details = array() ) {
+	protected static function _verify_registration_notification_send(EE_Registration $registration, $extra_details = array()) {
 		 //self::log(
 		 //	__CLASS__, __FUNCTION__, __LINE__,
 		 //	$registration->transaction(),
 		 //	array( '$extra_details' => $extra_details )
 		 //);
 		// currently only using this to send messages for the primary registrant
-		if ( ! $registration->is_primary_registrant() ) {
+		if ( ! $registration->is_primary_registrant()) {
 			return false;
 		}
 		// first we check if we're in admin and not doing front ajax
-		if ( is_admin() && ! EE_FRONT_AJAX ) {
+		if (is_admin() && ! EE_FRONT_AJAX) {
 			//make sure appropriate admin params are set for sending messages
-			if ( empty( $_REQUEST['txn_reg_status_change']['send_notifications'] ) || ! absint( $_REQUEST['txn_reg_status_change']['send_notifications'] ) ) {
+			if (empty($_REQUEST['txn_reg_status_change']['send_notifications']) || ! absint($_REQUEST['txn_reg_status_change']['send_notifications'])) {
 				//no messages sent please.
 				return false;
 			}
 		} else {
 			// frontend request (either regular or via AJAX)
 			// TXN is NOT finalized ?
-			if ( ! isset( $extra_details['finalized'] ) || $extra_details['finalized'] === false ) {
+			if ( ! isset($extra_details['finalized']) || $extra_details['finalized'] === false) {
 				return false;
 			}
 			// return visit but nothing changed ???
 			if (
-				isset( $extra_details['revisit'], $extra_details['status_updates'] ) &&
+				isset($extra_details['revisit'], $extra_details['status_updates']) &&
 				$extra_details['revisit'] && ! $extra_details['status_updates']
 			) {
 				return false;
 			}
 			// NOT sending messages && reg status is something other than "Not-Approved"
 			if (
-				! apply_filters( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', false ) &&
+				! apply_filters('FHEE__EED_Messages___maybe_registration__deliver_notifications', false) &&
 				$registration->status_ID() !== EEM_Registration::status_id_not_approved
 			) {
 				return false;
@@ -543,10 +543,10 @@ 
 	 *
 	 * @return array
 	 */
-	protected static function _get_reg_status_array( $reg_status = '' ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::convert_reg_status_to_message_type( $reg_status )
-			? EEH_MSG_Template::convert_reg_status_to_message_type( $reg_status )
+	protected static function _get_reg_status_array($reg_status = '') {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::convert_reg_status_to_message_type($reg_status)
+			? EEH_MSG_Template::convert_reg_status_to_message_type($reg_status)
 			: EEH_MSG_Template::reg_status_to_message_type_array();
 	}
 
@@ -562,10 +562,10 @@ 
 	 *
 	 * @return string|bool The payment message type slug matching the status or false if no match.
 	 */
-	protected static function _get_payment_message_type( $payment_status ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::convert_payment_status_to_message_type( $payment_status )
-			? EEH_MSG_Template::convert_payment_status_to_message_type( $payment_status )
+	protected static function _get_payment_message_type($payment_status) {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::convert_payment_status_to_message_type($payment_status)
+			? EEH_MSG_Template::convert_payment_status_to_message_type($payment_status)
 			: false;
 	}
 
@@ -579,33 +579,33 @@ 
 	 * @param array $req_data This is the $_POST & $_GET data sent from EE_Admin Pages
 	 * @return bool          success/fail
 	 */
-	public static function process_resend( $req_data ) {
+	public static function process_resend($req_data) {
 		self::_load_controller();
 
 		//if $msgID in this request then skip to the new resend_message
-		if ( EE_Registry::instance()->REQ->get( 'MSG_ID' ) ) {
+		if (EE_Registry::instance()->REQ->get('MSG_ID')) {
 			return self::resend_message();
 		}
 
 		//make sure any incoming request data is set on the REQ so that it gets picked up later.
 		$req_data = (array) $req_data;
-		foreach( $req_data as $request_key => $request_value ) {
-			EE_Registry::instance()->REQ->set( $request_key, $request_value );
+		foreach ($req_data as $request_key => $request_value) {
+			EE_Registry::instance()->REQ->set($request_key, $request_value);
 		}
 
-		if ( ! $messages_to_send = self::$_MSG_PROCESSOR->setup_messages_to_generate_from_registration_ids_in_request() ) {
+		if ( ! $messages_to_send = self::$_MSG_PROCESSOR->setup_messages_to_generate_from_registration_ids_in_request()) {
 			return false;
 		}
 
 		try {
-			self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist( $messages_to_send );
+			self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist($messages_to_send);
 			self::$_MSG_PROCESSOR->get_queue()->initiate_request_by_priority();
-		} catch( EE_Error $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+		} catch (EE_Error $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		EE_Error::add_success(
-			__( 'Messages have been successfully queued for generation and sending.', 'event_espresso' )
+			__('Messages have been successfully queued for generation and sending.', 'event_espresso')
 		);
 		return true; //everything got queued.
 	}
@@ -618,17 +618,17 @@ 
 	public static function resend_message() {
 		self::_load_controller();
 
-		$msgID = EE_Registry::instance()->REQ->get( 'MSG_ID' );
-		if ( ! $msgID ) {
-			EE_Error::add_error( __( 'Something went wrong because there is no "MSG_ID" value in the request', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$msgID = EE_Registry::instance()->REQ->get('MSG_ID');
+		if ( ! $msgID) {
+			EE_Error::add_error(__('Something went wrong because there is no "MSG_ID" value in the request', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
-		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send( (array) $msgID );
+		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send((array) $msgID);
 
 		//setup success message.
-		$count_ready_for_resend = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::status_resend );
-		EE_Error::add_success( sprintf(
+		$count_ready_for_resend = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::status_resend);
+		EE_Error::add_success(sprintf(
 			_n(
 				'There was %d message queued for resending.',
 				'There were %d messages queued for resending.',
@@ -636,7 +636,7 @@ 
 				'event_espresso'
 			),
 			$count_ready_for_resend
-		) );
+		));
 		return true;
 	}
 
@@ -649,13 +649,13 @@ 
 	 * @param  EE_Payment $payment EE_payment object
 	 * @return bool              success/fail
 	 */
-	public static function process_admin_payment( EE_Payment $payment ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+	public static function process_admin_payment(EE_Payment $payment) {
+		EE_Registry::instance()->load_helper('MSG_Template');
 		//we need to get the transaction object
 		$transaction = $payment->transaction();
-		if ( $transaction instanceof EE_Transaction ) {
-			$data = array( $transaction, $payment );
-			$message_type = EEH_MSG_Template::convert_payment_status_to_message_type( $payment->STS_ID() );
+		if ($transaction instanceof EE_Transaction) {
+			$data = array($transaction, $payment);
+			$message_type = EEH_MSG_Template::convert_payment_status_to_message_type($payment->STS_ID());
 
 			//if payment amount is less than 0 then switch to payment_refund message type.
 			$message_type = $payment->amount() < 0 ? 'payment_refund' : $message_type;
@@ -665,22 +665,22 @@ 
 
 			self::_load_controller();
 
-			self::$_MSG_PROCESSOR->generate_for_all_active_messengers( $message_type, $data );
+			self::$_MSG_PROCESSOR->generate_for_all_active_messengers($message_type, $data);
 
 			//get count of queued for generation
-			$count_to_generate = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( array( EEM_Message::status_incomplete, EEM_Message::status_idle ) );
+			$count_to_generate = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(array(EEM_Message::status_incomplete, EEM_Message::status_idle));
 
-			if ( $count_to_generate > 0 && self::$_MSG_PROCESSOR->get_queue()->get_message_repository()->count() !== 0 ) {
-				add_filter( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true' );
+			if ($count_to_generate > 0 && self::$_MSG_PROCESSOR->get_queue()->get_message_repository()->count() !== 0) {
+				add_filter('FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true');
 				return true;
 			} else {
-				$count_failed = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::instance()->stati_indicating_failed_sending() );
+				$count_failed = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::instance()->stati_indicating_failed_sending());
 				/**
 				 * Verify that there are actually errors.  If not then we return a success message because the queue might have been emptied due to successful
 				 * IMMEDIATE generation.
 				 */
-				if ( $count_failed > 0 ) {
-					EE_Error::add_error( sprintf(
+				if ($count_failed > 0) {
+					EE_Error::add_error(sprintf(
 						_n(
 							'The payment notification generation failed.',
 							'%d payment notifications failed being sent.',
@@ -688,11 +688,11 @@ 
 							'event_espresso'
 						),
 						$count_failed
-					), __FILE__, __FUNCTION__, __LINE__ );
+					), __FILE__, __FUNCTION__, __LINE__);
 
 					return false;
 				} else {
-					add_filter( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true' );
+					add_filter('FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true');
 					return true;
 				}
 			}
@@ -716,11 +716,11 @@ 
 	 * @param  int      	      $grp_id     a specific message template group id.
 	 * @return void
 	 */
-	public static function send_newsletter_message( $registrations, $grp_id ) {
+	public static function send_newsletter_message($registrations, $grp_id) {
 		//make sure mtp is id and set it in the EE_Request Handler later messages setup.
-		EE_Registry::instance()->REQ->set( 'GRP_ID', (int) $grp_id );
+		EE_Registry::instance()->REQ->set('GRP_ID', (int) $grp_id);
 		self::_load_controller();
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'newsletter', $registrations );
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('newsletter', $registrations);
 	}
 
 
@@ -735,9 +735,9 @@ 
 	 * @param string 	$message_type
 	 * @return 	string
 	 */
-	public static function registration_message_trigger_url( $registration_message_trigger_url, EE_Registration $registration, $messenger = 'html', $message_type = 'invoice' ) {
+	public static function registration_message_trigger_url($registration_message_trigger_url, EE_Registration $registration, $messenger = 'html', $message_type = 'invoice') {
 		// whitelist $messenger
-		switch ( $messenger ) {
+		switch ($messenger) {
 			case 'pdf' :
 				$sending_messenger = 'pdf';
 				$generating_messenger = 'html';
@@ -749,7 +749,7 @@ 
 				break;
 		}
 		// whitelist $message_type
-		switch ( $message_type ) {
+		switch ($message_type) {
 			case 'receipt' :
 				$message_type = 'receipt';
 				break;
@@ -759,7 +759,7 @@ 
 				break;
 		}
 		// verify that both the messenger AND the message type are active
-		if ( EEH_MSG_Template::is_messenger_active( $sending_messenger ) && EEH_MSG_Template::is_mt_active( $message_type ) ) {
+		if (EEH_MSG_Template::is_messenger_active($sending_messenger) && EEH_MSG_Template::is_mt_active($message_type)) {
 			//need to get the correct message template group for this (i.e. is there a custom invoice for the event this registration is registered for?)
 			$template_query_params = array(
 				'MTP_is_active' => true,
@@ -768,16 +768,16 @@ 
 				'Event.EVT_ID' => $registration->event_ID()
 			);
 			//get the message template group.
-			$msg_template_group = EEM_Message_Template_Group::instance()->get_one( array( $template_query_params ) );
+			$msg_template_group = EEM_Message_Template_Group::instance()->get_one(array($template_query_params));
 			//if we don't have an EE_Message_Template_Group then return
-			if ( ! $msg_template_group instanceof EE_Message_Template_Group ) {
+			if ( ! $msg_template_group instanceof EE_Message_Template_Group) {
 				// remove EVT_ID from query params so that global templates get picked up
-				unset( $template_query_params['Event.EVT_ID'] );
+				unset($template_query_params['Event.EVT_ID']);
 				//get global template as the fallback
-				$msg_template_group = EEM_Message_Template_Group::instance()->get_one( array( $template_query_params ) );
+				$msg_template_group = EEM_Message_Template_Group::instance()->get_one(array($template_query_params));
 			}
 			//if we don't have an EE_Message_Template_Group then return
-			if ( ! $msg_template_group instanceof EE_Message_Template_Group ) {
+			if ( ! $msg_template_group instanceof EE_Message_Template_Group) {
 				return '';
 			}
 			// generate the URL
@@ -806,7 +806,7 @@ 
 	 * @param bool 	  $send true we will do a test send using the messenger delivery, false we just do a regular preview
 	 * @return string|bool          The body of the message or if send is requested, sends.
 	 */
-	public static function preview_message( $type, $context, $messenger, $send = false ) {
+	public static function preview_message($type, $context, $messenger, $send = false) {
 		self::_load_controller();
 		$mtg = new EE_Message_To_Generate(
 			$messenger,
@@ -815,8 +815,8 @@ 
 			$context,
 			true
 		);
-		$generated_preview_queue = self::$_MSG_PROCESSOR->generate_for_preview( $mtg, $send );
-		if ( $generated_preview_queue instanceof EE_Messages_Queue ) {
+		$generated_preview_queue = self::$_MSG_PROCESSOR->generate_for_preview($mtg, $send);
+		if ($generated_preview_queue instanceof EE_Messages_Queue) {
 			return $generated_preview_queue->get_message_repository()->current()->content();
 		} else {
 			return $generated_preview_queue;
@@ -843,7 +843,7 @@ 
 	 *
 	 * @return bool          success or fail.
 	 */
-	public static function send_message_with_messenger_only( $messenger, $message_type, EE_Messages_Queue $queue, $custom_subject = '' ) {
+	public static function send_message_with_messenger_only($messenger, $message_type, EE_Messages_Queue $queue, $custom_subject = '') {
 		self::_load_controller();
 		/** @type EE_Message_To_Generate_From_Queue $message_to_generate */
 		$message_to_generate = EE_Registry::instance()->load_lib(
@@ -855,7 +855,7 @@ 
 				$custom_subject,
 			)
 		);
-		return self::$_MSG_PROCESSOR->queue_for_sending( $message_to_generate );
+		return self::$_MSG_PROCESSOR->queue_for_sending($message_to_generate);
 	}
 
 
@@ -868,22 +868,22 @@ 
 	 * @param array     $message_ids An array of message ids
 	 * @return bool | EE_Messages_Queue     false if nothing was generated, EE_Messages_Queue containing generated messages.
 	 */
-	public static function generate_now( $message_ids ) {
+	public static function generate_now($message_ids) {
 		self::_load_controller();
 		$messages = EEM_Message::instance()->get_all(
 			array(
 				0 => array(
-					'MSG_ID' => array( 'IN', $message_ids ),
+					'MSG_ID' => array('IN', $message_ids),
 					'STS_ID' => EEM_Message::status_incomplete,
 				)
 			)
 		);
 
-		$generated_queue = self::$_MSG_PROCESSOR->batch_generate_from_queue( $messages );
+		$generated_queue = self::$_MSG_PROCESSOR->batch_generate_from_queue($messages);
 
-		if ( ! $generated_queue instanceof EE_Messages_Queue ) {
+		if ( ! $generated_queue instanceof EE_Messages_Queue) {
 			EE_Error::add_error(
-				__( 'The messages were not generated.  This is usually because there is already a batch being generated on a separate request.  You can wait a minute or two and try again.', 'event_espresso' ),
+				__('The messages were not generated.  This is usually because there is already a batch being generated on a separate request.  You can wait a minute or two and try again.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -902,28 +902,28 @@ 
 	 *
 	 * @return bool | EE_Messages_Queue  false if no messages sent.
 	 */
-	public static function send_now( $message_ids ) {
+	public static function send_now($message_ids) {
 		self::_load_controller();
 		$messages = EEM_Message::instance()->get_all(
 			array(
 				0 => array(
-					'MSG_ID' => array( 'IN', $message_ids ),
-					'STS_ID' => array( 'IN', array( EEM_Message::status_idle, EEM_Message::status_resend, EEM_Message::status_retry ) )
+					'MSG_ID' => array('IN', $message_ids),
+					'STS_ID' => array('IN', array(EEM_Message::status_idle, EEM_Message::status_resend, EEM_Message::status_retry))
 				)
 			)
 		);
 
-		$sent_queue = self::$_MSG_PROCESSOR->batch_send_from_queue( $messages );
+		$sent_queue = self::$_MSG_PROCESSOR->batch_send_from_queue($messages);
 
-		if ( ! $sent_queue instanceof EE_Messages_Queue ) {
+		if ( ! $sent_queue instanceof EE_Messages_Queue) {
 			EE_Error::add_error(
-				__( 'The messages were not sent.  This is usually because there is already a batch being sent on a separate request.  You can wait a minute or two and try again.', 'event_espresso' ),
+				__('The messages were not sent.  This is usually because there is already a batch being sent on a separate request.  You can wait a minute or two and try again.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		} else {
 			//can count how many sent by using the messages in the queue
-			$sent_count = $sent_queue->count_STS_in_queue( EEM_Message::instance()->stati_indicating_sent() );
-			if ( $sent_count > 0 ) {
+			$sent_count = $sent_queue->count_STS_in_queue(EEM_Message::instance()->stati_indicating_sent());
+			if ($sent_count > 0) {
 				EE_Error::add_success(
 					sprintf(
 						_n(
@@ -938,8 +938,8 @@ 
 			} else {
 				EE_Error::overwrite_errors();
 				EE_Error::add_error(
-					__( 'No message was sent because of problems with sending. Either all the messages you selected were not a sendable message, they were ALREADY sent on a different scheduled task, or there was an error.
-					If there was an error, you can look at the messages in the message activity list table for any error messages.', 'event_espresso' ),
+					__('No message was sent because of problems with sending. Either all the messages you selected were not a sendable message, they were ALREADY sent on a different scheduled task, or there was an error.
+					If there was an error, you can look at the messages in the message activity list table for any error messages.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -960,13 +960,13 @@ 
 	 *
 	 * @return bool  true means messages were successfully queued for resending, false means none were queued for resending.
 	 */
-	public static function queue_for_resending( $message_ids ) {
+	public static function queue_for_resending($message_ids) {
 		self::_load_controller();
-		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send( $message_ids );
+		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send($message_ids);
 
 		//get queue and count
-		$queue_count = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::status_resend );
-		if ( $queue_count > 0 ) {
+		$queue_count = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::status_resend);
+		if ($queue_count > 0) {
 			EE_Error::add_success(
 				sprintf(
 					_n(
@@ -980,7 +980,7 @@ 
 			);
 		} else {
 			EE_Error::add_error(
-				__( 'No messages were queued for resending. This usually only happens when all the messages flagged for resending are not a status that can be resent.', 'event_espresso' ),
+				__('No messages were queued for resending. This usually only happens when all the messages flagged for resending are not a status that can be resent.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -1002,16 +1002,16 @@ 
 	 * @param array $info
 	 * @param bool $display_request
 	 */
-	protected static function log( $class = '', $func = '', $line = '', EE_Transaction $transaction, $info = array(), $display_request = false ) {
-		if ( WP_DEBUG && false ) {
-			if ( $transaction instanceof EE_Transaction ) {
+	protected static function log($class = '', $func = '', $line = '', EE_Transaction $transaction, $info = array(), $display_request = false) {
+		if (WP_DEBUG && false) {
+			if ($transaction instanceof EE_Transaction) {
 				// don't serialize objects
-				$info = EEH_Debug_Tools::strip_objects( $info );
+				$info = EEH_Debug_Tools::strip_objects($info);
 				$info['TXN_status'] = $transaction->status_ID();
 				$info['TXN_reg_steps'] = $transaction->reg_steps();
-				if ( $transaction->ID() ) {
-					$index = 'EE_Transaction: ' . $transaction->ID();
-					EEH_Debug_Tools::log( $class, $func, $line, $info, $display_request, $index );
+				if ($transaction->ID()) {
+					$index = 'EE_Transaction: '.$transaction->ID();
+					EEH_Debug_Tools::log($class, $func, $line, $info, $display_request, $index);
 				}
 			}
 		}

Braces +3 added lines, -1 removed lines

@@ -6,7 +6,9 @@
  * @package  Event Espresso
  * @subpackage modules, messages
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  *
  * Messages module.  Takes care of registering all the triggers for messages.