eventespresso / event-espresso-core

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

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/shortcodes/EE_Question_Shortcodes.lib.php

Spacing +7 added lines, -7 removed lines

@@ -49,15 +49,15 @@ 
     protected function _parser($shortcode)
     {
 
-        if (! $this->_data instanceof EE_Answer || ! isset($this->_extra_data['data']) || ! $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
+        if ( ! $this->_data instanceof EE_Answer || ! isset($this->_extra_data['data']) || ! $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
             return '';
         }
 
         switch ($shortcode) {
             case '[QUESTION]':
-                $question = isset($this->_extra_data['data']->questions[ $this->_data->ID() ])
-                    ? $this->_extra_data['data']->questions[ $this->_data->ID() ] : $this->_data->question();
-                if (! $question instanceof EE_Question) {
+                $question = isset($this->_extra_data['data']->questions[$this->_data->ID()])
+                    ? $this->_extra_data['data']->questions[$this->_data->ID()] : $this->_data->question();
+                if ( ! $question instanceof EE_Question) {
                     return ''; // get out because we can't figure out what the question is.
                 }
 
@@ -66,9 +66,9 @@ 
 
             case '[ANSWER]':
                 // need to get the question to determine the type of question (some questions require translation of the answer).
-                $question = isset($this->_extra_data['data']->questions[ $this->_data->ID() ])
-                    ? $this->_extra_data['data']->questions[ $this->_data->ID() ] : $this->_data->question();
-                if (! $question instanceof EE_Question) {
+                $question = isset($this->_extra_data['data']->questions[$this->_data->ID()])
+                    ? $this->_extra_data['data']->questions[$this->_data->ID()] : $this->_data->question();
+                if ( ! $question instanceof EE_Question) {
                     return ''; // get out cause we can't figure out what the question type is!
                 }
 

Indentation +70 added lines, -70 removed lines

@@ -17,85 +17,85 @@
  */
 class EE_Question_Shortcodes extends EE_Shortcodes
 {
-    /**
-     * _init_props
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _init_props()
-    {
-        $this->label = esc_html__('Attendee Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to attendee related data', 'event_espresso');
-        $this->_shortcodes = array(
-            '[QUESTION]' => esc_html__('Will parse to a question.', 'event_espresso'),
-            '[ANSWER]'   => esc_html__('Will parse to the answer for a question', 'event_espresso'),
-        );
-    }
+	/**
+	 * _init_props
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _init_props()
+	{
+		$this->label = esc_html__('Attendee Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to attendee related data', 'event_espresso');
+		$this->_shortcodes = array(
+			'[QUESTION]' => esc_html__('Will parse to a question.', 'event_espresso'),
+			'[ANSWER]'   => esc_html__('Will parse to the answer for a question', 'event_espresso'),
+		);
+	}
 
 
-    /**
-     * This method will give parsing instructions for each shortcode defined in the _shortcodes array.  Child methods
-     * will have to take care of handling.
-     *
-     * @access protected
-     *
-     * @param string $shortcode the shortcode to be parsed.
-     *
-     * @return string parsed shortcode
-     */
-    protected function _parser($shortcode)
-    {
+	/**
+	 * This method will give parsing instructions for each shortcode defined in the _shortcodes array.  Child methods
+	 * will have to take care of handling.
+	 *
+	 * @access protected
+	 *
+	 * @param string $shortcode the shortcode to be parsed.
+	 *
+	 * @return string parsed shortcode
+	 */
+	protected function _parser($shortcode)
+	{
 
-        if (! $this->_data instanceof EE_Answer || ! isset($this->_extra_data['data']) || ! $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
-            return '';
-        }
+		if (! $this->_data instanceof EE_Answer || ! isset($this->_extra_data['data']) || ! $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
+			return '';
+		}
 
-        switch ($shortcode) {
-            case '[QUESTION]':
-                $question = isset($this->_extra_data['data']->questions[ $this->_data->ID() ])
-                    ? $this->_extra_data['data']->questions[ $this->_data->ID() ] : $this->_data->question();
-                if (! $question instanceof EE_Question) {
-                    return ''; // get out because we can't figure out what the question is.
-                }
+		switch ($shortcode) {
+			case '[QUESTION]':
+				$question = isset($this->_extra_data['data']->questions[ $this->_data->ID() ])
+					? $this->_extra_data['data']->questions[ $this->_data->ID() ] : $this->_data->question();
+				if (! $question instanceof EE_Question) {
+					return ''; // get out because we can't figure out what the question is.
+				}
 
-                return $question->get('QST_display_text');
-                break;
+				return $question->get('QST_display_text');
+				break;
 
-            case '[ANSWER]':
-                // need to get the question to determine the type of question (some questions require translation of the answer).
-                $question = isset($this->_extra_data['data']->questions[ $this->_data->ID() ])
-                    ? $this->_extra_data['data']->questions[ $this->_data->ID() ] : $this->_data->question();
-                if (! $question instanceof EE_Question) {
-                    return ''; // get out cause we can't figure out what the question type is!
-                }
+			case '[ANSWER]':
+				// need to get the question to determine the type of question (some questions require translation of the answer).
+				$question = isset($this->_extra_data['data']->questions[ $this->_data->ID() ])
+					? $this->_extra_data['data']->questions[ $this->_data->ID() ] : $this->_data->question();
+				if (! $question instanceof EE_Question) {
+					return ''; // get out cause we can't figure out what the question type is!
+				}
 
-                // what we show for the answer depends on the question type!
-                switch ($question->get('QST_type')) {
-                    case 'STATE':
-                        $state = EEM_State::instance()->get_one_by_ID($this->_data->get('ANS_value'));
-                        $answer = $state instanceof EE_State ? $state->name() : '';
-                        break;
+				// what we show for the answer depends on the question type!
+				switch ($question->get('QST_type')) {
+					case 'STATE':
+						$state = EEM_State::instance()->get_one_by_ID($this->_data->get('ANS_value'));
+						$answer = $state instanceof EE_State ? $state->name() : '';
+						break;
 
-                    case 'COUNTRY':
-                        $country = EEM_Country::instance()->get_one_by_ID($this->_data->get('ANS_value'));
-                        $answer = $country instanceof EE_Country ? $country->name() : '';
-                        break;
+					case 'COUNTRY':
+						$country = EEM_Country::instance()->get_one_by_ID($this->_data->get('ANS_value'));
+						$answer = $country instanceof EE_Country ? $country->name() : '';
+						break;
 
-                    default:
-                        $answer = $this->_data->get_pretty('ANS_value', 'no_wpautop');
-                        break;
-                }
+					default:
+						$answer = $this->_data->get_pretty('ANS_value', 'no_wpautop');
+						break;
+				}
 
-                return apply_filters(
-                    'FHEE__EE_Question_Shortcodes___parser__answer',
-                    $answer,
-                    $question,
-                    $this->_data
-                );
-                break;
-        }
+				return apply_filters(
+					'FHEE__EE_Question_Shortcodes___parser__answer',
+					$answer,
+					$question,
+					$this->_data
+				);
+				break;
+		}
 
-        return '';
-    }
+		return '';
+	}
 }

caffeinated/modules/events_archive_caff/templates/admin-event-list-settings.template.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
             </label>
         </th>
         <td>
-            <p><?php echo site_url() . '/ '
+            <p><?php echo site_url().'/ '
                           . EEH_Form_Fields::text(
                               'not_used',
                               EE_Registry::instance()->CFG->core->event_cpt_slug,

Indentation +108 added lines, -108 removed lines

@@ -5,18 +5,18 @@ 
 add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
 
 $values = EEH_Form_Fields::prep_answer_options(
-    array(
-        array('id' => 1, 'text' => esc_html__('Yes', 'event_espresso')),
-        array('id' => 0, 'text' => esc_html__('No', 'event_espresso')),
-    )
+	array(
+		array('id' => 1, 'text' => esc_html__('Yes', 'event_espresso')),
+		array('id' => 0, 'text' => esc_html__('No', 'event_espresso')),
+	)
 );
 
 $description = EEH_Form_Fields::prep_answer_options(
-    array(
-        array('id' => 0, 'text' => esc_html__('none', 'event_espresso')),
-        array('id' => 1, 'text' => esc_html__('excerpt (short desc)', 'event_espresso')),
-        array('id' => 2, 'text' => esc_html__('full description', 'event_espresso')),
-    )
+	array(
+		array('id' => 0, 'text' => esc_html__('none', 'event_espresso')),
+		array('id' => 1, 'text' => esc_html__('excerpt (short desc)', 'event_espresso')),
+		array('id' => 2, 'text' => esc_html__('full description', 'event_espresso')),
+	)
 );
 
 ?>
@@ -35,14 +35,14 @@ 
         <th>
             <label for="event_listings_url">
                 <?php esc_html_e('Event Listings URL', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'event_listings_url_info'
-                ); ?>
+					'event_listings_url_info'
+				); ?>
             </label>
         </th>
         <td>
             <a id="event_listings_url" class="ee-admin-settings-hdr-lnk small-text"
                href="<?php echo EEH_Event_View::event_archive_url(); ?>"><?php
-                echo EEH_Event_View::event_archive_url(); ?></a>
+				echo EEH_Event_View::event_archive_url(); ?></a>
         </td>
     </tr>
 
@@ -54,30 +54,30 @@ 
         </th>
         <td>
             <p><?php echo site_url() . '/ '
-                          . EEH_Form_Fields::text(
-                              'not_used',
-                              EE_Registry::instance()->CFG->core->event_cpt_slug,
-                              'event_cpt_slug',
-                              'event_cpt_slug',
-                              'regular'
-                          ); ?></p>
+						  . EEH_Form_Fields::text(
+							  'not_used',
+							  EE_Registry::instance()->CFG->core->event_cpt_slug,
+							  'event_cpt_slug',
+							  'event_cpt_slug',
+							  'regular'
+						  ); ?></p>
             <p class="description"><?php
-                esc_html_e(
-                    'This allows you to configure what slug is used for the url of all event pages.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'This allows you to configure what slug is used for the url of all event pages.',
+					'event_espresso'
+				); ?></p>
             <?php if (has_filter('FHEE__EE_Register_CPTs__register_CPT__rewrite')) : ?>
                 <p class="important-notice">
                     <?php
-                    sprintf(
-                        esc_html__(
-                            'Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.',
-                            'event_espresso'
-                        ),
-                        '<code>',
-                        '</code>'
-                    );
-                    ?>
+					sprintf(
+						esc_html__(
+							'Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.',
+							'event_espresso'
+						),
+						'<code>',
+						'</code>'
+					);
+					?>
                 </p>
             <?php endif; ?>
         </td>
@@ -91,17 +91,17 @@ 
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'display_status_banner',
-                $display_status_banner,
-                $values,
-                'EED_Events_Archive_display_status_banner',
-                'EED_Events_Archive_display_status_banner'
-            ); ?>
+				'display_status_banner',
+				$display_status_banner,
+				$values,
+				'EED_Events_Archive_display_status_banner',
+				'EED_Events_Archive_display_status_banner'
+			); ?>
             <p class="description"><?php
-                esc_html_e(
-                    'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.',
+					'event_espresso'
+				); ?></p>
         </td>
     </tr>
 
@@ -109,18 +109,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_description">
                 <?php esc_html_e('Display Description', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_description_info'
-                ); ?>
+					'display_description_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'description',
-                $display_description,
-                $description,
-                'EED_Events_Archive_display_description',
-                'EED_Events_Archive_display_description'
-            ); ?>
+				'description',
+				$display_description,
+				$description,
+				'EED_Events_Archive_display_description',
+				'EED_Events_Archive_display_description'
+			); ?>
         </td>
     </tr>
 
@@ -128,18 +128,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_ticket_selector">
                 <?php esc_html_e('Display Ticket Selector', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_ticket_selector_info'
-                ); ?>
+					'display_ticket_selector_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'ticket_selector',
-                $display_ticket_selector,
-                $values,
-                'EED_Events_Archive_display_ticket_selector',
-                'EED_Events_Archive_display_ticket_selector'
-            ); ?>
+				'ticket_selector',
+				$display_ticket_selector,
+				$values,
+				'EED_Events_Archive_display_ticket_selector',
+				'EED_Events_Archive_display_ticket_selector'
+			); ?>
         </td>
     </tr>
 
