eventespresso / event-espresso-core

core/helpers/EEH_Formatter.helper.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
             return htmlspecialchars($string);
         } else {
             if ($translate === false) {
-                return self::ee_tep_parse_input_field_data($string, array( '"' => '"' ));
+                return self::ee_tep_parse_input_field_data($string, array('"' => '"'));
             } else {
                 return self::ee_tep_parse_input_field_data($string, $translate);
             }
@@ -84,7 +84,7 @@ 
                 return false;
             }
         } else {
-            if (( $value !== '' ) && ( strtolower($value) !== 'null' ) && ( strlen(trim($value)) > 0 )) {
+            if (($value !== '') && (strtolower($value) !== 'null') && (strlen(trim($value)) > 0)) {
                 return true;
             } else {
                 return false;

Indentation +92 added lines, -92 removed lines

@@ -10,108 +10,108 @@
  */
 class EEH_Formatter
 {
-    /**
-     * _admin_format_content
-     * Text formatting function for wp_editor.
-     * This should fix all of the formatting issues of text output from the database.
-     *
-     * @static
-     * @access public
-     * @param  string $content content to format
-     * @return string          formatted content
-     */
-    public static function admin_format_content($content = '')
-    {
-        return wpautop(stripslashes_deep(html_entity_decode($content, ENT_QUOTES, "UTF-8")));
-    }
+	/**
+	 * _admin_format_content
+	 * Text formatting function for wp_editor.
+	 * This should fix all of the formatting issues of text output from the database.
+	 *
+	 * @static
+	 * @access public
+	 * @param  string $content content to format
+	 * @return string          formatted content
+	 */
+	public static function admin_format_content($content = '')
+	{
+		return wpautop(stripslashes_deep(html_entity_decode($content, ENT_QUOTES, "UTF-8")));
+	}
 
 
 
-    /**
-     * ee_tep_output_string
-     * todo: we need a description for this.
-     *
-     * @static
-     * @access public
-     * @param  string  $string    string to handle
-     * @param  boolean $translate //todo what is this for?
-     * @param  boolean $protected true then we run htmlspecialchars and return
-     * @return string
-     */
-    public static function ee_tep_output_string($string, $translate = false, $protected = false)
-    {
-        if ($protected === true) {
-            return htmlspecialchars($string);
-        } else {
-            if ($translate === false) {
-                return self::ee_tep_parse_input_field_data($string, array( '"' => '"' ));
-            } else {
-                return self::ee_tep_parse_input_field_data($string, $translate);
-            }
-        }
-    }
+	/**
+	 * ee_tep_output_string
+	 * todo: we need a description for this.
+	 *
+	 * @static
+	 * @access public
+	 * @param  string  $string    string to handle
+	 * @param  boolean $translate //todo what is this for?
+	 * @param  boolean $protected true then we run htmlspecialchars and return
+	 * @return string
+	 */
+	public static function ee_tep_output_string($string, $translate = false, $protected = false)
+	{
+		if ($protected === true) {
+			return htmlspecialchars($string);
+		} else {
+			if ($translate === false) {
+				return self::ee_tep_parse_input_field_data($string, array( '"' => '"' ));
+			} else {
+				return self::ee_tep_parse_input_field_data($string, $translate);
+			}
+		}
+	}
 
 
 
-    /**
-     * ee_tep_parse_input_field_data
-     *
-     * @param  string $data string to be "translated"
-     * @param         array ] $parse array in the form array( 'from' => 'to', ... )
-     * @return string
-     */
-    public static function ee_tep_parse_input_field_data($data, $parse)
-    {
-        return strtr(trim($data), $parse);
-    }
+	/**
+	 * ee_tep_parse_input_field_data
+	 *
+	 * @param  string $data string to be "translated"
+	 * @param         array ] $parse array in the form array( 'from' => 'to', ... )
+	 * @return string
+	 */
+	public static function ee_tep_parse_input_field_data($data, $parse)
+	{
+		return strtr(trim($data), $parse);
+	}
 
 
 
-    /**
-     * [ee_tep_not_null description]
-     *
-     * @param  string | array $value [description]
-     * @return bool       [description]
-     */
-    public static function ee_tep_not_null($value)
-    {
-        if (is_array($value)) {
-            if (count($value) > 0) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            if (( $value !== '' ) && ( strtolower($value) !== 'null' ) && ( strlen(trim($value)) > 0 )) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
+	/**
+	 * [ee_tep_not_null description]
+	 *
+	 * @param  string | array $value [description]
+	 * @return bool       [description]
+	 */
+	public static function ee_tep_not_null($value)
+	{
+		if (is_array($value)) {
+			if (count($value) > 0) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			if (( $value !== '' ) && ( strtolower($value) !== 'null' ) && ( strlen(trim($value)) > 0 )) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+	}
 
 
 
-    /**
-     * Formats a date
-     *
-     * @param string $date
-     * @param string $format - format for the date
-     * @deprecated 4.6.12  Note, a search revealed this was not used anywhere in core or in our
-     *                       addons at time of writing this.  So just deprecated in case of third party use.
-     * @return string
-     * @deprecated v4.6.21
-     */
-    public static function event_date_display($date, $format = '')
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            esc_html__(
-                'This method is deprecated as of EE 4.6.12.  Currently it does not reformat as with prior behaviour but just returns the incoming string.  Please use the EE_Datetime helpers for Datetime on the event to display as desired.',
-                'event_espresso'
-            ),
-            '4.6.21'
-        );
-        return $date;
-    }
+	/**
+	 * Formats a date
+	 *
+	 * @param string $date
+	 * @param string $format - format for the date
+	 * @deprecated 4.6.12  Note, a search revealed this was not used anywhere in core or in our
+	 *                       addons at time of writing this.  So just deprecated in case of third party use.
+	 * @return string
+	 * @deprecated v4.6.21
+	 */
+	public static function event_date_display($date, $format = '')
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			esc_html__(
+				'This method is deprecated as of EE 4.6.12.  Currently it does not reformat as with prior behaviour but just returns the incoming string.  Please use the EE_Datetime helpers for Datetime on the event to display as desired.',
+				'event_espresso'
+			),
+			'4.6.21'
+		);
+		return $date;
+	}
 }

payment_methods/Paypal_Standard/templates/paypal_standard_intro.template.php

Indentation +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@
 // if this is decaf, which is put on WordPress.org, we need to inform users that
 // we just put an affiliate link there. See https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/ section 12
 if (apply_filters('FHEE__ee_show_affiliate_links', true)) {
-    $closing_tag .= esc_html__(' (affiliate link)', 'event_espresso');
+	$closing_tag .= esc_html__(' (affiliate link)', 'event_espresso');
 }
 printf(
-    esc_html__(
-        'PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
-        'event_espresso'
-    ),
-    '<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">',
-    $closing_tag
+	esc_html__(
+		'PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
+		'event_espresso'
+	),
+	'<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">',
+	$closing_tag
 );

caffeinated/admin/extend/support/templates/support_admin_details_faq.template.php

Indentation +10 added lines, -10 removed lines

@@ -4,14 +4,14 @@
     <h4><?php esc_html_e('New to Event Espresso?', 'event_espresso'); ?></h4>
 
     <p><?php
-        printf(
-            esc_html__(
-                'Check out the %1$squick start guide for Event Espresso 4%2$s. It has recommendations, tips, and tutorials so you can get your project started %3$squicker%4$s.',
-                'event_espresso'
-            ),
-            '<a href="https://eventespresso.com/wiki/welcome-to-event-espresso/#event-espresso-4" target="_blank">',
-            '</a>',
-            '<em>',
-            '</em>'
-        ); ?></p>
+		printf(
+			esc_html__(
+				'Check out the %1$squick start guide for Event Espresso 4%2$s. It has recommendations, tips, and tutorials so you can get your project started %3$squicker%4$s.',
+				'event_espresso'
+			),
+			'<a href="https://eventespresso.com/wiki/welcome-to-event-espresso/#event-espresso-4" target="_blank">',
+			'</a>',
+			'<em>',
+			'</em>'
+		); ?></p>
 </div>
\ No newline at end of file

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

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     protected function _modify_validator()
     {
         if ($this->_context === 'attendee') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['from'] = array(
+            $this->_valid_shortcodes_modifier[$this->_context]['from'] = array(
                 'recipient_details',
                 'email',
                 'organization',
@@ -43,7 +43,7 @@ 
         // excluded shortcodes
         $fields = array('to', 'from', 'subject', 'content', 'newsletter_content');
         foreach ($fields as $field) {
-            $this->_specific_shortcode_excludes[ $field ] = array(
+            $this->_specific_shortcode_excludes[$field] = array(
                 '[RECIPIENT_REGISTRATION_CODE]',
                 '[EVENT_AUTHOR_FORMATTED_EMAIL]',
                 '[EVENT_AUTHOR_EMAIL]',

Indentation +65 added lines, -65 removed lines

@@ -11,72 +11,72 @@
  */
 class EE_Messages_Email_Newsletter_Validator extends EE_Messages_Validator
 {
-    /**
-     * EE_Messages_Email_Newsletter_Validator constructor.
-     *
-     * @param array $fields
-     * @param string $context
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'newsletter';
+	/**
+	 * EE_Messages_Email_Newsletter_Validator constructor.
+	 *
+	 * @param array $fields
+	 * @param string $context
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	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]',
-                '[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]',
+				'[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 +13 added lines, -13 removed lines

@@ -114,11 +114,11 @@ 
 
         foreach ($this->_valid_shortcodes as $context => $shortcodes) {
             foreach ($shortcodes as $key => $shortcode) {
-                if (! in_array($shortcode, $included_shortcodes, true)) {
-                    unset($this->_valid_shortcodes[ $context ][ $key ]);
+                if ( ! in_array($shortcode, $included_shortcodes, true)) {
+                    unset($this->_valid_shortcodes[$context][$key]);
                 }
             }
-            $this->_valid_shortcodes[ $context ][] = 'newsletter';
+            $this->_valid_shortcodes[$context][] = 'newsletter';
         }
     }
 
@@ -148,23 +148,23 @@ 
                 ? $details['att_obj']
                 : null;
 
-            if (! $attendee instanceof EE_Attendee) {
+            if ( ! $attendee instanceof EE_Attendee) {
                 continue;
             }
 
             // set $aee from attendee object
             $aee['att_obj'] = $attendee;
-            $aee['reg_objs'] = isset($this->_data->attendees[ $attendee->ID() ]['reg_objs'])
-                ? $this->_data->attendees[ $attendee->ID() ]['reg_objs']
+            $aee['reg_objs'] = isset($this->_data->attendees[$attendee->ID()]['reg_objs'])
+                ? $this->_data->attendees[$attendee->ID()]['reg_objs']
                 : array();
             $aee['attendee_email'] = $attendee->email();
-            $aee['tkt_objs'] = isset($this->_data->attendees[ $attendee->ID() ]['tkt_objs'])
-                ? $this->_data->attendees[ $attendee->ID() ]['tkt_objs']
+            $aee['tkt_objs'] = isset($this->_data->attendees[$attendee->ID()]['tkt_objs'])
+                ? $this->_data->attendees[$attendee->ID()]['tkt_objs']
                 : array();
 
-            if (isset($this->_data->attendees[ $attendee->ID() ]['evt_objs'])) {
-                $aee['evt_objs'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
-                $aee['events'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
+            if (isset($this->_data->attendees[$attendee->ID()]['evt_objs'])) {
+                $aee['evt_objs'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
+                $aee['events'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
             } else {
                 $aee['evt_objs'] = $aee['events'] = array();
             }
@@ -199,8 +199,8 @@ 
         $excluded_fields = array(
             'email' => array('cc')
         );
-        return isset($excluded_fields[ $messenger_name ])
-            ? $excluded_fields[ $messenger_name ]
+        return isset($excluded_fields[$messenger_name])
+            ? $excluded_fields[$messenger_name]
             : parent::excludedFieldsForMessenger($messenger_name);
     }
 }

Indentation +190 added lines, -190 removed lines

@@ -12,194 +12,194 @@
  */
 class EE_Newsletter_message_type extends EE_message_type
 {
-    public function __construct()
-    {
-        $this->name = 'newsletter';
-        $this->description = esc_html__(
-            'Batch message type messages are triggered manually by the admin for sending notifications to a selected group of recipients. This should only be used for more general notification type messages that contain information specific for the recipients. For "newsletter" type messages we recommend using an email list service like MailChimp, because sending non-related mail-outs to contacts increases the risk of your site domain getting added to spam lists, which will prevent messages getting to users.',
-            'event_espresso'
-        );
-        $this->label = array(
-            'singular' => esc_html__('batch', 'event_espresso'),
-            'plural'   => esc_html__('batches', 'event_espresso'),
-        );
-        $this->_master_templates = array(
-            'email' => 'registration',
-        );
-
-        parent::__construct();
-    }
-
-
-    /**
-     * Sets admin_registered_pages property
-     */
-    protected function _set_admin_pages()
-    {
-        $this->admin_registered_pages = array(); // no admin pages to register this with.
-    }
-
-
-    /**
-     * Sets property related to data handler.
-     */
-    protected function _set_data_handler()
-    {
-        $this->_data_handler = 'Registrations';
-        $this->_single_message = $this->_data instanceof EE_Registration;
-    }
-
-
-    /**
-     * Returns the data for the given context for this message type.
-     * @param string          $context
-     * @param EE_Registration $registration
-     * @param int             $id
-     * @return array|mixed
-     */
-    protected function _get_data_for_context($context, EE_Registration $registration, $id)
-    {
-        // newsletter message type data handler is 'Registrations' and it expects an array of EE_Registration objects.
-        return array($registration);
-    }
-
-
-    /**
-     * Sets the admin settings fields property for this message type.
-     */
-    protected function _set_admin_settings_fields()
-    {
-        $this->_admin_settings_fields = array();
-    }
-
-
-    /**
-     * Sets the contexts for this message type.
-     */
-    protected function _set_contexts()
-    {
-        $this->_context_label = array(
-            'label'       => esc_html__('recipient', 'event_espresso'),
-            'plural'      => esc_html__('recipients', 'event_espresso'),
-            'description' => esc_html__('Recipient\'s are who will receive the message.', 'event_espresso'),
-        );
-
-        $this->_contexts = array(
-            'attendee' => array(
-                'label'       => esc_html__('Registrant', 'event_espresso'),
-                'description' => esc_html__('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();
-
-        $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, true)) {
-                    unset($this->_valid_shortcodes[ $context ][ $key ]);
-                }
-            }
-            $this->_valid_shortcodes[ $context ][] = 'newsletter';
-        }
-    }
-
-
-    /**
-     * Override default _attendee_addressees in EE_message_type because we want to loop through the registrations
-     * for EE_message_type.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     */
-    protected function _attendee_addressees()
-    {
-        $addressee = array();
-
-        // looping through registrations
-        foreach ($this->_data->registrations as $reg_id => $details) {
-            // set $attendee array to blank on each loop
-            $aee = array();
-
-            // need to get the attendee from this registration.
-            $attendee = isset($details['att_obj']) && $details['att_obj'] instanceof EE_Attendee
-                ? $details['att_obj']
-                : null;
-
-            if (! $attendee instanceof EE_Attendee) {
-                continue;
-            }
-
-            // set $aee from attendee object
-            $aee['att_obj'] = $attendee;
-            $aee['reg_objs'] = isset($this->_data->attendees[ $attendee->ID() ]['reg_objs'])
-                ? $this->_data->attendees[ $attendee->ID() ]['reg_objs']
-                : array();
-            $aee['attendee_email'] = $attendee->email();
-            $aee['tkt_objs'] = isset($this->_data->attendees[ $attendee->ID() ]['tkt_objs'])
-                ? $this->_data->attendees[ $attendee->ID() ]['tkt_objs']
-                : array();
-
-            if (isset($this->_data->attendees[ $attendee->ID() ]['evt_objs'])) {
-                $aee['evt_objs'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
-                $aee['events'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
-            } else {
-                $aee['evt_objs'] = $aee['events'] = array();
-            }
-
-            $aee['reg_obj'] = isset($details['reg_obj'])
-                ? $details['reg_obj']
-                : null;
-            $aee['attendees'] = $this->_data->attendees;
-
-            // merge in the primary attendee data
-            $aee = array_merge($this->_default_addressee_data, $aee);
-
-            // make sure txn is set
-            if (empty($aee['txn']) && $aee['reg_obj'] instanceof EE_Registration) {
-                $aee['txn'] = $aee['reg_obj']->transaction();
-            }
-
-            $addressee[] = new EE_Messages_Addressee($aee);
-        }
-        return $addressee;
-    }
-
-    /**
-     * Allows a message type to specifically exclude template fields for the provided messenger.
-     * Filtered so this can be programmatically altered as well.
-     *
-     * @param string $messenger_name name of messenger
-     * @return array
-     */
-    public function excludedFieldsForMessenger($messenger_name)
-    {
-        $excluded_fields = array(
-            'email' => array('cc')
-        );
-        return isset($excluded_fields[ $messenger_name ])
-            ? $excluded_fields[ $messenger_name ]
-            : parent::excludedFieldsForMessenger($messenger_name);
-    }
+	public function __construct()
+	{
+		$this->name = 'newsletter';
+		$this->description = esc_html__(
+			'Batch message type messages are triggered manually by the admin for sending notifications to a selected group of recipients. This should only be used for more general notification type messages that contain information specific for the recipients. For "newsletter" type messages we recommend using an email list service like MailChimp, because sending non-related mail-outs to contacts increases the risk of your site domain getting added to spam lists, which will prevent messages getting to users.',
+			'event_espresso'
+		);
+		$this->label = array(
+			'singular' => esc_html__('batch', 'event_espresso'),
+			'plural'   => esc_html__('batches', 'event_espresso'),
+		);
+		$this->_master_templates = array(
+			'email' => 'registration',
+		);
+
+		parent::__construct();
+	}
+
+
+	/**
+	 * Sets admin_registered_pages property
+	 */
+	protected function _set_admin_pages()
+	{
+		$this->admin_registered_pages = array(); // no admin pages to register this with.
+	}
+
+
+	/**
+	 * Sets property related to data handler.
+	 */
+	protected function _set_data_handler()
+	{
+		$this->_data_handler = 'Registrations';
+		$this->_single_message = $this->_data instanceof EE_Registration;
+	}
+
+
+	/**
+	 * Returns the data for the given context for this message type.
+	 * @param string          $context
+	 * @param EE_Registration $registration
+	 * @param int             $id
+	 * @return array|mixed
+	 */
+	protected function _get_data_for_context($context, EE_Registration $registration, $id)
+	{
+		// newsletter message type data handler is 'Registrations' and it expects an array of EE_Registration objects.
+		return array($registration);
+	}
+
+
+	/**
+	 * Sets the admin settings fields property for this message type.
+	 */
+	protected function _set_admin_settings_fields()
+	{
+		$this->_admin_settings_fields = array();
+	}
+
+
+	/**
+	 * Sets the contexts for this message type.
+	 */
+	protected function _set_contexts()
+	{
+		$this->_context_label = array(
+			'label'       => esc_html__('recipient', 'event_espresso'),
+			'plural'      => esc_html__('recipients', 'event_espresso'),
+			'description' => esc_html__('Recipient\'s are who will receive the message.', 'event_espresso'),
+		);
+
+		$this->_contexts = array(
+			'attendee' => array(
+				'label'       => esc_html__('Registrant', 'event_espresso'),
+				'description' => esc_html__('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();
+
+		$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, true)) {
+					unset($this->_valid_shortcodes[ $context ][ $key ]);
+				}
+			}
+			$this->_valid_shortcodes[ $context ][] = 'newsletter';
+		}
+	}
+
+
+	/**
+	 * Override default _attendee_addressees in EE_message_type because we want to loop through the registrations
+	 * for EE_message_type.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 */
+	protected function _attendee_addressees()
+	{
+		$addressee = array();
+
+		// looping through registrations
+		foreach ($this->_data->registrations as $reg_id => $details) {
+			// set $attendee array to blank on each loop
+			$aee = array();
+
+			// need to get the attendee from this registration.
+			$attendee = isset($details['att_obj']) && $details['att_obj'] instanceof EE_Attendee
+				? $details['att_obj']
+				: null;
+
+			if (! $attendee instanceof EE_Attendee) {
+				continue;
+			}
+
+			// set $aee from attendee object
+			$aee['att_obj'] = $attendee;
+			$aee['reg_objs'] = isset($this->_data->attendees[ $attendee->ID() ]['reg_objs'])
+				? $this->_data->attendees[ $attendee->ID() ]['reg_objs']
+				: array();
+			$aee['attendee_email'] = $attendee->email();
+			$aee['tkt_objs'] = isset($this->_data->attendees[ $attendee->ID() ]['tkt_objs'])
+				? $this->_data->attendees[ $attendee->ID() ]['tkt_objs']
+				: array();
+
+			if (isset($this->_data->attendees[ $attendee->ID() ]['evt_objs'])) {
+				$aee['evt_objs'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
+				$aee['events'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
+			} else {
+				$aee['evt_objs'] = $aee['events'] = array();
+			}
+
+			$aee['reg_obj'] = isset($details['reg_obj'])
+				? $details['reg_obj']
+				: null;
+			$aee['attendees'] = $this->_data->attendees;
+
+			// merge in the primary attendee data
+			$aee = array_merge($this->_default_addressee_data, $aee);
+
+			// make sure txn is set
+			if (empty($aee['txn']) && $aee['reg_obj'] instanceof EE_Registration) {
+				$aee['txn'] = $aee['reg_obj']->transaction();
+			}
+
+			$addressee[] = new EE_Messages_Addressee($aee);
+		}
+		return $addressee;
+	}
+
+	/**
+	 * Allows a message type to specifically exclude template fields for the provided messenger.
+	 * Filtered so this can be programmatically altered as well.
+	 *
+	 * @param string $messenger_name name of messenger
+	 * @return array
+	 */
+	public function excludedFieldsForMessenger($messenger_name)
+	{
+		$excluded_fields = array(
+			'email' => array('cc')
+		);
+		return isset($excluded_fields[ $messenger_name ])
+			? $excluded_fields[ $messenger_name ]
+			: parent::excludedFieldsForMessenger($messenger_name);
+	}
 }

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

Spacing +2 added lines, -2 removed lines

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

Indentation +48 added lines, -48 removed lines

@@ -15,61 +15,61 @@
 class EE_Cancelled_Registration_message_type extends EE_Registration_Base_message_type
 {
 
-    public function __construct()
-    {
-        $this->name = 'cancelled_registration';
-        $this->description = esc_html__('This message type is for messages sent to registrants when their registration is cancelled.', 'event_espresso');
-        $this->label = array(
-            'singular' => esc_html__('registration cancelled', 'event_espresso'),
-            'plural' => esc_html__('registrations cancelled', 'event_espresso')
-            );
-        $this->_master_templates = array(
-            'email' => 'not_approved_registration'
-            );
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		$this->name = 'cancelled_registration';
+		$this->description = esc_html__('This message type is for messages sent to registrants when their registration is cancelled.', 'event_espresso');
+		$this->label = array(
+			'singular' => esc_html__('registration cancelled', 'event_espresso'),
+			'plural' => esc_html__('registrations cancelled', 'event_espresso')
+			);
+		$this->_master_templates = array(
+			'email' => 'not_approved_registration'
+			);
+		parent::__construct();
+	}
 
 
 
 
-    /**
-     * _set_contexts
-     * This sets up the contexts associated with the message_type
-     *
-     * @access  protected
-     * @return  void
-     */
-    protected function _set_contexts()
-    {
-        $this->_context_label = array(
-            'label' => esc_html__('recipient', 'event_espresso'),
-            'plural' => esc_html__('recipients', 'event_espresso'),
-            'description' => esc_html__('Recipient\'s are who will receive the template.  You may want different registration details sent out depending on who the recipient is', 'event_espresso')
-            );
+	/**
+	 * _set_contexts
+	 * This sets up the contexts associated with the message_type
+	 *
+	 * @access  protected
+	 * @return  void
+	 */
+	protected function _set_contexts()
+	{
+		$this->_context_label = array(
+			'label' => esc_html__('recipient', 'event_espresso'),
+			'plural' => esc_html__('recipients', 'event_espresso'),
+			'description' => esc_html__('Recipient\'s are who will receive the template.  You may want different registration details sent out depending on who the recipient is', 'event_espresso')
+			);
 
-        $this->_contexts = array(
-            'admin' => array(
-                'label' => esc_html__('Event Admin', 'event_espresso'),
-                'description' => esc_html__('This template is what event administrators will receive with an cancelled registration', 'event_espresso')
-                ),
-            'attendee' => array(
-                'label' => esc_html__('Registrant', 'event_espresso'),
-                'description' => esc_html__('This template is what each registrant for the event will receive when their registration is cancelled.', 'event_espresso')
-                )
-            );
-    }
+		$this->_contexts = array(
+			'admin' => array(
+				'label' => esc_html__('Event Admin', 'event_espresso'),
+				'description' => esc_html__('This template is what event administrators will receive with an cancelled registration', 'event_espresso')
+				),
+			'attendee' => array(
+				'label' => esc_html__('Registrant', 'event_espresso'),
+				'description' => esc_html__('This template is what each registrant for the event will receive when their registration is cancelled.', 'event_espresso')
+				)
+			);
+	}
 
 
 
-    protected function _set_valid_shortcodes()
-    {
-        parent::_set_valid_shortcodes();
+	protected function _set_valid_shortcodes()
+	{
+		parent::_set_valid_shortcodes();
 
-        // remove unwanted transaction shortcode
-        foreach ($this->_valid_shortcodes as $context => $shortcodes) {
-            if (($key = array_search('transaction', $shortcodes) ) !== false) {
-                unset($this->_valid_shortcodes[ $context ][ $key ]);
-            }
-        }
-    }
+		// remove unwanted transaction shortcode
+		foreach ($this->_valid_shortcodes as $context => $shortcodes) {
+			if (($key = array_search('transaction', $shortcodes) ) !== false) {
+				unset($this->_valid_shortcodes[ $context ][ $key ]);
+			}
+		}
+	}
 }

caffeinated/core/libraries/messages/message_type/payment_reminder/EE_Messages_Email_Payment_Reminder_Validator.class.php

Spacing +3 added lines, -3 removed lines

@@ -32,18 +32,18 @@
 
         // modify just event_list
         $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
             );
         $new_config['ticket_list'] = array(
             'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
             );
         $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+            'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
             );
         $this->_messenger->set_validator_config($new_config);
 
         if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
         }
 
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Indentation +28 added lines, -28 removed lines

@@ -13,37 +13,37 @@
  */
 class EE_Messages_Email_Payment_Reminder_Validator extends EE_Messages_Validator
 {
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'payment_reminder';
+	public function __construct($fields, $context)
+	{
+		$this->_m_name = 'email';
+		$this->_mt_name = 'payment_reminder';
 
-        parent::__construct($fields, $context);
-    }
+		parent::__construct($fields, $context);
+	}
 
-    /**
-     * at this point no custom validation needed for this messenger/message_type combo.
-     */
-    protected function _modify_validator()
-    {
-        $new_config = $this->_messenger->get_validator_config();
+	/**
+	 * at this point no custom validation needed for this messenger/message_type combo.
+	 */
+	protected function _modify_validator()
+	{
+		$new_config = $this->_messenger->get_validator_config();
 
-        // modify just event_list
-        $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
-            );
-        $new_config['ticket_list'] = array(
-            'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
-            );
-        $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
-            );
-        $this->_messenger->set_validator_config($new_config);
+		// modify just event_list
+		$new_config['event_list'] = array(
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			);
+		$new_config['ticket_list'] = array(
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
+			);
+		$new_config['content'] = array(
+			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			);
+		$this->_messenger->set_validator_config($new_config);
 
-        if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
-        }
+		if ($this->_context != 'admin') {
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
-    }
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
+	}
 }

caffeinated/core/libraries/messages/message_type/payment_declined/EE_Messages_Email_Payment_Declined_Validator.class.php

Spacing +3 added lines, -3 removed lines

@@ -32,18 +32,18 @@
 
         // modify just event_list
         $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
             );
         $new_config['ticket_list'] = array(
             'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
             );
         $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+            'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
             );
         $this->_messenger->set_validator_config($new_config);
 
         if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
         }
 
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Indentation +28 added lines, -28 removed lines

@@ -13,37 +13,37 @@
  */
 class EE_Messages_Email_Payment_Declined_Validator extends EE_Messages_Validator
 {
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'payment_declined';
+	public function __construct($fields, $context)
+	{
+		$this->_m_name = 'email';
+		$this->_mt_name = 'payment_declined';
 
-        parent::__construct($fields, $context);
-    }
+		parent::__construct($fields, $context);
+	}
 
-    /**
-     * at this point no custom validation needed for this messenger/message_type combo.
-     */
-    protected function _modify_validator()
-    {
-        $new_config = $this->_messenger->get_validator_config();
+	/**
+	 * at this point no custom validation needed for this messenger/message_type combo.
+	 */
+	protected function _modify_validator()
+	{
+		$new_config = $this->_messenger->get_validator_config();
 
-        // modify just event_list
-        $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
-            );
-        $new_config['ticket_list'] = array(
-            'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
-            );
-        $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
-            );
-        $this->_messenger->set_validator_config($new_config);
+		// modify just event_list
+		$new_config['event_list'] = array(
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			);
+		$new_config['ticket_list'] = array(
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
+			);
+		$new_config['content'] = array(
+			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			);
+		$this->_messenger->set_validator_config($new_config);
 
-        if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
-        }
+		if ($this->_context != 'admin') {
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
-    }
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
+	}
 }

