eventespresso / event-espresso-core

core/libraries/messages/EE_message_type.lib.php

Indentation +2 added lines, -2 removed lines

@@ -864,8 +864,8 @@
 			//set the attendee array to blank on each loop;
 			$aee = array();
 			if ( isset( $this->_data->reg_obj )
-			     && ( $this->_data->reg_obj->attendee_ID() != $att_id )
-			     && $this->_single_message
+				 && ( $this->_data->reg_obj->attendee_ID() != $att_id )
+				 && $this->_single_message
 			) {
 				continue;
 			}

Spacing +80 added lines, -80 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');
 }
 
 
@@ -274,7 +274,7 @@ 
 	 *                                      EE_Base_Class_Object
 	 * @return mixed ( EE_Base_Class||EE_Base_Class[] )
 	 */
-	abstract protected function _get_data_for_context( $context, EE_Registration $registration, $id );
+	abstract protected function _get_data_for_context($context, EE_Registration $registration, $id);
 
 
 
@@ -301,7 +301,7 @@ 
 	 * @deprecated 4.9.0
 	 * @return int
 	 */
-	protected function _get_id_for_msg_url( $context, EE_Registration $registration ) {
+	protected function _get_id_for_msg_url($context, EE_Registration $registration) {
 		return 0;
 	}
 
@@ -330,7 +330,7 @@ 
 	 *                                  sending.
 	 * @since 4.9.0
 	 */
-	public function do_messenger_hooks( $messenger = null ) {
+	public function do_messenger_hooks($messenger = null) {
 		$this->_active_messenger = $messenger;
 		$this->_do_messenger_hooks();
 	}
@@ -379,10 +379,10 @@ 
 	 * @param mixed $data This sets the data property for the message type with the incoming data used for generating.
 	 * @return string (the reference for the data handler) (will be an empty string if could not be determined).
 	 */
-	public function get_data_handler( $data ) {
+	public function get_data_handler($data) {
 		$this->_data = $data;
 		$this->_set_data_handler();
-		return apply_filters( 'FHEE__EE_message_type__get_data_handler', $this->_data_handler, $this );
+		return apply_filters('FHEE__EE_message_type__get_data_handler', $this->_data_handler, $this);
 	}
 
 
@@ -419,26 +419,26 @@ 
 	 * @deprecated  4.9.0  Likely 4.9.10 or 4.10.0 will remove this method completely
 	 * @return string          generated url
 	 */
-	public function get_url_trigger( $context, $sending_messenger, EE_Registration $registration ) {
+	public function get_url_trigger($context, $sending_messenger, EE_Registration $registration) {
 		//validate context
 		//valid context?
-		if ( ! isset( $this->_contexts[ $context ] ) ) {
+		if ( ! isset($this->_contexts[$context])) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The context %s is not a valid context for %s.', 'event_espresso' ),
+					__('The context %s is not a valid context for %s.', 'event_espresso'),
 					$context,
-					get_class( $this )
+					get_class($this)
 				)
 			);
 		}
 		//valid sending_messenger?
 		$not_valid_msgr = false;
-		foreach ( $this->_with_messengers as $generating => $sendings ) {
-			if ( empty( $sendings ) || array_search( $sending_messenger, $sendings ) === false ) {
+		foreach ($this->_with_messengers as $generating => $sendings) {
+			if (empty($sendings) || array_search($sending_messenger, $sendings) === false) {
 				$not_valid_msgr = true;
 			}
 		}
-		if ( $not_valid_msgr ) {
+		if ($not_valid_msgr) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -446,7 +446,7 @@ 
 						'event_espresso'
 					),
 					$sending_messenger,
-					get_class( $this )
+					get_class($this)
 				)
 			);
 		}
@@ -457,7 +457,7 @@ 
 			$this->name,
 			$registration,
 			$this->_GRP_ID,
-			$this->_get_id_for_msg_url( $context, $registration )
+			$this->_get_id_for_msg_url($context, $registration)
 		);
 	}
 
@@ -476,26 +476,26 @@ 
 	 *                                      EE_Base_Class_Object
 	 * @return mixed (EE_Base_Class||EE_Base_Class[])
 	 */
-	public function get_data_for_context( $context, EE_Registration $registration, $id = 0 ) {
+	public function get_data_for_context($context, EE_Registration $registration, $id = 0) {
 		//valid context?
-		if ( ! isset( $this->_contexts[ $context ] ) ) {
+		if ( ! isset($this->_contexts[$context])) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The context %s is not a valid context for %s.', 'event_espresso' ),
+					__('The context %s is not a valid context for %s.', 'event_espresso'),
 					$context,
-					get_class( $this )
+					get_class($this)
 				)
 			);
 		}
 		//get data and apply global and class specific filters on it.
 		$data = apply_filters(
 			'FHEE__EE_message_type__get_data_for_context__data',
-			$this->_get_data_for_context( $context, $registration, $id ),
+			$this->_get_data_for_context($context, $registration, $id),
 			$this
 		);
-		$data = apply_filters( 'FHEE__' . get_class( $this ) . '__get_data_for_context__data', $data, $this );
+		$data = apply_filters('FHEE__'.get_class($this).'__get_data_for_context__data', $data, $this);
 		//if empty then something went wrong!
