eventespresso / event-espresso-core

public/Espresso_Arabica_2014/content-espresso_venues-thumbnail.php

Spacing +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@ 
 <?php //echo '<h1>' . __FILE__ . '</h1>'; ?>
 <?php global $post; ?>
-<?php do_action( 'AHEE__content_espresso_venues_template__before_featured_img', $post ); ?>	
+<?php do_action('AHEE__content_espresso_venues_template__before_featured_img', $post); ?>	
 <?php				
-if ( has_post_thumbnail( $post->ID )) :
-	if ( $img_ID = get_post_thumbnail_id( $post->ID )) :
-		if ( $featured_img = wp_get_attachment_image_src( $img_ID, 'large' )) :
-			$caption = esc_attr( get_post( get_post( $img_ID ))->post_excerpt );
+if (has_post_thumbnail($post->ID)) :
+	if ($img_ID = get_post_thumbnail_id($post->ID)) :
+		if ($featured_img = wp_get_attachment_image_src($img_ID, 'large')) :
+			$caption = esc_attr(get_post(get_post($img_ID))->post_excerpt);
 			$wrap_class .= ' has-img';
 			?>
 <div id="ee-venue-img-dv-<?php echo $post->ID; ?>" class="ee-venue-img-dv">
@@ -18,5 +18,5 @@ 
 	endif;
 endif;
 ?>		
-<?php do_action( 'AHEE__content_espresso_venues_template__after_featured_img', $post );?>
+<?php do_action('AHEE__content_espresso_venues_template__after_featured_img', $post); ?>
 <!-- .venue-content -->

public/Espresso_Arabica_2014/content-espresso_venues.php

Spacing +17 added lines, -17 removed lines

@@ -11,41 +11,41 @@
  */
 
 global $post;
-$wrap_class = has_excerpt( $post->ID ) ? ' has-excerpt' : '';
+$wrap_class = has_excerpt($post->ID) ? ' has-excerpt' : '';
 ?>
-<?php do_action( 'AHEE__content_espresso_venues_template__before_post', $post ); ?>
-<article id="post-<?php the_ID(); ?>" <?php post_class( 'espresso-venue-details entry-content ' . $wrap_class ); ?>>
+<?php do_action('AHEE__content_espresso_venues_template__before_post', $post); ?>
+<article id="post-<?php the_ID(); ?>" <?php post_class('espresso-venue-details entry-content '.$wrap_class); ?>>
 
-<?php if ( is_single() ) : ?>
+<?php if (is_single()) : ?>
 
-	<div id="espresso-venue-header-dv-<?php echo $post->ID;?>" class="espresso-venue-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_venues-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_venues-header' ); ?>
+	<div id="espresso-venue-header-dv-<?php echo $post->ID; ?>" class="espresso-venue-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_venues-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-header'); ?>
 	</div>
 
 	<div class="espresso-venue-wrapper-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_venues-details' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_venues-location' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-details'); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-location'); ?>
 		<footer class="venue-meta">
-			<?php do_action( 'AHEE__content_espresso_venues_template__footer_top', $post ); ?>
-			<?php do_action( 'AHEE__content_espresso_venues_template__footer_bottom', $post ); ?>
+			<?php do_action('AHEE__content_espresso_venues_template__footer_top', $post); ?>
+			<?php do_action('AHEE__content_espresso_venues_template__footer_bottom', $post); ?>
 		</footer>
 	</div>
 
-<?php elseif ( is_archive() ) : ?>
+<?php elseif (is_archive()) : ?>
 
-	<div id="espresso-venue-header-dv-<?php echo $post->ID;?>" class="espresso-venue-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_venues-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_venues-header' ); ?>
+	<div id="espresso-venue-header-dv-<?php echo $post->ID; ?>" class="espresso-venue-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_venues-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-header'); ?>
 	</div>
 
 	<div class="espresso-venue-wrapper-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_venues-details' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-details'); ?>
 	</div>
 
 <?php endif; ?>
 
 </article>
 <!-- #post -->
-<?php do_action( 'AHEE__content_espresso_venues_template__after_post', $post );
+<?php do_action('AHEE__content_espresso_venues_template__after_post', $post);
 

public/Espresso_Arabica_2014/loop-espresso_venues.php

Spacing +7 added lines, -7 removed lines

@@ -10,30 +10,30 @@
  * @ version		4+
  */
 
-if ( have_posts() ) : ?>
+if (have_posts()) : ?>
 
 	<header class="page-header">
 		<h1 class="page-title">
-			<?php echo __( 'Event Venues', 'event_espresso' ); ?>
+			<?php echo __('Event Venues', 'event_espresso'); ?>
 		</h1>
 	</header><!-- .page-header -->
 	
 <?php 
 	// allow other stuff
-	do_action( 'AHEE__archive_espresso_venues_template__before_loop' ); 
+	do_action('AHEE__archive_espresso_venues_template__before_loop'); 
 	// Start the Loop.
-	while ( have_posts() ) : the_post();
+	while (have_posts()) : the_post();
 		// Include the post TYPE-specific template for the content.
-		espresso_get_template_part( 'content', 'espresso_venues' );
+		espresso_get_template_part('content', 'espresso_venues');
 	endwhile;
 	// Previous/next page navigation.
 	espresso_pagination();
 	// allow moar other stuff
