eventespresso / event-espresso-core

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_Event_Shortcodes.lib.php

Braces +11 added lines, -7 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
@@ -85,8 +86,9 @@ 
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
-			return '';
+		if ( ! $this->_event instanceof EE_Event ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 
@@ -125,14 +127,16 @@ 
 
 			case '[VIRTUAL_URL]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
-					return '';
+				if ( empty( $venue ) ) {
+									return '';
+				}
 				return $venue->get('VNU_virtual_url');
 
 			case '[VIRTUAL_PHONE]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
-					return '';
+				if ( empty( $venue ) ) {
+									return '';
+				}
 				return $venue->get('VNU_virtual_phone');
 				break;
 

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -56,7 +56,7 @@ 
 			'[EVENT_NAME]' => __("This also can be used for the name of the event", 'event_espresso'),
 			'[EVENT_PHONE]' => __('The phone number for the event (usually an info number)', 'event_espresso'),
 			'[EVENT_DESCRIPTION]' => __('The description of the event', 'event_espresso'),
-			'[EVENT_EXCERPT]' => __( 'This gets parsed to the value for the excerpt field in the event or blank if there is no excerpt.', 'event_espresso' ),
+			'[EVENT_EXCERPT]' => __('This gets parsed to the value for the excerpt field in the event or blank if there is no excerpt.', 'event_espresso'),
 			'[EVENT_LINK]' => __('A link associated with the event', 'event_espresso'),
 			'[EVENT_URL]' => __('A link to the event set up on the host site.', 'event_espresso'),
 			'[VIRTUAL_URL]' => __('What was used for the "URL of Event" field in the Venue settings', 'event_espresso'),
@@ -68,14 +68,14 @@ 
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		EE_Registry::instance()->load_helper( 'Formatter' );
+		EE_Registry::instance()->load_helper('Formatter');
 
 		$this->_event = $this->_data instanceof EE_Event ? $this->_data : null;
 
 		//if no event, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the event from the reg_obj instead.
-		if ( empty( $this->_event ) ) {
+		if (empty($this->_event)) {
 			$aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
 			$aee = $this->_extra_data instanceof EE_Messages_Addressee ? $this->_extra_data : $aee;
 
@@ -84,17 +84,17 @@ 
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
+		if ( ! $this->_event instanceof EE_Event)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[EVENT_ID]' :
 				return $this->_event->ID();
 				break;
 
 			case '[EVENT_IDENTIFIER]' :
-				return isset($this->_data['line_ref']) ? $this->_data['line_ref']: '';
+				return isset($this->_data['line_ref']) ? $this->_data['line_ref'] : '';
 				break;
 
 			case '[EVENT]' :
@@ -124,36 +124,36 @@ 
 
 			case '[VIRTUAL_URL]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
+				if (empty($venue))
 					return '';
 				return $venue->get('VNU_virtual_url');
 
 			case '[VIRTUAL_PHONE]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
+				if (empty($venue))
 					return '';
 				return $venue->get('VNU_virtual_phone');
 				break;
 
 			case '[EVENT_IMAGE]' :
-				$image = $this->_event->feature_image_url(array(600,300) );
+				$image = $this->_event->feature_image_url(array(600, 300));
 				// @todo: eventually we should make this an attribute shortcode so that em can send along what size they want returned.
-				return !empty( $image ) ? '<img src="' . $image . '" alt="' . sprintf( esc_attr__( '%s Feature Image', 'event_espresso'), $this->_event->get('EVT_name') ) . '" />' : '';
+				return ! empty($image) ? '<img src="'.$image.'" alt="'.sprintf(esc_attr__('%s Feature Image', 'event_espresso'), $this->_event->get('EVT_name')).'" />' : '';
 				break;
 
 			case '[EVENT_FACEBOOK_URL]' :
-				$facebook_url = $this->_event->get_post_meta('event_facebook', true );
-				return empty( $facebook_url ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' ) : $facebook_url;
+				$facebook_url = $this->_event->get_post_meta('event_facebook', true);
+				return empty($facebook_url) ? EE_Registry::instance()->CFG->organization->get_pretty('facebook') : $facebook_url;
 				break;
 
 			case '[EVENT_TWITTER_URL]' :
 				$twitter_url = $this->_event->get_post_meta('event_twitter', true);
-				return empty( $twitter_url ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' ) : $twitter_url;
+				return empty($twitter_url) ? EE_Registry::instance()->CFG->organization->get_pretty('twitter') : $twitter_url;
 				break;
 
 			case '[EVENT_AUTHOR_EMAIL]' :
 				$author_id = $this->_event->get('EVT_wp_user');
-				$user_data = get_userdata( (int) $author_id );
+				$user_data = get_userdata((int) $author_id);
 				return $user_data->user_email;
 				break;
 
@@ -168,10 +168,10 @@ 
 	 * @param  boolean $full_link if TRUE (default) we return the html for the name of the event linked to the event.  Otherwise we just return the url of the event.
 	 * @return string
 	 */
-	private function _get_event_link( $event, $full_link = TRUE ) {
+	private function _get_event_link($event, $full_link = TRUE) {
 		$url = get_permalink($event->ID());
 
-		return $full_link ? '<a href="' . $url . '">' . $event->get('EVT_name') . '</a>' : $url;
+		return $full_link ? '<a href="'.$url.'">'.$event->get('EVT_name').'</a>' : $url;
 	}
 
 

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

Spacing +24 added lines, -24 removed lines

@@ -44,18 +44,18 @@ 
 		//add messages about what happens  when the messenger is active.
 		$this->_active_messengers = EE_Registry::instance()->load_lib('messages')->get_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'));
 			}
 		}
 
@@ -63,24 +63,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 '';
@@ -98,11 +98,11 @@ 
 	 *
 	 * @return string                Generated html
 	 */
-	private function _get_button( EE_Messages_Addressee $recipient, $type ) {
-		$download_text = $type == 'pdf' ? __('Download PDF', 'event_espresso') : __('Show HTML', 'event_espresso' );
+	private function _get_button(EE_Messages_Addressee $recipient, $type) {
+		$download_text = $type == 'pdf' ? __('Download PDF', 'event_espresso') : __('Show HTML', 'event_espresso');
 		$content = '
-<form method="post" action="' . $this->_get_url( $recipient, $type ) . '" >
-	<input class="print_button" type="submit" value="' . $download_text . '" />
+<form method="post" action="' . $this->_get_url($recipient, $type).'" >
+	<input class="print_button" type="submit" value="' . $download_text.'" />
 </form>
 		';
 		return $content;
@@ -118,10 +118,10 @@ 
 	 *
 	 * @return string The generated url for displaying the link.
 	 */
-	private function _get_url( EE_Messages_Addressee $recipient, $type ) {
+	private function _get_url(EE_Messages_Addressee $recipient, $type) {
 
 		//get out early if the given messenger is not active!
-		if ( ! isset( $this->_active_messengers[$type]) ) {
+		if ( ! isset($this->_active_messengers[$type])) {
 			return '';
 		}
 
@@ -129,12 +129,12 @@ 
 		$reg = ! $reg instanceof EE_Registration ? $recipient->primary_reg_obj : $reg;
 
 		//if no reg object then we really can't do anything at this point.
-		if ( ! $reg instanceof EE_Registration ) {
+		if ( ! $reg instanceof EE_Registration) {
 			return '';
 		}
 
-		if ( $this->_message_type instanceof EE_message_type ) {
-			return $this->_message_type->get_url_trigger( $this->_context, $type, $reg );
+		if ($this->_message_type instanceof EE_message_type) {
+			return $this->_message_type->get_url_trigger($this->_context, $type, $reg);
 		}
 
 		return '';

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]' :

core/libraries/shortcodes/EE_Organization_Shortcodes.lib.php

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -63,91 +63,91 @@ 
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[COMPANY]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'name' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('name');
 				break;
 
 			case '[CO_ADD1]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'address_1' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_1');
 				break;
 
 			case '[CO_ADD2]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'address_2' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_2');
 				break;
 
 			case '[CO_CITY]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'city' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('city');
 				break;
 
 			case '[CO_STATE]' :
-				$state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( EE_Registry::instance()->CFG->organization->STA_ID );
+				$state = EE_Registry::instance()->load_model('State')->get_one_by_ID(EE_Registry::instance()->CFG->organization->STA_ID);
 				return $state->name();
 				break;
 
 			case '[CO_ZIP]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'zip' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('zip');
 				break;
 
 			case '[CO_EMAIL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('email');
 				break;
 
 			case '[CO_PHONE]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'phone' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('phone');
 				break;
 
 			case '[CO_LOGO]' :
-				return '<img src="' . EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' ) . '" id="headerImage" />';
+				return '<img src="'.EE_Registry::instance()->CFG->organization->get_pretty('logo_url').'" id="headerImage" />';
 				break;
 
 			case '[CO_LOGO_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
 				break;
 
 			case '[CO_FACEBOOK_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
 				break;
 
 			case '[CO_TWITTER_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
 				break;
 
 			case '[CO_PINTEREST_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
 				break;
 
 			case '[CO_LINKEDIN_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
 				break;
 
 			case '[CO_GOOGLE_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'google' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('google');
 				break;
 
 			case '[CO_INSTAGRAM_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
 				break;
 
 		}
 
 		//also allow for parameter shortcode
-		if ( strpos( $shortcode, '[CO_TAX_NUMBER_*' ) !== FALSE ) {
+		if (strpos($shortcode, '[CO_TAX_NUMBER_*') !== FALSE) {
 			//first see if there is any company tax number set and bail early if not
 			$tax_number = EE_Registry::instance()->CFG->organization->vat;
-			if ( empty( $tax_number ) ) {
+			if (empty($tax_number)) {
 				return '';
 			}
 
 			//see if there are any attributes.
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
+			$attrs = $this->_get_shortcode_attrs($shortcode);
 
 			//set custom attrs if present (or default)
-			$prefix = isset( $attrs['prefix'] ) ? $attrs['prefix'] : __('VAT/Tax Number: ', 'event_espresso');
-			return $prefix . $tax_number;
+			$prefix = isset($attrs['prefix']) ? $attrs['prefix'] : __('VAT/Tax Number: ', 'event_espresso');
+			return $prefix.$tax_number;
 		}
 
 		return '';

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso

core/libraries/shortcodes/EE_Payment_Shortcodes.lib.php

Spacing +9 added lines, -9 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,7 +34,7 @@ 
 			'[PAYMENT_TIMESTAMP]' => __('Outputs the date of the payment (using the default date format).', 'event_espresso'),
 			'[PAYMENT_METHOD]' => __('Outputs a the payment method.', 'event_espresso'),
 			'[PAYMENT_AMOUNT]' => __('Outputs the payment amount (with currency symbol).', 'event_espresso'),
-			'[PAYMENT_GATEWAY]' => __('Outputs the gateway used for the payment.', 'event_espresso' ),
+			'[PAYMENT_GATEWAY]' => __('Outputs the gateway used for the payment.', 'event_espresso'),
 			'[PAYMENT_GATEWAY_RESPONSE]' => __('Outputs the payment gateway response.', 'event_espresso'),
 			'[PAYMENT_GATEWAY_TXN_ID]' => __('This will either be the gateway transaction ID, or the manual ID added with payment applied via the admin.', 'event_espresso'),
 			'[PAYMENT_PO_NUMBER]' => __('Purchase Order number (if present)', 'event_espresso'),
@@ -46,15 +46,15 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//ensure that the incoming object is an EE_Payment object.  If it isn't then bail early.
-		if ( ! $this->_data instanceof EE_Payment ) {
+		if ( ! $this->_data instanceof EE_Payment) {
 			return '';
 		}
 
 		$payment = $this->_data;
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[PAYMENT_TIMESTAMP]' :
 				return $payment->timestamp();
 				break;
@@ -70,10 +70,10 @@ 
 
 			case '[PAYMENT_GATEWAY]' :
 				//previously teh column 'PMD_ID' was more-or-less 'PAY_gateway'
-				if( $payment->payment_method() instanceof EE_Payment_Method ){
+				if ($payment->payment_method() instanceof EE_Payment_Method) {
 					return $payment->payment_method()->name();
-				}else{
-					return __( 'Unknown', 'event_espresso' );
+				} else {
+					return __('Unknown', 'event_espresso');
 				}
 				break;
 
@@ -98,7 +98,7 @@ 
 				break;
 
 			case '[PAYMENT_STATUS_WITH_ICONS]' :
-				return $payment->pretty_status( TRUE );
+				return $payment->pretty_status(TRUE);
 				break;
 
 			default :

Braces +3 added lines, -2 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');
+}
 
 /**
  *
@@ -72,7 +73,7 @@ 
 				//previously teh column 'PMD_ID' was more-or-less 'PAY_gateway'
 				if( $payment->payment_method() instanceof EE_Payment_Method ){
 					return $payment->payment_method()->name();
-				}else{
+				} else{
 					return __( 'Unknown', 'event_espresso' );
 				}
 				break;

core/libraries/shortcodes/EE_Primary_Registration_List_Shortcodes.lib.php

Spacing +40 added lines, -40 removed lines

@@ -43,15 +43,15 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
-		switch ( $shortcode ) {
+	protected function _parser($shortcode) {
+		switch ($shortcode) {
 
 			case '[PRIMARY_REGISTRANT_TICKET_LIST]' :
-				return $this->_get_recipient_ticket_list( TRUE );
+				return $this->_get_recipient_ticket_list(TRUE);
 				break;
 
 			case '[PRIMARY_REGISTRANT_DATETIME_LIST]' :
-				return $this->_get_recipient_datetime_list( TRUE );
+				return $this->_get_recipient_datetime_list(TRUE);
 				break;
 		}
 		return '';
@@ -65,58 +65,58 @@ 
 	 * @param  boolean $primary whether we're getting the primary registrant ticket_list.
 	 * @return string
 	 */
-	private function _get_recipient_ticket_list( $primary = FALSE ) {
+	private function _get_recipient_ticket_list($primary = FALSE) {
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_ticket_list_parsed($this->_data['data'], $primary);
 
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
+		else if ($this->_extra_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_ticket_list_parsed($this->_extra_data['data'], $primary);
 
 		else
 			return '';
 	}
 
 
-	private function _get_recipient_ticket_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
+	private function _get_recipient_ticket_list_parsed(EE_Messages_Addressee $data, $primary = FALSE) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-			if ( ! $registration instanceof EE_Registration ) return '';
+			if ( ! $registration instanceof EE_Registration) return '';
 		//setup valid shortcodes depending on what the status of the $this->_data property is
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
-			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list','datetime_list', 'registration_details', 'attendee');
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list', 'datetime_list', 'registration_details', 'attendee');
 			$template = $this->_data['template'];
 			$tkts = array($data->registrations[$registration->ID()]['tkt_obj']);
 			$data = $this->_data;
-		} elseif ( $this->_data['data'] instanceof EE_Event ) {
+		} elseif ($this->_data['data'] instanceof EE_Event) {
 			$valid_shortcodes = array('ticket', 'attendee_list', 'datetime_list', 'attendee');
-			$template = is_array($this->_data['template'] ) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
+			$template = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
 			//let's remove any existing [EVENT_LIST] shortcode from the ticket list template so that we don't get recursion.
 			$template = str_replace('[EVENT_LIST]', '', $template);
 			//data will be tickets for this event for this recipient.
-			$tkts = $this->_get_tickets_from_event( $this->_data['data'], $registration );
+			$tkts = $this->_get_tickets_from_event($this->_data['data'], $registration);
 			$data = $this->_extra_data;
 		} else {
 			return '';
 		}
 
 		$tktparsed = '';
-		foreach ( $tkts as $ticket ) {
-			$tktparsed .= $this->_shortcode_helper->parse_ticket_list_template( $template, $ticket, $valid_shortcodes, $data );
+		foreach ($tkts as $ticket) {
+			$tktparsed .= $this->_shortcode_helper->parse_ticket_list_template($template, $ticket, $valid_shortcodes, $data);
 		}
 		return $tktparsed;
 	}
 
 
-	private function _get_tickets_from_event( EE_Event $event, $reg = NULL ) {
+	private function _get_tickets_from_event(EE_Event $event, $reg = NULL) {
 		$evt_tkts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['tkt_objs'] : array();
 
-		if ( $reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
 			$adj_tkts = array();
 			//return only tickets for the given attendee
-			foreach ( $evt_tkts as $tkt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() )
+			foreach ($evt_tkts as $tkt) {
+				if (isset($this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID())
 					$adj_tkts[] = $tkt;
 			}
 			$evt_tkts = $adj_tkts;
@@ -133,58 +133,58 @@ 
 	 * @param  boolean $primary whether we're getting the primary registrant ticket_list.
 	 * @return string
 	 */
-	private function _get_recipient_datetime_list( $primary = FALSE ) {
+	private function _get_recipient_datetime_list($primary = FALSE) {
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_datetime_list_parsed($this->_data['data'], $primary);
 
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
+		else if ($this->_extra_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_datetime_list_parsed($this->_extra_data['data'], $primary);
 
 		else
 			return '';
 
-		return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary);
+		return $this->_get_recipient_datetime_list_parsed($this->_data['data'], $primary);
 	}
 
 
-	private function _get_recipient_datetime_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
+	private function _get_recipient_datetime_list_parsed(EE_Messages_Addressee $data, $primary = FALSE) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-		if ( ! $registration instanceof EE_Registration ) return '';
+		if ( ! $registration instanceof EE_Registration) return '';
 		//setup valid shortcodes depending on what the status of the $this->_data property is
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
 			$valid_shortcodes = array('datetime', 'attendee');
 			$template = $this->_data['template'];
 			$dtts = $data->registrations[$registration->ID()]['dtt_objs'];
 			$data = $this->_data;
-		} elseif ( $this->_data['data'] instanceof EE_Event ) {
+		} elseif ($this->_data['data'] instanceof EE_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'];
-			$dtts = $this->_get_datetimes_from_event( $this->_data['data'], $registration );
+			$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
+			$dtts = $this->_get_datetimes_from_event($this->_data['data'], $registration);
 			$data = $this->_extra_data;
 		} else {
 			return '';
 		}
 
 		$dtt_parsed = '';
-		foreach ( $dtts as $datetime ) {
-			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template( $template, $datetime, $valid_shortcodes, $this->_extra_data );
+		foreach ($dtts as $datetime) {
+			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template($template, $datetime, $valid_shortcodes, $this->_extra_data);
 		}
 		return $dtt_parsed;
 	}
 
 
 
-	private function _get_datetimes_from_event( EE_Event $event, $reg = NULL ) {
+	private function _get_datetimes_from_event(EE_Event $event, $reg = NULL) {
 		$evt_dtts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['dtt_objs'] : array();
 
-		if ( $reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
 			$adj_dtts = array();
 			//return only dtts for the given attendee
-			foreach ( $evt_dtts as $dtt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) )
+			foreach ($evt_dtts as $dtt) {
+				if (isset($this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()]))
 					$adj_dtts[] = $dtt;
 			}
 			$evt_dtts = $adj_dtts;

Braces +26 added lines, -22 removed lines

@@ -69,20 +69,21 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
-
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
-
-		else
-			return '';
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
+		} else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
+		} else {
+					return '';
+		}
 	}
 
 
 	private function _get_recipient_ticket_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-			if ( ! $registration instanceof EE_Registration ) return '';
+			if ( ! $registration instanceof EE_Registration ) {
+				return '';
+			}
 		//setup valid shortcodes depending on what the status of the $this->_data property is
 		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
 			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list','datetime_list', 'registration_details', 'attendee');
@@ -116,8 +117,9 @@ 
 			$adj_tkts = array();
 			//return only tickets for the given attendee
 			foreach ( $evt_tkts as $tkt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() )
-					$adj_tkts[] = $tkt;
+				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() ) {
+									$adj_tkts[] = $tkt;
+				}
 			}
 			$evt_tkts = $adj_tkts;
 		}
@@ -137,14 +139,13 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
-
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
-
-		else
-			return '';
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
+		} else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
+		} else {
+					return '';
+		}
 
 		return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary);
 	}
@@ -152,7 +153,9 @@ 
 
 	private function _get_recipient_datetime_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-		if ( ! $registration instanceof EE_Registration ) return '';
+		if ( ! $registration instanceof EE_Registration ) {
+			return '';
+		}
 		//setup valid shortcodes depending on what the status of the $this->_data property is
 		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
 			$valid_shortcodes = array('datetime', 'attendee');
@@ -184,8 +187,9 @@ 
 			$adj_dtts = array();
 			//return only dtts for the given attendee
 			foreach ( $evt_dtts as $dtt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) )
-					$adj_dtts[] = $dtt;
+				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) ) {
+									$adj_dtts[] = $dtt;
+				}
 			}
 			$evt_dtts = $adj_dtts;
 		}

core/libraries/shortcodes/EE_Shortcodes.lib.php

Spacing +25 added lines, -25 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -157,7 +157,7 @@ 
 	 */
 	protected function _set_shortcode_helper() {
 		//shortcode helper
-		EE_Registry::instance()->load_helper( 'Parse_Shortcodes' );
+		EE_Registry::instance()->load_helper('Parse_Shortcodes');
 		//get shortcode_replace instance- set when _get_messages is called in child...
 		$this->_shortcode_helper = new EEH_Parse_Shortcodes();
 	}
@@ -165,7 +165,7 @@ 
 
 
 	public function get_shortcode_helper() {
-		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes )
+		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes)
 			$this->_set_shortcode_helper();
 		return $this->_shortcode_helper;
 	}
