eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Attendee_Shortcodes.lib.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -60,34 +60,34 @@ 
 			'[ADDRESS2]' => __('Whatever was in the address 2 field for the registration.', 'event_espresso'),
 			'[CITY]' => __('The city for the registration.', 'event_espresso'),
 			'[ZIP_PC]' => __('The ZIP (or Postal) Code for the Registration.', 'event_espresso'),
-			'[ADDRESS_STATE]' => __('The state/province for the registration.', 'event_espresso' ),
+			'[ADDRESS_STATE]' => __('The state/province for the registration.', 'event_espresso'),
 			'[COUNTRY]' => __('The country for the registration.', 'event_espresso')
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 
-		$this->_xtra = !empty($this->_extra_data ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : NULL;
+		$this->_xtra = ! empty($this->_extra_data) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : NULL;
 
 		//incoming object should only be a registration object.
 		$registration = ! $this->_data instanceof EE_Registration ? 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 ? $this->_xtra->txn->ID() : __('Unknown', 'event_espresso' );
-			throw new EE_Error( __('There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.', 'event_espresso' ) . '|' . sprintf( __('The transaction ID for this request is: %s', 'event_espresso' ), $txn_id ) );
+			$txn_id = isset($this->_xtra->txn) && $this->_xtra->txn instanceof EE_Transaction ? $this->_xtra->txn->ID() : __('Unknown', 'event_espresso');
+			throw new EE_Error(__('There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.', 'event_espresso').'|'.sprintf(__('The transaction ID for this request is: %s', 'event_espresso'), $txn_id));
 		}
 
 		//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 ) {
