eventespresso / event-espresso-core

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];

Indentation +6 added lines, -6 removed lines

@@ -135,11 +135,11 @@ 
 
 
 
-    /**
-     * _setup_data
-     *
-     * @throws EE_Error
-     */
+	/**
+	 * _setup_data
+	 *
+	 * @throws EE_Error
+	 */
 	protected function _setup_data() {
 
 		$this->reg_info = array();
@@ -157,7 +157,7 @@ 
 		$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 = '';
-        //get all non-trashed registrations
+		//get all non-trashed registrations
 		$this->reg_objs = $this->txn->registrations(array(array('REG_deleted' => false)));
 		$this->_assemble_data();
 

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');
 
 /**
@@ -44,25 +44,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);
 	}
 
 
@@ -76,18 +76,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];
 		}
 
@@ -107,11 +107,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;
 	}
@@ -122,8 +122,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(),
@@ -153,9 +153,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 = '';
         //get all non-trashed registrations
 		$this->reg_objs = $this->txn->registrations(array(array('REG_deleted' => false)));

core/libraries/messages/defaults/EE_Messages_Template_Pack.core.php

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,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');
+}
 
 /**
  * EE_Template_Packs are classes that contain all the information related to messages templates for a given "template pack".
@@ -282,8 +284,9 @@ 
 
 		foreach ( $contexts as $context => $details ) {
 			foreach ( $fields as $field => $field_details ) {
-				if ( empty( $field_details ) )
-					continue;
+				if ( empty( $field_details ) ) {
+									continue;
+				}
 				/**
 				 * is this a field array (linked to a main field)?
 				 */

Spacing +85 added lines, -85 removed lines

@@ -167,44 +167,44 @@ 
 	public function __construct() {
 		$this->_set_props();
 		//make sure classname is correct
-		$classname = get_class( $this );
+		$classname = get_class($this);
 		//make sure required props have been set
 
 		//if label is empty then throw an error because we should have it defined by now.
-		if ( ! isset( $this->label )  ) {
-			throw new EE_Error( sprintf( __('The label property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
+		if ( ! isset($this->label)) {
+			throw new EE_Error(sprintf(__('The label property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
 		}
 
 
 		//the reference for this template pack
-		if ( ! isset( $this->dbref )  ) {
-			throw new EE_Error( sprintf( __('The dbref property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
+		if ( ! isset($this->dbref)) {
+			throw new EE_Error(sprintf(__('The dbref property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
 		}
 
 		//make sure dbref is safe
-		$this->dbref = str_replace( '-', '_', sanitize_key( $this->dbref ) );
+		$this->dbref = str_replace('-', '_', sanitize_key($this->dbref));
 
-		$should_be = 'EE_Messages_Template_Pack_' . str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $this->dbref ) ) );
+		$should_be = 'EE_Messages_Template_Pack_'.str_replace(' ', '_', ucwords(str_replace('_', ' ', $this->dbref)));
 
-		if ( $should_be !== $classname ) {
-			throw new EE_Error( sprintf( __('The name of the template pack instantiated class is "%s".  It should be "%s".  Make sure that the name of the template pack class matches is prepended with "EE_Messages_Template_Pack_" and appended with a sentence case iteration of the value for your template pack\'s dbref property.', 'event_espresso' ), $classname, $should_be ) );
+		if ($should_be !== $classname) {
+			throw new EE_Error(sprintf(__('The name of the template pack instantiated class is "%s".  It should be "%s".  Make sure that the name of the template pack class matches is prepended with "EE_Messages_Template_Pack_" and appended with a sentence case iteration of the value for your template pack\'s dbref property.', 'event_espresso'), $classname, $should_be));
 		}
 
 		//if _base_path is not set then throw an error because a base path string is needed.
-		if ( empty( $this->_base_path ) ) {
-			throw new EE_Error( sprintf( __('The _base_path property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
+		if (empty($this->_base_path)) {
+			throw new EE_Error(sprintf(__('The _base_path property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
 		}
 
 
 		//if _base_url is not set then throw an error because a  string is needed for variations.
-		if ( empty( $this->_base_url ) ) {
-			throw new EE_Error( sprintf( __('The _base_url property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
+		if (empty($this->_base_url)) {
+			throw new EE_Error(sprintf(__('The _base_url property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
 		}
 
 
 		//if $supports is not set then throw an error because that effectively means this template_pack does not have any templates!
-		if ( empty( $this->_supports ) ) {
-			throw new EE_Error( sprintf( __('The supports property is not set for %s.  Please ensure that is set for the class.', 'event_espresso' ), $classname ) );
+		if (empty($this->_supports)) {
+			throw new EE_Error(sprintf(__('The supports property is not set for %s.  Please ensure that is set for the class.', 'event_espresso'), $classname));
 		}
 
 
@@ -241,8 +241,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_templates( EE_messenger $messenger, EE_message_type $message_type ) {
-		return isset( $this->_templates[$messenger->name][$message_type->name] ) ? $this->_templates[$messenger->name][$message_type->name] : $this->_get_templates( $messenger, $message_type );
+	public function get_templates(EE_messenger $messenger, EE_message_type $message_type) {
+		return isset($this->_templates[$messenger->name][$message_type->name]) ? $this->_templates[$messenger->name][$message_type->name] : $this->_get_templates($messenger, $message_type);
 	}
 
 
@@ -259,7 +259,7 @@ 
 	 * @return array          Returns an multi-level associative array indexed by template context and field in the format:
 	 *                                array( 'context' => array( 'field' => 'value', 'another-field', 'value' ) );
 	 */
-	protected function _get_templates( EE_messenger $messenger, EE_message_type $message_type ) {
+	protected function _get_templates(EE_messenger $messenger, EE_message_type $message_type) {
 		$templates = array();
 
 		/**
@@ -278,28 +278,28 @@ 
 		$contexts = $message_type->get_contexts();
 
 
-		foreach ( $contexts as $context => $details ) {
-			foreach ( $fields as $field => $field_details ) {
-				if ( empty( $field_details ) )
+		foreach ($contexts as $context => $details) {
+			foreach ($fields as $field => $field_details) {
+				if (empty($field_details))
 					continue;
 				/**
 				 * is this a field array (linked to a main field)?
 				 */
-				if ( $field == 'extra'  ) {
-					foreach ( $field_details as $main_field => $sub_fields ) {
-						foreach ( $sub_fields as $sub_field => $sub_field_details ) {
+				if ($field == 'extra') {
+					foreach ($field_details as $main_field => $sub_fields) {
+						foreach ($sub_fields as $sub_field => $sub_field_details) {
 							//make sure that the template_field_ref matches what the main template field is for this template group.
 							$template_field_ref = $sub_field == 'main' ? $main_field : $sub_field;
-							$templates[ $context ][ $main_field ][ $sub_field ] = $this->_get_specific_template( $default_pack, $messenger, $message_type, $template_field_ref, $context );
+							$templates[$context][$main_field][$sub_field] = $this->_get_specific_template($default_pack, $messenger, $message_type, $template_field_ref, $context);
 						}
 					}
 				} else {
-					$templates[ $context ][ $field ] = $this->_get_specific_template( $default_pack, $messenger, $message_type, $field, $context );
+					$templates[$context][$field] = $this->_get_specific_template($default_pack, $messenger, $message_type, $field, $context);
 				}
 			}
 		}
 
-		$templates = apply_filters( 'FHEE__EE_Template_Pack___get_templates__templates', $templates, $messenger, $message_type, $this );
+		$templates = apply_filters('FHEE__EE_Template_Pack___get_templates__templates', $templates, $messenger, $message_type, $this);
 
 		$this->_templates[$messenger->name][$message_type->name] = $templates;
 		 return $templates;
@@ -317,22 +317,22 @@ 
 	 *
 	 * @return string          The template contents.
 	 */
-	protected function _get_specific_template( $default_pack, EE_messenger $messenger, EE_message_type $message_type, $field, $context ) {
+	protected function _get_specific_template($default_pack, EE_messenger $messenger, EE_message_type $message_type, $field, $context) {
 
 		//default templates
-		$default_templates = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_templates( $messenger, $message_type ) : array();
+		$default_templates = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_templates($messenger, $message_type) : array();
 
 		//first we allow for the $_base_path to be filtered.  However, we assign this to a new variable so that we have the original base_path as a fallback.
-		$filtered_base_path = apply_filters( 'FHEE__EE_Template_Pack___get_specific_template__filtered_base_path', $this->_base_path, $messenger, $message_type, $field, $context, $this );
+		$filtered_base_path = apply_filters('FHEE__EE_Template_Pack___get_specific_template__filtered_base_path', $this->_base_path, $messenger, $message_type, $field, $context, $this);
 
 		$master_templates = $message_type->get_master_templates();
-		$master_templates_mt = isset( $master_templates[$messenger->name] ) ? $master_templates[$messenger->name] : $message_type->name;
-		$full_path = $filtered_base_path . $messenger->name . '_' . $message_type->name . '_' . $field . '_' . $context . '.template.php';
-		$fallback_path = $filtered_base_path . $messenger->name . '_' . $message_type->name . '_' . $field . '.template.php';
-		$mt_defined_full_path = $filtered_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '_' . $context . '.template.php';
-		$mt_defined_fallback_path = $filtered_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '.template.php';
-		$base_defined_full_path = $this->_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '_' . $context . '.template.php';
-		$base_defined_fallback_path = $this->_base_path . $messenger->name . '_' . $master_templates_mt . '_' . $field . '.template.php';
+		$master_templates_mt = isset($master_templates[$messenger->name]) ? $master_templates[$messenger->name] : $message_type->name;
+		$full_path = $filtered_base_path.$messenger->name.'_'.$message_type->name.'_'.$field.'_'.$context.'.template.php';
+		$fallback_path = $filtered_base_path.$messenger->name.'_'.$message_type->name.'_'.$field.'.template.php';
+		$mt_defined_full_path = $filtered_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'_'.$context.'.template.php';
+		$mt_defined_fallback_path = $filtered_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'.template.php';
+		$base_defined_full_path = $this->_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'_'.$context.'.template.php';
+		$base_defined_fallback_path = $this->_base_path.$messenger->name.'_'.$master_templates_mt.'_'.$field.'.template.php';
 
 		/**
 		 * Template checks are done hierarchically in the following order:
@@ -346,28 +346,28 @@ 
 		 */
 
 
-		if ( is_readable( $full_path ) ) {
+		if (is_readable($full_path)) {
 			$actual_path = $full_path;
-		} elseif ( is_readable( $fallback_path ) ) {
+		} elseif (is_readable($fallback_path)) {
 			$actual_path = $fallback_path;
-		} elseif ( is_readable( $mt_defined_full_path ) ) {
+		} elseif (is_readable($mt_defined_full_path)) {
 			$actual_path = $mt_defined_full_path;
-		} elseif ( is_readable( $mt_defined_fallback_path ) ) {
+		} elseif (is_readable($mt_defined_fallback_path)) {
 			$actual_path = $mt_defined_fallback_path;
-		} elseif ( is_readable( $base_defined_full_path ) ) {
+		} elseif (is_readable($base_defined_full_path)) {
 			$actual_path = $base_defined_full_path;
-		} elseif ( is_readable( $base_defined_fallback_path ) ) {
+		} elseif (is_readable($base_defined_fallback_path)) {
 			$actual_path = $base_defined_fallback_path;
-		} else  {
+		} else {
 			$actual_path = '';
 		}
-		if ( empty( $actual_path ) ) {
-			$contents = isset( $default_templates[$context][$field] ) ? $default_templates[$context][$field] : '';
+		if (empty($actual_path)) {
+			$contents = isset($default_templates[$context][$field]) ? $default_templates[$context][$field] : '';
 		} else {
-			$contents = EEH_Template::display_template( $actual_path, array(), TRUE );
+			$contents = EEH_Template::display_template($actual_path, array(), TRUE);
 		}
 
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_specific_template__contents', $contents, $actual_path, $messenger, $message_type, $field, $context, $this );
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', $contents, $actual_path, $messenger, $message_type, $field, $context, $this);
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @return array
 	 */
 	public function get_supports() {
-		$supports = apply_filters( 'FHEE__' . get_class( $this ) . '__get_supports', $this->_supports );
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_supports', $supports, $this );
+		$supports = apply_filters('FHEE__'.get_class($this).'__get_supports', $this->_supports);
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_supports', $supports, $this);
 	}
 
 
@@ -398,11 +398,11 @@ 
 	 *
 	 * @return array|string
 	 */
-	public function get_default_variation_labels( $messenger = '' ) {
-		$label = empty( $messenger ) ? $this->_default_variation_labels : array();
-		$label = empty( $label ) && ! empty( $this->_default_variation_labels[$messenger] ) ? $this->_default_variation_labels[$messenger] : __('Default', 'event_espresso');
+	public function get_default_variation_labels($messenger = '') {
+		$label = empty($messenger) ? $this->_default_variation_labels : array();
+		$label = empty($label) && ! empty($this->_default_variation_labels[$messenger]) ? $this->_default_variation_labels[$messenger] : __('Default', 'event_espresso');
 
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_default_variation_labels', $label, $this->_default_variation_labels, $messenger );
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_default_variation_labels', $label, $this->_default_variation_labels, $messenger);
 	}
 
 
@@ -418,25 +418,25 @@ 
 	 * @param string $message_type if included then css variations matching the message_type are returned (must have $messenger set).  Otherwise the array of variations per message type are returned.  If message_type is provided but NOT the messenger, then just all variations for all messengers are returned.
 	 * @return array
 	 */
-	public function get_variations( $messenger = '', $message_type = '' ) {
-		$messenger_variations = ! empty( $messenger ) && isset( $this->_variations[$messenger] ) ? $this->_variations[$messenger] : array();
+	public function get_variations($messenger = '', $message_type = '') {
+		$messenger_variations = ! empty($messenger) && isset($this->_variations[$messenger]) ? $this->_variations[$messenger] : array();
 
 		//message_type provided? IF so, then we've requested a specific set of variations, so we need to make sure we set it as empty if that's not present.
-		$variations = !empty( $messenger ) && !empty( $message_type ) && isset( $messenger_variations[$message_type] ) ? $messenger_variations[$message_type] : array();
+		$variations = ! empty($messenger) && ! empty($message_type) && isset($messenger_variations[$message_type]) ? $messenger_variations[$message_type] : array();
 
 		//now let's account for the possibility we just want all the variations for a messenger (which is indicated by providing the messenger but not the message type).
-		$variations = empty( $variations ) && !empty( $messenger ) && empty( $message_type ) ? $messenger_variations : $variations;
+		$variations = empty($variations) && ! empty($messenger) && empty($message_type) ? $messenger_variations : $variations;
 
 		//filter per template pack and globally.
-		$variations = apply_filters( 'FHEE__' . get_class( $this ) . '__get_variations', $variations, $messenger, $message_type );
-		$variations = apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variations', $variations, $messenger, $message_type, $this );
+		$variations = apply_filters('FHEE__'.get_class($this).'__get_variations', $variations, $messenger, $message_type);
+		$variations = apply_filters('FHEE__EE_Messages_Template_Pack__get_variations', $variations, $messenger, $message_type, $this);
 
 		//prepend the _default_variation, but ONLY if we're returning the fully validated array.
-		if ( !empty( $messenger ) && !empty( $message_type ) && ! empty( $variations ) ) {
-			$variations = array( 'default' => $this->get_default_variation_labels( $messenger ) ) + $variations;
+		if ( ! empty($messenger) && ! empty($message_type) && ! empty($variations)) {
+			$variations = array('default' => $this->get_default_variation_labels($messenger)) + $variations;
 		}
 
-		return empty( $variations ) ? array( 'default' => $this->get_default_variation_labels('dft') ): $variations;
+		return empty($variations) ? array('default' => $this->get_default_variation_labels('dft')) : $variations;
 	}
 
 
@@ -457,39 +457,39 @@ 
 	 *
 	 * @return string The variation path or url (typically css reference)
 	 */
-	public function get_variation( $messenger, $message_type, $type, $variation, $url = true, $file_extension = '.css', $skip_filters = FALSE ) {
+	public function get_variation($messenger, $message_type, $type, $variation, $url = true, $file_extension = '.css', $skip_filters = FALSE) {
 
 		$base = $url ? $this->_base_url : $this->_base_path;
 		$base_path = $this->_base_path;
 
-		if ( ! $skip_filters ) {
-			$base =  apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variation__base_path_or_url', $base, $messenger, $message_type, $type, $variation, $url, $file_extension, $this );
-			$base_path = apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variation__base_path', $base_path, $messenger, $message_type, $type, $variation, FALSE, $file_extension, $this );
+		if ( ! $skip_filters) {
+			$base = apply_filters('FHEE__EE_Messages_Template_Pack__get_variation__base_path_or_url', $base, $messenger, $message_type, $type, $variation, $url, $file_extension, $this);
+			$base_path = apply_filters('FHEE__EE_Messages_Template_Pack__get_variation__base_path', $base_path, $messenger, $message_type, $type, $variation, FALSE, $file_extension, $this);
 		}
 
-		$default_pack = get_class( $this ) != 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : $this;
+		$default_pack = get_class($this) != 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : $this;
 
 		//possible variation paths considering whether message type is present or not in the file name.
-		$path_string = 'variations/' . $messenger . '_' . $message_type . '_'  . $type . '_' . $variation . $file_extension;
-		$default_path_string = 'variations/' . $messenger . '_' . $type . '_' . $variation . $file_extension;
+		$path_string = 'variations/'.$messenger.'_'.$message_type.'_'.$type.'_'.$variation.$file_extension;
+		$default_path_string = 'variations/'.$messenger.'_'.$type.'_'.$variation.$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 {
-			$variation_path = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_default_variation( $messenger, $message_type, $type, $url, $file_extension ) : '';
+			$variation_path = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_default_variation($messenger, $message_type, $type, $url, $file_extension) : '';
 		}
 
-		if ( $skip_filters ) {
+		if ($skip_filters) {
 			return $variation_path;
 		}
 
 		//filter result
-		$variation_path = apply_filters( 'FHEE__' . get_class( $this ) . '__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url );
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, $this );
+		$variation_path = apply_filters('FHEE__'.get_class($this).'__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url);
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_variation', $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, $this);
 	}
 
 
@@ -504,19 +504,19 @@ 
 	 *
 	 * @return string returns the path for the requested wrapper template.
 	 */
-	public function get_wrapper( $messenger, $type = 'main' ) {
-		$default_pack = get_class( $this ) !== 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : NULL;
+	public function get_wrapper($messenger, $type = 'main') {
+		$default_pack = get_class($this) !== 'EE_Messages_Template_Pack_Default' ? new EE_Messages_Template_Pack_Default() : NULL;
 
-		$path_string = $this->_base_path . $messenger . '_' . $type . '_wrapper.template.php';
+		$path_string = $this->_base_path.$messenger.'_'.$type.'_wrapper.template.php';
 
-		if ( is_readable( $path_string ) ) {
+		if (is_readable($path_string)) {
 			$template = $path_string;
 		} else {
-			$template = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_wrapper( $messenger, $type ) : '';
+			$template = $default_pack instanceof EE_Messages_Template_Pack_Default ? $default_pack->get_wrapper($messenger, $type) : '';
 		}
 
 		//filter
-		$template = apply_filters( 'FHEE__' . get_class( $this ) . '__get_wrapper', $template, $messenger, $type );
-		return apply_filters( 'FHEE__EE_Messages_Template_Pack__get_wrapper', $template, $messenger, $type, $this );
+		$template = apply_filters('FHEE__'.get_class($this).'__get_wrapper', $template, $messenger, $type);
+		return apply_filters('FHEE__EE_Messages_Template_Pack__get_wrapper', $template, $messenger, $type, $this);
 	}
 }

Doc Comments +1 added lines

@@ -314,6 +314,7 @@
 	 * @param EE_message_type                          $message_type
 	 * @param string                                   $field          The field reference for the specific template being looked up.
 	 * @param string                                   $context      The context reference for the specific template being looked up
+	 * @param EE_Messages_Template_Pack_Default|null $default_pack
 	 *
 	 * @return string          The template contents.
 	 */

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

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,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 is the default messages template pack.

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 Espresso 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 = '';

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

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

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <h5>[FNAME] [LNAME]</h5>
 <ul>
-	<li><strong><?php _e( 'Registration Code:', 'event_espresso' ); ?></strong> [REGISTRATION_CODE]</li>
-	<li><strong><?php _e( 'Tickets:', 'event_espresso' ); ?></strong></li>
+	<li><strong><?php _e('Registration Code:', 'event_espresso'); ?></strong> [REGISTRATION_CODE]</li>
+	<li><strong><?php _e('Tickets:', 'event_espresso'); ?></strong></li>
 </ul>
 <ul>
 	<li>[TICKET_LIST]</li>