@@ -178,25 +178,25 @@ 
 	 * @param  mixed (object|array) $extra_data extra incoming data (usually EE_Messages_Addressee)
 	 * @return string            parsed shortcode.
 	 */
-	public function parser($shortcode, $data, $extra_data = array() ) {
+	public function parser($shortcode, $data, $extra_data = array()) {
 
 		//filter setup shortcodes
 		$this->_shortcodes = $this->get_shortcodes();
 
 		//we need to setup any dynamic shortcodes so that they work with the array_key_exists
-		$sc = preg_match_all( '/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches );
-		$sc_to_verify = !empty($matches[0] ) ? $matches[0][0] . ']' : $shortcode;
+		$sc = preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches);
+		$sc_to_verify = ! empty($matches[0]) ? $matches[0][0].']' : $shortcode;
 
 		//first we want to make sure this is a valid shortcode
-		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) )
+		if ( ! array_key_exists($sc_to_verify, $this->_shortcodes))
 			return false; //get out, this parser doesn't handle the incoming shortcode.
 		$this->_data = $data;
 		$this->_extra_data = $extra_data;
 		$this->_set_messages_properties();
-		$parsed = apply_filters( 'FHEE__' . get_class($this) . '__parser_after', $this->_parser($shortcode), $shortcode, $data, $extra_data, $this );
+		$parsed = apply_filters('FHEE__'.get_class($this).'__parser_after', $this->_parser($shortcode), $shortcode, $data, $extra_data, $this);
 
 		//note the below filter applies to ALL shortcode parsers... be careful!
