eventespresso / event-espresso-core

core/CPTs/EE_CPT_Default_Strategy.core.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      */
     public function pre_get_posts(WP_Query $WP_Query)
     {
-        if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
+        if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
             return $WP_Query;
         }
         return $WP_Query;

Indentation +58 added lines, -58 removed lines

@@ -11,70 +11,70 @@
  */
 class EE_CPT_Default_Strategy
 {
-    /**
-     * $CPT - the current page, if it utilizes CPTs
-     *
-     * @var    object
-     * @access    protected
-     */
-    protected $CPT = null;
+	/**
+	 * $CPT - the current page, if it utilizes CPTs
+	 *
+	 * @var    object
+	 * @access    protected
+	 */
+	protected $CPT = null;
 
 
-    /**
-     *    class constructor
-     *
-     * @access    private
-     * @param    array $arguments
-     * @return    \EE_CPT_Default_Strategy
-     */
-    public function __construct($arguments = array())
-    {
-        $this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
-    }
+	/**
+	 *    class constructor
+	 *
+	 * @access    private
+	 * @param    array $arguments
+	 * @return    \EE_CPT_Default_Strategy
+	 */
+	public function __construct($arguments = array())
+	{
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
+	}
 
 
-    /**
-     *    pre_get_posts
-     *
-     * @access    public
-     * @param    \WP_Query $WP_Query
-     * @return    \WP_Query
-     */
-    public function pre_get_posts(WP_Query $WP_Query)
-    {
-        if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
-            return $WP_Query;
-        }
-        return $WP_Query;
-    }
+	/**
+	 *    pre_get_posts
+	 *
+	 * @access    public
+	 * @param    \WP_Query $WP_Query
+	 * @return    \WP_Query
+	 */
+	public function pre_get_posts(WP_Query $WP_Query)
+	{
+		if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
+			return $WP_Query;
+		}
+		return $WP_Query;
+	}
 
 
-    /**
-     *    wp
-     *
-     * @access    public
-     * @param    \WP_Post[] $posts
-     * @param    \WP_Query  $WP_Query
-     * @return    \WP_Post[]
-     */
-    public function the_posts($posts, WP_Query $WP_Query)
-    {
-        return $posts;
-    }
+	/**
+	 *    wp
+	 *
+	 * @access    public
+	 * @param    \WP_Post[] $posts
+	 * @param    \WP_Query  $WP_Query
+	 * @return    \WP_Post[]
+	 */
+	public function the_posts($posts, WP_Query $WP_Query)
+	{
+		return $posts;
+	}
 
 
-    /**
-     *    get_EE_post_type_metadata
-     *
-     * @access    public
-     * @param mixed     $meta_value
-     * @param    int    $post_id
-     * @param    string $meta_key
-     * @param    string $single
-     * @return    mixed
-     */
-    public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single)
-    {
-        return $meta_value;
-    }
+	/**
+	 *    get_EE_post_type_metadata
+	 *
+	 * @access    public
+	 * @param mixed     $meta_value
+	 * @param    int    $post_id
+	 * @param    string $meta_key
+	 * @param    string $single
+	 * @return    mixed
+	 */
+	public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single)
+	{
+		return $meta_value;
+	}
 }

