eventespresso / event-espresso-core

caffeinated/admin/new/venues/help_tours/Venues_Overview_Help_Tour.class.php

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -125,44 +125,44 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Venue Overview', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Venues Overview page will provide an overview of the different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Venue Overview', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Venues Overview page will provide an overview of the different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 		return $content;
 	}
 	
 	protected function _id_stop() {
-		return '<p>' . __('View the venue ID. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the venue ID. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 	
 	protected function _name_stop() {
-		return '<p>' . __('View the name of each venue. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the name of each venue. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 	
 	protected function _address_stop() {
-		return '<p>' . __('View the address for each venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the address for each venue.', 'event_espresso').'</p>';
 	}
 	
 	protected function _city_stop() {
-		return '<p>' . __('View the city for each venue. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the city for each venue. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 	
 	protected function _capacity_stop() {
-		return '<p>' . __('View the capacity for each venue. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the capacity for each venue. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 
 	protected function _shortcode_stop() {
-		return '<p>' . __('View the shortcode for a venue. This shortcode can be added to an event, WordPress post, or WordPress page. ', 'event_espresso') . '</p>';
+		return '<p>'.__('View the shortcode for a venue. This shortcode can be added to an event, WordPress post, or WordPress page. ', 'event_espresso').'</p>';
 	}
 
 	protected function _bulk_actions_stop() {
-		return '<p>' . __('Perform bulk actions to multiple venues.', 'event_espresso') . '</p>';
+		return '<p>'.__('Perform bulk actions to multiple venues.', 'event_espresso').'</p>';
 	}
 
 	protected function _search_stop() {
-		return '<p>' . __('Search through venues. The following sources will be searched: Venue Name, Venue Description, Venue Short Description, Venue Address, Venue City, Venue Zip/Postal Code, Venue Phone, Venue URL, Venue Virtual Phone, Venue Google Map link, Event Name, Event Description, Event Phone, and Event External URL.', 'event_espresso') . '</p>';
+		return '<p>'.__('Search through venues. The following sources will be searched: Venue Name, Venue Description, Venue Short Description, Venue Address, Venue City, Venue Zip/Postal Code, Venue Phone, Venue URL, Venue Virtual Phone, Venue Google Map link, Event Name, Event Description, Event Phone, and Event External URL.', 'event_espresso').'</p>';
 	}
 	
 	protected function _new_venue_stop() {
-		return '<p>' . __('Click here to add a new venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('Click here to add a new venue.', 'event_espresso').'</p>';
 	}
 }
\ No newline at end of file

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');
+}
 
 /**
  *

caffeinated/admin/new/venues/templates/event_venues_metabox_content_from_manager.template.php

Spacing +5 added lines, -5 removed lines

@@ -3,11 +3,11 @@ 
 		<td valign="top" class="use-ven-manager">
 		<label><?php _e('Select from Venue Manager List', 'event_espresso'); ?></label>
 		<?php echo $venue_selector; ?>
-		<?php foreach ( $venues as $venue ) :
+		<?php foreach ($venues as $venue) :
 			$selected = $evt_venue_id == $venue->ID() ? '' : ' style="display:none;"';
-			$edit_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'edit', 'post' => $venue->ID() ), EE_VENUES_ADMIN_URL );
-			$state_name = is_object( $venue->state_obj() ) ? $venue->state_obj()->name() : NULL;
-			$country_name = is_object( $venue->country_obj() ) ? $venue->country_obj()->name() : NULL;
+			$edit_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $venue->ID()), EE_VENUES_ADMIN_URL);
+			$state_name = is_object($venue->state_obj()) ? $venue->state_obj()->name() : NULL;
+			$country_name = is_object($venue->country_obj()) ? $venue->country_obj()->name() : NULL;
 			?>
 			<fieldset id="eebox_<?php echo $venue->ID(); ?>" class="eebox"<?php echo $selected; ?>>
 				<ul class="address-view">
@@ -18,7 +18,7 @@ 
 							<span><?php _e('State:', 'event_espresso'); ?></span> <?php echo $state_name; ?><br />
 							<span><?php _e('Country:', 'event_espresso'); ?></span> <?php echo $country_name; ?><br />
 							<span><?php _e('Venue ID:', 'event_espresso'); ?></span> <?php echo $venue->ID(); ?><br /></p>
-							<!-- <?php printf( __('This venue\'s shortcode: %s[ESPRESSO_VENUE id="%d"]%s', 'event_espresso'), '<strong class="highlight">', $venue->ID(), '</strong>' ); ?><br /> -->
+							<!-- <?php printf(__('This venue\'s shortcode: %s[ESPRESSO_VENUE id="%d"]%s', 'event_espresso'), '<strong class="highlight">', $venue->ID(), '</strong>'); ?><br /> -->
 							<a href="<?php echo $edit_url; ?>" target="_blank"><?php _e('Edit this Venue', 'event_espresso'); ?></a>
 					</li>	
 				</ul>

caffeinated/admin/new/venues/templates/venue_gmap_metabox_content.template.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 	<tr>
 		<td valign="top">
 			<fieldset>
-				<?php if( isset( EE_Registry::instance()->CFG->map_settings ) && isset( EE_Registry::instance()->CFG->map_settings->use_google_maps ) && EE_Registry::instance()->CFG->map_settings->use_google_maps ) { ?>
+				<?php if (isset(EE_Registry::instance()->CFG->map_settings) && isset(EE_Registry::instance()->CFG->map_settings->use_google_maps) && EE_Registry::instance()->CFG->map_settings->use_google_maps) { ?>
 				<p>
 					<label for="enable_for_gmap">
 						<?php _e('Display Google Map for this venue? ', 'event_espresso') ?>
@@ -14,11 +14,11 @@ 
 					<input type="text" name="vnu_google_map_link" value="<?php echo $vnu_google_map_link; ?>" class="all-options" /> 
 				</p> -->
 				<?php } ?>
-				<?php if( ! isset( EE_Registry::instance()->CFG->map_settings ) || ! isset( EE_Registry::instance()->CFG->map_settings->use_google_maps ) || ! EE_Registry::instance()->CFG->map_settings->use_google_maps ) { ?>
+				<?php if ( ! isset(EE_Registry::instance()->CFG->map_settings) || ! isset(EE_Registry::instance()->CFG->map_settings->use_google_maps) || ! EE_Registry::instance()->CFG->map_settings->use_google_maps) { ?>
 					<p class="ee-notice">
 						<?php
 							echo sprintf( 
-								__('To display a Google Map for event venues, go to %sEvent Espresso General Settings%sGoogle Maps%s, and set "Activate Google Maps" to "Yes"', 'event_espresso' ),
+								__('To display a Google Map for event venues, go to %sEvent Espresso General Settings%sGoogle Maps%s, and set "Activate Google Maps" to "Yes"', 'event_espresso'),
 								'<b>',
 								'</b> &raquo; <b>',
 								'</b>'

caffeinated/core/libraries/messages/defaults/default/email_newsletter_content.template.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
                         <tbody>
                             <tr>
                                 <td>
-                                    <h2><?php printf( __('Hello, %s:', 'event_espresso'), '[RECIPIENT_FNAME]' ); ?></h2>
+                                    <h2><?php printf(__('Hello, %s:', 'event_espresso'), '[RECIPIENT_FNAME]'); ?></h2>
                                     <p class="lead"><?php _e("We've got a few things we want to share with you!", 'event_espresso'); ?></p>
                                     <div>
                                         [NEWSLETTER_CONTENT]

caffeinated/core/libraries/messages/defaults/default/email_newsletter_subject.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php printf( __('Message from %s', 'event_espresso'), EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) ); ?>
+<?php printf(__('Message from %s', 'event_espresso'), EE_Registry::instance()->CFG->organization->get_pretty('name')); ?>

caffeinated/core/libraries/messages/message_type/cancelled_registration/EE_Cancelled_Registration_message_type.class.php

Indentation +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 		//remove unwanted transaction shortcode
 		foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
 			if( ($key = array_search('transaction', $shortcodes) ) !== false) {
-			    unset($this->_valid_shortcodes[$context][$key]);
+				unset($this->_valid_shortcodes[$context][$key]);
 			}
 		}
 	}

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -78,8 +78,8 @@ 
 		parent::_set_valid_shortcodes();
 
 		//remove unwanted transaction shortcode
-		foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
-			if( ($key = array_search('transaction', $shortcodes) ) !== false) {
+		foreach ($this->_valid_shortcodes as $context => $shortcodes) {
+			if (($key = array_search('transaction', $shortcodes)) !== false) {
 			    unset($this->_valid_shortcodes[$context][$key]);
 			}
 		}

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');
+}
 
 /**
  *

caffeinated/core/libraries/messages/message_type/newsletter/EE_Messages_Contacts_incoming_data.class.php

Indentation +52 added lines, -52 removed lines

@@ -19,63 +19,63 @@
 class EE_Messages_Contacts_incoming_data extends EE_Messages_incoming_data {
 
 
-    /**
-     * Constructor.
-     *
-     * @since    4.3.0
-     * @param  EE_Attendee[]     $data expecting an array of EE_Attendee objects.
-     * @access protected
-     */
-    public function __construct( $data = array() ) {
+	/**
+	 * Constructor.
+	 *
+	 * @since    4.3.0
+	 * @param  EE_Attendee[]     $data expecting an array of EE_Attendee objects.
+	 * @access protected
+	 */
+	public function __construct( $data = array() ) {
 
-        //validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
-        $ctc_chk = reset( $data );
-        if ( ! $ctc_chk instanceof EE_Attendee )
-            throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+		//validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
+		$ctc_chk = reset( $data );
+		if ( ! $ctc_chk instanceof EE_Attendee )
+			throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
 
-        parent::__construct( $data );
-    }
+		parent::__construct( $data );
+	}
 
 
 
-    /**
-     * setup the data.
-     *
-     * Sets up the expected data object for the messages prep using incoming registration objects.
-     *
-     * @since   4.3.0
-     *
-     * @return void
-     * @access protected
-     */
-    protected function _setup_data() {
+	/**
+	 * setup the data.
+	 *
+	 * Sets up the expected data object for the messages prep using incoming registration objects.
+	 *
+	 * @since   4.3.0
+	 *
+	 * @return void
+	 * @access protected
+	 */
+	protected function _setup_data() {
 
-        //we'll loop through each contact and setup the data needed.  Note that many properties will just be set as empty because the contacts data handler is for a very specific set of data (i.e. just what's related to the contact).
-        $this->txn = NULL;
-        $this->taxes = NULL;
-        $this->grand_total_price_object = '';
-        $this->user_id = $this->ip_address = $this->user_agent = $this->init_access = '';
-        $this->payment = NULL;
-        $this->billing = array();
-        $this->reg_objs = array();
-        $this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer =  $this->registrations = array();
-        $this->total_ticket_count = 0;
-        $this->primary_attendee_data = array(
-            'registration_id' => 0,
-            'att_obj' => NULL,
-            'reg_obj' => NULL,
-            'primary_att_obj' => NULL,
-            'primary_reg_obj' => NULL
-            );
+		//we'll loop through each contact and setup the data needed.  Note that many properties will just be set as empty because the contacts data handler is for a very specific set of data (i.e. just what's related to the contact).
+		$this->txn = NULL;
+		$this->taxes = NULL;
+		$this->grand_total_price_object = '';
+		$this->user_id = $this->ip_address = $this->user_agent = $this->init_access = '';
+		$this->payment = NULL;
+		$this->billing = array();
+		$this->reg_objs = array();
+		$this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer =  $this->registrations = array();
+		$this->total_ticket_count = 0;
+		$this->primary_attendee_data = array(
+			'registration_id' => 0,
+			'att_obj' => NULL,
+			'reg_obj' => NULL,
+			'primary_att_obj' => NULL,
+			'primary_reg_obj' => NULL
+			);
 
-        foreach ( $this->_data as $contact ) {
-            $id = $contact->ID();
-            $reg = $contact->get_first_related('Registration');
-            $this->attendees[$id]['att_obj'] = $contact;
-            $this->attendees[$id]['reg_objs'][$reg->ID()] = $reg;
-            $this->attendees[$id]['attendee_email'] = $contact->email();
-            $this->attendees[$id]['tkt_objs'] = array();
-            $this->attendees[$id]['evt_objs'] = array();
-        }
-    }
+		foreach ( $this->_data as $contact ) {
+			$id = $contact->ID();
+			$reg = $contact->get_first_related('Registration');
+			$this->attendees[$id]['att_obj'] = $contact;
+			$this->attendees[$id]['reg_objs'][$reg->ID()] = $reg;
+			$this->attendees[$id]['attendee_email'] = $contact->email();
+			$this->attendees[$id]['tkt_objs'] = array();
+			$this->attendees[$id]['evt_objs'] = array();
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -26,14 +26,14 @@ 
      * @param  EE_Attendee[]     $data expecting an array of EE_Attendee objects.
      * @access protected
      */
-    public function __construct( $data = array() ) {
+    public function __construct($data = array()) {
 
         //validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
-        $ctc_chk = reset( $data );
-        if ( ! $ctc_chk instanceof EE_Attendee )
-            throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+        $ctc_chk = reset($data);
+        if ( ! $ctc_chk instanceof EE_Attendee)
+            throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso'));
 
-        parent::__construct( $data );
+        parent::__construct($data);
     }
 
 
@@ -58,7 +58,7 @@ 
         $this->payment = NULL;
         $this->billing = array();
         $this->reg_objs = array();
-        $this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer =  $this->registrations = array();
+        $this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer = $this->registrations = array();
         $this->total_ticket_count = 0;
         $this->primary_attendee_data = array(
             'registration_id' => 0,
@@ -68,7 +68,7 @@ 
             'primary_reg_obj' => NULL
             );
 
-        foreach ( $this->_data as $contact ) {
+        foreach ($this->_data as $contact) {
             $id = $contact->ID();
             $reg = $contact->get_first_related('Registration');
             $this->attendees[$id]['att_obj'] = $contact;

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * This prepares data for message types that send messages for multiple contacts and handles
@@ -30,8 +32,9 @@ 
 
         //validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
         $ctc_chk = reset( $data );
-        if ( ! $ctc_chk instanceof EE_Attendee )
-            throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+        if ( ! $ctc_chk instanceof EE_Attendee ) {
+                    throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+        }
 
         parent::__construct( $data );
     }

caffeinated/core/libraries/messages/message_type/newsletter/EE_Messages_Email_Newsletter_Validator.class.php

Spacing +7 added lines, -7 removed lines

@@ -18,27 +18,27 @@
  * @author          Darren Ethier
  */
 class EE_Messages_Email_Newsletter_Validator extends EE_Messages_Validator {
-    public function __construct( $fields, $context ) {
+    public function __construct($fields, $context) {
         $this->_m_name = 'email';
         $this->_mt_name = 'newsletter';
 
-        parent::__construct( $fields, $context );
+        parent::__construct($fields, $context);
     }
 
     /**
      * custom validator (restricting what was originally set by the messenger)
      */
     protected function _modify_validator() {
-        if ( $this->_context == 'attendee' )
+        if ($this->_context == 'attendee')
             $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization');
 
         //excluded shortcodes
-        $fields = array('to','from','subject','content','newsletter_content');
-        foreach ( $fields as $field ) {
+        $fields = array('to', 'from', 'subject', 'content', 'newsletter_content');
+        foreach ($fields as $field) {
             $this->_specific_shortcode_excludes[$field] = array('[RECIPIENT_REGISTRATION_CODE]', '[RECIPIENT_EDIT_REGISTRATION_LINK]', '[EVENT_AUTHOR_FORMATTED_EMAIL]', '[EVENT_AUTHOR_EMAIL]');
         }
-        $add_excludes = array( '[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]','[CO_ADD2]', '[CO_CITY]', '[CO_STATE]','[CO_ZIP]','[CO_LOGO]','[CO_PHONE]','[CO_LOGO_URL]','[CO_FACEBOOK_URL]','[CO_TWITTER_URL]','[CO_PINTEREST_URL]','[CO_GOOGLE_URL]','[CO_LINKEDIN_URL]','[CO_INSTAGRAM_URL]');
+        $add_excludes = array('[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]', '[CO_ADD2]', '[CO_CITY]', '[CO_STATE]', '[CO_ZIP]', '[CO_LOGO]', '[CO_PHONE]', '[CO_LOGO_URL]', '[CO_FACEBOOK_URL]', '[CO_TWITTER_URL]', '[CO_PINTEREST_URL]', '[CO_GOOGLE_URL]', '[CO_LINKEDIN_URL]', '[CO_INSTAGRAM_URL]');
         $this->_specific_shortcode_excludes['from'] = array_merge($this->_specific_shortcode_excludes['from'], $add_excludes);
-        $this->_specific_shortcode_excludes['content'] = array_merge( $this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]') );
+        $this->_specific_shortcode_excludes['content'] = array_merge($this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]'));
     }
 }

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Holds any special validation rules for template fields with Email messenger and Newsletter
@@ -29,8 +31,9 @@ 
      * custom validator (restricting what was originally set by the messenger)
      */
     protected function _modify_validator() {
-        if ( $this->_context == 'attendee' )
-            $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization');
+        if ( $this->_context == 'attendee' ) {
+                    $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization');
+        }
 
         //excluded shortcodes
         $fields = array('to','from','subject','content','newsletter_content');

Indentation +20 added lines, -20 removed lines

@@ -18,27 +18,27 @@
  * @author          Darren Ethier
  */
 class EE_Messages_Email_Newsletter_Validator extends EE_Messages_Validator {
-    public function __construct( $fields, $context ) {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'newsletter';
+	public function __construct( $fields, $context ) {
+		$this->_m_name = 'email';
+		$this->_mt_name = 'newsletter';
 
-        parent::__construct( $fields, $context );
-    }
+		parent::__construct( $fields, $context );
+	}
 
-    /**
-     * custom validator (restricting what was originally set by the messenger)
-     */
-    protected function _modify_validator() {
-        if ( $this->_context == 'attendee' )
-            $this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization');
+	/**
+	 * custom validator (restricting what was originally set by the messenger)
+	 */
+	protected function _modify_validator() {
+		if ( $this->_context == 'attendee' )
+			$this->_valid_shortcodes_modifier[$this->_context]['from'] = array('recipient_details', 'email', 'organization');
 
-        //excluded shortcodes
-        $fields = array('to','from','subject','content','newsletter_content');
-        foreach ( $fields as $field ) {
-            $this->_specific_shortcode_excludes[$field] = array('[RECIPIENT_REGISTRATION_CODE]', '[RECIPIENT_EDIT_REGISTRATION_LINK]', '[EVENT_AUTHOR_FORMATTED_EMAIL]', '[EVENT_AUTHOR_EMAIL]');
-        }
-        $add_excludes = array( '[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]','[CO_ADD2]', '[CO_CITY]', '[CO_STATE]','[CO_ZIP]','[CO_LOGO]','[CO_PHONE]','[CO_LOGO_URL]','[CO_FACEBOOK_URL]','[CO_TWITTER_URL]','[CO_PINTEREST_URL]','[CO_GOOGLE_URL]','[CO_LINKEDIN_URL]','[CO_INSTAGRAM_URL]');
-        $this->_specific_shortcode_excludes['from'] = array_merge($this->_specific_shortcode_excludes['from'], $add_excludes);
-        $this->_specific_shortcode_excludes['content'] = array_merge( $this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]') );
-    }
+		//excluded shortcodes
+		$fields = array('to','from','subject','content','newsletter_content');
+		foreach ( $fields as $field ) {
+			$this->_specific_shortcode_excludes[$field] = array('[RECIPIENT_REGISTRATION_CODE]', '[RECIPIENT_EDIT_REGISTRATION_LINK]', '[EVENT_AUTHOR_FORMATTED_EMAIL]', '[EVENT_AUTHOR_EMAIL]');
+		}
+		$add_excludes = array( '[RECIPIENT_FNAME]', '[RECIPIENT_LNAME]', '[RECIPIENT_EMAIL]', '[COMPANY]', '[CO_ADD1]','[CO_ADD2]', '[CO_CITY]', '[CO_STATE]','[CO_ZIP]','[CO_LOGO]','[CO_PHONE]','[CO_LOGO_URL]','[CO_FACEBOOK_URL]','[CO_TWITTER_URL]','[CO_PINTEREST_URL]','[CO_GOOGLE_URL]','[CO_LINKEDIN_URL]','[CO_INSTAGRAM_URL]');
+		$this->_specific_shortcode_excludes['from'] = array_merge($this->_specific_shortcode_excludes['from'], $add_excludes);
+		$this->_specific_shortcode_excludes['content'] = array_merge( $this->_specific_shortcode_excludes['content'], array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]') );
+	}
 }

caffeinated/core/libraries/messages/message_type/newsletter/EE_Newsletter_message_type.class.php

Spacing +7 added lines, -7 removed lines

@@ -48,11 +48,11 @@ 
 
 
 
-    protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
+    protected function _get_data_for_context($context, EE_Registration $registration, $id) {
         //newsletter message type data handler is 'Contacts' and it expects an array of EE_Attendee objects.
         $contact = $registration->attendee();
-        if ( $contact instanceof EE_Attendee ) {
-            return array( $contact );
+        if ($contact instanceof EE_Attendee) {
+            return array($contact);
         }
        return array();
     }
@@ -99,10 +99,10 @@ 
             'recipient_details', 'organization', 'newsletter'
             );
 
-        foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
-            foreach ( $shortcodes as $key => $shortcode ) {
-                if ( !in_array( $shortcode, $included_shortcodes ) )
-                    unset( $this->_valid_shortcodes[$context][$key] );
+        foreach ($this->_valid_shortcodes as $context => $shortcodes) {
+            foreach ($shortcodes as $key => $shortcode) {
+                if ( ! in_array($shortcode, $included_shortcodes))
+                    unset($this->_valid_shortcodes[$context][$key]);
             }
             $this->_valid_shortcodes[$context][] = 'newsletter';
         }

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * The message type for newsletter type of messages.
@@ -101,8 +103,9 @@ 
 
         foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
             foreach ( $shortcodes as $key => $shortcode ) {
-                if ( !in_array( $shortcode, $included_shortcodes ) )
-                    unset( $this->_valid_shortcodes[$context][$key] );
+                if ( !in_array( $shortcode, $included_shortcodes ) ) {
+                                    unset( $this->_valid_shortcodes[$context][$key] );
+                }
             }
             $this->_valid_shortcodes[$context][] = 'newsletter';
         }

Indentation +65 added lines, -65 removed lines

@@ -20,94 +20,94 @@
  */
 class EE_Newsletter_message_type extends EE_message_type {
 
-    public function __construct() {
-        $this->name = 'newsletter';
-        $this->description = __('Newsletter message types are triggered manually by the admin for sending mass email to select groups of registrants.', 'event_espresso');
-        $this->label = array(
-            'singular' => __('newsletter', 'event_espresso'),
-            'plural' => __('newsletters', 'event_espresso')
-            );
-        $this->_master_templates = array(
-            'email' => 'registration'
-            );
-        parent::__construct();
-    }
+	public function __construct() {
+		$this->name = 'newsletter';
+		$this->description = __('Newsletter message types are triggered manually by the admin for sending mass email to select groups of registrants.', 'event_espresso');
+		$this->label = array(
+			'singular' => __('newsletter', 'event_espresso'),
+			'plural' => __('newsletters', 'event_espresso')
+			);
+		$this->_master_templates = array(
+			'email' => 'registration'
+			);
+		parent::__construct();
+	}
 
 
 
-    protected function _set_admin_pages() {
-        $this->admin_registered_pages = array(); //no admin pages to register this with.
-    }
+	protected function _set_admin_pages() {
+		$this->admin_registered_pages = array(); //no admin pages to register this with.
+	}
 
 
 
-    protected function _set_data_handler() {
-        $this->_data_handler = 'Contacts';
-        $this->_single_message = $this->_data instanceof EE_Registration ? TRUE : FALSE;
-    }
+	protected function _set_data_handler() {
+		$this->_data_handler = 'Contacts';
+		$this->_single_message = $this->_data instanceof EE_Registration ? TRUE : FALSE;
+	}
 
 
 
-    protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
-        //newsletter message type data handler is 'Contacts' and it expects an array of EE_Attendee objects.
-        $contact = $registration->attendee();
-        if ( $contact instanceof EE_Attendee ) {
-            return array( $contact );
-        }
-       return array();
-    }
+	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
+		//newsletter message type data handler is 'Contacts' and it expects an array of EE_Attendee objects.
+		$contact = $registration->attendee();
+		if ( $contact instanceof EE_Attendee ) {
+			return array( $contact );
+		}
+	   return array();
+	}
 
 
 
-    protected function _set_admin_settings_fields() {
-        $this->_admin_settings_fields = array();
-    }
+	protected function _set_admin_settings_fields() {
+		$this->_admin_settings_fields = array();
+	}
 
 
 
-    protected function _set_contexts() {
-        $this->_context_label = array(
-            'label' => __('recipient', 'event_espresso'),
-            'plural' => __('recipients', 'event_espresso'),
-            'description' => __('Recipient\'s are who will receive the message.', 'event_espresso')
-            );
+	protected function _set_contexts() {
+		$this->_context_label = array(
+			'label' => __('recipient', 'event_espresso'),
+			'plural' => __('recipients', 'event_espresso'),
+			'description' => __('Recipient\'s are who will receive the message.', 'event_espresso')
+			);
 
-        $this->_contexts = array(
-            'attendee' => array(
-                'label' => __('Registrant', 'event_espresso'),
-                'description' => __('This template goes to selected registrants.', 'event_espresso')
-                )
-            );
-    }
+		$this->_contexts = array(
+			'attendee' => array(
+				'label' => __('Registrant', 'event_espresso'),
+				'description' => __('This template goes to selected registrants.', 'event_espresso')
+				)
+			);
+	}
 
 
 
 
-    /**
-     * used to set the valid shortcodes.
-     *
-     * For the newsletter message type we only have two valid shortcode libraries in use, recipient details and organization.  That's it!
-     *
-     * @since   4.3.0
-     *
-     * @return  void
-     */
-    protected function _set_valid_shortcodes() {
-        parent::_set_valid_shortcodes();
+	/**
+	 * used to set the valid shortcodes.
+	 *
+	 * For the newsletter message type we only have two valid shortcode libraries in use, recipient details and organization.  That's it!
+	 *
+	 * @since   4.3.0
+	 *
+	 * @return  void
+	 */
+	protected function _set_valid_shortcodes() {
+		parent::_set_valid_shortcodes();
 
-        $included_shortcodes = array(
-            'recipient_details', 'organization', 'newsletter'
-            );
+		$included_shortcodes = array(
+			'recipient_details', 'organization', 'newsletter'
+			);
 
-        foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
-            foreach ( $shortcodes as $key => $shortcode ) {
-                if ( !in_array( $shortcode, $included_shortcodes ) )
-                    unset( $this->_valid_shortcodes[$context][$key] );
-            }
-            $this->_valid_shortcodes[$context][] = 'newsletter';
-        }
+		foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
+			foreach ( $shortcodes as $key => $shortcode ) {
+				if ( !in_array( $shortcode, $included_shortcodes ) )
+					unset( $this->_valid_shortcodes[$context][$key] );
+			}
+			$this->_valid_shortcodes[$context][] = 'newsletter';
+		}
 
-    }
+	}
 
 
 }