-		$parsed = apply_filters( 'FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this );
+		$parsed = apply_filters('FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this);
 		return $parsed;
 	}
 
@@ -212,10 +212,10 @@ 
 	 * @return array array of shortcodes => description pairs
 	 */
 	public function get_shortcodes() {
-		$this->_shortcodes = apply_filters( 'FHEE__' . get_class($this) . '__shortcodes', $this->_shortcodes, $this );
+		$this->_shortcodes = apply_filters('FHEE__'.get_class($this).'__shortcodes', $this->_shortcodes, $this);
 
 		//note the below filter applies to ALL shortcode parsers... be careful!
-		$this->_shortcodes = apply_filters( 'FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this );
+		$this->_shortcodes = apply_filters('FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this);
 
 		return $this->_shortcodes;
 	}
@@ -245,7 +245,7 @@ 
 	 * @param mixed (object|array) $data incoming data for the parser.  The data could be either an object or array because there are some shortcodes that might be replaced by prepared data that has multiple items in a list (i.e. list of attendees in an event and we're showing fname/lname for each attendee).  In this case data will be in an array.  Otherwise the data shoudl be in a properly formatted object.  The EEH_Parse_Shortcodes.helper.php describes the data object we're expecting.
 	 * @return string parsed shortcode
 	 */
-	abstract protected function _parser( $shortcode );
+	abstract protected function _parser($shortcode);
 
 
 
@@ -257,22 +257,22 @@ 
 	protected function _validate_list_requirements() {
 
 		//first test to make sure we've got an array!
-		if ( !is_array($this->_data) ) {
-			throw new EE_Error( sprintf( __('Expecting an array for the data sent to %s. Instead it was %s', 'event_espresso'), get_class($this), gettype( $this->_data ) ) );
+		if ( ! is_array($this->_data)) {
+			throw new EE_Error(sprintf(__('Expecting an array for the data sent to %s. Instead it was %s', 'event_espresso'), get_class($this), gettype($this->_data)));
 		}
 
 		//next test to make sure we've got the required template in the index!
-		if ( !isset( $this->_data['template'] ) ) {
-			throw new EE_Error( sprintf( __('The incoming data does not have the required template index in its array', 'event_espresso') ) );
+		if ( ! isset($this->_data['template'])) {
+			throw new EE_Error(sprintf(__('The incoming data does not have the required template index in its array', 'event_espresso')));
 		}
 
 		//next test to make sure we've got got a data index in the incoming data array
-		if ( !isset( $this->_data['data'] ) )
-			throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		if ( ! isset($this->_data['data']))
+			throw new EE_Error(__('The incoming data does not have the required data index in its array', 'event_espresso'));
 
 		//all is well let's make sure _extra_data always has the values needed.
 		//let's make sure that extra_data includes all templates (for later parsing if necessary)
-		if ( empty( $this->_extra_data ) || ( empty( $this->_extra_data['data'] ) && empty( $this->_extra_data['template'] ) ) ) {
+		if (empty($this->_extra_data) || (empty($this->_extra_data['data']) && empty($this->_extra_data['template']))) {
 			$this->_extra_data['data'] = $this->_data['data'];
 			$this->_extra_data['template'] = $this->_data['template'];
 		}
@@ -289,16 +289,16 @@ 
 	 *
 	 * @return array An array with the attributes
 	 */
-	protected function _get_shortcode_attrs( $shortcode ) {
+	protected function _get_shortcode_attrs($shortcode) {
 		//make sure the required wp helper function is present
 		//require the shortcode file if necessary
-		if ( ! function_exists( 'shortcode_parse_atts' ) ) {
-			require_once( ABSPATH . WPINC . '/shortcodes.php');
+		if ( ! function_exists('shortcode_parse_atts')) {
+			require_once(ABSPATH.WPINC.'/shortcodes.php');
 		}
 
 		//let's get any attributes that may be present and set the defaults.
-		$shortcode_to_parse = str_replace( '[', '', str_replace( ']', '', $shortcode ) );
-		return shortcode_parse_atts( $shortcode_to_parse );
+		$shortcode_to_parse = str_replace('[', '', str_replace(']', '', $shortcode));
+		return shortcode_parse_atts($shortcode_to_parse);
 	}
 
 
@@ -313,7 +313,7 @@ 
 	 */
 	protected function _set_messages_properties() {
 		//should be in _extra_data
-		if ( isset( $this->_extra_data['messenger'] ) ) {
+		if (isset($this->_extra_data['messenger'])) {
 			$this->_messenger = $this->_extra_data['messenger'];
 			$this->_message_type = $this->_extra_data['message_type'];
 			$this->_context = $this->_extra_data['context'];

Braces +12 added lines, -7 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
@@ -165,8 +166,9 @@ 
 
 
 	public function get_shortcode_helper() {
-		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes )
-			$this->_set_shortcode_helper();
+		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes ) {
+					$this->_set_shortcode_helper();
+		}
 		return $this->_shortcode_helper;
 	}
 
@@ -188,8 +190,10 @@ 
 		$sc_to_verify = !empty($matches[0] ) ? $matches[0][0] . ']' : $shortcode;
 
 		//first we want to make sure this is a valid shortcode
-		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) )
-			return false; //get out, this parser doesn't handle the incoming shortcode.
+		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) ) {
+					return false;
+		}
+		//get out, this parser doesn't handle the incoming shortcode.
 		$this->_data = $data;
 		$this->_extra_data = $extra_data;
 		$this->_set_messages_properties();
@@ -267,8 +271,9 @@ 
 		}
 
 		//next test to make sure we've got got a data index in the incoming data array
-		if ( !isset( $this->_data['data'] ) )
-			throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		if ( !isset( $this->_data['data'] ) ) {
+					throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		}
 
 		//all is well let's make sure _extra_data always has the values needed.
 		//let's make sure that extra_data includes all templates (for later parsing if necessary)