-		if ( empty( $data ) ) {
+		if (empty($data)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -539,7 +539,7 @@ 
 	 */
 	protected function _set_with_messengers() {
 		$this->_with_messengers = array(
-			'email' => array( 'html' ),
+			'email' => array('html'),
 		);
 	}
 
@@ -553,7 +553,7 @@ 
 	 */
 	public function with_messengers() {
 		return apply_filters(
-			'FHEE__EE_message_type__get_with_messengers__with_messengers__' . get_class( $this ),
+			'FHEE__EE_message_type__get_with_messengers__with_messengers__'.get_class($this),
 			$this->_with_messengers
 		);
 	}
@@ -580,7 +580,7 @@ 
 		$messengers = array()
 	) {
 		//we can also further refine the context by action (if present).
-		return $this->_get_admin_page_content( $page, $action, $extra, $messengers );
+		return $this->_get_admin_page_content($page, $action, $extra, $messengers);
 	}
 
 
@@ -615,10 +615,10 @@ 
 	public function get_master_templates() {
 		//first class specific filter then filter that by the global filter.
 		$master_templates = apply_filters(
-			'FHEE__' . get_class( $this ) . '__get_master_templates',
+			'FHEE__'.get_class($this).'__get_master_templates',
 			$this->_master_templates
 		);
-		return apply_filters( 'FHEE__EE_message_type__get_master_templates', $master_templates, $this );
+		return apply_filters('FHEE__EE_message_type__get_master_templates', $master_templates, $this);
 	}
 
 
@@ -632,20 +632,20 @@ 
 	 * @return array   An array indexed by context where each context is an array of EE_Messages_Addressee objects for
 	 *                                           that context
 	 */
-	public function get_addressees( EE_Messages_incoming_data $data, $context = '' ) {
+	public function get_addressees(EE_Messages_incoming_data $data, $context = '') {
 		//override _data
 		$this->_data = $data;
 		$addressees = array();
 		//if incoming context then limit to that context
-		if ( ! empty( $context ) ) {
-			$cntxt = ! empty( $this->_contexts[ $context ] ) ? $this->_contexts[ $context ] : '';
-			if ( ! empty( $cntxt ) ) {
+		if ( ! empty($context)) {
+			$cntxt = ! empty($this->_contexts[$context]) ? $this->_contexts[$context] : '';
+			if ( ! empty($cntxt)) {
 				$this->_contexts = array();
-				$this->_contexts[ $context ] = $cntxt;
+				$this->_contexts[$context] = $cntxt;
 			}
 		}
 		$this->_set_default_addressee_data();
-		if ( $this->_process_data() ) {
+		if ($this->_process_data()) {
 			$addressees = $this->_addressees;
 		}
 		return $addressees;
@@ -661,14 +661,14 @@ 
 	 */
 	protected function _process_data() {
 		//at a minimum, we NEED EE_Attendee objects.
-		if ( empty( $this->_data->attendees ) ) {
-			return false;  //there's no data to process!
+		if (empty($this->_data->attendees)) {
+			return false; //there's no data to process!
 		}
 		// process addressees for each context.  Child classes will have to have methods for
 		// each context defined to handle the processing of the data object within them
-		foreach ( $this->_contexts as $context => $details ) {
-			$xpctd_method = '_' . $context . '_addressees';
-			if ( ! method_exists( $this, $xpctd_method ) ) {
+		foreach ($this->_contexts as $context => $details) {
+			$xpctd_method = '_'.$context.'_addressees';
+			if ( ! method_exists($this, $xpctd_method)) {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -680,7 +680,7 @@ 
 					)
 				);
 			}
-			$this->_addressees[ $context ] = call_user_func( array( $this, $xpctd_method ) );
+			$this->_addressees[$context] = call_user_func(array($this, $xpctd_method));
 		}
 		return true; //data was processed successfully.
 	}
@@ -702,7 +702,7 @@ 
 			'grand_total_line_item'    => $this->_data->grand_total_line_item,
 			'txn'                      => $this->_data->txn,
 			'payments'                 => $this->_data->payments,
-			'payment'                  => isset( $this->_data->payment ) && $this->_data->payment instanceof EE_Payment
+			'payment'                  => isset($this->_data->payment) && $this->_data->payment instanceof EE_Payment
 				? $this->_data->payment
 				: null,
 			'reg_objs'                 => $this->_data->reg_objs,
@@ -715,7 +715,7 @@ 
 			'txn_status'               => $this->_data->txn_status,
 			'total_ticket_count'       => $this->_data->total_ticket_count,
 		);
-		if ( is_array( $this->_data->primary_attendee_data ) ) {
+		if (is_array($this->_data->primary_attendee_data)) {
 			$this->_default_addressee_data = array_merge(
 				$this->_default_addressee_data,
 				$this->_data->primary_attendee_data
@@ -759,24 +759,24 @@ 
 			'messenger',
 		);
 		$contexts = $this->get_contexts();
-		foreach ( $contexts as $context => $details ) {
-			$this->_valid_shortcodes[ $context ] = $all_shortcodes;
+		foreach ($contexts as $context => $details) {
+			$this->_valid_shortcodes[$context] = $all_shortcodes;
 			//make sure non admin context does not include the event_author shortcodes
-			if ( $context != 'admin' ) {
-				if ( ( $key = array_search( 'event_author', $this->_valid_shortcodes[ $context ] ) ) !== false ) {
-					unset( $this->_valid_shortcodes[ $context ][ $key ] );
+			if ($context != 'admin') {
+				if (($key = array_search('event_author', $this->_valid_shortcodes[$context])) !== false) {
+					unset($this->_valid_shortcodes[$context][$key]);
 				}
 			}
 		}
 		// make sure admin context does not include the recipient_details shortcodes
 		// IF we have admin context hooked in message types might not have that context.
-		if ( ! empty( $this->_valid_shortcodes['admin'] ) ) {
-			if ( ( $key = array_search( 'recipient_details', $this->_valid_shortcodes['admin'] ) ) !== false ) {
-				unset( $this->_valid_shortcodes['admin'][ $key ] );
+		if ( ! empty($this->_valid_shortcodes['admin'])) {
+			if (($key = array_search('recipient_details', $this->_valid_shortcodes['admin'])) !== false) {
+				unset($this->_valid_shortcodes['admin'][$key]);
 			}
 			//make sure admin context does not include the recipient_details shortcodes
-			if ( ( $key = array_search( 'recipient_list', $this->_valid_shortcodes['admin'] ) ) !== false ) {
-				unset( $this->_valid_shortcodes['admin'][ $key ] );
+			if (($key = array_search('recipient_list', $this->_valid_shortcodes['admin'])) !== false) {
+				unset($this->_valid_shortcodes['admin'][$key]);
 			}
 		}
 	}
@@ -789,9 +789,9 @@ 
 	 * @param  array $new_config array of valid shortcodes (by context)
 	 * @return void               sets valid_shortcodes property
 	 */
-	public function reset_valid_shortcodes_config( $new_config ) {
-		foreach ( $new_config as $context => $shortcodes ) {
-			$this->_valid_shortcodes[ $context ] = $shortcodes;
+	public function reset_valid_shortcodes_config($new_config) {
+		foreach ($new_config as $context => $shortcodes) {
+			$this->_valid_shortcodes[$context] = $shortcodes;
 		}
 	}
 
@@ -808,13 +808,13 @@ 
 		$addressees = array();
 		// first we need to get the event admin user id for all the events
 		// and setup an addressee object for each unique admin user.
-		foreach ( $this->_data->events as $line_ref => $event ) {
-			$admin_id = $this->_get_event_admin_id( $event['ID'] );
+		foreach ($this->_data->events as $line_ref => $event) {
+			$admin_id = $this->_get_event_admin_id($event['ID']);
 			//make sure we are just including the events that belong to this admin!
-			$admin_events[ $admin_id ][ $line_ref ] = $event;
+			$admin_events[$admin_id][$line_ref] = $event;
 		}
 		//k now we can loop through the event_admins and setup the addressee data.
-		foreach ( $admin_events as $admin_id => $event_details ) {
+		foreach ($admin_events as $admin_id => $event_details) {
 			$aee = array(
 				'user_id'        => $admin_id,
 				'events'         => $event_details,
@@ -822,8 +822,8 @@ 
 				'recipient_id'   => $admin_id,
 				'recipient_type' => 'WP_User',
 			);
-			$aee = array_merge( $this->_default_addressee_data, $aee );
-			$addressees[] = new EE_Messages_Addressee( $aee );
+			$aee = array_merge($this->_default_addressee_data, $aee);
+			$addressees[] = new EE_Messages_Addressee($aee);
 		}
 		return $addressees;
 	}
@@ -843,7 +843,7 @@ 
 		$aee['recipient_id'] = $aee['primary_att_obj'] instanceof EE_Attendee ? $aee['primary_att_obj']->ID() : 0;
 		$aee['recipient_type'] = 'Attendee';
 		//great now we can instantiate the $addressee object and return (as an array);
-		$add[] = new EE_Messages_Addressee( $aee );
+		$add[] = new EE_Messages_Addressee($aee);
 		return $add;
 	}
 
@@ -860,25 +860,25 @@ 
 		//we just have to loop through the attendees.  We'll also set the attached events for each attendee.
 		//use to verify unique attendee emails... we don't want to sent multiple copies to the same attendee do we?
 		$already_processed = array();
-		foreach ( $this->_data->attendees as $att_id => $details ) {
+		foreach ($this->_data->attendees as $att_id => $details) {
 			//set the attendee array to blank on each loop;
 			$aee = array();
-			if ( isset( $this->_data->reg_obj )
-			     && ( $this->_data->reg_obj->attendee_ID() != $att_id )
+			if (isset($this->_data->reg_obj)
+			     && ($this->_data->reg_obj->attendee_ID() != $att_id)
 			     && $this->_single_message
 			) {
 				continue;
 			}
 			// is $this->_regs_for_sending present?
 			// If so, let's make sure we ONLY generate addressee for registrations in that array.
-			if ( ! empty( $this->_regs_for_sending ) && is_array( $this->_regs_for_sending ) ) {
-				$regs_allowed = array_intersect_key( array_flip( $this->_regs_for_sending ), $details['reg_objs'] );
-				if ( empty( $regs_allowed ) ) {
+			if ( ! empty($this->_regs_for_sending) && is_array($this->_regs_for_sending)) {
+				$regs_allowed = array_intersect_key(array_flip($this->_regs_for_sending), $details['reg_objs']);
+				if (empty($regs_allowed)) {
 					continue;
 				}
 			}
 			if (
-				in_array( $details['attendee_email'], $already_processed )
+				in_array($details['attendee_email'], $already_processed)
 				&& apply_filters(
 					'FHEE__EE_message_type___attendee_addressees__prevent_duplicate_email_sends',
 					true,
@@ -889,14 +889,14 @@ 
 				continue;
 			}
 			$already_processed[] = $details['attendee_email'];
-			foreach ( $details as $item => $value ) {
-				$aee[ $item ] = $value;
-				if ( $item == 'line_ref' ) {
-					foreach ( $value as $event_id ) {
-						$aee['events'][ $event_id ] = $this->_data->events[ $event_id ];
+			foreach ($details as $item => $value) {
+				$aee[$item] = $value;
+				if ($item == 'line_ref') {
+					foreach ($value as $event_id) {
+						$aee['events'][$event_id] = $this->_data->events[$event_id];
 					}
 				}
-				if ( $item == 'attendee_email' ) {
+				if ($item == 'attendee_email') {
 					$aee['attendee_email'] = $value;
 				}
 				/*if ( $item == 'registration_id' ) {
@@ -905,13 +905,13 @@ 
 			}
 			// note the FIRST reg object in this array is the one
 			// we'll use for this attendee as the primary registration for this attendee.
-			$aee['reg_obj'] = reset( $this->_data->attendees[ $att_id ]['reg_objs'] );
+			$aee['reg_obj'] = reset($this->_data->attendees[$att_id]['reg_objs']);
 			$aee['attendees'] = $this->_data->attendees;
 			$aee['recipient_id'] = $att_id;
 			$aee['recipient_type'] = 'Attendee';
 			//merge in the primary attendee data
-			$aee = array_merge( $this->_default_addressee_data, $aee );
-			$add[] = new EE_Messages_Addressee( $aee );
+			$aee = array_merge($this->_default_addressee_data, $aee);
+			$add[] = new EE_Messages_Addressee($aee);
 		}
 		return $add;
 	}
@@ -922,8 +922,8 @@ 
 	 * @param $event_id
 	 * @return int
 	 */
-	protected function _get_event_admin_id( $event_id ) {
-		$event = EEM_Event::instance()->get_one_by_ID( $event_id );
+	protected function _get_event_admin_id($event_id) {
+		$event = EEM_Event::instance()->get_one_by_ID($event_id);
 		return $event instanceof EE_Event ? $event->wp_user() : 0;
 	}
 

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

Spacing +7 added lines, -7 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');
 }
 
 
@@ -260,7 +260,7 @@ 
 	 * @param array $addressee_data We're expecting an incoming array of data that will be used to fill the properties
 	 *                              for the object.
 	 */
-	public function __construct( $addressee_data ) {
+	public function __construct($addressee_data) {
 		$this->_data = $addressee_data;
 		$this->_set_properties();
 	}
@@ -275,15 +275,15 @@ 
 	 * @return void.
 	 */
 	protected function _set_properties() {
-		foreach ( $this->_data as $prop => $value ) {
-			if ( property_exists( $this, $prop ) ) {
+		foreach ($this->_data as $prop => $value) {
+			if (property_exists($this, $prop)) {
 				$this->{$prop} = $value;
 			}
 		}
 		//if user_id present we'll use this to set the fname and lname and admin_email.
-		if ( ! empty( $this->user_id ) ) {
+		if ( ! empty($this->user_id)) {
 			$this->user_id = (int) $this->user_id;
-			$user = get_userdata( $this->user_id );
+			$user = get_userdata($this->user_id);
 			$this->fname = $user->user_firstname;
 			$this->lname = $user->user_lastname;
 			$this->admin_email = $user->user_email;

core/libraries/shortcodes/EE_Transaction_Shortcodes.lib.php

Spacing +162 added lines, -162 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -40,50 +40,50 @@ 
 
 
 	protected function _init_props() {
-		$this->label = esc_html__( 'Transaction Shortcodes', 'event_espresso' );
-		$this->description = esc_html__( 'All shortcodes specific to transaction related data', 'event_espresso' );
+		$this->label = esc_html__('Transaction Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to transaction related data', 'event_espresso');
 		$this->_shortcodes = array(
-			'[TXN_ID]' => esc_html__( 'The transaction id for the purchase.', 'event_espresso' ),
-			'[PAYMENT_URL]' => esc_html__( 'This is a link to make a payment for the event', 'event_espresso' ),
-			'[PAYMENT_LINK_IF_NEEDED_*]' => esc_html__( 'This is a special dynamic shortcode that allows one to insert a payment link conditional on there being amount owing on the transaction. Three params are available on this shortcode:', 'event_espresso' ) . '<ul>'
-				. '<li>' . sprintf( esc_html__( '%sclass:%s This can be used to indicate css class is given to the containing css element (default is "callout").', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( esc_html__( '%scustom_text:%s This should be a sprintf format text string (with %%s for where the hyperlink tags go) that is used for the generated link text (The default is "You can %%smake a payment here »%%s.)', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( esc_html__( '%scontainer_tag:%s Use this to indicate what container tag you want surrounding the payment link (default is "p").', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
+			'[TXN_ID]' => esc_html__('The transaction id for the purchase.', 'event_espresso'),
+			'[PAYMENT_URL]' => esc_html__('This is a link to make a payment for the event', 'event_espresso'),
+			'[PAYMENT_LINK_IF_NEEDED_*]' => esc_html__('This is a special dynamic shortcode that allows one to insert a payment link conditional on there being amount owing on the transaction. Three params are available on this shortcode:', 'event_espresso').'<ul>'
+				. '<li>'.sprintf(esc_html__('%sclass:%s This can be used to indicate css class is given to the containing css element (default is "callout").', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(esc_html__('%scustom_text:%s This should be a sprintf format text string (with %%s for where the hyperlink tags go) that is used for the generated link text (The default is "You can %%smake a payment here »%%s.)', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(esc_html__('%scontainer_tag:%s Use this to indicate what container tag you want surrounding the payment link (default is "p").', 'event_espresso'), '<strong>', '</strong>').'</li>'
 				. '</ul>',
-			'[PAYMENT_DUE_DATE_*]' => esc_html__( 'This is a special dynamic shortcode that allows one to output a payment due date.  It will only result in a date shown if there is money owing.  Three parameters are available on this shortcode:', 'event_espresso' )
+			'[PAYMENT_DUE_DATE_*]' => esc_html__('This is a special dynamic shortcode that allows one to output a payment due date.  It will only result in a date shown if there is money owing.  Three parameters are available on this shortcode:', 'event_espresso')
 				. '<ul>'
-				. '<li>' . sprintf( esc_html__( '%sformat:%s This is used to indicate what format the date is in.  Default is whatever is set as date formats for your website.', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( esc_html__( '%sdays_until_due:%s This is the number of days form the transaction creation date that the payment is due.  Defaults to 30.', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( esc_html__( '%sprefix_text:%s You can use this to indicate what text will prefix the date string.  Defaults to "Payment in full due by:"', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>',
-			'[INVOICE_LINK]' => esc_html__( 'This is a full html link to the invoice', 'event_espresso' ),
-			'[INVOICE_URL]' => esc_html__( 'This is just the url for the invoice', 'event_espresso' ),
-			'[INVOICE_LOGO_URL]' => esc_html__( 'This returns the url for the logo uploaded via the invoice settings page.', 'event_espresso' ),
-			'[INVOICE_LOGO]' => esc_html__( 'This returns the logo uploaded via the invoice settings page wrapped in img_tags and with a "logo screen" classes. The image size is also set in the img tags automatically to match the uploaded logo.', 'event_espresso' ),
-			'[INVOICE_PAYEE_NAME]' => esc_html__( 'This will parse to either: the value of the "Company Name" field in the invoice payment method settings; if that is blank, then the value of the Company Name in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso' ),
-			'[INVOICE_PAYEE_ADDRESS]' => esc_html__( 'This will parse to either: the value of the "Company Address" field in the invoice payment method settings; if that is blank, then the value of the Company Address in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso' ),
-			'[INVOICE_PAYMENT_INSTRUCTIONS]' => esc_html__( 'This will parse to the value of the "Payment Instructions" field found on the Invoice payment methods settings page', 'event_espresso' ),
-			'[INVOICE_PAYEE_EMAIL]' => esc_html__( 'This will parse to either: the value of the "Company Email" field in the invoice payment method settings; if that is blank, then the value of the Company Email in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso' ),
-			'[INVOICE_PAYEE_TAX_NUMBER_*]' => sprintf( esc_html__( 'This will parse to either: the value of the "Company Tax Number" field in the invoice payment method settings; if that is blank, then the value of the Company Tax Number in the "Your Organization Settings", if that is blank then an empty string. Note this is also a special dynamic shortcode. You can use the "prefix" parameter to indicate what text you want to use as a prefix before this tax number.  It defaults to "VAT/Tax Number:". To change this prefix you do the following format for this shortcode: %1$s[INVOICE_PAYEE_TAX_NUMBER_* prefix="GST:"]%2$s and that will output: GST: 12345t56.  If you have no tax number in your settings, then no prefix will be output either.', 'event_espresso' ), '<code>', '</code>' ),
-			'[TOTAL_COST]' => esc_html__( 'The total cost for the transaction', 'event_espresso' ),
-			'[TXN_STATUS]' => esc_html__( 'The transaction status for the transaction.', 'event_espresso' ),
-			'[TXN_STATUS_ID]' => esc_html__( 'The ID representing the transaction status as saved in the db.  This tends to be useful for including with css classes for styling certain statuses differently from others.', 'event_espresso' ),
-			'[PAYMENT_STATUS]' => esc_html__( 'The transaction status for the transaction. This parses to the same value as the [TXN_STATUS] shortcode and still remains here for legacy support.', 'event_espresso' ),
-			'[PAYMENT_GATEWAY]' => esc_html__( 'The payment gateway used for the transaction', 'event_espresso' ),
-			'[AMOUNT_PAID]' => esc_html__( 'The amount paid or refunded.  This will only have a value if there was a payment or refund at the time of generating the message.', 'event_espresso' ),
-			'[LAST_AMOUNT_PAID]' => esc_html__( 'This is the last payment or refund made on the transaction related to the message being generated.', 'event_espresso' ),
-			'[TOTAL_AMOUNT_PAID]' => esc_html__( 'This parses to the total amount paid over all payments', 'event_espresso' ),
-			'[TOTAL_OWING]' => esc_html__( 'The total owing on a transaction with no attributes.', 'event_espresso' ),
-			'[TXN_SUBTOTAL]' => esc_html__( 'The subtotal for all txn line items.', 'event_espresso' ),
-			'[TXN_TAX_SUBTOTAL]' => esc_html__( 'The subtotal for all tax line items.', 'event_espresso' ),
-			'[OWING_STATUS_MESSAGE_*]' => esc_html__( 'A dynamic shortcode for adjusting how total owing gets shown. The acceptable attributes on the shortcode are:', 'event_espresso' ) . '<p></ul>' .
-				'<li><strong>still_owing</strong>:' . esc_html__( 'If the transaction is not paid in full, then whatever is set for this attribute is shown (otherwise its just the amount owing). The default is:', 'event_espresso' ) . sprintf( esc_html__( '%sPlease make a payment.%s', 'event_espresso' ),  '<a href="[PAYMENT_URL]" class="noPrint">', '</a>' ) . '</li>' .
-				'<li><strong>none_owing</strong>:' . esc_html__( 'If the transaction is paid in full, then you can indicate how this gets displayed.  Note, that it defaults to just be the total owing.', 'event_espresso' ) . '</li></ul></p>',
-			'[TXN_TOTAL_TICKETS]' => esc_html__( 'The total number of all tickets purchased in a transaction', 'event_espresso' ),
-			'[TKT_QTY_PURCHASED]' => sprintf( esc_html__( 'The total number of all tickets purchased in a transaction. %1$sNOTE: This shortcode is good to use in the "[TICKET_LIST]" field but has been deprecated from all other contexts in favor of the more explicit [TXN_TOTAL_TICKETS] shortcode.%2$s', 'event_espresso' ), '<strong>', '</strong>' ),
-			'[TRANSACTION_ADMIN_URL]' => esc_html__( 'The url to the admin page for this transaction', 'event_espresso' ),
-			'[RECEIPT_URL]' => esc_html__( 'This parses to the generated url for retrieving the receipt for the transaction', 'event_espresso' ),
-			'[INVOICE_RECEIPT_SWITCHER_URL]' => esc_html__( 'This parses to the url that will switch to the receipt if an invoice is displayed, and switch to the invoice if receipt is displayed. If a message type OTHER than invoice or receipt is displayed then this will just return the url for the invoice. If the related message type is not active  then will parse to an empty string.', 'event_espresso' ),
-			'[INVOICE_RECEIPT_SWITCHER_BUTTON]' => sprintf( esc_html__( 'The same as %1$s[INVOICE_RECEIPT_SWITCHER_URL]%2$s except this returns the html for a button linked to the invoice or receipt.', 'event_espresso' ), '<code>', '</code>' )
+				. '<li>'.sprintf(esc_html__('%sformat:%s This is used to indicate what format the date is in.  Default is whatever is set as date formats for your website.', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(esc_html__('%sdays_until_due:%s This is the number of days form the transaction creation date that the payment is due.  Defaults to 30.', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(esc_html__('%sprefix_text:%s You can use this to indicate what text will prefix the date string.  Defaults to "Payment in full due by:"', 'event_espresso'), '<strong>', '</strong>').'</li>',
+			'[INVOICE_LINK]' => esc_html__('This is a full html link to the invoice', 'event_espresso'),
+			'[INVOICE_URL]' => esc_html__('This is just the url for the invoice', 'event_espresso'),
+			'[INVOICE_LOGO_URL]' => esc_html__('This returns the url for the logo uploaded via the invoice settings page.', 'event_espresso'),
+			'[INVOICE_LOGO]' => esc_html__('This returns the logo uploaded via the invoice settings page wrapped in img_tags and with a "logo screen" classes. The image size is also set in the img tags automatically to match the uploaded logo.', 'event_espresso'),
+			'[INVOICE_PAYEE_NAME]' => esc_html__('This will parse to either: the value of the "Company Name" field in the invoice payment method settings; if that is blank, then the value of the Company Name in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso'),
+			'[INVOICE_PAYEE_ADDRESS]' => esc_html__('This will parse to either: the value of the "Company Address" field in the invoice payment method settings; if that is blank, then the value of the Company Address in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso'),
+			'[INVOICE_PAYMENT_INSTRUCTIONS]' => esc_html__('This will parse to the value of the "Payment Instructions" field found on the Invoice payment methods settings page', 'event_espresso'),
+			'[INVOICE_PAYEE_EMAIL]' => esc_html__('This will parse to either: the value of the "Company Email" field in the invoice payment method settings; if that is blank, then the value of the Company Email in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso'),
+			'[INVOICE_PAYEE_TAX_NUMBER_*]' => sprintf(esc_html__('This will parse to either: the value of the "Company Tax Number" field in the invoice payment method settings; if that is blank, then the value of the Company Tax Number in the "Your Organization Settings", if that is blank then an empty string. Note this is also a special dynamic shortcode. You can use the "prefix" parameter to indicate what text you want to use as a prefix before this tax number.  It defaults to "VAT/Tax Number:". To change this prefix you do the following format for this shortcode: %1$s[INVOICE_PAYEE_TAX_NUMBER_* prefix="GST:"]%2$s and that will output: GST: 12345t56.  If you have no tax number in your settings, then no prefix will be output either.', 'event_espresso'), '<code>', '</code>'),
+			'[TOTAL_COST]' => esc_html__('The total cost for the transaction', 'event_espresso'),
+			'[TXN_STATUS]' => esc_html__('The transaction status for the transaction.', 'event_espresso'),
+			'[TXN_STATUS_ID]' => esc_html__('The ID representing the transaction status as saved in the db.  This tends to be useful for including with css classes for styling certain statuses differently from others.', 'event_espresso'),
+			'[PAYMENT_STATUS]' => esc_html__('The transaction status for the transaction. This parses to the same value as the [TXN_STATUS] shortcode and still remains here for legacy support.', 'event_espresso'),
+			'[PAYMENT_GATEWAY]' => esc_html__('The payment gateway used for the transaction', 'event_espresso'),
+			'[AMOUNT_PAID]' => esc_html__('The amount paid or refunded.  This will only have a value if there was a payment or refund at the time of generating the message.', 'event_espresso'),
+			'[LAST_AMOUNT_PAID]' => esc_html__('This is the last payment or refund made on the transaction related to the message being generated.', 'event_espresso'),
+			'[TOTAL_AMOUNT_PAID]' => esc_html__('This parses to the total amount paid over all payments', 'event_espresso'),
+			'[TOTAL_OWING]' => esc_html__('The total owing on a transaction with no attributes.', 'event_espresso'),
+			'[TXN_SUBTOTAL]' => esc_html__('The subtotal for all txn line items.', 'event_espresso'),
+			'[TXN_TAX_SUBTOTAL]' => esc_html__('The subtotal for all tax line items.', 'event_espresso'),
+			'[OWING_STATUS_MESSAGE_*]' => esc_html__('A dynamic shortcode for adjusting how total owing gets shown. The acceptable attributes on the shortcode are:', 'event_espresso').'<p></ul>'.
+				'<li><strong>still_owing</strong>:'.esc_html__('If the transaction is not paid in full, then whatever is set for this attribute is shown (otherwise its just the amount owing). The default is:', 'event_espresso').sprintf(esc_html__('%sPlease make a payment.%s', 'event_espresso'), '<a href="[PAYMENT_URL]" class="noPrint">', '</a>').'</li>'.
+				'<li><strong>none_owing</strong>:'.esc_html__('If the transaction is paid in full, then you can indicate how this gets displayed.  Note, that it defaults to just be the total owing.', 'event_espresso').'</li></ul></p>',
+			'[TXN_TOTAL_TICKETS]' => esc_html__('The total number of all tickets purchased in a transaction', 'event_espresso'),
+			'[TKT_QTY_PURCHASED]' => sprintf(esc_html__('The total number of all tickets purchased in a transaction. %1$sNOTE: This shortcode is good to use in the "[TICKET_LIST]" field but has been deprecated from all other contexts in favor of the more explicit [TXN_TOTAL_TICKETS] shortcode.%2$s', 'event_espresso'), '<strong>', '</strong>'),
+			'[TRANSACTION_ADMIN_URL]' => esc_html__('The url to the admin page for this transaction', 'event_espresso'),
+			'[RECEIPT_URL]' => esc_html__('This parses to the generated url for retrieving the receipt for the transaction', 'event_espresso'),
+			'[INVOICE_RECEIPT_SWITCHER_URL]' => esc_html__('This parses to the url that will switch to the receipt if an invoice is displayed, and switch to the invoice if receipt is displayed. If a message type OTHER than invoice or receipt is displayed then this will just return the url for the invoice. If the related message type is not active  then will parse to an empty string.', 'event_espresso'),
+			'[INVOICE_RECEIPT_SWITCHER_BUTTON]' => sprintf(esc_html__('The same as %1$s[INVOICE_RECEIPT_SWITCHER_URL]%2$s except this returns the html for a button linked to the invoice or receipt.', 'event_espresso'), '<code>', '</code>')
 			);
 	}
 
@@ -94,40 +94,40 @@ 
 	 * @param  string $shortcode the shortcode to be parsed.
 	 * @return string parsed shortcode
 	 */
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 		//attempt to get the transaction.  Since this is potentially used in more fields, we may have to look in the _extra_data for the transaction.
 		$transaction = $this->_data->txn instanceof EE_Transaction ? $this->_data->txn : null;
-		$transaction = ! $transaction instanceof EE_Transaction && is_array( $this->_extra_data ) &&  isset( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->txn: $transaction;
+		$transaction = ! $transaction instanceof EE_Transaction && is_array($this->_extra_data) && isset($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->txn : $transaction;
 
 		//payment
 		$payment = $this->_data->payment instanceof EE_Payment ? $this->_data->payment : null;
-		$payment = ! $payment instanceof EE_Payment && is_array( $this->_extra_data ) &&  isset( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->payment: $payment;
+		$payment = ! $payment instanceof EE_Payment && is_array($this->_extra_data) && isset($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->payment : $payment;
 
 
-		if ( ! $transaction instanceof EE_Transaction ) {
+		if ( ! $transaction instanceof EE_Transaction) {
 			return '';
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[TXN_ID]' :
 				return $transaction->ID();
 				break;
 
 			case '[PAYMENT_URL]' :
 				$payment_url = $transaction->payment_overview_url();
-				return empty( $payment_url ) ? esc_html__( 'http://dummypaymenturlforpreview.com', 'event_espresso' ) : $payment_url;
+				return empty($payment_url) ? esc_html__('http://dummypaymenturlforpreview.com', 'event_espresso') : $payment_url;
 				break;
 
 			case '[INVOICE_LINK]' :
 				$invoice_url = $transaction->invoice_url();
-				$invoice_url = empty( $invoice_url ) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
-				return sprintf( esc_html__( '%sClick here for Invoice%s', 'event_espresso' ), '<a href="' . $invoice_url . '">', '</a>' );
+				$invoice_url = empty($invoice_url) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
+				return sprintf(esc_html__('%sClick here for Invoice%s', 'event_espresso'), '<a href="'.$invoice_url.'">', '</a>');
 				break; /**/
 
 			case '[INVOICE_URL]' :
 				$invoice_url = $transaction->invoice_url();
-				return empty( $invoice_url ) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
+				return empty($invoice_url) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
 				break;
 
 			case '[INVOICE_LOGO_URL]' :
@@ -135,7 +135,7 @@ 
 				break;
 
 			case '[INVOICE_LOGO]' :
-				return $this->_get_invoice_logo( true );
+				return $this->_get_invoice_logo(true);
 				break;
 
 			case '[INVOICE_PAYEE_NAME]' :
@@ -157,18 +157,18 @@ 
 
 			case '[TOTAL_COST]' :
 				$total = $transaction->total();
-				return ! empty($total) ? EEH_Template::format_currency( $total ) : '';
+				return ! empty($total) ? EEH_Template::format_currency($total) : '';
 				break;
 
 			case '[PAYMENT_STATUS]' :
 				$status = $transaction->pretty_status();
-				return ! empty($status) ? $status : esc_html__( 'Unknown', 'event_espresso' );
+				return ! empty($status) ? $status : esc_html__('Unknown', 'event_espresso');
 				break; /**/
 
 			// note the [payment_status] shortcode is kind of misleading because payment status might be different from txn status so I'm adding this here for clarity.
 			case '[TXN_STATUS]':
 				$status = $transaction->pretty_status();
-				return ! empty( $status ) ? $status : esc_html__( 'Unknown', 'event_espresso' );
+				return ! empty($status) ? $status : esc_html__('Unknown', 'event_espresso');
 				break;
 
 			case '[TXN_STATUS_ID]' :
@@ -176,36 +176,36 @@ 
 				break;
 
 			case '[PAYMENT_GATEWAY]' :
-				return $this->_get_payment_gateway( $transaction );
+				return $this->_get_payment_gateway($transaction);
 				break;
 
 			case '[AMOUNT_PAID]' :
 				return $payment instanceof EE_Payment
-					? EEH_Template::format_currency( $payment->amount() )
-					: EEH_Template::format_currency( 0 );
+					? EEH_Template::format_currency($payment->amount())
+					: EEH_Template::format_currency(0);
 				break;
 
 			case '[LAST_AMOUNT_PAID]' :
 				$last_payment = $transaction->last_payment();
 				return $last_payment instanceof EE_Payment
-					? EEH_Template::format_currency( $last_payment->amount() )
-					: EEH_Template::format_currency( 0 );
+					? EEH_Template::format_currency($last_payment->amount())
+					: EEH_Template::format_currency(0);
 
 			case '[TOTAL_AMOUNT_PAID]' :
-				return EEH_Template::format_currency( $transaction->paid() );
+				return EEH_Template::format_currency($transaction->paid());
 				break;
 
 			case '[TOTAL_OWING]' :
 				$total_owing = $transaction->remaining();
-				return EEH_Template::format_currency( $total_owing );
+				return EEH_Template::format_currency($total_owing);
 				break;
 
 			case '[TXN_SUBTOTAL]' :
-				return EEH_Template::format_currency( $this->_get_subtotal() );
+				return EEH_Template::format_currency($this->_get_subtotal());
 				break;
 
 			case '[TXN_TAX_SUBTOTAL]' :
-				return EEH_Template::format_currency( $this->_get_subtotal( true ) );
+				return EEH_Template::format_currency($this->_get_subtotal(true));
 				break;
 
 			case '[TKT_QTY_PURCHASED]' :
@@ -214,9 +214,9 @@ 
 				break;
 
 			case '[TRANSACTION_ADMIN_URL]' :
-				require_once EE_CORE . 'admin/EE_Admin_Page.core.php';
-				$query_args = array( 'page' => 'espresso_transactions', 'action' => 'view_transaction', 'TXN_ID' => $transaction->ID() );
-				$url = EE_Admin_Page::add_query_args_and_nonce( $query_args, admin_url( 'admin.php' ) );
+				require_once EE_CORE.'admin/EE_Admin_Page.core.php';
+				$query_args = array('page' => 'espresso_transactions', 'action' => 'view_transaction', 'TXN_ID' => $transaction->ID());
+				$url = EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php'));
 				return $url;
 				break;
 
@@ -224,14 +224,14 @@ 
 				//get primary_registration
 				$reg = $this->_data->primary_reg_obj;
 
-				if ( ! $reg instanceof EE_Registration ) {
+				if ( ! $reg instanceof EE_Registration) {
 					return '';
 				}
 				return $reg->receipt_url();
 				break;
 
 			case '[INVOICE_RECEIPT_SWITCHER_URL]' :
-				return $this->_get_invoice_receipt_switcher( false );
+				return $this->_get_invoice_receipt_switcher(false);
 				break;
 
 			case '[INVOICE_RECEIPT_SWITCHER_BUTTON]' :
@@ -241,20 +241,20 @@ 
 
 		}
 
-		if ( strpos( $shortcode, '[OWING_STATUS_MESSAGE_*' ) !== false ) {
-			return $this->_get_custom_total_owing( $shortcode );
+		if (strpos($shortcode, '[OWING_STATUS_MESSAGE_*') !== false) {
+			return $this->_get_custom_total_owing($shortcode);
 		}
 
-		if ( strpos( $shortcode, '[INVOICE_PAYEE_TAX_NUMBER_*' ) !== false ) {
-			return $this->_get_invoice_payee_tax_number( $shortcode );
+		if (strpos($shortcode, '[INVOICE_PAYEE_TAX_NUMBER_*') !== false) {
+			return $this->_get_invoice_payee_tax_number($shortcode);
 		}
 
-		if ( strpos( $shortcode, '[PAYMENT_LINK_IF_NEEDED_*' ) !== false ) {
-			return $this->_get_payment_link_if_needed( $shortcode );
+		if (strpos($shortcode, '[PAYMENT_LINK_IF_NEEDED_*') !== false) {
+			return $this->_get_payment_link_if_needed($shortcode);
 		}
 
-		if ( strpos( $shortcode, '[PAYMENT_DUE_DATE_*' ) !== false ) {
-			return $this->_get_payment_due_date( $shortcode, $transaction );
+		if (strpos($shortcode, '[PAYMENT_DUE_DATE_*') !== false) {
+			return $this->_get_payment_due_date($shortcode, $transaction);
 		}
 
 		return '';
@@ -271,19 +271,19 @@ 
 	 *
 	 * @return string parsed.
 	 */
-	private function _get_custom_total_owing( $shortcode ) {
-		$valid_shortcodes = array( 'transaction' );
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
+	private function _get_custom_total_owing($shortcode) {
+		$valid_shortcodes = array('transaction');
+		$attrs = $this->_get_shortcode_attrs($shortcode);
 
 		//ensure default is set.
 		$addressee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
 		$total_owing = $addressee instanceof EE_Messages_Addressee && $addressee->txn instanceof EE_Transaction ? $addressee->txn->remaining() : 0;
 
-		if ( $total_owing > 0 ) {
-			$owing_content = ! empty( $attrs['still_owing'] ) ? $attrs['still_owing'] : sprintf( esc_html__( '%sPlease make a payment.%s', 'event_espresso' ),  '<a href="[PAYMENT_URL]" class="noPrint">', '</a>' );
-			$owing_content = $this->_shortcode_helper->parse_message_template( $owing_content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
+		if ($total_owing > 0) {
+			$owing_content = ! empty($attrs['still_owing']) ? $attrs['still_owing'] : sprintf(esc_html__('%sPlease make a payment.%s', 'event_espresso'), '<a href="[PAYMENT_URL]" class="noPrint">', '</a>');
+			$owing_content = $this->_shortcode_helper->parse_message_template($owing_content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message);
 		} else {
-			$owing_content = ! empty( $attrs['none_owing']) ? $attrs['none_owing'] : '';
+			$owing_content = ! empty($attrs['none_owing']) ? $attrs['none_owing'] : '';
 		}
 
 		return $owing_content;
@@ -295,8 +295,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return string
 	 */
-	private function _get_payment_gateway( $transaction ) {
-		$pm = $this->_get_payment_method( $transaction );
+	private function _get_payment_gateway($transaction) {
+		$pm = $this->_get_payment_method($transaction);
 		return $pm instanceof EE_Payment_Method ? $pm->name() : '';
 	}
 
@@ -311,37 +311,37 @@ 
 	 *
 	 * @return string url or html
 	 */
-	private function _get_invoice_logo( $img_tags = false ) {
+	private function _get_invoice_logo($img_tags = false) {
 		//try to get the invoice payment method's logo for this transaction image first
 		$pm = $this->_get_payment_method();
-		if ( $pm instanceof EE_Payment_Method ){
-			$invoice_logo_url = $pm->get_extra_meta( 'pdf_logo_image', true );
+		if ($pm instanceof EE_Payment_Method) {
+			$invoice_logo_url = $pm->get_extra_meta('pdf_logo_image', true);
 		} else {
 			$invoice_logo_url = null;
 		}
-		if ( empty( $invoice_logo_url ) ){
+		if (empty($invoice_logo_url)) {
 			$invoice_logo_url = EE_Registry::instance()->CFG->organization->logo_url;
 		}
 
-		if ( empty( $invoice_logo_url ) ) {
+		if (empty($invoice_logo_url)) {
 			return '';
 		}
 
-		if ( ! $img_tags ) {
+		if ( ! $img_tags) {
 			return $invoice_logo_url;
 		}
 
 		//image tags have been requested.
-		$image_size = getimagesize( $invoice_logo_url );
+		$image_size = getimagesize($invoice_logo_url);
 
 		//if image is wider than 200px, set the width to 200
-		if ( $image_size[0] > 300 ) {
+		if ($image_size[0] > 300) {
 			$image_width = 300;
 		} else {
 			$image_width = $image_size[0];
 		}
 
-		return '<img class="logo screen" src="' . $invoice_logo_url . '" width="' . $image_width . '" alt="logo" />';
+		return '<img class="logo screen" src="'.$invoice_logo_url.'" width="'.$image_width.'" alt="logo" />';
 	}
 
 
@@ -358,10 +358,10 @@ 
 	private function _get_invoice_payee_name() {
 		$payee_name = null;
 		$pm = $this->_get_payment_method();
-		if ( $pm instanceof EE_Payment_Method ){
-			$payee_name = $pm->get_extra_meta( 'pdf_payee_name', true );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_name = $pm->get_extra_meta('pdf_payee_name', true);
 		}
-		$payee_name = empty( $payee_name ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) : $payee_name;
+		$payee_name = empty($payee_name) ? EE_Registry::instance()->CFG->organization->get_pretty('name') : $payee_name;
 		return $payee_name;
 	}
 
@@ -373,16 +373,16 @@ 
 	 * @param EE_Transaction|null $transaction
 	 * @return \EE_Payment_Method|mixed|null|void
 	 */
-	private function _get_payment_method( $transaction = null ){
-		if ( $transaction instanceof EE_Transaction ) {
+	private function _get_payment_method($transaction = null) {
+		if ($transaction instanceof EE_Transaction) {
 			$payment_method = $transaction->payment_method();
-			if ( empty( $payment_method ) ) {
-				return apply_filters( 'FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type( 'Invoice' ) );
+			if (empty($payment_method)) {
+				return apply_filters('FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
 			}
 			return $payment_method;
 		} else {
 			//get the first payment method we can find
-			return apply_filters( 'FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type( 'Invoice' ) );
+			return apply_filters('FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
 		}
 	}
 
@@ -399,10 +399,10 @@ 
 	private function _get_invoice_payee_email() {
 		$payee_email = null;
 		$pm = $this->_get_payment_method();
-		if ( $pm instanceof EE_Payment_Method ){
-			$payee_email = $pm->get_extra_meta( 'pdf_payee_email', true );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_email = $pm->get_extra_meta('pdf_payee_email', true);
 		}
-		$payee_email = empty( $payee_email ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'email' ) : $payee_email;
+		$payee_email = empty($payee_email) ? EE_Registry::instance()->CFG->organization->get_pretty('email') : $payee_email;
 		return $payee_email;
 	}
 
@@ -418,24 +418,24 @@ 
 	 *
 	 * @return string
 	 */
-	private function _get_invoice_payee_tax_number( $shortcode ) {
+	private function _get_invoice_payee_tax_number($shortcode) {
 		$payee_tax_number = null;
 		$pm = $this->_get_payment_method();
-		if ( $pm instanceof EE_Payment_Method ){
-			$payee_tax_number = $pm->get_extra_meta( 'pdf_payee_tax_number', true );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_tax_number = $pm->get_extra_meta('pdf_payee_tax_number', true);
 		}
-		$payee_tax_number = empty( $payee_tax_number ) ? EE_Registry::instance()->CFG->organization->vat : $payee_tax_number;
+		$payee_tax_number = empty($payee_tax_number) ? EE_Registry::instance()->CFG->organization->vat : $payee_tax_number;
 
-		if ( empty( $payee_tax_number ) ) {
+		if (empty($payee_tax_number)) {
 			return '';
 		}
 
 		//any attributes?
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
+		$attrs = $this->_get_shortcode_attrs($shortcode);
 
 		//prefix?
-		$prefix = isset( $attrs['prefix'] ) ? $attrs['prefix'] : esc_html__( 'VAT/Tax Number: ', 'event_espresso' );
-		return $prefix . $payee_tax_number;
+		$prefix = isset($attrs['prefix']) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
+		return $prefix.$payee_tax_number;
 	}
 
 
@@ -452,22 +452,22 @@ 
 	private function _get_invoice_payee_address() {
 		$payee_address = null;
 		$pm = $this->_get_payment_method();
-		if ( $pm instanceof EE_Payment_Method ){
-			$payee_address = $pm->get_extra_meta( 'pdf_payee_address', true );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_address = $pm->get_extra_meta('pdf_payee_address', true);
 		}
-		if ( empty( $payee_address ) ) {
+		if (empty($payee_address)) {
 			$organization = EE_Registry::instance()->CFG->organization;
-			$payee_address = $organization->get_pretty( 'address_1' ) . '<br>';
-			$payee_address .= ! empty( $organization->address_2 ) ? $organization->get_pretty( 'address_2' ) . '<br>' : '';
-			$payee_address .= $organization->get_pretty( 'city' ) . '<br>';
+			$payee_address = $organization->get_pretty('address_1').'<br>';
+			$payee_address .= ! empty($organization->address_2) ? $organization->get_pretty('address_2').'<br>' : '';
+			$payee_address .= $organization->get_pretty('city').'<br>';
 
 			//state
-			$state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $organization->STA_ID );
-			$payee_address .= $state instanceof EE_State ? $state->name()  : '';
+			$state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
+			$payee_address .= $state instanceof EE_State ? $state->name() : '';
 
 			//Country
-			$payee_address .= ! empty( $organization->CNT_ISO ) ? ', ' . $organization->CNT_ISO . '<br>' : '';
-			$payee_address .= ! empty( $organization->zip ) ? $organization->zip : '';
+			$payee_address .= ! empty($organization->CNT_ISO) ? ', '.$organization->CNT_ISO.'<br>' : '';
+			$payee_address .= ! empty($organization->zip) ? $organization->zip : '';
 		}
 		return $payee_address;
 	}
@@ -485,7 +485,7 @@ 
 	private function _get_invoice_payment_instructions() {
 		$instructions = null;
 		$pm = $this->_get_payment_method();
-		return ( $pm instanceof EE_Payment_Method ) ? $pm->get_extra_meta( 'pdf_instructions', true ) : '';
+		return ($pm instanceof EE_Payment_Method) ? $pm->get_extra_meta('pdf_instructions', true) : '';
 	}
 
 
@@ -499,27 +499,27 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _get_invoice_receipt_switcher( $button = true ) {
+	protected function _get_invoice_receipt_switcher($button = true) {
 		$reg = $this->_data->primary_reg_obj;
-		$message_type = isset( $this->_extra_data['message_type'] ) ? $this->_extra_data['message_type'] : '';
-		if ( ! $reg instanceof EE_Registration || empty( $message_type ) ) {
+		$message_type = isset($this->_extra_data['message_type']) ? $this->_extra_data['message_type'] : '';
+		if ( ! $reg instanceof EE_Registration || empty($message_type)) {
 			return '';
 		}
 
-		$switch_to_invoice = ! $message_type instanceof EE_Invoice_message_type  ? true : false;
-		$switch_to_label = $switch_to_invoice && ! $message_type instanceof EE_Receipt_message_type ? esc_html__( 'View Invoice', 'event_espresso' ) : esc_html__( 'Switch to Invoice', 'event_espresso' );
-		$switch_to_label = ! $switch_to_invoice ? esc_html__( 'Switch to Receipt', 'event_espresso' ) : $switch_to_label;
+		$switch_to_invoice = ! $message_type instanceof EE_Invoice_message_type ? true : false;
+		$switch_to_label = $switch_to_invoice && ! $message_type instanceof EE_Receipt_message_type ? esc_html__('View Invoice', 'event_espresso') : esc_html__('Switch to Invoice', 'event_espresso');
+		$switch_to_label = ! $switch_to_invoice ? esc_html__('Switch to Receipt', 'event_espresso') : $switch_to_label;
 		$switch_to_url = $switch_to_invoice ? $reg->invoice_url() : $reg->receipt_url();
 
-		if ( ! $button ) {
+		if ( ! $button) {
 			return $switch_to_url;
 		}
 
-		if ( ! empty( $switch_to_url ) ) {
+		if ( ! empty($switch_to_url)) {
 
 			return  '
-	<form method="post" action="' . $switch_to_url . '" >
-		<input class="print_button" type="submit" value="' . $switch_to_label . '" />
+	<form method="post" action="' . $switch_to_url.'" >
+		<input class="print_button" type="submit" value="' . $switch_to_label.'" />
 	</form>
 			';
 		}
@@ -559,10 +559,10 @@ 
 	 *
 	 * @return int
 	 */
-	private function _get_subtotal( $tax = false ) {
-		$grand_total = isset( $this->_data->grand_total_line_item ) ? $this->_data->grand_total_line_item : null;
+	private function _get_subtotal($tax = false) {
+		$grand_total = isset($this->_data->grand_total_line_item) ? $this->_data->grand_total_line_item : null;
 
-		if ( ! $grand_total instanceof EE_Line_Item ) {
+		if ( ! $grand_total instanceof EE_Line_Item) {
 			return 0;
 		}
 
@@ -581,26 +581,26 @@ 
 	 *
 	 * @return string parsed.
 	 */
-	private function _get_payment_link_if_needed( $shortcode ) {
-		$valid_shortcodes = array( 'transaction' );
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
+	private function _get_payment_link_if_needed($shortcode) {
+		$valid_shortcodes = array('transaction');
+		$attrs = $this->_get_shortcode_attrs($shortcode);
 
 		//ensure default is set.
 		$addressee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
 		$total_owing = $addressee instanceof EE_Messages_Addressee && $addressee->txn instanceof EE_Transaction ? $addressee->txn->remaining() : 0;
 
-		if ( $total_owing > 0 ) {
-			$class = isset( $attrs['class'] ) ? $attrs['class'] : 'callout';
-			$custom_text = isset( $attrs['custom_text'] ) ? $attrs['custom_text'] : 'You can %smake a payment here »%s.';
-			$container_tag = isset( $attrs['container_tag'] ) ? $attrs['container_tag'] : 'p';
-			$opening_tag = ! empty( $container_tag ) ? '<' . $container_tag : '';
-			$opening_tag .= ! empty( $opening_tag ) && ! empty( $class ) ? ' class="' . $class . '"' : $opening_tag;
-			$opening_tag .= ! empty( $opening_tag ) ? '>' : $opening_tag;
-			$closing_tag = ! empty( $container_tag ) ? '</' . $container_tag .'>' : '';
-			$content = $opening_tag . sprintf( $custom_text, '<a href="[PAYMENT_URL]">', '</a>' ) . $closing_tag;
+		if ($total_owing > 0) {
+			$class = isset($attrs['class']) ? $attrs['class'] : 'callout';
+			$custom_text = isset($attrs['custom_text']) ? $attrs['custom_text'] : 'You can %smake a payment here »%s.';
+			$container_tag = isset($attrs['container_tag']) ? $attrs['container_tag'] : 'p';
+			$opening_tag = ! empty($container_tag) ? '<'.$container_tag : '';
+			$opening_tag .= ! empty($opening_tag) && ! empty($class) ? ' class="'.$class.'"' : $opening_tag;
+			$opening_tag .= ! empty($opening_tag) ? '>' : $opening_tag;
+			$closing_tag = ! empty($container_tag) ? '</'.$container_tag.'>' : '';
+			$content = $opening_tag.sprintf($custom_text, '<a href="[PAYMENT_URL]">', '</a>').$closing_tag;
 
 			//we need to re run this string through the parser to catch any shortcodes that are in it.
-			$owing_content = $this->_shortcode_helper->parse_message_template( $content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
+			$owing_content = $this->_shortcode_helper->parse_message_template($content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message);
 		} else {
 			return '';
 		}
@@ -620,31 +620,31 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return string
 	 */
-	protected function _get_payment_due_date( $shortcode, EE_Transaction $transaction ) {
+	protected function _get_payment_due_date($shortcode, EE_Transaction $transaction) {
 		//if transaction is paid in full then we can just return an empty string
-		if ( $transaction->remaining() === 0 ) {
+		if ($transaction->remaining() === 0) {
 			return '';
 		}
 
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
-		$format = isset( $attrs['format'] ) ? $attrs['format'] : get_option( 'date_format' );
-		$days_until_due = isset( $attrs['days_until_due'] ) ? (int) $attrs['days_until_due'] : 30;
-		$prefix_text = isset( $attrs['prefix_text'] ) ? $attrs['prefix_text'] : esc_html__( 'Payment in full due by: ', 'event_espresso' );
-		$transaction_created = $transaction->get_DateTime_object( 'TXN_timestamp' );
+		$attrs = $this->_get_shortcode_attrs($shortcode);
+		$format = isset($attrs['format']) ? $attrs['format'] : get_option('date_format');
+		$days_until_due = isset($attrs['days_until_due']) ? (int) $attrs['days_until_due'] : 30;
+		$prefix_text = isset($attrs['prefix_text']) ? $attrs['prefix_text'] : esc_html__('Payment in full due by: ', 'event_espresso');
+		$transaction_created = $transaction->get_DateTime_object('TXN_timestamp');
 
 		//setup date due:
 		try {
-			if ( $transaction_created instanceof DateTime ) {
-				$date_due = $transaction_created->add( new DateInterval( 'P' . $days_until_due . 'D' ) )->format( $format );
+			if ($transaction_created instanceof DateTime) {
+				$date_due = $transaction_created->add(new DateInterval('P'.$days_until_due.'D'))->format($format);
 			} else {
 				throw new Exception();
 			}
-		} catch( Exception $e ) {
+		} catch (Exception $e) {
 			//format was likely invalid.
 			$date_due = 'Unable to calculate date due, likely the format string is invalid.';
 		}
 
-		return $prefix_text . $date_due;
+		return $prefix_text.$date_due;
 	}
 
 } //end EE_Transaction Shortcodes library

core/libraries/shortcodes/EE_Attendee_Shortcodes.lib.php

Spacing +35 added lines, -35 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -49,25 +49,25 @@ 
 
 
 	protected function _init_props() {
-		$this->label = esc_html__( 'Attendee Shortcodes', 'event_espresso' );
-		$this->description = esc_html__( 'All shortcodes specific to attendee related data', 'event_espresso' );
+		$this->label = esc_html__('Attendee Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to attendee related data', 'event_espresso');
 		$this->_shortcodes = array(
-			'[FNAME]' => esc_html__( 'First Name of an attendee.', 'event_espresso' ),
-			'[LNAME]' => esc_html__( 'Last Name of an attendee.', 'event_espresso' ),
-			'[ATTENDEE_EMAIL]' => esc_html__( 'Email address for the attendee.', 'event_espresso' ),
-			'[EDIT_ATTENDEE_LINK]' => esc_html__( 'Edit Registration Link (typically you\'d only use this for messages going to event administrators)', 'event_espresso' ),
-			'[REGISTRATION_CODE]' => esc_html__( 'Unique Registration Code for the registration', 'event_espresso' ),
-			'[REGISTRATION_STATUS_ID]' => esc_html__( 'Parses to the registration status for the attendee', 'event_espresso' ),
-			'[REGISTRATION_STATUS_LABEL]' => esc_html__( 'Parses to the status label for the registrant', 'event_espresso' ),
-			'[REGISTRATION_TOTAL_AMOUNT_PAID]' => esc_html__( 'Parses to the total amount paid for this registration.', 'event_espresso' ),
-			'[FRONTEND_EDIT_REG_LINK]' => esc_html__( 'Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso' ),
-			'[PHONE_NUMBER]' => esc_html__( 'The Phone Number for the Registration.', 'event_espresso' ),
-			'[ADDRESS]' => esc_html__( 'The Address for the Registration', 'event_espresso' ),
-			'[ADDRESS2]' => esc_html__( 'Whatever was in the address 2 field for the registration.', 'event_espresso' ),
-			'[CITY]' => esc_html__( 'The city for the registration.', 'event_espresso' ),
-			'[ZIP_PC]' => esc_html__( 'The ZIP (or Postal) Code for the Registration.', 'event_espresso' ),
-			'[ADDRESS_STATE]' => esc_html__( 'The state/province for the registration.', 'event_espresso' ),
-			'[COUNTRY]' => esc_html__( 'The country for the registration.', 'event_espresso' )
+			'[FNAME]' => esc_html__('First Name of an attendee.', 'event_espresso'),
+			'[LNAME]' => esc_html__('Last Name of an attendee.', 'event_espresso'),
+			'[ATTENDEE_EMAIL]' => esc_html__('Email address for the attendee.', 'event_espresso'),
+			'[EDIT_ATTENDEE_LINK]' => esc_html__('Edit Registration Link (typically you\'d only use this for messages going to event administrators)', 'event_espresso'),
+			'[REGISTRATION_CODE]' => esc_html__('Unique Registration Code for the registration', 'event_espresso'),
+			'[REGISTRATION_STATUS_ID]' => esc_html__('Parses to the registration status for the attendee', 'event_espresso'),
+			'[REGISTRATION_STATUS_LABEL]' => esc_html__('Parses to the status label for the registrant', 'event_espresso'),
+			'[REGISTRATION_TOTAL_AMOUNT_PAID]' => esc_html__('Parses to the total amount paid for this registration.', 'event_espresso'),
+			'[FRONTEND_EDIT_REG_LINK]' => esc_html__('Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso'),
+			'[PHONE_NUMBER]' => esc_html__('The Phone Number for the Registration.', 'event_espresso'),
+			'[ADDRESS]' => esc_html__('The Address for the Registration', 'event_espresso'),
+			'[ADDRESS2]' => esc_html__('Whatever was in the address 2 field for the registration.', 'event_espresso'),
+			'[CITY]' => esc_html__('The city for the registration.', 'event_espresso'),
+			'[ZIP_PC]' => esc_html__('The ZIP (or Postal) Code for the Registration.', 'event_espresso'),
+			'[ADDRESS_STATE]' => esc_html__('The state/province for the registration.', 'event_espresso'),
+			'[COUNTRY]' => esc_html__('The country for the registration.', 'event_espresso')
 			);
 	}
 
@@ -81,10 +81,10 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 
-		$this->_xtra = ! empty( $this->_extra_data ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
+		$this->_xtra = ! empty($this->_extra_data) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
 			? $this->_extra_data['data']
 			: null;
 
@@ -93,34 +93,34 @@ 
 			? null
 			: $this->_data;
 
-		if ( ! $registration instanceof EE_Registration ) {
+		if ( ! $registration instanceof EE_Registration) {
 			//let's attempt to get the txn_id for the error message.
-			$txn_id = isset( $this->_xtra->txn ) && $this->_xtra->txn instanceof EE_Transaction
+			$txn_id = isset($this->_xtra->txn) && $this->_xtra->txn instanceof EE_Transaction
 				? $this->_xtra->txn->ID()
-				: esc_html__( 'Unknown', 'event_espresso' );
-			$msg = esc_html__( 'There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.', 'event_espresso' );
+				: esc_html__('Unknown', 'event_espresso');
+			$msg = esc_html__('There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.', 'event_espresso');
 			$dev_msg = sprintf(
-				esc_html__( 'The transaction ID for this request is: %s', 'event_espresso' ),
+				esc_html__('The transaction ID for this request is: %s', 'event_espresso'),
 				$txn_id
 			);
-			throw new EE_Error( "{$msg}||{$msg} {$dev_msg}" );
+			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
 		}
 
 		//attendee obj for this registration
-		$attendee = isset( $this->_xtra->registrations[ $registration->ID() ]['att_obj'] )
-			?  $this->_xtra->registrations[ $registration->ID() ]['att_obj']
-			: null ;
+		$attendee = isset($this->_xtra->registrations[$registration->ID()]['att_obj'])
+			? $this->_xtra->registrations[$registration->ID()]['att_obj']
+			: null;
 
-		if ( ! $attendee instanceof EE_Attendee ) {
-			$msg = esc_html__( 'There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.', 'event_espresso' );
+		if ( ! $attendee instanceof EE_Attendee) {
+			$msg = esc_html__('There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.', 'event_espresso');
 			$dev_msg = sprintf(
-				esc_html__( 'The registration ID for this request is: %s', 'event_espresso' ),
+				esc_html__('The registration ID for this request is: %s', 'event_espresso'),
 				$registration->ID()
 			);
-			throw new EE_Error( "{$msg}||{$msg} {$dev_msg}" );
+			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[FNAME]' :
 				return $attendee->fname();