@@ -147,18 +147,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_datetimes">
                 <?php esc_html_e('Display Datetimes', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_datetimes_info'
-                ); ?>
+					'display_datetimes_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'venue_details',
-                $display_datetimes,
-                $values,
-                'EED_Events_Archive_display_datetimes',
-                'EED_Events_Archive_display_datetimes'
-            ); ?>
+				'venue_details',
+				$display_datetimes,
+				$values,
+				'EED_Events_Archive_display_datetimes',
+				'EED_Events_Archive_display_datetimes'
+			); ?>
         </td>
     </tr>
 
@@ -166,18 +166,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_venue">
                 <?php esc_html_e('Display Venue Details', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_venue_details_info'
-                ); ?>
+					'display_venue_details_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'display_venue',
-                $display_venue,
-                $values,
-                'EED_Events_Archive_display_venue',
-                'EED_Events_Archive_display_venue'
-            ); ?>
+				'display_venue',
+				$display_venue,
+				$values,
+				'EED_Events_Archive_display_venue',
+				'EED_Events_Archive_display_venue'
+			); ?>
         </td>
     </tr>
 
@@ -185,18 +185,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_expired_events">
                 <?php esc_html_e('Display Expired Events', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_expired_events_info'
-                ); ?>
+					'display_expired_events_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'expired_events',
-                $display_expired_events,
-                $values,
-                'EED_Events_Archive_display_expired_events',
-                'EED_Events_Archive_display_expired_events'
-            ); ?>
+				'expired_events',
+				$display_expired_events,
+				$values,
+				'EED_Events_Archive_display_expired_events',
+				'EED_Events_Archive_display_expired_events'
+			); ?>
         </td>
     </tr>
 
