eventespresso / event-espresso-core

core/libraries/messages/EE_Registration_Base_message_type.lib.php

Braces +9 added lines, -5 removed lines

@@ -6,7 +6,9 @@ 
  * @subpackage messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * This class contains common methods/properties shared among all registration message types.
@@ -125,16 +127,18 @@ 
 	 * @return array array of EE_Messages_Addressee objects
 	 */
 	protected function _admin_addressees() {
-		if ( $this->_single_message )
-			return array();
+		if ( $this->_single_message ) {
+					return array();
+		}
 		return parent::_admin_addressees();
 	}
 
 
 
 	protected function _primary_attendee_addressees() {
-		if ( $this->_single_message )
-			return array();
+		if ( $this->_single_message ) {
+					return array();
+		}
 
 		return parent::_primary_attendee_addressees();
 	}

Spacing +20 added lines, -20 removed lines

@@ -38,35 +38,35 @@ 
 	}
 
 
-	protected function _get_admin_content_events_edit_for_messenger( EE_messenger $messenger ) {
+	protected function _get_admin_content_events_edit_for_messenger(EE_messenger $messenger) {
 		//this is just a test
-		return $this->name . ' Message Type for ' . $messenger->name . ' Messenger ';
+		return $this->name.' Message Type for '.$messenger->name.' Messenger ';
 	}
 
 
 
 
 	protected function _set_data_handler() {
-		if ( is_array( $this->_data ) ) {
-			$data_type = reset( $this->_data );
+		if (is_array($this->_data)) {
+			$data_type = reset($this->_data);
 
-			if ( is_array( $data_type ) ) {
+			if (is_array($data_type)) {
 				//grab the first item and see if its a registration.
-				$maybe_reg = isset( $data_type[0] ) && is_array( $data_type[0] ) ? reset( $data_type[0] ) : reset( $data_type );
-				if ( $maybe_reg instanceof EE_Registration ) {
+				$maybe_reg = isset($data_type[0]) && is_array($data_type[0]) ? reset($data_type[0]) : reset($data_type);
+				if ($maybe_reg instanceof EE_Registration) {
 					//is $data_type itself just an array of registrations?
-					if ( isset( $data_type[1] ) && $data_type[1] instanceof EE_Registration  ) {
+					if (isset($data_type[1]) && $data_type[1] instanceof EE_Registration) {
 						$regs = $data_type;
 					} else {
-						$regs = is_array( $data_type[0] ) ? $data_type[0] : array( $maybe_reg );
+						$regs = is_array($data_type[0]) ? $data_type[0] : array($maybe_reg);
 					}
 
-					foreach ( $regs as $reg ) {
-						if ( $reg instanceof EE_Registration ) {
+					foreach ($regs as $reg) {
+						if ($reg instanceof EE_Registration) {
 							$this->_regs_for_sending[] = $reg->ID();
 						}
 					}
-					$this->_data = isset( $this->_data[1] ) ? array( $maybe_reg->transaction(), null, $this->_data[1] ) : array( $maybe_reg->transaction() );
+					$this->_data = isset($this->_data[1]) ? array($maybe_reg->transaction(), null, $this->_data[1]) : array($maybe_reg->transaction());
 					$this->_data_handler = 'Gateways';
 				} else {
 					$this->_data_handler = 'Gateways';
@@ -83,18 +83,18 @@ 
 
 
 
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
-		if ( $context  == 'admin' ) {
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
+		if ($context == 'admin') {
 			//use the registration to get the transaction.
 			$transaction = $registration->transaction();
 
 			//bail early if no transaction
-			if ( ! $transaction instanceof EE_Transaction ) {
-				throw new EE_Error( __('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso' ) );
+			if ( ! $transaction instanceof EE_Transaction) {
+				throw new EE_Error(__('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso'));
 			}
 
-			$payment = !empty( $id ) ? EEM_Payment::instance()->get_one( array( array( 'PAY_ID' => $id, 'TXN_ID' => $transaction->ID() ) ) ) : 0;
-			return array( $transaction, $payment );
+			$payment = ! empty($id) ? EEM_Payment::instance()->get_one(array(array('PAY_ID' => $id, 'TXN_ID' => $transaction->ID()))) : 0;
+			return array($transaction, $payment);
 		} else {
 			return $registration;
 		}
@@ -120,7 +120,7 @@ 
 	 * @return array array of EE_Messages_Addressee objects
 	 */
 	protected function _admin_addressees() {
-		if ( $this->_single_message )
+		if ($this->_single_message)
 			return array();
 		return parent::_admin_addressees();
 	}
@@ -128,7 +128,7 @@ 
 
 
 	protected function _primary_attendee_addressees() {
-		if ( $this->_single_message )
+		if ($this->_single_message)
 			return array();
 
 		return parent::_primary_attendee_addressees();

core/libraries/messages/data_class/EE_Messages_Gateways_incoming_data.class.php

Braces +8 added lines, -5 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -46,11 +47,13 @@ 
 	public function __construct( $data ) {
 
 		//test for valid params
-		if ( ! ( $data[0] instanceof EE_Transaction ))
-			throw new EE_Error( __('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso') );
+		if ( ! ( $data[0] instanceof EE_Transaction )) {
+					throw new EE_Error( __('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso') );
+		}
 
-		if ( empty( $data[1] ) || ! $data[1] instanceof  EE_Payment  )
-			$pmt_obj = $this->_get_empty_payment_obj( $data[0] );
+		if ( empty( $data[1] ) || ! $data[1] instanceof  EE_Payment  ) {
+					$pmt_obj = $this->_get_empty_payment_obj( $data[0] );
+		}
 
 		if ( ! empty( $data[2] ) ) {
 			$filtered_reg_status = $data[2];

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -43,25 +43,25 @@ 
 	 * @param array $data
 	 * @throws \EE_Error
 	 */
-	public function __construct( $data ) {
+	public function __construct($data) {
 
 		//test for valid params
-		if ( ! ( $data[0] instanceof EE_Transaction ))
-			throw new EE_Error( __('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso') );
+		if ( ! ($data[0] instanceof EE_Transaction))
+			throw new EE_Error(__('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso'));
 
-		if ( empty( $data[1] ) || ! $data[1] instanceof  EE_Payment  )
-			$pmt_obj = $this->_get_empty_payment_obj( $data[0] );
+		if (empty($data[1]) || ! $data[1] instanceof  EE_Payment)
+			$pmt_obj = $this->_get_empty_payment_obj($data[0]);
 
-		if ( ! empty( $data[2] ) ) {
+		if ( ! empty($data[2])) {
 			$filtered_reg_status = $data[2];
 		}
 
 		$data = array(
 			'txn_obj' => $data[0],
 			'pmt_obj' => isset($pmt_obj) ? $pmt_obj : $data[1],
-			'filtered_reg_status' => isset( $filtered_reg_status ) ? $filtered_reg_status : null
+			'filtered_reg_status' => isset($filtered_reg_status) ? $filtered_reg_status : null
 			);
-		parent::__construct( $data );
+		parent::__construct($data);
 	}
 
 
@@ -75,18 +75,18 @@ 
 	 *
 	 * @return array   The prepped data for db
 	 */
-	static public function convert_data_for_persistent_storage( $data ) {
+	static public function convert_data_for_persistent_storage($data) {
 		$prepped_data = array();
 
-		if ( $data[0] instanceof EE_Transaction ) {
+		if ($data[0] instanceof EE_Transaction) {
 			$prepped_data['Transaction'] = $data[0]->ID();
 		}
 
-		if ( isset( $data[1] ) && $data[1] instanceof EE_Payment ) {
+		if (isset($data[1]) && $data[1] instanceof EE_Payment) {
 			$prepped_data['Payment'] = $data[1]->ID();
 		}
 
-		if ( ! empty( $data[2] ) ) {
+		if ( ! empty($data[2])) {
 			$prepped_data['filter'] = $data[2];
 		}
 
@@ -106,11 +106,11 @@ 
 	 *
 	 * @return array
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		$prepped_data = array(
-			0 => isset( $data['Transaction'] ) ? EEM_Transaction::instance()->get_one_by_ID( $data['Transaction'] ) : null,
-			1 => isset( $data['Payment'] ) ? EEM_Payment::instance()->get_one_by_ID( $data['Payment'] ) : null,
-			2 => isset( $data['filter'] ) ? $data['filter'] : null
+			0 => isset($data['Transaction']) ? EEM_Transaction::instance()->get_one_by_ID($data['Transaction']) : null,
+			1 => isset($data['Payment']) ? EEM_Payment::instance()->get_one_by_ID($data['Payment']) : null,
+			2 => isset($data['filter']) ? $data['filter'] : null
 		);
 		return $prepped_data;
 	}
@@ -121,8 +121,8 @@ 
 	 * @param \EE_Transaction $txn
 	 * @return \EE_Payment
 	 */
-	private function _get_empty_payment_obj( EE_Transaction $txn ) {
-		$PMT = EE_Payment::new_instance( array(
+	private function _get_empty_payment_obj(EE_Transaction $txn) {
+		$PMT = EE_Payment::new_instance(array(
 			'STS_ID' => EEM_Payment::status_id_pending,
 			'PAY_timestamp' => time(),
 			'PMD_ID' => $txn->payment_method_ID(),
@@ -150,9 +150,9 @@ 
 
 
 		//other data from the session (if possible)
-		$this->user_id = isset( $session_data['user_id'] ) ? $session_data['user_id'] : '';
-		$this->ip_address = isset( $session_data['ip_address'] ) ? $session_data['ip_address'] : '';
-		$this->user_agent = isset( $session_data['user_agent'] ) ? $session_data['user_agent'] : '';
+		$this->user_id = isset($session_data['user_id']) ? $session_data['user_id'] : '';
+		$this->ip_address = isset($session_data['ip_address']) ? $session_data['ip_address'] : '';
+		$this->user_agent = isset($session_data['user_agent']) ? $session_data['user_agent'] : '';
 		$this->init_access = $this->last_access = '';
 
 		$this->reg_objs = $this->txn->get_many_related('Registration');

core/libraries/messages/data_class/EE_Messages_incoming_data.core.php

Braces +9 added lines, -5 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -323,8 +324,9 @@ 
 		$regchk = array_shift($regchk);
 		$line_items = array();
 		//verify that reg_objs is set
-		if ( !is_array( $this->reg_objs) && ! reset( $this->reg_objs ) instanceof EE_Registration )
-			throw new EE_Error( __('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso') );
+		if ( !is_array( $this->reg_objs) && ! reset( $this->reg_objs ) instanceof EE_Registration ) {
+					throw new EE_Error( __('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso') );
+		}
 
 		//get all attendee and events associated with the registrations in this transaction
 		$events = $event_setup = $evtcache = $tickets = $datetimes = array();
@@ -384,8 +386,10 @@ 
 					$eventsetup[$evt_id]['dtt_objs'][$dtt_id] = $datetime;
 					$registrations[$reg->ID()]['dtt_objs'][$dtt_id] = $datetime;
 
-					if ( isset( $datetimes[$dtt_id] ) )
-						continue; //already have this info in the datetimes array.
+					if ( isset( $datetimes[$dtt_id] ) ) {
+											continue;
+					}
+					//already have this info in the datetimes array.
 
 					$datetimes[$dtt_id]['tkt_objs'][] = $ticket;
 					$datetimes[$dtt_id]['datetime'] = $datetime;

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -266,7 +266,7 @@ 
 	 * @param mixed $data incoming data object|array.  Suggested that child classes use type hinting for expected
 	 * data object.  But here parent will be generic because we don't know what's coming in.
 	 */
-	public function __construct( $data ) {
+	public function __construct($data) {
 		$this->_data = $data;
 		$this->_setup_data();
 	}
@@ -290,7 +290,7 @@ 
 	 *
 	 * @return mixed   The prepped data for db
 	 */
-	static public function convert_data_for_persistent_storage( $data ) {
+	static public function convert_data_for_persistent_storage($data) {
 		return $data;
 	}
 
@@ -306,7 +306,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		return $data;
 	}
 
@@ -333,19 +333,19 @@ 
 	protected function _assemble_data() {
 
 		//verify that reg_objs is set
-		if ( !is_array( $this->reg_objs) && ! reset( $this->reg_objs ) instanceof EE_Registration )
-			throw new EE_Error( __('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso') );
+		if ( ! is_array($this->reg_objs) && ! reset($this->reg_objs) instanceof EE_Registration)
+			throw new EE_Error(__('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso'));
 
 		//get all attendee and events associated with the registrations in this transaction
 		$events = $event_setup = $evtcache = $tickets = $datetimes = array();
 		$answers = $questions = $attendees = $line_items = $registrations = array();
 		$total_ticket_count = 0;
 
-		if ( ! empty( $this->reg_objs ) ) {
+		if ( ! empty($this->reg_objs)) {
 			$event_attendee_count = array();
-			foreach ( $this->reg_objs as $reg ) {
+			foreach ($this->reg_objs as $reg) {
 				//account for filtered registrations by status.
-				if ( ! empty( $this->filtered_reg_status ) && $this->filtered_reg_status !== $reg->status_ID() ) {
+				if ( ! empty($this->filtered_reg_status) && $this->filtered_reg_status !== $reg->status_ID()) {
 					continue;
 				}
 
@@ -355,7 +355,7 @@ 
 				$relateddatetime = $ticket->datetimes();
 				$total_ticket_count++;
 				$tickets[$ticket->ID()]['ticket'] = $ticket;
-				$tickets[$ticket->ID()]['count'] = is_array($tickets[$ticket->ID()]) && isset( $tickets[$ticket->ID()]['count'] ) ? $tickets[$ticket->ID()]['count'] + 1 : 1;
+				$tickets[$ticket->ID()]['count'] = is_array($tickets[$ticket->ID()]) && isset($tickets[$ticket->ID()]['count']) ? $tickets[$ticket->ID()]['count'] + 1 : 1;
 				$tickets[$ticket->ID()]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
 				$tickets[$ticket->ID()]['dtt_objs'] = $relateddatetime;
 				$tickets[$ticket->ID()]['reg_objs'][$reg->ID()] = $reg;
@@ -365,7 +365,7 @@ 
 				$eventsetup[$evt_id]['reg_objs'][$reg->ID()] = $reg;
 				$eventsetup[$evt_id]['tkt_objs'][$ticket->ID()] = $ticket;
 				$eventsetup[$evt_id]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
-				$event_attendee_count[$evt_id] = isset( $event_attendee_count[$evt_id] ) ? $event_attendee_count[$evt_id] + 1 : 0;
+				$event_attendee_count[$evt_id] = isset($event_attendee_count[$evt_id]) ? $event_attendee_count[$evt_id] + 1 : 0;
 				$attendees[$reg->attendee_ID()]['line_ref'][] = $evt_id;
 				$attendees[$reg->attendee_ID()]['att_obj'] = $reg->attendee();
 				$attendees[$reg->attendee_ID()]['reg_objs'][$reg->ID()] = $reg;
@@ -382,19 +382,19 @@ 
 
 				//set up answer objects
 				$rel_ans = $reg->get_many_related('Answer');
-				foreach ( $rel_ans as $ansid => $answer ) {
-					if ( !isset( $questions[$ansid] ) ) {
+				foreach ($rel_ans as $ansid => $answer) {
+					if ( ! isset($questions[$ansid])) {
 						$questions[$ansid] = $answer->get_first_related('Question');
 					}
 					$answers[$ansid] = $answer;
 					$registrations[$reg->ID()]['ans_objs'][$ansid] = $answer;
 				}
 
-				foreach ( $relateddatetime as $dtt_id => $datetime ) {
+				foreach ($relateddatetime as $dtt_id => $datetime) {
 					$eventsetup[$evt_id]['dtt_objs'][$dtt_id] = $datetime;
 					$registrations[$reg->ID()]['dtt_objs'][$dtt_id] = $datetime;
 
-					if ( isset( $datetimes[$dtt_id] ) )
+					if (isset($datetimes[$dtt_id]))
 						continue; //already have this info in the datetimes array.
 
 					$datetimes[$dtt_id]['tkt_objs'][] = $ticket;
@@ -406,9 +406,9 @@ 
 
 			//let's loop through the unique event=>reg items and setup data on them
 
-			if ( !empty( $eventsetup) ) {
-				foreach ( $eventsetup as $evt_id => $items ) {
-					$ticket_line_items_for_event = EEM_Line_Item::instance()->get_all(array(array('Ticket.Datetime.EVT_ID'=>$evt_id,'TXN_ID'=>$this->txn->ID()), 'default_where_conditions' => 'none'));
+			if ( ! empty($eventsetup)) {
+				foreach ($eventsetup as $evt_id => $items) {
+					$ticket_line_items_for_event = EEM_Line_Item::instance()->get_all(array(array('Ticket.Datetime.EVT_ID'=>$evt_id, 'TXN_ID'=>$this->txn->ID()), 'default_where_conditions' => 'none'));
 					$events[$evt_id] = array(
 						'ID' => $evt_id,
 						'event' => $evtcache[$evt_id],
@@ -417,13 +417,13 @@ 
 						'reg_objs' => $items['reg_objs'],
 						'tkt_objs' => $items['tkt_objs'],
 						'att_objs' => $items['att_objs'],
-						'dtt_objs' => isset( $items['dtt_objs'] ) ? $items['dtt_objs'] : array(),
+						'dtt_objs' => isset($items['dtt_objs']) ? $items['dtt_objs'] : array(),
 						'line_items' => $ticket_line_items_for_event
 					);
 
 					//make sure the tickets have the line items setup for them.
-					foreach ( $ticket_line_items_for_event as $line_id => $line_item ) {
-						if ( $line_item instanceof EE_Line_Item ) {
+					foreach ($ticket_line_items_for_event as $line_id => $line_item) {
+						if ($line_item instanceof EE_Line_Item) {
 							$tickets[$line_item->ticket()->ID()]['line_item'] = $line_item;
 							$tickets[$line_item->ticket()->ID()]['sub_line_items'] = $line_item->children();
 							$line_items[$line_item->ID()]['children'] = $line_item->children();
@@ -447,7 +447,7 @@ 
 		$this->total_ticket_count = $total_ticket_count;
 		$this->registrations = $registrations;
 
-		$this->tax_line_items =  $this->txn->tax_items();
+		$this->tax_line_items = $this->txn->tax_items();
 		$this->additional_line_items = $this->txn->non_ticket_line_items();
 		$this->payments = $this->txn->payments();
 
@@ -457,10 +457,10 @@ 
 		//let's get just the primary_attendee_data!  First we get the primary registration object.
 		$primary_reg = $this->txn->primary_registration();
 		// verify
-		if( $primary_reg instanceof EE_Registration ) {
+		if ($primary_reg instanceof EE_Registration) {
 
 			// get attendee object
-			if( $primary_reg->attendee() instanceof EE_Attendee ) {
+			if ($primary_reg->attendee() instanceof EE_Attendee) {
 
 				//now we can setup the primary_attendee_data array
 				$this->primary_attendee_data = array(
@@ -472,11 +472,11 @@ 
 				);
 
 			} else {
-				EE_Error::add_error( __('Incoming data does not have a valid Attendee object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('Incoming data does not have a valid Attendee object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 
 		} else {
-			EE_Error::add_error( __('Incoming data does not have a valid Registration object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Incoming data does not have a valid Registration object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 

core/libraries/messages/defaults/EE_Messages_Template_Pack_Default.class.php

Spacing +12 added lines, -12 removed lines

@@ -21,8 +21,8 @@ 
 		$this->label = __('Default', 'event_espresso');
 		$this->dbref = 'default';
 		$this->description = __('This is the default template pack included with Event Espress core messages system.', 'event_espresso');
-		$this->_base_url = EE_PLUGIN_DIR_URL . 'core/libraries/messages/defaults/default/';
-		$this->_base_path = EE_LIBRARIES . 'messages/defaults/default/';
+		$this->_base_url = EE_PLUGIN_DIR_URL.'core/libraries/messages/defaults/default/';
+		$this->_base_path = EE_LIBRARIES.'messages/defaults/default/';
 		$this->_supports = array(
 			'email' => array(
 				'cancelled_registration', 'declined_registration', 'not_approved_registration', 'pending_approval', 'registration',
@@ -33,9 +33,9 @@ 
 				'receipt', 'invoice'
 				)
 			);
-		$this->_default_variation_labels= array(
-			'email' => __('Default', 'event_espresso' ),
-			'html' =>  __('Simple', 'event_espresso' )
+		$this->_default_variation_labels = array(
+			'email' => __('Default', 'event_espresso'),
+			'html' =>  __('Simple', 'event_espresso')
 			 );
 		$this->_variations = array(
 			'html' => array(
@@ -63,18 +63,18 @@ 
 
 
 
-	public function get_default_variation( $messenger, $message_type, $type, $url, $file_extension ) {
+	public function get_default_variation($messenger, $message_type, $type, $url, $file_extension) {
 		$base = $url ? $this->_base_url : $this->_base_path;
 		$base_path = $this->_base_path;
 		//possible variation paths considering whether message type is present or not in the file name.
-		$path_string = 'variations/' . $messenger . '_' . $message_type . '_'  . $type . '_default' . $file_extension;
-		$default_path_string = 'variations/' . $messenger . '_' . $type . '_default' . $file_extension;
+		$path_string = 'variations/'.$messenger.'_'.$message_type.'_'.$type.'_default'.$file_extension;
+		$default_path_string = 'variations/'.$messenger.'_'.$type.'_default'.$file_extension;
 		//first see if fully validated file exists.
-		if ( is_readable( $base_path . $path_string ) ) {
-			$variation_path = $base . $path_string;
+		if (is_readable($base_path.$path_string)) {
+			$variation_path = $base.$path_string;
 		//otherwise see if default exists.
-		} elseif ( is_readable( $base_path . $default_path_string ) ) {
-			$variation_path = $base . $default_path_string;
+		} elseif (is_readable($base_path.$default_path_string)) {
+			$variation_path = $base.$default_path_string;
 		} else {
 			//no matches found so nothing is present.
 			$variation_path = '';

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

core/libraries/messages/defaults/default/email_cancelled_registration_content.template.php

Spacing +9 added lines, -9 removed lines

@@ -31,9 +31,9 @@ 
 						<tbody>
 							<tr>
 								<td>
-									<h2><?php printf( __( 'Hello, %s', 'event_espresso' ), '[RECIPIENT_FNAME]' ); ?>:</h2>
+									<h2><?php printf(__('Hello, %s', 'event_espresso'), '[RECIPIENT_FNAME]'); ?>:</h2>
 
-									<p class="lead"><?php _e( 'Your registration was cancelled for the following tickets:', 'event_espresso' ); ?></p>
+									<p class="lead"><?php _e('Your registration was cancelled for the following tickets:', 'event_espresso'); ?></p>
 								</td>
 							</tr>
 						</tbody>
@@ -62,10 +62,10 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
 											</td>
 										</tr>
 									</tbody>
@@ -75,9 +75,9 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
-												<?php _e( 'Email:', 'event_espresso' ); ?>
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
+												<?php _e('Email:', 'event_espresso'); ?>
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
 											</td>
 										</tr>

core/libraries/messages/defaults/default/email_cancelled_registration_content_admin.template.php

Spacing +9 added lines, -9 removed lines

@@ -31,9 +31,9 @@ 
 						<tbody>
 							<tr>
 								<td>
-									<h2><?php printf( __( 'Hello, %s:', 'event_espresso' ), '[EVENT_AUTHOR_FNAME]' ); ?></h2>
+									<h2><?php printf(__('Hello, %s:', 'event_espresso'), '[EVENT_AUTHOR_FNAME]'); ?></h2>
 
-									<p class="lead"><?php _e( 'Registrations were cancelled for the following events.', 'event_espresso' ); ?></p>
+									<p class="lead"><?php _e('Registrations were cancelled for the following events.', 'event_espresso'); ?></p>
 								</td>
 							</tr>
 						</tbody>
@@ -59,10 +59,10 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
 											</td>
 										</tr>
 									</tbody>
@@ -72,9 +72,9 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
-												<?php _e( 'Email:', 'event_espresso' ); ?>
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
+												<?php _e('Email:', 'event_espresso'); ?>
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
 											</td>
 										</tr>

core/libraries/messages/defaults/default/email_declined_registration_content.template.php

Spacing +9 added lines, -9 removed lines

@@ -31,8 +31,8 @@ 
 						<tbody>
 							<tr>
 								<td>
-									<h2><?php printf( __( 'Hello, %s:', 'event_espresso' ), '[RECIPIENT_FNAME]' ); ?></h2>
-									<p class="lead"><?php _e( 'Your registration was declined for the following tickets:', 'event_espresso' ); ?></p>
+									<h2><?php printf(__('Hello, %s:', 'event_espresso'), '[RECIPIENT_FNAME]'); ?></h2>
+									<p class="lead"><?php _e('Your registration was declined for the following tickets:', 'event_espresso'); ?></p>
 								</td>
 							</tr>
 						</tbody>
@@ -61,10 +61,10 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
 											</td>
 										</tr>
 									</tbody>
@@ -74,9 +74,9 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
-												<?php _e( 'Email:', 'event_espresso' ); ?>
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
+												<?php _e('Email:', 'event_espresso'); ?>
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
 											</td>
 										</tr>

core/libraries/messages/defaults/default/email_declined_registration_content_admin.template.php

Spacing +9 added lines, -9 removed lines

@@ -31,8 +31,8 @@ 
 						<tbody>
 							<tr>
 								<td>
-									<h2><?php printf( __( 'Hello, %s:', 'event_espresso' ), '[EVENT_AUTHOR_FNAME]' ); ?></h2>
-									<p class="lead"><?php _e( 'Registrations were declined for the following events:', 'event_espresso' ); ?></p>
+									<h2><?php printf(__('Hello, %s:', 'event_espresso'), '[EVENT_AUTHOR_FNAME]'); ?></h2>
+									<p class="lead"><?php _e('Registrations were declined for the following events:', 'event_espresso'); ?></p>
 								</td>
 							</tr>
 						</tbody>
@@ -58,10 +58,10 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
 											</td>
 										</tr>
 									</tbody>
@@ -71,9 +71,9 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
-												<?php _e( 'Email:', 'event_espresso' ); ?>
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
+												<?php _e('Email:', 'event_espresso'); ?>
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
 											</td>
 										</tr>

core/libraries/messages/defaults/default/email_declined_registration_subject.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php _e('Declined Registration Details', 'event_espresso');?>
\ No newline at end of file
+<?php _e('Declined Registration Details', 'event_espresso'); ?>
\ No newline at end of file