-	do_action( 'AHEE__archive_espresso_venues_template__after_loop' ); 
+	do_action('AHEE__archive_espresso_venues_template__after_loop'); 
 
 
 else :
 	// If no content, include the "No posts found" template.
-	espresso_get_template_part( 'content', 'none' );
+	espresso_get_template_part('content', 'none');
 	
 endif;

Braces +3 added lines, -1 removed lines

@@ -32,8 +32,10 @@
 	do_action( 'AHEE__archive_espresso_venues_template__after_loop' ); 
 
 
-else :
+else {
+	:
 	// If no content, include the "No posts found" template.
 	espresso_get_template_part( 'content', 'none' );
+}
 	
 endif;

public/Espresso_Arabica_2014/single-espresso_venues.php

Spacing +4 added lines, -4 removed lines

@@ -18,11 +18,11 @@ 
 				<div id="espresso-venue-details-dv" class="" >				
 			<?php
 				// Start the Loop.
-				while ( have_posts() ) : the_post();
+				while (have_posts()) : the_post();
 					//  Include the post TYPE-specific template for the content.
-					espresso_get_template_part( 'content', 'espresso_venues' );
+					espresso_get_template_part('content', 'espresso_venues');
 					// If comments are open or we have at least one comment, load up the comment template.
-					if ( comments_open() || get_comments_number() ) {
+					if (comments_open() || get_comments_number()) {
 						comments_template();
 					}
 				endwhile;
@@ -34,6 +34,6 @@ 
 	</div><!-- #primary -->
 
 <?php
-get_sidebar( 'content' );
+get_sidebar('content');
 get_sidebar();
 get_footer();
\ No newline at end of file

shortcodes/espresso_event_attendees/EES_Espresso_Event_Attendees.shortcode.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Attendees shortcode class
  *

Spacing +31 added lines, -31 removed lines

@@ -19,7 +19,7 @@ 
 	 * @param       WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {}
+	public function run(WP $WP) {}
 
 
 	/**
@@ -69,7 +69,7 @@ 
 	 *  @param 	    array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 
 		//set default attributes
 		$default_shortcode_attributes = array(
@@ -86,7 +86,7 @@ 
 			$default_shortcode_attributes
 		);
 		// grab attributes and merge with defaults, then extract
-		$attributes = array_merge( (array) $default_shortcode_attributes, (array) $attributes );
+		$attributes = array_merge((array) $default_shortcode_attributes, (array) $attributes);
 
 		$template_args = array(
 			'contacts'      => array(),
@@ -102,31 +102,31 @@ 
 		$error = false;
 
 		//what event?
-		if ( empty( $attributes['event_id'] ) && empty( $attributes['datetime_id'] ) && empty( $attributes['ticket_id'] ) ) {
+		if (empty($attributes['event_id']) && empty($attributes['datetime_id']) && empty($attributes['ticket_id'])) {
 			//seems like is_espresso_event_single() isn't working as expected. So using alternate method.
-			if ( is_single() && is_espresso_event() ) {
+			if (is_single() && is_espresso_event()) {
 				$event = EEH_Event_View::get_event();
-				if ( $event instanceof EE_Event ) {
+				if ($event instanceof EE_Event) {
 					$template_args['event']          = $event;
 					$query[0]['Registration.EVT_ID'] = $event->ID();
 				}
 			} else {
 				//try getting the earliest active event if none then get the
-				$events = EEM_Event::instance()->get_active_events( array( 'limit'    => 1,
-				                                                          'order_by' => array( 'Datetime.DTT_EVT_start' => 'ASC' )
-				) );
-				$events = empty( $events ) ? EEM_Event::instance()->get_upcoming_events( array( 'limit'    => 1,
-				                                                                              'order_by' => array( 'Datetime.DTT_EVT_start' => 'ASC' )
-				) ) : $events;
-				$event = reset( $events );
-				if ( $event instanceof EE_Event ) {
+				$events = EEM_Event::instance()->get_active_events(array('limit'    => 1,
+				                                                          'order_by' => array('Datetime.DTT_EVT_start' => 'ASC')
+				));
+				$events = empty($events) ? EEM_Event::instance()->get_upcoming_events(array('limit'    => 1,
+				                                                                              'order_by' => array('Datetime.DTT_EVT_start' => 'ASC')
+				)) : $events;
+				$event = reset($events);
+				if ($event instanceof EE_Event) {
 					$query[0]['Registration.EVT_ID'] = $event->ID();
 					$template_args['event']          = $event;
 				}
 			}
-		} elseif ( ! empty( $attributes['event_id'] ) ) {
-			$event = EEM_Event::instance()->get_one_by_ID( $attributes['event_id'] );
-			if ( $event instanceof EE_Event ) {
+		} elseif ( ! empty($attributes['event_id'])) {
+			$event = EEM_Event::instance()->get_one_by_ID($attributes['event_id']);
+			if ($event instanceof EE_Event) {
 				$query[0]['Registration.EVT_ID'] = $attributes['event_id'];
 				$template_args['event']          = $event;
 			} else {
@@ -135,9 +135,9 @@ 
 		}
 
 		//datetime?
-		if ( ! empty( $attributes['datetime_id'] ) && empty( $attributes['event_id'] ) ) {
-			$datetime = EEM_Datetime::instance()->get_one_by_ID( $attributes['datetime_id'] );
-			if ( $datetime instanceof EE_Datetime ) {
+		if ( ! empty($attributes['datetime_id']) && empty($attributes['event_id'])) {
+			$datetime = EEM_Datetime::instance()->get_one_by_ID($attributes['datetime_id']);
+			if ($datetime instanceof EE_Datetime) {
 				$query[0]['Registration.Ticket.Datetime.DTT_ID'] = $attributes['datetime_id'];
 				$query['default_where_conditions'] = 'this_model_only';
 				$template_args['datetime']                      = $datetime;
@@ -148,9 +148,9 @@ 
 		}
 
 		//ticket?just
-		if ( ! empty( $attributes['ticket_id'] ) && empty( $attributes['event_id'] ) && empty( $attributes['datetime_id'] ) ) {
-			$ticket = EEM_Ticket::instance()->get_one_by_ID( $attributes['ticket_id'] );
-			if ( $ticket instanceof EE_Ticket ) {
+		if ( ! empty($attributes['ticket_id']) && empty($attributes['event_id']) && empty($attributes['datetime_id'])) {
+			$ticket = EEM_Ticket::instance()->get_one_by_ID($attributes['ticket_id']);
+			if ($ticket instanceof EE_Ticket) {
 				$query[0]['Registration.TKT_ID'] = $attributes['ticket_id'];
 				$template_args['ticket']         = $ticket;
 				$template_args['event']          = $ticket->first_datetime() instanceof EE_Datetime ? $ticket->first_datetime()->event() : null;
@@ -161,17 +161,17 @@ 
 
 		//status
 		$reg_status_array = EEM_Registration::reg_status_array();
-		if ( $attributes['status'] != 'all' && isset( $reg_status_array[$attributes['status']] ) ) {
+		if ($attributes['status'] != 'all' && isset($reg_status_array[$attributes['status']])) {
 			$query[0]['Registration.STS_ID'] = $attributes['status'];
 		}
-		$query['group_by'] = array( 'ATT_ID' );
-		$query['order_by'] = apply_filters( 'FHEE__EES_Espresso_Event_Attendees__process_shortcode__order_by', array( 'ATT_lname' => 'ASC', 'ATT_fname' => 'ASC' ) );
+		$query['group_by'] = array('ATT_ID');
+		$query['order_by'] = apply_filters('FHEE__EES_Espresso_Event_Attendees__process_shortcode__order_by', array('ATT_lname' => 'ASC', 'ATT_fname' => 'ASC'));
 
 		//if we have NO query where conditions, then there was an invalid parameter or the shortcode was used incorrectly
 		//so when WP_DEBUG is set and true, we'll show a message, otherwise we'll just return an empty string.
-		if ( ( ! isset( $query[0] ) || ! is_array( $query[0] ) ) || $error ) {
-			if ( WP_DEBUG ) {
-				return '<div class="important-notice ee-attention">' . __( 'The [ESPRESSO_EVENT_ATTENDEES] shortcode has been used incorrectly.  Please double check the arguments you used for any typos.  In the case of ID type arguments, its possible the given ID does not correspond to existing data in the database.', 'event_espresso' ) . '</div>';
+		if (( ! isset($query[0]) || ! is_array($query[0])) || $error) {
+			if (WP_DEBUG) {
+				return '<div class="important-notice ee-attention">'.__('The [ESPRESSO_EVENT_ATTENDEES] shortcode has been used incorrectly.  Please double check the arguments you used for any typos.  In the case of ID type arguments, its possible the given ID does not correspond to existing data in the database.', 'event_espresso').'</div>';
 			} else {
 				return '';
 			}
@@ -179,11 +179,11 @@ 
 
 
 		//get contacts!
-		$template_args['contacts'] = EEM_Attendee::instance()->get_all( $query );
+		$template_args['contacts'] = EEM_Attendee::instance()->get_all($query);
 
 
 		//all set let's load up the template and return.
-		return EEH_Template::locate_template( 'loop-espresso_event_attendees.php', $template_args, true, true );
+		return EEH_Template::locate_template('loop-espresso_event_attendees.php', $template_args, true, true);
 
 	}
 

Indentation +2 added lines, -2 removed lines

@@ -113,10 +113,10 @@
 			} else {
 				//try getting the earliest active event if none then get the
 				$events = EEM_Event::instance()->get_active_events( array( 'limit'    => 1,
-				                                                          'order_by' => array( 'Datetime.DTT_EVT_start' => 'ASC' )
+																		  'order_by' => array( 'Datetime.DTT_EVT_start' => 'ASC' )
 				) );
 				$events = empty( $events ) ? EEM_Event::instance()->get_upcoming_events( array( 'limit'    => 1,
-				                                                                              'order_by' => array( 'Datetime.DTT_EVT_start' => 'ASC' )
+																							  'order_by' => array( 'Datetime.DTT_EVT_start' => 'ASC' )
 				) ) : $events;
 				$event = reset( $events );
 				if ( $event instanceof EE_Event ) {

shortcodes/espresso_thank_you/templates/thank-you-page-payment-details.template.php

Spacing +16 added lines, -16 removed lines

@@ -1,30 +1,30 @@ 
 <h2 class="section-heading display-box-heading">
 	<?php _e('Payment Overview', 'event_espresso'); ?>
 </h2>
-<?php  do_action( 'AHEE__thank_you_page_payment_details_template__after_heading' ); ?>
+<?php  do_action('AHEE__thank_you_page_payment_details_template__after_heading'); ?>
 
 <div id="espresso-thank-you-page-payment-details-dv">
-<?php if ( ! empty( $payments )){	 ?>
+<?php if ( ! empty($payments)) {	 ?>
 	<table class="ee-table">
 		<thead>
 			<tr>
 				<th width="35%" class="jst-left">
-					<?php _e('Payment Date','event_espresso')?>
+					<?php _e('Payment Date', 'event_espresso')?>
 				</th>
 				<th width="17.5%" class="jst-left">
-					<?php _e('Type','event_espresso');?>
+					<?php _e('Type', 'event_espresso'); ?>
 				</th>
 				<th width="17.5%" class="jst-rght">
-					<?php _e('Amount','event_espresso');?>
+					<?php _e('Amount', 'event_espresso'); ?>
 				</th>
 				<th width="30%" class="jst-rght">
-					<?php _e('Status','event_espresso');?>
+					<?php _e('Status', 'event_espresso'); ?>
 				</th>
 			</tr>
 		</thead>
 		<tbody>
 		<?php
-			foreach ( $payments as $payment ) {
+			foreach ($payments as $payment) {
 				echo $payment;
 			}
 		?>
@@ -33,38 +33,38 @@ 
 <?php
 	} else {
 
-		if ( $transaction->total() ){
+		if ($transaction->total()) {
 
 			echo apply_filters(
 				'FHEE__payment_overview_template__no_payments_made',
-				sprintf (
-					__('%sNo payments towards this transaction have been received.%s', 'event_espresso' ),
+				sprintf(
+					__('%sNo payments towards this transaction have been received.%s', 'event_espresso'),
 					'<p class="important-notice">',
 					'</p>'
 				)
 			);
-			do_action( 'AHEE__thank_you_page_payment_details_template__no_payments_made', $transaction );
+			do_action('AHEE__thank_you_page_payment_details_template__no_payments_made', $transaction);
 
 		} else {
 
 			echo apply_filters(
 				'FHEE__payment_overview_template__no_payment_required',
-				sprintf (
-					__('%sNo payment is required for this transaction.%s', 'event_espresso' ),
+				sprintf(
+					__('%sNo payment is required for this transaction.%s', 'event_espresso'),
 					'<p>',
 					'</p>'
 				)
 			);
-			do_action( 'AHEE__thank_you_page_payment_details_template__no_payment_required' );
+			do_action('AHEE__thank_you_page_payment_details_template__no_payment_required');
 
 		 }
 
 	}
 	echo $gateway_content;
-	do_action( 'AHEE__thank_you_page_payment_details_template__after_gateway_content', $gateway_content );
+	do_action('AHEE__thank_you_page_payment_details_template__after_gateway_content', $gateway_content);
 
 ?>
 
 	<br/>
-	<?php  do_action( 'AHEE__thank_you_page_payment_details_template__after_payment_details' ); ?>
+	<?php  do_action('AHEE__thank_you_page_payment_details_template__after_payment_details'); ?>
 

shortcodes/espresso_thank_you/templates/thank-you-page-transaction-details.template.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <h3><?php _e('Transaction Details', 'event_espresso'); ?></h3>
-<?php  do_action( 'AHEE__thank_you_page_transaction_details_template__after_heading' ); ?>
+<?php  do_action('AHEE__thank_you_page_transaction_details_template__after_heading'); ?>
 
 <div id="espresso-thank-you-page-transaction-details-dv">
 	<table class='ee-table'>
@@ -9,7 +9,7 @@ 
 					<label><?php _e('Total Cost: ', 'event_espresso'); ?></label>
 				</td>
 				<td>
-					<?php echo EEH_Template::format_currency( $transaction->total() ); ?>
+					<?php echo EEH_Template::format_currency($transaction->total()); ?>
 				</td>
 			</tr>
 			<tr>
@@ -17,7 +17,7 @@ 
 					<label><?php _e('Amount Owing: ', 'event_espresso'); ?></label>
 				</td>
 				<td class="<?php echo ($transaction->paid() == $transaction->total()) ? 'ee-transaction-paid' : 'ee-transaction-unpaid' ?>">
-					<?php echo EEH_Template::format_currency( $transaction->remaining() ); ?>
+					<?php echo EEH_Template::format_currency($transaction->remaining()); ?>
 				</td>
 			</tr>
 			<tr>
@@ -25,8 +25,8 @@ 
 					<label><?php _e('Transaction Status: ', 'event_espresso'); ?></label>
 				</td>
 				<td>
-					<?php $transaction->e_pretty_status( TRUE );
-					if ( $show_try_pay_again_link && ! $transaction->is_completed() ) { ?>
+					<?php $transaction->e_pretty_status(TRUE);
+					if ($show_try_pay_again_link && ! $transaction->is_completed()) { ?>
 					 &nbsp; <span class="small-text"><a href='<?php echo $SPCO_payment_options_url?>'><?php _e('View Payment Options', 'event_espresso'); ?></a></span>
 					<?php } ?>
 				</td>
@@ -39,11 +39,11 @@ 
 					<?php  echo $primary_registrant_name; ?>
 				</td>
 			</tr>
-            <?php  do_action( 'AHEE__thank_you_page_transaction_details_template__after_transaction_table_row', $transaction ); ?>
+            <?php  do_action('AHEE__thank_you_page_transaction_details_template__after_transaction_table_row', $transaction); ?>
 		</tbody>
 	</table>
 
-<?php if ( $show_try_pay_again_link && ! $transaction->is_completed() ) { ?>
+<?php if ($show_try_pay_again_link && ! $transaction->is_completed()) { ?>
 	<p class="small-text jst-rght">
 		<a href='<?php echo $SPCO_payment_options_url?>'><?php _e("Click here to view Payment Options", 'event_espresso'); ?></a>
 	</p>
@@ -52,6 +52,6 @@ 
 
 <?php }?>
 
-    <?php  do_action( 'AHEE__thank_you_page_transaction_details_template__after_transaction_details' ); ?>
+    <?php  do_action('AHEE__thank_you_page_transaction_details_template__after_transaction_details'); ?>
 
 </div>

widgets/upcoming_events/EEW_Upcoming_Events.widget.php

Indentation +11 added lines, -11 removed lines

@@ -192,14 +192,14 @@ 
 		        <?php _e('Show on all Pages:', 'event_espresso'); ?>
 			</label>
 	 	    <?php
-	 	    echo EEH_Form_Fields::select(
-	 	        __('Show on all Pages:', 'event_espresso'),
-	 	        $instance['show_everywhere'],
-	 	        $yes_no_values,
-	 	        $this->get_field_name('show_everywhere'),
-	 	        $this->get_field_id('show_everywhere')
-	 	    );
-	 	    ?>
+	 		echo EEH_Form_Fields::select(
+	 			__('Show on all Pages:', 'event_espresso'),
+	 			$instance['show_everywhere'],
+	 			$yes_no_values,
+	 			$this->get_field_name('show_everywhere'),
+	 			$this->get_field_id('show_everywhere')
+	 		);
+	 		?>
 	 	</p>
 		<p>
 			<label for="<?php echo $this->get_field_id('date_limit'); ?>">
@@ -282,13 +282,13 @@ 
 				extract($args);
 
 				// add function to make the title a link
-	            add_filter('widget_title', array($this, 'make_the_title_a_link'), 15);
+				add_filter('widget_title', array($this, 'make_the_title_a_link'), 15);
 
 				// filter the title
 				$title = apply_filters('widget_title', $instance['title']);
 
 				// remove the function from the filter, so it does not affect other widgets
-	            remove_filter('widget_title', array($this, 'make_the_title_a_link'), 15);
+				remove_filter('widget_title', array($this, 'make_the_title_a_link'), 15);
 
 				// Before widget (defined by themes).
 				echo $before_widget;
@@ -385,7 +385,7 @@ 
 	 * @return string
 	 */
 	public function make_the_title_a_link($title) {
-	    return '<a href="' . EEH_Event_View::event_archive_url() . '">' . $title . '</a>';
+		return '<a href="' . EEH_Event_View::event_archive_url() . '">' . $title . '</a>';
 	}
 
 }

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -360,7 +362,7 @@ 
 									$single_time_format = apply_filters( 'FHEE__espresso_event_date_range__single_time_format', get_option( 'time_format' ));
 									if ( $date_range == TRUE ) {
 										echo espresso_event_date_range( $date_format, $time_format, $single_date_format, $single_time_format, $event->ID() );
-									}else{
+									} else{
 										echo espresso_list_of_event_dates( $event->ID(), $date_format, $time_format, FALSE, NULL, TRUE, TRUE, $date_limit );
 									}
 								}