-			throw new EE_Error( __('There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.', 'event_espresso' ) . '|' . sprintf( __('The registration ID for this request is: %s', 'event_espresso' ), $registration->ID() ) );
+		if ( ! $attendee instanceof EE_Attendee) {
+			throw new EE_Error(__('There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.', 'event_espresso').'|'.sprintf(__('The registration ID for this request is: %s', 'event_espresso'), $registration->ID()));
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[FNAME]' :
 				return $attendee->fname();

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

core/libraries/shortcodes/EE_Datetime_List_Shortcodes.lib.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -44,8 +44,8 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
-		switch ( $shortcode ) {
+	protected function _parser($shortcode) {
+		switch ($shortcode) {
 			case '[DATETIME_LIST]' :
 				return $this->_get_datetime_list();
 				break;
@@ -63,13 +63,13 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Ticket )
+		if ($this->_data['data'] instanceof EE_Ticket)
 			return $this->_get_datetime_list_for_ticket();
 
-		else if ( $this->_data['data'] instanceof EE_Event )
+		else if ($this->_data['data'] instanceof EE_Event)
 			return $this->_get_datetime_list_for_event();
 
-		else if ( $this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration ) {
+		else if ($this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration) {
 			return $this->_get_datetime_list_for_registration();
 		}
 
@@ -86,7 +86,7 @@ 
 	 */
 	private function _get_datetime_list_for_event() {
 		$valid_shortcodes = array('datetime', 'attendee');
-		$template = is_array($this->_data['template'] ) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
 		$event = $this->_data['data'];
 
 		//here we're setting up the datetimes for the datetime list template for THIS event.
@@ -94,7 +94,7 @@ 
 		$datetimes = $this->_get_datetimes_from_event($event);
 
 		//each datetime in this case should be an datetime object.
-		foreach ( $datetimes as $datetime ) {
+		foreach ($datetimes as $datetime) {
 			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template($template, $datetime, $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -110,7 +110,7 @@ 
 	private function _get_datetime_list_for_ticket() {
 		$valid_shortcodes = array('datetime', 'attendee');
 
-		$template = is_array($this->_data['template'] ) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
 		$ticket = $this->_data['data'];
 
 		//here we're setting up the datetimes for the datetime list template for THIS ticket.
@@ -118,7 +118,7 @@ 
 		$datetimes = $this->_get_datetimes_from_ticket($ticket);
 
 		//each datetime in this case should be an datetime object.
-		foreach ( $datetimes as $datetime ) {
+		foreach ($datetimes as $datetime) {
 			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template($template, $datetime, $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -143,11 +143,11 @@ 
 
 
 
-	private function _get_datetimes_from_event( EE_Event $event, $att = NULL ) {
+	private function _get_datetimes_from_event(EE_Event $event, $att = NULL) {
 		 return isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['dtt_objs'] : array();
 	}
 
-	private function _get_datetimes_from_ticket( EE_Ticket $ticket, $att = NULL ) {
+	private function _get_datetimes_from_ticket(EE_Ticket $ticket, $att = NULL) {
 		return isset($this->_extra_data['data']->tickets) ? $this->_extra_data['data']->tickets[$ticket->ID()]['dtt_objs'] : array();
 	}
 

Braces +10 added lines, -10 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
@@ -63,19 +64,18 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Ticket )
-			return $this->_get_datetime_list_for_ticket();
-
-		else if ( $this->_data['data'] instanceof EE_Event )
-			return $this->_get_datetime_list_for_event();
-
-		else if ( $this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration ) {
+		if ( $this->_data['data'] instanceof EE_Ticket ) {
+					return $this->_get_datetime_list_for_ticket();
+		} else if ( $this->_data['data'] instanceof EE_Event ) {
+					return $this->_get_datetime_list_for_event();
+		} else if ( $this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration ) {
 			return $this->_get_datetime_list_for_registration();
 		}
 
 		//prevent recursive loop
-		else
-			return '';
+		else {
+					return '';
+		}
 	}
 
 

core/libraries/shortcodes/EE_Email_Shortcodes.lib.php

Braces +8 added lines, -4 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
@@ -101,8 +102,9 @@ 
 	private function _get_event_admin_emails( $fancy_headers = TRUE ) {
 
 		if ( !empty( $this->_data->admin_email ) ) {
-			if ( ! $fancy_headers )
-				return $this->_data->admin_email;
+			if ( ! $fancy_headers ) {
+							return $this->_data->admin_email;
+			}
 			return !empty( $this->_data->fname ) ? $this->_data->fname . ' ' . $this->_data->lname . ' <' . $this->_data->admin_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . ' <' . $this->_data->admin_email . '>';
 		}
 
@@ -142,7 +144,9 @@ 
 
 		foreach ( $admin_details as $admin ) {
 			//only add an admin email if it is present.
-			if ( empty( $admin->email ) || $admin->email == '' ) continue;
+			if ( empty( $admin->email ) || $admin->email == '' ) {
+				continue;
+			}
 
 			if ( ! $fancy_headers ) {
 				$admin_email[] = $admin->email;

Spacing +28 added lines, -28 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -43,19 +43,19 @@ 
 		$this->description = __('All shortcodes related to emails', 'event_espresso');
 		$this->_shortcodes = array(
 			'[SITE_ADMIN_EMAIL]' => __('Will be replaced with the admin email for the site that Event Espresso is installed on', 'event_espresso'),
-			'[EVENT_AUTHOR_FORMATTED_EMAIL]' => __('This will be replaced with a properly formatted list of Event Creator emails for the events in a registration. %1$sNOTE:%2$s If the event author has not filled out their WordPress user profile then the organization name will be used as the "From" name.', 'event_espresso'),'<strong>','</strong>',
+			'[EVENT_AUTHOR_FORMATTED_EMAIL]' => __('This will be replaced with a properly formatted list of Event Creator emails for the events in a registration. %1$sNOTE:%2$s If the event author has not filled out their WordPress user profile then the organization name will be used as the "From" name.', 'event_espresso'), '<strong>', '</strong>',
 			'[EVENT_AUTHOR_EMAIL]' => __('This is the same as %1$s shortcode except it is just a list of emails (not fancy headers).', 'event_espresso'), '[EVENT_AUTHOR_FORMATTED_EMAIL]',
-			'[CO_FORMATTED_EMAIL]' => __('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso' ),
+			'[CO_FORMATTED_EMAIL]' => __('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso'),
 			'[CO_EMAIL]' => __('This will parse to the email address only for the organization set in Your Organization Settings.', 'event_espresso'),
-			'[ESPRESSO_ADMIN_FORMATTED_EMAIL]' => __('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso' ),
+			'[ESPRESSO_ADMIN_FORMATTED_EMAIL]' => __('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso'),
 			'[ESPRESSO_ADMIN_EMAIL]' => __('This parses to the email address only for the organization set in Your Organization Settings page.', 'event_espresso')
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[SITE_ADMIN_EMAIL]' :
 				return $this->_get_site_admin_email();
@@ -66,17 +66,17 @@ 
 				break;
 
 			case '[EVENT_AUTHOR_EMAIL]' :
-				return $this->_get_event_admin_emails( FALSE );
+				return $this->_get_event_admin_emails(FALSE);
 				break;
 
 			case '[CO_FORMATTED_EMAIL]' :
 			case '[ESPRESSO_ADMIN_FORMATTED_EMAIL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . ' <' . EE_Registry::instance()->CFG->organization->get_pretty( 'email' ) . '>';
+				return EE_Registry::instance()->CFG->organization->get_pretty('name').' <'.EE_Registry::instance()->CFG->organization->get_pretty('email').'>';
 				break;
 
 			case '[CO_EMAIL]' :
 			case '[ESPRESSO_ADMIN_EMAIL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('email');
 				break;
 
 			default :
@@ -98,12 +98,12 @@ 
 	}
 
 
-	private function _get_event_admin_emails( $fancy_headers = TRUE ) {
+	private function _get_event_admin_emails($fancy_headers = TRUE) {
 
-		if ( !empty( $this->_data->admin_email ) ) {
-			if ( ! $fancy_headers )
+		if ( ! empty($this->_data->admin_email)) {
+			if ( ! $fancy_headers)
 				return $this->_data->admin_email;
-			return !empty( $this->_data->fname ) ? $this->_data->fname . ' ' . $this->_data->lname . ' <' . $this->_data->admin_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . ' <' . $this->_data->admin_email . '>';
+			return ! empty($this->_data->fname) ? $this->_data->fname.' '.$this->_data->lname.' <'.$this->_data->admin_email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').' <'.$this->_data->admin_email.'>';
 		}
 
 		//k this shortcode has been used else where.  Since we don't know what particular event this is for, let's loop through the events and get an array of event admins for the events.  We'll return the formatted list of admin emails and let the messenger make sure we only pick one if this is for a field that can only have ONE!.
@@ -111,18 +111,18 @@ 
 		$admin_email = array();
 
 		//loop through events and set the list of event_ids to retrieve so we can do ONE query.
-		foreach ( $this->_data->events as $event ) {
+		foreach ($this->_data->events as $event) {
 			$ids[] = $event['ID'];
 		}
 
 		//get all the events
-		$events = EE_Registry::instance()->load_model('Event')->get_all( array(array('EVT_ID' => array('IN', $ids ) ) ) );
+		$events = EE_Registry::instance()->load_model('Event')->get_all(array(array('EVT_ID' => array('IN', $ids))));
 
 		//now loop through each event and setup the details
 		$admin_details = array();
 		$cnt = 0;
-		foreach ( $events as $event ) {
-			$user = get_userdata($event->get('EVT_wp_user') );
+		foreach ($events as $event) {
+			$user = get_userdata($event->get('EVT_wp_user'));
 			$admin_details[$cnt] = new stdClass();
 			$admin_details[$cnt]->email = $user->user_email;
 			$admin_details[$cnt]->first_name = $user->user_firstname;
@@ -131,28 +131,28 @@ 
 		}
 
 		//results?
-		if ( empty($admin_details) || !is_array($admin_details) ) {
+		if (empty($admin_details) || ! is_array($admin_details)) {
 			$msg[] = __('The admin details could not be retrieved from the database.', 'event_espresso');
-			$msg[] = sprintf( __('Query: %s', 'event_espresso'), $sql );
-			$msg[] = sprintf( __('Events Data: %s', 'event_espresso'), var_export($this->_data->events, TRUE) );
-			$msg[] = sprintf( __('Event IDS: %s', 'event_espresso'), var_export($ids, TRUE) );
-			$msg[] = sprintf( __('Query Results: %s', 'event_espresso'), var_export($admin_details) );
-			do_action( 'AHEE_log', __FILE__, __FUNCTION__, implode( PHP_EOL, $msg ), 'shortcode_parser' );
+			$msg[] = sprintf(__('Query: %s', 'event_espresso'), $sql);
+			$msg[] = sprintf(__('Events Data: %s', 'event_espresso'), var_export($this->_data->events, TRUE));
+			$msg[] = sprintf(__('Event IDS: %s', 'event_espresso'), var_export($ids, TRUE));
+			$msg[] = sprintf(__('Query Results: %s', 'event_espresso'), var_export($admin_details));
+			do_action('AHEE_log', __FILE__, __FUNCTION__, implode(PHP_EOL, $msg), 'shortcode_parser');
 		}
 
-		foreach ( $admin_details as $admin ) {
+		foreach ($admin_details as $admin) {
 			//only add an admin email if it is present.
-			if ( empty( $admin->email ) || $admin->email == '' ) continue;
+			if (empty($admin->email) || $admin->email == '') continue;
 
-			if ( ! $fancy_headers ) {
+			if ( ! $fancy_headers) {
 				$admin_email[] = $admin->email;
 				continue;
 			}
 
-			$admin_email[] = !empty( $admin->first_name ) ? $admin->first_name . ' ' . $admin->last_name . ' <' . $admin->email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . ' <' . $admin->email . '>';
+			$admin_email[] = ! empty($admin->first_name) ? $admin->first_name.' '.$admin->last_name.' <'.$admin->email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').' <'.$admin->email.'>';
 		}
 
-		$admin_email = implode( ',', $admin_email );
+		$admin_email = implode(',', $admin_email);
 		return $admin_email;
 	}
 

core/libraries/shortcodes/EE_Event_Author_Shortcodes.lib.php

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');
 
 /**
@@ -49,54 +49,54 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
 
 		//now it's possible that $recipient is not an instance of EE_Messages_Addressee in which case we need to see if $this->_data is an instance of $event.
 		$event = $this->_data instanceof EE_Event ? $this->_data : NULL;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event )
+		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[EVENT_AUTHOR_FNAME]' :
-				$fname =  !empty( $recipient ) ? $recipient->fname : NULL;
-				if ( empty( $fname ) && !empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
+				$fname = ! empty($recipient) ? $recipient->fname : NULL;
+				if (empty($fname) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
 					$fname = $user->first_name;
 				}
 				return $fname;
 				break;
 
 			case '[EVENT_AUTHOR_LNAME]' :
-				$lname =  !empty( $recipient ) ? $recipient->lname : NULL;
-				if ( empty( $lname ) && !empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
+				$lname = ! empty($recipient) ? $recipient->lname : NULL;
+				if (empty($lname) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
 					$lname = $user->last_name;
 				}
 				return $lname;
 				break;
 
 			case '[EVENT_AUTHOR_FORMATTED_EMAIL]' :
-				if ( !empty( $recipient ) ) {
-					$email =  !empty( $recipient->fname ) ? $recipient->fname . ' ' . $recipient->lname . '<' . $recipient->admin_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . '<' . $recipient->admin_email . '>';
+				if ( ! empty($recipient)) {
+					$email = ! empty($recipient->fname) ? $recipient->fname.' '.$recipient->lname.'<'.$recipient->admin_email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').'<'.$recipient->admin_email.'>';
 				} else {
 					$email = NULL;
 				}
-				if ( empty( $email ) && ! empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
-					$email = ! empty( $user->first_name ) ? $user->first_name . ' ' . $user->last_name . '<' . $user->user_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . '<' . $user->user_email . '>';
+				if (empty($email) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
+					$email = ! empty($user->first_name) ? $user->first_name.' '.$user->last_name.'<'.$user->user_email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').'<'.$user->user_email.'>';
 				}
 				return $email;
 				break;
 
 			case '[EVENT_AUTHOR_EMAIL]' :
-				$email = ! empty( $recipient ) ? $recipient->admin_email : NULL;
-				if ( empty( $email ) && !empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
+				$email = ! empty($recipient) ? $recipient->admin_email : NULL;
+				if (empty($email) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
 					$email = $user->user_email;
 				}
 				return $email;
@@ -117,9 +117,9 @@ 
 	 *
 	 * @return WP_User
 	 */
-	private function _get_author_for_event( EE_Event $event ) {
+	private function _get_author_for_event(EE_Event $event) {
 		$author_id = $event->wp_user();
-		$user_data = get_userdata( (int) $author_id );
+		$user_data = get_userdata((int) $author_id);
 		return $user_data;
 		break;
 	}

Braces +5 added lines, -3 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
@@ -58,8 +59,9 @@ 
 		//now it's possible that $recipient is not an instance of EE_Messages_Addressee in which case we need to see if $this->_data is an instance of $event.
 		$event = $this->_data instanceof EE_Event ? $this->_data : NULL;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event )
-			return '';
+		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 			case '[EVENT_AUTHOR_FNAME]' :

core/libraries/shortcodes/EE_Event_List_Shortcodes.lib.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -48,8 +48,8 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
-		switch ( $shortcode ) {
+	protected function _parser($shortcode) {
+		switch ($shortcode) {
 			case '[EVENT_LIST]' :
 				return $this->_get_event_list();
 				break;
@@ -67,10 +67,10 @@ 
 		$this->_set_shortcode_helper();
 
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
 			return $this->_get_event_list_for_main();
 
-		else if ( $this->_data['data'] instanceof EE_Registration )
+		else if ($this->_data['data'] instanceof EE_Registration)
 			return $this->_get_event_list_for_registration();
 
 		//prevent recursive loop
@@ -91,7 +91,7 @@ 
 		$events = '';
 
 		//now we need to loop through the events array in EE_Messages_Addressee and send data to the EE_Parser helper.
-		foreach ( $data->events as $event ) {
+		foreach ($data->events as $event) {
 			$events .= $this->_shortcode_helper->parse_event_list_template($template, $event['event'], $valid_shortcodes, $this->_extra_data);
 		}
 		return $events;
@@ -107,7 +107,7 @@ 
 	 */
 	private function _get_event_list_for_registration() {
 		$valid_shortcodes = array('event', 'ticket_list', 'datetime_list', 'attendee', 'event_author', 'recipient_details', 'recipient_list', 'venue');
-		$template = is_array( $this->_data['template'] ) && isset($this->_data['template']['event_list']) ? $this->_data['template']['event_list'] : $this->_extra_data['template']['event_list'];
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['event_list']) ? $this->_data['template']['event_list'] : $this->_extra_data['template']['event_list'];
 		$registration = $this->_data['data'];
 
 		//let's remove any existing [ATTENDEE_LIST] shortcode from the event list template so that we don't get recursion.
@@ -120,7 +120,7 @@ 
 		//we're NOT going to prepare a list of attendees this time around
 		$events = '';
 
-		foreach ( (array) $all_events as $event ) {
+		foreach ((array) $all_events as $event) {
 			$events .= $this->_shortcode_helper->parse_event_list_template($template, $event, $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -129,8 +129,8 @@ 
 
 
 
-	private function _get_events_from_registration( EE_Registration $registration ) {
-		return isset( $this->_extra_data['data']->registrations ) ? array($this->_extra_data['data']->registrations[$registration->ID()]['evt_obj']) : array();
+	private function _get_events_from_registration(EE_Registration $registration) {
+		return isset($this->_extra_data['data']->registrations) ? array($this->_extra_data['data']->registrations[$registration->ID()]['evt_obj']) : array();
 	}
 
 

Braces +10 added lines, -8 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
@@ -67,15 +68,16 @@ 
 		$this->_set_shortcode_helper();
 
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_event_list_for_main();
-
-		else if ( $this->_data['data'] instanceof EE_Registration )
-			return $this->_get_event_list_for_registration();
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_event_list_for_main();
+		} else if ( $this->_data['data'] instanceof EE_Registration ) {
+					return $this->_get_event_list_for_registration();
+		}
 
 		//prevent recursive loop
-		else
-			return '';
+		else {
+					return '';
+		}
 	}
 
 

core/libraries/shortcodes/EE_Event_Meta_Shortcodes.lib.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -51,19 +51,19 @@ 
 	 * @param  mixed (array|object) $data      incoming data object/array
 	 * @return string            parsed code.
 	 */
-	public function parser( $shortcode, $data, $extra_data = array() ) {
+	public function parser($shortcode, $data, $extra_data = array()) {
 		
 		//all shortcodes will be checked in the post_meta table (assuming the shortcode matches the post_meta key);
-		if ( empty( $this->_data['ID'] ) )
+		if (empty($this->_data['ID']))
 			return ''; //need the event id to do anything!
 
 		$meta = get_post_meta($this->_data['ID'], $shortcode, true);
 
-		return !empty( $meta ) ? $meta : '';
+		return ! empty($meta) ? $meta : '';
 	}
 
 
-	protected function _parser( $shortcode ) {}
+	protected function _parser($shortcode) {}
 
 
 } //end EE_Event_Meta_Shortcodes class
\ No newline at end of file

Braces +6 added lines, -3 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
@@ -54,8 +55,10 @@ 
 	public function parser( $shortcode, $data, $extra_data = array() ) {
 		
 		//all shortcodes will be checked in the post_meta table (assuming the shortcode matches the post_meta key);
-		if ( empty( $this->_data['ID'] ) )
-			return ''; //need the event id to do anything!
+		if ( empty( $this->_data['ID'] ) ) {
+					return '';
+		}
+		//need the event id to do anything!
 
 		$meta = get_post_meta($this->_data['ID'], $shortcode, true);
 

core/libraries/shortcodes/EE_Line_Item_List_Shortcodes.lib.php

Spacing +24 added lines, -24 removed lines

@@ -6,7 +6,7 @@ 
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -34,16 +34,16 @@ 
 		$this->_shortcodes = array(
 			'[TICKET_LINE_ITEM_LIST]' => __('Outputs a list of ticket line items.', 'event_espresso'),
 			'[TAX_LINE_ITEM_LIST]' => __('Outputs a list of tax line items.', 'event_espresso'),
-			'[ADDITIONAL_LINE_ITEM_LIST]' => __( 'Outputs a list of additional line items (other charges or discounts)', 'event_espresso' ),
+			'[ADDITIONAL_LINE_ITEM_LIST]' => __('Outputs a list of additional line items (other charges or discounts)', 'event_espresso'),
 			'[PRICE_MODIFIER_LINE_ITEM_LIST]' => __('Outputs a list of price modifier line items', 'event_espresso')
 			);
 	}
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[TICKET_LINE_ITEM_LIST]' :
 				return $this->_get_ticket_line_item_list();
 				break;
@@ -80,28 +80,28 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Ticket ) {
+		if ( ! $this->_data['data'] instanceof EE_Ticket) {
 			return '';
 		}
 
-		$valid_shortcodes = array( 'line_item', 'line_item_list', 'ticket' );
+		$valid_shortcodes = array('line_item', 'line_item_list', 'ticket');
 
 		$ticket = $this->_data['data'];
 		$templates = $this->_extra_data['template'];
 		$addressee_obj = $this->_extra_data['data'];
 
 		//made it here so we have an EE_Ticket, so we should have what we need.
-		$ticket_line_item = isset( $addressee_obj->tickets[$ticket->ID()]['line_item'] ) ? $addressee_obj->tickets[$ticket->ID()]['line_item'] : null;
-		$sub_line_items = isset( $addressee_obj->tickets[$ticket->ID()]['sub_line_items'] ) ? $addressee_obj->tickets[$ticket->ID()]['sub_line_items'] : array();
+		$ticket_line_item = isset($addressee_obj->tickets[$ticket->ID()]['line_item']) ? $addressee_obj->tickets[$ticket->ID()]['line_item'] : null;
+		$sub_line_items = isset($addressee_obj->tickets[$ticket->ID()]['sub_line_items']) ? $addressee_obj->tickets[$ticket->ID()]['sub_line_items'] : array();
 
-		$template = count( $sub_line_items ) < 2 ? $templates['ticket_line_item_no_pms'] : $templates['ticket_line_item_pms'];
+		$template = count($sub_line_items) < 2 ? $templates['ticket_line_item_no_pms'] : $templates['ticket_line_item_pms'];
 
-		if ( empty( $ticket_line_item ) || empty( $sub_line_items ) ) {
+		if (empty($ticket_line_item) || empty($sub_line_items)) {
 			return '';
 		}
 
 		//now we just return the appropriate template parsed for each ticket.
-		return $this->_shortcode_helper->parse_line_item_list_template( $template, $ticket_line_item, $valid_shortcodes, $this->_extra_data );
+		return $this->_shortcode_helper->parse_line_item_list_template($template, $ticket_line_item, $valid_shortcodes, $this->_extra_data);
 	}
 
 
@@ -119,18 +119,18 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
 		//made it here so we're good to go.
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 		$templates = $this->_data['template'];
 
 		$tax_line_items = $this->_data['data']->tax_line_items;
 		$line_item_list = '';
-		foreach ( $tax_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['tax_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data );
+		foreach ($tax_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['tax_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 		return $line_item_list;
@@ -148,18 +148,18 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
 		//made it here so we're good to go.
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 		$templates = $this->_data['template'];
 
 		$additional_line_items = $this->_data['data']->additional_line_items;
 		$line_item_list = '';
-		foreach ( $additional_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['additional_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data );
+		foreach ($additional_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['additional_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 
@@ -182,7 +182,7 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Line_Item ) {
+		if ( ! $this->_data['data'] instanceof EE_Line_Item) {
 			return '';
 		}
 
@@ -191,16 +191,16 @@ 
 		$templates = $this->_extra_data['template'];
 		$addressee_obj = $this->_extra_data['data'];
 
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 
 		$main_line_item_id = $main_line_item->ID();
 
-		$price_mod_line_items = ! empty( $addressee_obj->line_items_with_children[$main_line_item_id]['children'] ) ? $addressee_obj->line_items_with_children[$main_line_item_id]['children'] : array();
+		$price_mod_line_items = ! empty($addressee_obj->line_items_with_children[$main_line_item_id]['children']) ? $addressee_obj->line_items_with_children[$main_line_item_id]['children'] : array();
 
 		$line_item_list = '';
 
-		foreach( $price_mod_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['price_modifier_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data  );
+		foreach ($price_mod_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['price_modifier_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 		return $line_item_list;

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

core/libraries/shortcodes/EE_Line_Item_Shortcodes.lib.php

Spacing +11 added lines, -11 removed lines

@@ -6,7 +6,7 @@ 
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -34,23 +34,23 @@ 
 			'[LINE_ITEM_NAME]' => __('Outputs the line item name.', 'event_espresso'),
 			'[LINE_ITEM_DESCRIPTION]' => __('Outputs a the description for the line item.', 'event_espresso'),
 			'[LINE_ITEM_QUANTITY]' => __('Outputs the quantity for this line item.', 'event_espresso'),
-			'[LINE_ITEM_AMOUNT]' => __('This will either output the unit price for a line item if its not a percent, or the percent of the line item (if it is percent).', 'event_espresso' ),
+			'[LINE_ITEM_AMOUNT]' => __('This will either output the unit price for a line item if its not a percent, or the percent of the line item (if it is percent).', 'event_espresso'),
 			'[LINE_ITEM_TOTAL]' => __('This outputs the line item total.', 'event_espresso'),
-			'[LINE_ITEM_TAXABLE_*]' => __('This attribute type shortcode allows users to indicate what to output if a line item is taxable or not.  One can use the key "symbol=" with the shortcode to indicate what they\'d like to represent a taxable line item.  So doing something like <code>[LINE_ITEM_TAXABLE_* symbol="*"]</code> means that when the line item is parsed, if it\'s taxable the "*" symbol will be returned.  The default symbol if no attribute is included is the "*" symbol.', 'event_espresso' )
+			'[LINE_ITEM_TAXABLE_*]' => __('This attribute type shortcode allows users to indicate what to output if a line item is taxable or not.  One can use the key "symbol=" with the shortcode to indicate what they\'d like to represent a taxable line item.  So doing something like <code>[LINE_ITEM_TAXABLE_* symbol="*"]</code> means that when the line item is parsed, if it\'s taxable the "*" symbol will be returned.  The default symbol if no attribute is included is the "*" symbol.', 'event_espresso')
 			);
 	}
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//ensure that the incoming object IS a line item.  If it isn't then bail early.
-		if ( ! $this->_data instanceof EE_Line_Item ) {
+		if ( ! $this->_data instanceof EE_Line_Item) {
 			return '';
 		}
 
 		$line_item = $this->_data;
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[LINE_ITEM_NAME]' :
 				return $line_item->name();
 				break;
@@ -64,7 +64,7 @@ 
 				break;
 
 			case '[LINE_ITEM_AMOUNT]' :
-				return $line_item->is_percent() ? $line_item->percent() . '%' : $line_item->unit_price_no_code();
+				return $line_item->is_percent() ? $line_item->percent().'%' : $line_item->unit_price_no_code();
 				break;
 
 			case '[LINE_ITEM_TOTAL]' :
@@ -72,10 +72,10 @@ 
 				break;
 		}
 
-		if ( strpos( $shortcode, '[LINE_ITEM_TAXABLE_*' ) !== FALSE ) {
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
-			if ( $line_item->is_taxable() ) {
-				return !empty( $attrs['symbol'] ) ? $attrs['symbol'] : '*';
+		if (strpos($shortcode, '[LINE_ITEM_TAXABLE_*') !== FALSE) {
+			$attrs = $this->_get_shortcode_attrs($shortcode);
+			if ($line_item->is_taxable()) {
+				return ! empty($attrs['symbol']) ? $attrs['symbol'] : '*';
 			}
 		}
 

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

core/libraries/shortcodes/EE_Messenger_Shortcodes.lib.php

Braces +6 added lines, -3 removed lines

@@ -6,7 +6,9 @@ 
  * @package Event Espresso
  * @subpackage shortcodes library
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * EE_Messenger_Shortcodes
  *
@@ -69,8 +71,9 @@ 
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
-			return '';
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 			case '[DISPLAY_HTML_URL]' :

Spacing +26 added lines, -26 removed lines

@@ -41,22 +41,22 @@ 
 		$this->label = __('Messenger Shortcodes', 'event_espresso');
 		$this->description = __('All shortcodes that are messenger specific.', 'event_espresso');
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		//add messages about what happens  when the messenger is active.
 		$this->_active_messengers = $message_resource_manager->active_messengers();
 
-		$this->_shortcodes['[DISPLAY_HTML_URL]'] =__('This will return a link to view the template in a browser if the html messenger is active.', 'event_espresso');
-		$this->_shortcodes['[DISPLAY_PDF_URL]'] = __('This will return a link to generate a pdf for the template if the pdf messenger is active.', 'event_espresso' );
+		$this->_shortcodes['[DISPLAY_HTML_URL]'] = __('This will return a link to view the template in a browser if the html messenger is active.', 'event_espresso');
+		$this->_shortcodes['[DISPLAY_PDF_URL]'] = __('This will return a link to generate a pdf for the template if the pdf messenger is active.', 'event_espresso');
 		$this->_shortcodes['[DISPLAY_PDF_BUTTON]'] = __('This will return html for a download pdf button trigger if the pdf messenger is active.', 'event_espresso');
 
 		//show error message about buttons/urls not working as expected if messenger deactivated.
-		if ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'update_message_template' ) {
-			if ( ! isset( $this->_active_messengers['pdf'] ) ) {
-				EE_Error::add_attention( __('Be aware that the pdf messenger is inactive.  This means that any pdf related shortcodes will parse to an empty string.', 'event_espresso' ) );
+		if (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'update_message_template') {
+			if ( ! isset($this->_active_messengers['pdf'])) {
+				EE_Error::add_attention(__('Be aware that the pdf messenger is inactive.  This means that any pdf related shortcodes will parse to an empty string.', 'event_espresso'));
 			}
 
-			if ( !isset( $this->_active_messengers['html'] ) ) {
-				EE_Error::add_attention( __('Be aware that the html messenger is inactive. This means that any html related shortcodes will parse to an empty string.', 'event_espresso' ) );
+			if ( ! isset($this->_active_messengers['html'])) {
+				EE_Error::add_attention(__('Be aware that the html messenger is inactive. This means that any html related shortcodes will parse to an empty string.', 'event_espresso'));
 			}
 		}
 
@@ -64,24 +64,24 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
+		if ( ! $recipient instanceof EE_Messages_Addressee)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[DISPLAY_HTML_URL]' :
-				return  isset( $this->_active_messengers['html'] ) ? $this->_get_url( $recipient, 'html' ) : '';
+				return  isset($this->_active_messengers['html']) ? $this->_get_url($recipient, 'html') : '';
 				break;
 			case '[DISPLAY_PDF_URL]' :
-				return  isset( $this->_active_messengers['pdf'] ) ? $this->_get_url( $recipient, 'pdf' ) : '';
+				return  isset($this->_active_messengers['pdf']) ? $this->_get_url($recipient, 'pdf') : '';
 				break;
 			case '[DISPLAY_PDF_BUTTON]' :
-				return  isset( $this->_active_messengers['pdf'] ) ? $this->_get_button( $recipient, 'pdf' ) : '';
+				return  isset($this->_active_messengers['pdf']) ? $this->_get_button($recipient, 'pdf') : '';
 				break;
 		}
 		return '';
@@ -99,11 +99,11 @@ 
 	 *
 	 * @return string                Generated html
 	 */
-	private function _get_button( EE_Messages_Addressee $recipient, $sending_messenger ) {
-		$download_text = $sending_messenger == 'pdf' ? __('Download PDF', 'event_espresso') : __('Show HTML', 'event_espresso' );
+	private function _get_button(EE_Messages_Addressee $recipient, $sending_messenger) {
+		$download_text = $sending_messenger == 'pdf' ? __('Download PDF', 'event_espresso') : __('Show HTML', 'event_espresso');
 		$content = '
-<form method="post" action="' . $this->_get_url( $recipient, $sending_messenger ) . '" >
-	<input class="print_button" type="submit" value="' . $download_text . '" />
+<form method="post" action="' . $this->_get_url($recipient, $sending_messenger).'" >
+	<input class="print_button" type="submit" value="' . $download_text.'" />
 </form>
 		';
 		return $content;
@@ -122,18 +122,18 @@ 
 	 * @return string The generated url for displaying the link.
 	 * @throws EE_Error
 	 */
-	private function _get_url( EE_Messages_Addressee $recipient, $sending_messenger ) {
+	private function _get_url(EE_Messages_Addressee $recipient, $sending_messenger) {
 
 		$reg = $recipient->reg_obj;
 		$reg = ! $reg instanceof EE_Registration ? $recipient->primary_reg_obj : $reg;
 
 
-		if ( $this->_message_type instanceof EE_message_type && $this->_message instanceof EE_Message ) {
-			EE_Registry::instance()->load_helper( 'MSG_Template' );
+		if ($this->_message_type instanceof EE_message_type && $this->_message instanceof EE_Message) {
+			EE_Registry::instance()->load_helper('MSG_Template');
 			try {
-				return EEH_MSG_Template::get_url_trigger( $this->_message_type, $this->_message, $reg, $sending_messenger );
-			} catch( EE_Error $e ) {
-				if ( WP_DEBUG ) {
+				return EEH_MSG_Template::get_url_trigger($this->_message_type, $this->_message, $reg, $sending_messenger);
+			} catch (EE_Error $e) {
+				if (WP_DEBUG) {
 					$e->get_error();
 				}
 			}