caffeinated/core/libraries/messages/message_type/payment_cancelled/EE_Messages_Email_Payment_Cancelled_Validator.class.php

Spacing +3 added lines, -3 removed lines

@@ -32,18 +32,18 @@
 
         // modify just event_list
         $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
             );
         $new_config['ticket_list'] = array(
             'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
             );
         $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+            'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
             );
         $this->_messenger->set_validator_config($new_config);
 
         if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
         }
 
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Indentation +28 added lines, -28 removed lines

@@ -14,37 +14,37 @@
  */
 class EE_Messages_Email_Payment_Cancelled_Validator extends EE_Messages_Validator
 {
-    public function __construct($fields, $context)
-    {
-        $this->_m_name = 'email';
-        $this->_mt_name = 'payment_cancelled';
+	public function __construct($fields, $context)
+	{
+		$this->_m_name = 'email';
+		$this->_mt_name = 'payment_cancelled';
 
-        parent::__construct($fields, $context);
-    }
+		parent::__construct($fields, $context);
+	}
 
-    /**
-     * at this point no custom validation needed for this messenger/message_type combo.
-     */
-    protected function _modify_validator()
-    {
-        $new_config = $this->_messenger->get_validator_config();
+	/**
+	 * at this point no custom validation needed for this messenger/message_type combo.
+	 */
+	protected function _modify_validator()
+	{
+		$new_config = $this->_messenger->get_validator_config();
 
-        // modify just event_list
-        $new_config['event_list'] = array(
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
-            );
-        $new_config['ticket_list'] = array(
-            'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
-            );
-        $new_config['content'] = array(
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
-            );
-        $this->_messenger->set_validator_config($new_config);
+		// modify just event_list
+		$new_config['event_list'] = array(
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			);
+		$new_config['ticket_list'] = array(
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
+			);
+		$new_config['content'] = array(
+			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			);
+		$this->_messenger->set_validator_config($new_config);
 
-        if ($this->_context != 'admin') {
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
-        }
+		if ($this->_context != 'admin') {
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
-    }
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
+	}
 }