Spacing +73 added lines, -73 removed lines

@@ -30,8 +30,8 @@ 
 	function __construct() {
 		parent::__construct(
 			'ee-upcoming-events-widget',
-			__( 'Event Espresso Upcoming Events', 'event_espresso' ),
-			 array( 'description' => __( 'A widget to display your upcoming events.', 'event_espresso' )),
+			__('Event Espresso Upcoming Events', 'event_espresso'),
+			 array('description' => __('A widget to display your upcoming events.', 'event_espresso')),
 			array(
 				'width' => 300,
 				'height' => 350,
@@ -49,9 +49,9 @@ 
 	 * @param array $instance Previously saved values from database.
 	 * @return string|void
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
-		EE_Registry::instance()->load_class( 'Question_Option', array(), FALSE, FALSE, TRUE );
+		EE_Registry::instance()->load_class('Question_Option', array(), FALSE, FALSE, TRUE);
 		// Set up some default widget settings.
 		$defaults = array(
 			'title' => __('Upcoming Events', 'event_espresso'),
@@ -66,12 +66,12 @@ 
 			'image_size' => 'medium'
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults );
+		$instance = wp_parse_args((array) $instance, $defaults);
 		// don't add HTML labels for EE_Form_Fields generated inputs
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
+		add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
 		$yes_no_values = array(
-			EE_Question_Option::new_instance( array( 'QSO_value' => FALSE, 'QSO_desc' => __('No', 'event_espresso'))),
-			EE_Question_Option::new_instance( array( 'QSO_value' => TRUE, 'QSO_desc' => __('Yes', 'event_espresso')))
+			EE_Question_Option::new_instance(array('QSO_value' => FALSE, 'QSO_desc' => __('No', 'event_espresso'))),
+			EE_Question_Option::new_instance(array('QSO_value' => TRUE, 'QSO_desc' => __('Yes', 'event_espresso')))
 		);
 
 	?>
@@ -82,7 +82,7 @@ 
 			<label for="<?php echo $this->get_field_id('title'); ?>">
 				<?php _e('Title:', 'event_espresso'); ?>
 			</label>
-			<input id="<?php echo $this->get_field_id('title'); ?>" class="widefat" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr( $instance['title'] ); ?>" type="text" />
+			<input id="<?php echo $this->get_field_id('title'); ?>" class="widefat" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr($instance['title']); ?>" type="text" />
 		</p>
 		<p>
 			<label for="<?php echo $this->get_field_id('category_name'); ?>">
@@ -91,16 +91,16 @@ 
 			<?php
 			$event_categories = array();
 			/** @type EEM_Term $EEM_Term */
-			$EEM_Term = EE_Registry::instance()->load_model( 'Term' );
-			$categories = $EEM_Term->get_all_ee_categories( TRUE );
-			if ( $categories ) {
-				foreach ( $categories as $category ) {
-					if ( $category instanceof EE_Term ) {
-						$event_categories[] = EE_Question_Option::new_instance( array( 'QSO_value' => $category->get( 'slug' ), 'QSO_desc' => $category->get( 'name' )));
+			$EEM_Term = EE_Registry::instance()->load_model('Term');
+			$categories = $EEM_Term->get_all_ee_categories(TRUE);
+			if ($categories) {
+				foreach ($categories as $category) {
+					if ($category instanceof EE_Term) {
+						$event_categories[] = EE_Question_Option::new_instance(array('QSO_value' => $category->get('slug'), 'QSO_desc' => $category->get('name')));
 					}
 				}
 			}
-			array_unshift( $event_categories, EE_Question_Option::new_instance( array( 'QSO_value' => '', 'QSO_desc' => __(' - display all - ', 'event_espresso'))));
+			array_unshift($event_categories, EE_Question_Option::new_instance(array('QSO_value' => '', 'QSO_desc' => __(' - display all - ', 'event_espresso'))));
 			echo EEH_Form_Fields::select(
 				 __('Event Category:', 'event_espresso'),
 				$instance['category_name'],
@@ -137,16 +137,16 @@ 
 			<?php
 			$image_sizes = array();
 			$sizes = get_intermediate_image_sizes();
-			if ( $sizes ) {
+			if ($sizes) {
 				// loop thru images and create option objects out of them
-				foreach ( $sizes as $image_size ) {
-					$image_size = trim( $image_size );
+				foreach ($sizes as $image_size) {
+					$image_size = trim($image_size);
 					// no big images plz
-					if ( ! in_array( $image_size, array( 'large', 'post-thumbnail' ))) {
-						$image_sizes[] = EE_Question_Option::new_instance( array( 'QSO_value' => $image_size, 'QSO_desc' => $image_size ));
+					if ( ! in_array($image_size, array('large', 'post-thumbnail'))) {
+						$image_sizes[] = EE_Question_Option::new_instance(array('QSO_value' => $image_size, 'QSO_desc' => $image_size));
 					}
 				}
-				$image_sizes[] = EE_Question_Option::new_instance( array( 'QSO_value' => 'none', 'QSO_desc' =>  __('don\'t show images', 'event_espresso') ));
+				$image_sizes[] = EE_Question_Option::new_instance(array('QSO_value' => 'none', 'QSO_desc' =>  __('don\'t show images', 'event_espresso')));
 			}
 			echo EEH_Form_Fields::select(
 				 __('Image Size:', 'event_espresso'),
@@ -204,7 +204,7 @@ 
 			<label for="<?php echo $this->get_field_id('date_limit'); ?>">
 				<?php _e('Number of Dates to Display:', 'event_espresso'); ?>
 			</label>
-			<input id="<?php echo $this->get_field_id('date_limit'); ?>" name="<?php echo $this->get_field_name('date_limit'); ?>" value="<?php echo esc_attr( $instance['date_limit'] ); ?>" size="3" type="text" />
+			<input id="<?php echo $this->get_field_id('date_limit'); ?>" name="<?php echo $this->get_field_name('date_limit'); ?>" value="<?php echo esc_attr($instance['date_limit']); ?>" size="3" type="text" />
 		</p>
 		<p>
 			<label for="<?php echo $this->get_field_id('date_range'); ?>">
@@ -236,9 +236,9 @@ 
 	 *
 	 * @return array Updated safe values to be saved.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = ! empty( $new_instance['title'] ) ? strip_tags( $new_instance['title'] ) : '';
+		$instance['title'] = ! empty($new_instance['title']) ? strip_tags($new_instance['title']) : '';
 		$instance['category_name'] = $new_instance['category_name'];
 		$instance['show_expired'] = $new_instance['show_expired'];
 		$instance['limit'] = $new_instance['limit'];
@@ -261,18 +261,18 @@ 
 	 * @param array $args     Widget arguments.
 	 * @param array $instance Saved values from database.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		global $post;
 		// make sure there is some kinda post object
-		if ( $post instanceof WP_Post ) {
+		if ($post instanceof WP_Post) {
 			$before_widget = '';
 			$before_title = '';
 			$after_title = '';
 			$after_widget = '';
 			// but NOT an events archives page, cuz that would be like two event lists on the same page
-			$show_everywhere = isset( $instance['show_everywhere'] ) ? (bool) absint( $instance['show_everywhere'] ) : TRUE;
-			if ( $show_everywhere || ! ( $post->post_type == 'espresso_events' && is_archive() )) {
+			$show_everywhere = isset($instance['show_everywhere']) ? (bool) absint($instance['show_everywhere']) : TRUE;
+			if ($show_everywhere || ! ($post->post_type == 'espresso_events' && is_archive())) {
 				// let's use some of the event helper functions'
 				// make separate vars out of attributes
 
@@ -291,83 +291,83 @@ 
 				// Before widget (defined by themes).
 				echo $before_widget;
 				// Display the widget title if one was input (before and after defined by themes).
-				if ( ! empty( $title )) {
-					echo $before_title . $title . $after_title;
+				if ( ! empty($title)) {
+					echo $before_title.$title.$after_title;
 				}
 				// grab widget settings
-				$category = isset( $instance['category_name'] ) && ! empty( $instance['category_name'] ) ? $instance['category_name'] : FALSE;
-				$show_expired = isset( $instance['show_expired'] ) ? (bool) absint( $instance['show_expired'] ) : FALSE;
-				$image_size = isset( $instance['image_size'] ) && ! empty( $instance['image_size'] ) ? $instance['image_size'] : 'medium';
-				$show_desc = isset( $instance['show_desc'] ) ? (bool) absint( $instance['show_desc'] ) : TRUE;
-				$show_dates = isset( $instance['show_dates'] ) ? (bool) absint( $instance['show_dates'] ) : TRUE;
-				$date_limit = isset( $instance['date_limit'] ) && ! empty( $instance['date_limit'] ) ? $instance['date_limit'] : NULL;
-				$date_range = isset( $instance['date_range'] ) && ! empty( $instance['date_range'] ) ? $instance['date_range'] : FALSE;
+				$category = isset($instance['category_name']) && ! empty($instance['category_name']) ? $instance['category_name'] : FALSE;
+				$show_expired = isset($instance['show_expired']) ? (bool) absint($instance['show_expired']) : FALSE;
+				$image_size = isset($instance['image_size']) && ! empty($instance['image_size']) ? $instance['image_size'] : 'medium';
+				$show_desc = isset($instance['show_desc']) ? (bool) absint($instance['show_desc']) : TRUE;
+				$show_dates = isset($instance['show_dates']) ? (bool) absint($instance['show_dates']) : TRUE;
+				$date_limit = isset($instance['date_limit']) && ! empty($instance['date_limit']) ? $instance['date_limit'] : NULL;
+				$date_range = isset($instance['date_range']) && ! empty($instance['date_range']) ? $instance['date_range'] : FALSE;
 				// start to build our where clause
 				$where = array(
 //					'Datetime.DTT_is_primary' => 1,
-					'status' => array( 'IN', array( 'publish', 'sold_out' ) )
+					'status' => array('IN', array('publish', 'sold_out'))
 				);
 				// add category
-				if ( $category ) {
+				if ($category) {
 					$where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 					$where['Term_Taxonomy.Term.slug'] = $category;
 				}
 				// if NOT expired then we want events that start today or in the future
-				if ( ! $show_expired ) {
-					$where['Datetime.DTT_EVT_end'] = array( '>=', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) );
+				if ( ! $show_expired) {
+					$where['Datetime.DTT_EVT_end'] = array('>=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
 				}
 				// allow $where to be filtered
-				$where = apply_filters( 'FHEE__EEW_Upcoming_Events__widget__where', $where, $category, $show_expired );
+				$where = apply_filters('FHEE__EEW_Upcoming_Events__widget__where', $where, $category, $show_expired);
 				// run the query
-				$events = EE_Registry::instance()->load_model( 'Event' )->get_all( array(
+				$events = EE_Registry::instance()->load_model('Event')->get_all(array(
 					$where,
-					'limit' => $instance['limit'] > 0 ? '0,' . $instance['limit'] : '0,10',
+					'limit' => $instance['limit'] > 0 ? '0,'.$instance['limit'] : '0,10',
 					'order_by' => 'Datetime.DTT_EVT_start',
 					'order' => 'ASC',
 					'group_by' => 'EVT_ID'
 				));
 
-				if ( ! empty( $events )) {
+				if ( ! empty($events)) {
 					echo '<ul class="ee-upcoming-events-widget-ul">';
-					foreach ( $events as $event ) {
-						if ( $event instanceof EE_Event && ( !is_single() || $post->ID != $event->ID() ) ) {
+					foreach ($events as $event) {
+						if ($event instanceof EE_Event && ( ! is_single() || $post->ID != $event->ID())) {
 							//printr( $event, '$event  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-							echo '<li id="ee-upcoming-events-widget-li-' . $event->ID() . '" class="ee-upcoming-events-widget-li">';
+							echo '<li id="ee-upcoming-events-widget-li-'.$event->ID().'" class="ee-upcoming-events-widget-li">';
 							// how big is the event name ?
-							$name_length = strlen( $event->name() );
-							switch( $name_length ) {
+							$name_length = strlen($event->name());
+							switch ($name_length) {
 								case $name_length > 70 :
-									$len_class =  ' three-line';
+									$len_class = ' three-line';
 									break;
 								case $name_length > 35 :
-									$len_class =  ' two-line';
+									$len_class = ' two-line';
 									break;
 								default :
-									$len_class =  ' one-line';
+									$len_class = ' one-line';
 							}
-							$event_url = apply_filters( 'FHEE_EEW_Upcoming_Events__widget__event_url', $event->get_permalink(), $event );
-							echo '<h5 class="ee-upcoming-events-widget-title-h5"><a class="ee-widget-event-name-a' . $len_class . '" href="' . $event_url . '">' . $event->name() . '</a></h5>';
-							if ( post_password_required( $event->ID() ) ) {
-								$pswd_form = apply_filters( 'FHEE_EEW_Upcoming_Events__widget__password_form', get_the_password_form( $event->ID() ), $event );
+							$event_url = apply_filters('FHEE_EEW_Upcoming_Events__widget__event_url', $event->get_permalink(), $event);
+							echo '<h5 class="ee-upcoming-events-widget-title-h5"><a class="ee-widget-event-name-a'.$len_class.'" href="'.$event_url.'">'.$event->name().'</a></h5>';
+							if (post_password_required($event->ID())) {
+								$pswd_form = apply_filters('FHEE_EEW_Upcoming_Events__widget__password_form', get_the_password_form($event->ID()), $event);
 								echo $pswd_form;
 							} else {
-								if ( has_post_thumbnail( $event->ID() ) && $image_size != 'none' ) {
-									echo '<div class="ee-upcoming-events-widget-img-dv"><a class="ee-upcoming-events-widget-img" href="' . $event_url . '">' . get_the_post_thumbnail( $event->ID(), $image_size ) . '</a></div>';
+								if (has_post_thumbnail($event->ID()) && $image_size != 'none') {
+									echo '<div class="ee-upcoming-events-widget-img-dv"><a class="ee-upcoming-events-widget-img" href="'.$event_url.'">'.get_the_post_thumbnail($event->ID(), $image_size).'</a></div>';
 								}
-								$desc = $event->short_description( 25 );
-								if ( $show_dates ) {
-									$date_format = apply_filters( 'FHEE__espresso_event_date_range__date_format', get_option( 'date_format' ));
-									$time_format = apply_filters( 'FHEE__espresso_event_date_range__time_format', get_option( 'time_format' ));
-									$single_date_format = apply_filters( 'FHEE__espresso_event_date_range__single_date_format', get_option( 'date_format' ));
-									$single_time_format = apply_filters( 'FHEE__espresso_event_date_range__single_time_format', get_option( 'time_format' ));
-									if ( $date_range == TRUE ) {
-										echo espresso_event_date_range( $date_format, $time_format, $single_date_format, $single_time_format, $event->ID() );
-									}else{
-										echo espresso_list_of_event_dates( $event->ID(), $date_format, $time_format, FALSE, NULL, TRUE, TRUE, $date_limit );
+								$desc = $event->short_description(25);
+								if ($show_dates) {
+									$date_format = apply_filters('FHEE__espresso_event_date_range__date_format', get_option('date_format'));
+									$time_format = apply_filters('FHEE__espresso_event_date_range__time_format', get_option('time_format'));
+									$single_date_format = apply_filters('FHEE__espresso_event_date_range__single_date_format', get_option('date_format'));
+									$single_time_format = apply_filters('FHEE__espresso_event_date_range__single_time_format', get_option('time_format'));
+									if ($date_range == TRUE) {
+										echo espresso_event_date_range($date_format, $time_format, $single_date_format, $single_time_format, $event->ID());
+									} else {
+										echo espresso_list_of_event_dates($event->ID(), $date_format, $time_format, FALSE, NULL, TRUE, TRUE, $date_limit);
 									}
 								}
-								if ( $show_desc && $desc ) {
-									echo '<p style="margin-top: .5em">' . $desc . '</p>';
+								if ($show_desc && $desc) {
+									echo '<p style="margin-top: .5em">'.$desc.'</p>';
 								}
 							}
 							echo '</li>';
@@ -391,7 +391,7 @@ 
 	 * @return string
 	 */
 	public function make_the_title_a_link($title) {
-	    return '<a href="' . EEH_Event_View::event_archive_url() . '">' . $title . '</a>';
+	    return '<a href="'.EEH_Event_View::event_archive_url().'">'.$title.'</a>';
 	}
 
 }

core/libraries/messages/EE_message_type.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -767,7 +767,7 @@
 	 * Takes care of setting up the addressee object(s) for the primary attendee.
 	 *
 	 * @access protected
-	 * @return array of EE_Addressee objects
+	 * @return EE_Messages_Addressee[] of EE_Addressee objects
 	 */
 	protected function _primary_attendee_addressees() {
 		$aee = $this->_default_addressee_data;

Indentation +2 added lines, -2 removed lines

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

Spacing +80 added lines, -80 removed lines

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