@@ -204,43 +204,43 @@ 
         <th>
             <label for="EED_Events_Archive_use_sortable_display_order">
                 <?php esc_html_e(
-                    'Use Custom Display Order?',
-                    'event_espresso'
-                ); ?><?php // echo EEH_Template::get_help_tab_link('use_sortable_display_order_info');?>
+					'Use Custom Display Order?',
+					'event_espresso'
+				); ?><?php // echo EEH_Template::get_help_tab_link('use_sortable_display_order_info');?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'use_sortable_display_order',
-                $use_sortable_display_order,
-                $values,
-                'EED_Events_Archive_use_sortable_display_order',
-                'EED_Events_Archive_use_sortable_display_order'
-            ); ?>
+				'use_sortable_display_order',
+				$use_sortable_display_order,
+				$values,
+				'EED_Events_Archive_use_sortable_display_order',
+				'EED_Events_Archive_use_sortable_display_order'
+			); ?>
         </td>
     </tr>
 
     <tr>
         <th>
             <?php esc_html_e(
-                'Display Order',
-                'event_espresso'
-            ); ?><?php // echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
+				'Display Order',
+				'event_espresso'
+			); ?><?php // echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
         </th>
         <td>
 
             <?php wp_nonce_field(
-                'espresso_update_event_archive_order',
-                'espresso_update_event_archive_order_nonce',
-                false
-            ); ?>
+				'espresso_update_event_archive_order',
+				'espresso_update_event_archive_order_nonce',
+				false
+			); ?>
             <?php echo wp_kses($event_archive_display_order, AllowedTags::getWithFormTags()); ?>
 
             <p class="description"><?php
-                esc_html_e(
-                    'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.',
+					'event_espresso'
+				); ?></p>
 
         </td>
     </tr>
@@ -253,12 +253,12 @@ 
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'reset_event_list_settings',
-                0,
-                $values,
-                'EED_Events_Archive_reset_event_list_settings',
-                'EED_Events_Archive_reset_event_list_settings'
-            ); ?>
+				'reset_event_list_settings',
+				0,
+				$values,
+				'EED_Events_Archive_reset_event_list_settings',
+				'EED_Events_Archive_reset_event_list_settings'
+			); ?>
         </td>
     </tr>
 

caffeinated/modules/recaptcha/templates/recaptcha.template.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 /** @type string $recaptcha_language */
 /** @type string $recaptcha_publickey */

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 /** @type string $recaptcha_language */