modules/invalid_checkout_access/EED_Invalid_Checkout_Access.module.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      */
     public static function getInvalidCheckoutAccess()
     {
-        if (! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
+        if ( ! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
             self::$invalid_checkout_access_form = new InvalidCheckoutAccess();
         }
         return self::$invalid_checkout_access_form;

Indentation +69 added lines, -69 removed lines

@@ -13,84 +13,84 @@
  */
 class EED_Invalid_Checkout_Access extends EED_Module
 {
-    /**
-     * @var InvalidCheckoutAccess $invalid_checkout_access_form
-     */
-    private static $invalid_checkout_access_form;
+	/**
+	 * @var InvalidCheckoutAccess $invalid_checkout_access_form
+	 */
+	private static $invalid_checkout_access_form;
 
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     */
-    public static function set_hooks()
-    {
-    }
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 */
+	public static function set_hooks()
+	{
+	}
 
 
-    /**
-     * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     */
-    public static function set_hooks_admin()
-    {
-        add_action(
-            'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-            array('EED_Invalid_Checkout_Access', 'display_invalid_checkout_access_form'),
-            15
-        );
-        add_filter(
-            'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
-            array('EED_Invalid_Checkout_Access', 'process_invalid_checkout_access_form')
-        );
-    }
+	/**
+	 * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 */
+	public static function set_hooks_admin()
+	{
+		add_action(
+			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
+			array('EED_Invalid_Checkout_Access', 'display_invalid_checkout_access_form'),
+			15
+		);
+		add_filter(
+			'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
+			array('EED_Invalid_Checkout_Access', 'process_invalid_checkout_access_form')
+		);
+	}
 
 
-    /**
-     * run - initial module setup
-     * this method is primarily used for activating resources in the EE_Front_Controller thru the use of filters
-     *
-     * @var WP $WP
-     */
-    public function run($WP)
-    {
-        // TODO: Implement run() method.
-    }
+	/**
+	 * run - initial module setup
+	 * this method is primarily used for activating resources in the EE_Front_Controller thru the use of filters
+	 *
+	 * @var WP $WP
+	 */
+	public function run($WP)
+	{
+		// TODO: Implement run() method.
+	}
 
 
-    /**
-     * @return InvalidCheckoutAccess
-     */
-    public static function getInvalidCheckoutAccess()
-    {
-        if (! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
-            self::$invalid_checkout_access_form = new InvalidCheckoutAccess();
-        }
-        return self::$invalid_checkout_access_form;
-    }
+	/**
+	 * @return InvalidCheckoutAccess
+	 */
+	public static function getInvalidCheckoutAccess()
+	{
+		if (! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
+			self::$invalid_checkout_access_form = new InvalidCheckoutAccess();
+		}
+		return self::$invalid_checkout_access_form;
+	}
 
 
-    /**
-     * email_validation_settings_form
-     *
-     * @return    void
-     * @throws EE_Error
-     */
-    public static function display_invalid_checkout_access_form()
-    {
-        $invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
-        echo wp_kses($invalid_checkout_access_form->getForm()->get_html(), AllowedTags::getWithFormTags());
-    }
+	/**
+	 * email_validation_settings_form
+	 *
+	 * @return    void
+	 * @throws EE_Error
+	 */
+	public static function display_invalid_checkout_access_form()
+	{
+		$invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
+		echo wp_kses($invalid_checkout_access_form->getForm()->get_html(), AllowedTags::getWithFormTags());
+	}
 
 
-    /**
-     * email_validation_settings_form
-     *
-     * @param EE_Registration_Config $EE_Registration_Config
-     * @return EE_Registration_Config
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function process_invalid_checkout_access_form(EE_Registration_Config $EE_Registration_Config)
-    {
-        $invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
-        return $invalid_checkout_access_form->processForm($EE_Registration_Config);
-    }
+	/**
+	 * email_validation_settings_form
+	 *
+	 * @param EE_Registration_Config $EE_Registration_Config
+	 * @return EE_Registration_Config
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function process_invalid_checkout_access_form(EE_Registration_Config $EE_Registration_Config)
+	{
+		$invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
+		return $invalid_checkout_access_form->processForm($EE_Registration_Config);
+	}
 }

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/Extend_Support_Admin_Page.core.php

Spacing +4 added lines, -4 removed lines

@@ -15,13 +15,13 @@ 
     public function __construct($routing = true)
     {
         parent::__construct($routing);
-        define('EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'support/templates/');
+        define('EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'support/templates/');
     }
 
 
     protected function _extend_page_config()
     {
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'support';
+        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'support';
         // new routes and new configs (or overrides )
         $new_page_routes = array(
             'faq' => array(
@@ -47,7 +47,7 @@ 
 
     protected function _faq()
     {
-        $template_path = EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH . 'support_admin_details_faq.template.php';
+        $template_path = EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH.'support_admin_details_faq.template.php';
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
             $template_path,
             '',
@@ -66,7 +66,7 @@ 
         add_meta_box(
             'espresso_additional_information_support',
             esc_html__('Additional Information', 'event_espresso'),
-            function ($post, $metabox) {
+            function($post, $metabox) {
                 echo EEH_Template::display_template(
                     $metabox['args']['template_path'],
                     '',

Indentation +61 added lines, -61 removed lines

@@ -11,71 +11,71 @@
  */
 class Extend_Support_Admin_Page extends Support_Admin_Page
 {
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-        define('EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'support/templates/');
-    }
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+		define('EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'support/templates/');
+	}
 
 
-    protected function _extend_page_config()
-    {
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'support';
-        // new routes and new configs (or overrides )
-        $new_page_routes = array(
-            'faq' => array(
-                'func'       => '_faq',
-                'capability' => 'ee_read_ee',
-            ),
-        );
-        $this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
-        $new_page_config = array(
-            'faq' => array(
-                'nav'           => array(
-                    'label' => esc_html__('FAQ', 'event_espresso'),
-                    'order' => 40,
-                ),
-                'metaboxes'     => array('_espresso_news_post_box', '_espresso_links_post_box'),
-                'require_nonce' => false,
-            ),
-        );
-        $this->_page_config = array_merge($this->_page_config, $new_page_config);
-        $this->_page_config['default']['metaboxes'][] = '_installation_boxes';
-    }
+	protected function _extend_page_config()
+	{
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'support';
+		// new routes and new configs (or overrides )
+		$new_page_routes = array(
+			'faq' => array(
+				'func'       => '_faq',
+				'capability' => 'ee_read_ee',
+			),
+		);
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
+		$new_page_config = array(
+			'faq' => array(
+				'nav'           => array(
+					'label' => esc_html__('FAQ', 'event_espresso'),
+					'order' => 40,
+				),
+				'metaboxes'     => array('_espresso_news_post_box', '_espresso_links_post_box'),
+				'require_nonce' => false,
+			),
+		);
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
+		$this->_page_config['default']['metaboxes'][] = '_installation_boxes';
+	}
 
 
-    protected function _faq()
-    {
-        $template_path = EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH . 'support_admin_details_faq.template.php';
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            $template_path,
-            '',
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
+	protected function _faq()
+	{
+		$template_path = EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH . 'support_admin_details_faq.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			$template_path,
+			'',
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
 
 
-    protected function _installation_boxes()
-    {
-        $callback_args = array(
-            'template_path' => EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH
-                               . 'support_admin_details_additional_information.template.php',
-        );
-        add_meta_box(
-            'espresso_additional_information_support',
-            esc_html__('Additional Information', 'event_espresso'),
-            function ($post, $metabox) {
-                echo EEH_Template::display_template(
-                    $metabox['args']['template_path'],
-                    '',
-                    true
-                );
-            },
-            $this->_current_screen->id,
-            'normal',
-            'high',
-            $callback_args
-        );
-    }
+	protected function _installation_boxes()
+	{
+		$callback_args = array(
+			'template_path' => EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH
+							   . 'support_admin_details_additional_information.template.php',
+		);
+		add_meta_box(
+			'espresso_additional_information_support',
+			esc_html__('Additional Information', 'event_espresso'),
+			function ($post, $metabox) {
+				echo EEH_Template::display_template(
+					$metabox['args']['template_path'],
+					'',
+					true
+				);
+			},
+			$this->_current_screen->id,
+			'normal',
+			'high',
+			$callback_args
+		);
+	}
 }

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/admin/extend/messages/Extend_Messages_Admin_Page.core.php

Spacing +10 added lines, -10 removed lines

@@ -21,17 +21,17 @@ 
     public function __construct($routing = true)
     {
         parent::__construct($routing);
-        if (! defined('EE_MSG_CAF_ASSETS_PATH')) {
-            define('EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/assets/');
-            define('EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/assets/');
-            define('EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/templates/');
-            define('EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/templates/');
+        if ( ! defined('EE_MSG_CAF_ASSETS_PATH')) {
+            define('EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND.'messages/assets/');
+            define('EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'messages/assets/');
+            define('EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'messages/templates/');
+            define('EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'messages/templates/');
         }
     }
 
     protected function _extend_page_config()
     {
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'messages';
+        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'messages';
         $this->_page_routes['custom_mtps'] = array(
             'func'       => '_ee_custom_messages_overview_list_table',
             'capability' => 'ee_read_messages',
@@ -76,13 +76,13 @@ 
     {
         global $admin_page_hooks;
 
-        if (! empty($admin_page_hooks['espresso_events'])) {
+        if ( ! empty($admin_page_hooks['espresso_events'])) {
             // we're on a EE specific page... good stuff!
             $hook_prefix = $admin_page_hooks['espresso_events'];
-            $filter_ref = $hook_prefix . '_page_' . $this->page_slug;
-            add_filter('FHEE_manage_' . $filter_ref . '_columns', array($this, 'add_custom_mtps_columns'), 10, 2);
+            $filter_ref = $hook_prefix.'_page_'.$this->page_slug;
+            add_filter('FHEE_manage_'.$filter_ref.'_columns', array($this, 'add_custom_mtps_columns'), 10, 2);
             add_action(
-                'AHEE__EE_Admin_List_Table__column_actions__' . $filter_ref,
+                'AHEE__EE_Admin_List_Table__column_actions__'.$filter_ref,
                 array($this, 'custom_mtp_create_button_column'),
                 10,
                 2

Indentation +186 added lines, -186 removed lines

@@ -16,190 +16,190 @@
  */
 class Extend_Messages_Admin_Page extends Messages_Admin_Page
 {
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-        if (! defined('EE_MSG_CAF_ASSETS_PATH')) {
-            define('EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/assets/');
-            define('EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/assets/');
-            define('EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/templates/');
-            define('EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/templates/');
-        }
-    }
-
-    protected function _extend_page_config()
-    {
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'messages';
-        $this->_page_routes['custom_mtps'] = array(
-            'func'       => '_ee_custom_messages_overview_list_table',
-            'capability' => 'ee_read_messages',
-        );
-        $this->_page_config['custom_mtps'] = array(
-            'nav'           => array(
-                'label' => esc_html__('Custom Message Templates', 'event_espresso'),
-                'order' => 30,
-            ),
-            'list_table'    => 'Custom_Messages_Template_List_Table',
-            'help_tabs'     => array(
-                'message_overview_message_types_help_tab' => array(
-                    'title'    => esc_html__('Message Types', 'event_espresso'),
-                    'filename' => 'messages_overview_types',
-                ),
-                'messages_overview_messengers_help_tab'   => array(
-                    'title'    => esc_html__('Messengers', 'event_espresso'),
-                    'filename' => 'messages_overview_messengers',
-                ),
-                'messages_overview_other_help_tab'        => array(
-                    'title'    => esc_html__('Messages Other', 'event_espresso'),
-                    'filename' => 'messages_overview_other',
-                ),
-            ),
-            'require_nonce' => false,
-        );
-
-        add_action('current_screen', array($this, 'dynamic_screen_hooks'), 10);
-    }
-
-
-    /**
-     * Callback for current_screen action
-     * This is used for any filters and/or actions that require the dynamic screen hook_prefix to be correct.
-     *
-     * @since 4.5.0
-     *
-     * @return void
-     */
-    public function dynamic_screen_hooks()
-    {
-        global $admin_page_hooks;
-
-        if (! empty($admin_page_hooks['espresso_events'])) {
-            // we're on a EE specific page... good stuff!
-            $hook_prefix = $admin_page_hooks['espresso_events'];
-            $filter_ref = $hook_prefix . '_page_' . $this->page_slug;
-            add_filter('FHEE_manage_' . $filter_ref . '_columns', array($this, 'add_custom_mtps_columns'), 10, 2);
-            add_action(
-                'AHEE__EE_Admin_List_Table__column_actions__' . $filter_ref,
-                array($this, 'custom_mtp_create_button_column'),
-                10,
-                2
-            );
-        }
-    }
-
-
-    /**
-     * This is the callback for the FHEE__manage_event-espresso_page_espresso_messages_columns to register the
-     * caffeinated columns for the global message templates list table.
-     *
-     * @since 4.3.2
-     *
-     * @param array  $columns   Original defined list of columns
-     * @param string $screen_id The unique screen id for the page.
-     */
-    public function add_custom_mtps_columns($columns, $screen_id)
-    {
-        if ($screen_id !== 'espresso_messages_global_mtps') {
-            return $columns;
-        }
-
-        $columns['actions'] = '';
-        return $columns;
-    }
-
-
-    /**
-     * Callback for FHEE__EE_Admin_List_Table__column_actions__event-espresso_page_espresso_messages action that allows
-     * for adding the content for the registered "action" column.
-     *
-     * @since 4.3.2
-     *
-     * @param EE_Base_Class
-     * @param string $screen_id Unique screen id for the page
-     *
-     * @return string html content for the page.
-     */
-    public function custom_mtp_create_button_column($item, $screen_id)
-    {
-        if (
-            $screen_id !== 'espresso_messages_global_mtps' || ! EE_Registry::instance()->CAP->current_user_can(
-                'ee_edit_messages',
-                'espresso_messages_add_new_message_template'
-            )
-        ) {
-            return '';
-        }
-
-        // first we consider whether this template has override set.  If it does then that means no custom templates can be created from this template as a base.  So let's just skip the button creation.
-        if ($item->get('MTP_is_override')) {
-            return '';
-        }
-
-
-        $create_args = array(
-            'GRP_ID'       => $item->ID(),
-            'messenger'    => $item->messenger(),
-            'message_type' => $item->message_type(),
-            'action'       => 'add_new_message_template',
-        );
-        $create_link = EE_Admin_Page::add_query_args_and_nonce($create_args, EE_MSG_ADMIN_URL);
-        echo sprintf(
-            '<a href="%s" class="button button-small">%s</a>',
-            $create_link,
-            esc_html__('Create Custom', 'event_espresso')
-        );
-    }
-
-
-    protected function _add_screen_options_custom_mtps()
-    {
-        $page_title = $this->_admin_page_title;
-        $this->_admin_page_title = esc_html__('Custom Message Templates', 'event_espresso');
-        $this->_per_page_screen_option();
-        $this->_admin_page_title = $page_title;
-    }
-
-
-    /**
-     * set views array for Custom Templates list table
-     *
-     * @access public
-     * @return void
-     */
-    public function _set_list_table_views_custom_mtps()
-    {
-        $this->_views = array(
-            'in_use' => array(
-                'slug'        => 'in_use',
-                'label'       => esc_html__('In Use', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'trash_message_template' => esc_html__('Move to Trash', 'event_espresso'),
-                ),
-            ),
-        );
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_messages',
-                'espresso_messages_trash_message_template'
-            )
-        ) {
-            $this->_views['trashed'] = array(
-                'slug'        => 'trashed',
-                'label'       => esc_html__('Trash', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'restore_message_template' => esc_html__('Restore From Trash', 'event_espresso'),
-                    'delete_message_template'  => esc_html__('Delete Permanently', 'event_espresso'),
-                ),
-            );
-        }
-    }
-
-
-    protected function _ee_custom_messages_overview_list_table()
-    {
-        $this->_admin_page_title = esc_html__('Custom Message Templates', 'event_espresso');
-        $this->display_admin_list_table_page_with_no_sidebar();
-    }
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+		if (! defined('EE_MSG_CAF_ASSETS_PATH')) {
+			define('EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/assets/');
+			define('EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/assets/');
+			define('EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/templates/');
+			define('EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/templates/');
+		}
+	}
+
+	protected function _extend_page_config()
+	{
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'messages';
+		$this->_page_routes['custom_mtps'] = array(
+			'func'       => '_ee_custom_messages_overview_list_table',
+			'capability' => 'ee_read_messages',
+		);
+		$this->_page_config['custom_mtps'] = array(
+			'nav'           => array(
+				'label' => esc_html__('Custom Message Templates', 'event_espresso'),
+				'order' => 30,
+			),
+			'list_table'    => 'Custom_Messages_Template_List_Table',
+			'help_tabs'     => array(
+				'message_overview_message_types_help_tab' => array(
+					'title'    => esc_html__('Message Types', 'event_espresso'),
+					'filename' => 'messages_overview_types',
+				),
+				'messages_overview_messengers_help_tab'   => array(
+					'title'    => esc_html__('Messengers', 'event_espresso'),
+					'filename' => 'messages_overview_messengers',
+				),
+				'messages_overview_other_help_tab'        => array(
+					'title'    => esc_html__('Messages Other', 'event_espresso'),
+					'filename' => 'messages_overview_other',
+				),
+			),
+			'require_nonce' => false,
+		);
+
+		add_action('current_screen', array($this, 'dynamic_screen_hooks'), 10);
+	}
+
+
+	/**
+	 * Callback for current_screen action
+	 * This is used for any filters and/or actions that require the dynamic screen hook_prefix to be correct.
+	 *
+	 * @since 4.5.0
+	 *
+	 * @return void
+	 */
+	public function dynamic_screen_hooks()
+	{
+		global $admin_page_hooks;
+
+		if (! empty($admin_page_hooks['espresso_events'])) {
+			// we're on a EE specific page... good stuff!
+			$hook_prefix = $admin_page_hooks['espresso_events'];
+			$filter_ref = $hook_prefix . '_page_' . $this->page_slug;
+			add_filter('FHEE_manage_' . $filter_ref . '_columns', array($this, 'add_custom_mtps_columns'), 10, 2);
+			add_action(
+				'AHEE__EE_Admin_List_Table__column_actions__' . $filter_ref,
+				array($this, 'custom_mtp_create_button_column'),
+				10,
+				2
+			);
+		}
+	}
+
+
+	/**
+	 * This is the callback for the FHEE__manage_event-espresso_page_espresso_messages_columns to register the
+	 * caffeinated columns for the global message templates list table.
+	 *
+	 * @since 4.3.2
+	 *
+	 * @param array  $columns   Original defined list of columns
+	 * @param string $screen_id The unique screen id for the page.
+	 */
+	public function add_custom_mtps_columns($columns, $screen_id)
+	{
+		if ($screen_id !== 'espresso_messages_global_mtps') {
+			return $columns;
+		}
+
+		$columns['actions'] = '';
+		return $columns;
+	}
+
+
+	/**
+	 * Callback for FHEE__EE_Admin_List_Table__column_actions__event-espresso_page_espresso_messages action that allows
+	 * for adding the content for the registered "action" column.
+	 *
+	 * @since 4.3.2
+	 *
+	 * @param EE_Base_Class
+	 * @param string $screen_id Unique screen id for the page
+	 *
+	 * @return string html content for the page.
+	 */
+	public function custom_mtp_create_button_column($item, $screen_id)
+	{
+		if (
+			$screen_id !== 'espresso_messages_global_mtps' || ! EE_Registry::instance()->CAP->current_user_can(
+				'ee_edit_messages',
+				'espresso_messages_add_new_message_template'
+			)
+		) {
+			return '';
+		}
+
+		// first we consider whether this template has override set.  If it does then that means no custom templates can be created from this template as a base.  So let's just skip the button creation.
+		if ($item->get('MTP_is_override')) {
+			return '';
+		}
+
+
+		$create_args = array(
+			'GRP_ID'       => $item->ID(),
+			'messenger'    => $item->messenger(),
+			'message_type' => $item->message_type(),
+			'action'       => 'add_new_message_template',
+		);
+		$create_link = EE_Admin_Page::add_query_args_and_nonce($create_args, EE_MSG_ADMIN_URL);
+		echo sprintf(
+			'<a href="%s" class="button button-small">%s</a>',
+			$create_link,
+			esc_html__('Create Custom', 'event_espresso')
+		);
+	}
+
+
+	protected function _add_screen_options_custom_mtps()
+	{
+		$page_title = $this->_admin_page_title;
+		$this->_admin_page_title = esc_html__('Custom Message Templates', 'event_espresso');
+		$this->_per_page_screen_option();
+		$this->_admin_page_title = $page_title;
+	}
+
+
+	/**
+	 * set views array for Custom Templates list table
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function _set_list_table_views_custom_mtps()
+	{
+		$this->_views = array(
+			'in_use' => array(
+				'slug'        => 'in_use',
+				'label'       => esc_html__('In Use', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'trash_message_template' => esc_html__('Move to Trash', 'event_espresso'),
+				),
+			),
+		);
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_messages',
+				'espresso_messages_trash_message_template'
+			)
+		) {
+			$this->_views['trashed'] = array(
+				'slug'        => 'trashed',
+				'label'       => esc_html__('Trash', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'restore_message_template' => esc_html__('Restore From Trash', 'event_espresso'),
+					'delete_message_template'  => esc_html__('Delete Permanently', 'event_espresso'),
+				),
+			);
+		}
+	}
+
+
+	protected function _ee_custom_messages_overview_list_table()
+	{
+		$this->_admin_page_title = esc_html__('Custom Message Templates', 'event_espresso');
+		$this->display_admin_list_table_page_with_no_sidebar();
+	}
 }

caffeinated/admin/extend/general_settings/Extend_General_Settings_Admin_Page.core.php

Spacing +3 added lines, -3 removed lines

@@ -21,14 +21,14 @@ 
     public function __construct($routing = true)
     {
         parent::__construct($routing);
-        define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'general_settings/templates/');
+        define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'general_settings/templates/');
     }
 
 
     protected function _extend_page_config()
     {
 
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'general_settings';
+        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'general_settings';
 
         // filters and action hooks here
         add_action('AHEE__admin_option_settings__template__before', array($this, 'debug_logging_options'), 9);
@@ -60,7 +60,7 @@ 
         $template_args['remote_logging_url'] = isset(EE_Registry::instance()->CFG->admin->remote_logging_url)
                                                && ! empty(EE_Registry::instance()->CFG->admin->remote_logging_url)
             ? stripslashes(EE_Registry::instance()->CFG->admin->remote_logging_url) : '';
-        $template = GEN_SET_CAF_TEMPLATE_PATH . 'debug_log_settings.template.php';
+        $template = GEN_SET_CAF_TEMPLATE_PATH.'debug_log_settings.template.php';
         EEH_Template::display_template($template, $template_args);
     }
 

Indentation +53 added lines, -53 removed lines

@@ -16,68 +16,68 @@
  */
 class Extend_General_Settings_Admin_Page extends General_Settings_Admin_Page
 {
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-        define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'general_settings/templates/');
-    }
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+		define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'general_settings/templates/');
+	}
 
 
-    protected function _extend_page_config()
-    {
+	protected function _extend_page_config()
+	{
 
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'general_settings';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'general_settings';
 
-        // filters and action hooks here
-        add_action('AHEE__admin_option_settings__template__before', array($this, 'debug_logging_options'), 9);
-        add_filter(
-            'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
-            array($this, 'update_debug_logging_options'),
-            10,
-            1
-        );
-    }
+		// filters and action hooks here
+		add_action('AHEE__admin_option_settings__template__before', array($this, 'debug_logging_options'), 9);
+		add_filter(
+			'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
+			array($this, 'update_debug_logging_options'),
+			10,
+			1
+		);
+	}
 
 
 
-    /*************        Logging Settings        *************/
+	/*************        Logging Settings        *************/
 
-    /**
-     * debug_logging_options
-     *
-     * @param array $template_args
-     *
-     * @return void
-     */
-    public function debug_logging_options($template_args = array())
-    {
-        $template_args['use_remote_logging'] = isset(EE_Registry::instance()->CFG->admin->use_remote_logging) ? absint(
-            EE_Registry::instance()->CFG->admin->use_remote_logging
-        ) : false;
-        $template_args['remote_logging_url'] = isset(EE_Registry::instance()->CFG->admin->remote_logging_url)
-                                               && ! empty(EE_Registry::instance()->CFG->admin->remote_logging_url)
-            ? stripslashes(EE_Registry::instance()->CFG->admin->remote_logging_url) : '';
-        $template = GEN_SET_CAF_TEMPLATE_PATH . 'debug_log_settings.template.php';
-        EEH_Template::display_template($template, $template_args);
-    }
+	/**
+	 * debug_logging_options
+	 *
+	 * @param array $template_args
+	 *
+	 * @return void
+	 */
+	public function debug_logging_options($template_args = array())
+	{
+		$template_args['use_remote_logging'] = isset(EE_Registry::instance()->CFG->admin->use_remote_logging) ? absint(
+			EE_Registry::instance()->CFG->admin->use_remote_logging
+		) : false;
+		$template_args['remote_logging_url'] = isset(EE_Registry::instance()->CFG->admin->remote_logging_url)
+											   && ! empty(EE_Registry::instance()->CFG->admin->remote_logging_url)
+			? stripslashes(EE_Registry::instance()->CFG->admin->remote_logging_url) : '';
+		$template = GEN_SET_CAF_TEMPLATE_PATH . 'debug_log_settings.template.php';
+		EEH_Template::display_template($template, $template_args);
+	}
 
 
-    /**
-     * update_debug_logging_options
-     *
-     * @param array $admin_options
-     *
-     * @return array
-     */
-    public function update_debug_logging_options($admin_options = array())
-    {
-        $admin_options->use_remote_logging = isset($this->_req_data['use_remote_logging']) ? absint(
-            $this->_req_data['use_remote_logging']
-        ) : $admin_options->use_remote_logging;
-        $admin_options->remote_logging_url = isset($this->_req_data['remote_logging_url']) ? esc_url_raw(
-            $this->_req_data['remote_logging_url']
-        ) : $admin_options->remote_logging_url;
+	/**
+	 * update_debug_logging_options
+	 *
+	 * @param array $admin_options
+	 *
+	 * @return array
+	 */
+	public function update_debug_logging_options($admin_options = array())
+	{
+		$admin_options->use_remote_logging = isset($this->_req_data['use_remote_logging']) ? absint(
+			$this->_req_data['use_remote_logging']
+		) : $admin_options->use_remote_logging;
+		$admin_options->remote_logging_url = isset($this->_req_data['remote_logging_url']) ? esc_url_raw(
+			$this->_req_data['remote_logging_url']
+		) : $admin_options->remote_logging_url;
 
-        return $admin_options;
-    }
+		return $admin_options;
+	}
 }

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

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(array $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(array $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]')
+		);
+	}
 }

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

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