eventespresso / event-espresso-core

admin_pages/messages/help_tours/Message_Templates_Edit_Help_Tour.class.php

Indentation +133 added lines, -133 removed lines

@@ -15,137 +15,137 @@
 class Message_Templates_Edit_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Message Template Editor Tour', 'event_espresso');
-        $this->_slug = 'messages-templates-edit-joyride';
-    }
-
-
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            20 => array(
-                'id'      => 'submit-msg-context-switcher-sbmt',
-                'content' => $this->_context_switcher_stop(),
-                'options' => array(
-                    'tipLocation'    => 'bottom',
-                    'tipAdjustmentY' => -30,
-                    'tipAdjustmentX' => -60,
-                ),
-            ),
-            30 => array(
-                'class'   => 'messages-preview-button"',
-                'content' => $this->_preview_button_stop(),
-                'options' => array(
-                    'tipLocation'    => 'bottom',
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            40 => array(
-                'content' => $this->_template_area_stop(),
-                'options' => array(
-                    'tipAdjustmentY' => -100,
-                    'tipAdjustmentX' => -60,
-                ),
-            ),
-            50 => array(
-                'id'      => 'mtp_valid_shortcodes',
-                'content' => $this->_mtp_valid_shortcodes_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-            60 => array(
-                'id'      => 'mtp_extra_actions',
-                'content' => $this->_mtp_extra_actions_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-            70 => array(
-                'id'      => 'espresso_espresso_messages_editor_overview',
-                'content' => $this->_update_metabox_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-        );
-    }
-
-
-    protected function _start()
-    {
-        $content = '<h3>' . __('Message Template Editor', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Message Template Editor page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
-
-
-    protected function _context_switcher_stop()
-    {
-        return '<p>'
-               . __(
-                   'This dropdown allows you to swap between the different recipients templates that are available in this message type. Be sure to save changes befor switching to a different context.',
-                   'event_espresso'
-               ) . '</p>';
-    }
-
-
-    protected function _preview_button_stop()
-    {
-        return '<p>'
-               . __(
-                   'Clicking this button will show you a preview of how your message will look.',
-                   'event_espresso'
-               ) . '</p>';
-    }
-
-
-    protected function _template_area_stop()
-    {
-        return '<p>'
-               . __(
-                   'Depending on the messenger (recipient) and the message type, the main screen can show different boxes. Overall the screen allows you to confirm who the messages go to and who from, and the actual content of the message.',
-                   'event_espresso'
-               ) . '</p>';
-    }
-
-    protected function _mtp_valid_shortcodes_stop()
-    {
-        return '<p>'
-               . __(
-                   'These shortcodes allow you to quickly add data into your messages, without touching code. From emails, to ticket details, to your company logo, building messages with shortcodes is easy and fast.',
-                   'event_espresso'
-               ) . '</p>';
-    }
-
-
-    protected function _mtp_extra_actions_stop()
-    {
-        return '<p>'
-               . __(
-                   'Here you will find miscellaneous options to assist you, including a test send button and a reset button.',
-                   'event_espresso'
-               ) . '</p>';
-    }
-
-
-    protected function _update_metabox_stop()
-    {
-        return '<p>' . __('When done creating your message, click here to save it.', 'event_espresso') . '</p>';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Message Template Editor Tour', 'event_espresso');
+		$this->_slug = 'messages-templates-edit-joyride';
+	}
+
+
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			20 => array(
+				'id'      => 'submit-msg-context-switcher-sbmt',
+				'content' => $this->_context_switcher_stop(),
+				'options' => array(
+					'tipLocation'    => 'bottom',
+					'tipAdjustmentY' => -30,
+					'tipAdjustmentX' => -60,
+				),
+			),
+			30 => array(
+				'class'   => 'messages-preview-button"',
+				'content' => $this->_preview_button_stop(),
+				'options' => array(
+					'tipLocation'    => 'bottom',
+					'tipAdjustmentY' => -30,
+				),
+			),
+			40 => array(
+				'content' => $this->_template_area_stop(),
+				'options' => array(
+					'tipAdjustmentY' => -100,
+					'tipAdjustmentX' => -60,
+				),
+			),
+			50 => array(
+				'id'      => 'mtp_valid_shortcodes',
+				'content' => $this->_mtp_valid_shortcodes_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+			60 => array(
+				'id'      => 'mtp_extra_actions',
+				'content' => $this->_mtp_extra_actions_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+			70 => array(
+				'id'      => 'espresso_espresso_messages_editor_overview',
+				'content' => $this->_update_metabox_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+		);
+	}
+
+
+	protected function _start()
+	{
+		$content = '<h3>' . __('Message Template Editor', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Message Template Editor page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
+
+
+	protected function _context_switcher_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This dropdown allows you to swap between the different recipients templates that are available in this message type. Be sure to save changes befor switching to a different context.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
+
+
+	protected function _preview_button_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Clicking this button will show you a preview of how your message will look.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
+
+
+	protected function _template_area_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Depending on the messenger (recipient) and the message type, the main screen can show different boxes. Overall the screen allows you to confirm who the messages go to and who from, and the actual content of the message.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
+
+	protected function _mtp_valid_shortcodes_stop()
+	{
+		return '<p>'
+			   . __(
+				   'These shortcodes allow you to quickly add data into your messages, without touching code. From emails, to ticket details, to your company logo, building messages with shortcodes is easy and fast.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
+
+
+	protected function _mtp_extra_actions_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Here you will find miscellaneous options to assist you, including a test send button and a reset button.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
+
+
+	protected function _update_metabox_stop()
+	{
+		return '<p>' . __('When done creating your message, click here to save it.', 'event_espresso') . '</p>';
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -85,12 +85,12 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Message Template Editor', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Message Template Editor', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Message Template Editor page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
@@ -101,7 +101,7 @@ 
                . __(
                    'This dropdown allows you to swap between the different recipients templates that are available in this message type. Be sure to save changes befor switching to a different context.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
 
@@ -111,7 +111,7 @@ 
                . __(
                    'Clicking this button will show you a preview of how your message will look.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
 
@@ -121,7 +121,7 @@ 
                . __(
                    'Depending on the messenger (recipient) and the message type, the main screen can show different boxes. Overall the screen allows you to confirm who the messages go to and who from, and the actual content of the message.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _mtp_valid_shortcodes_stop()
@@ -130,7 +130,7 @@ 
                . __(
                    'These shortcodes allow you to quickly add data into your messages, without touching code. From emails, to ticket details, to your company logo, building messages with shortcodes is easy and fast.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
 
@@ -140,12 +140,12 @@ 
                . __(
                    'Here you will find miscellaneous options to assist you, including a test send button and a reset button.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
 
     protected function _update_metabox_stop()
     {
-        return '<p>' . __('When done creating your message, click here to save it.', 'event_espresso') . '</p>';
+        return '<p>'.__('When done creating your message, click here to save it.', 'event_espresso').'</p>';
     }
 }

admin_pages/messages/help_tours/Messages_Settings_Help_Tour.class.php

Indentation +99 added lines, -99 removed lines

@@ -15,112 +15,112 @@
 class Messages_Settings_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Messages Settings Tour', 'event_espresso');
-        $this->_slug = 'messages-settings-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Messages Settings Tour', 'event_espresso');
+		$this->_slug = 'messages-settings-joyride';
+	}
 
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            20 => array(
-                'class'   => 'messenger_links',
-                'content' => $this->_messenger_links_stop(),
-                'options' => array(
-                    'tipLocation'    => 'bottom',
-                    'tipAdjustmentX' => -5,
-                    'tipAdjustmentY' => -25,
-                ),
-            ),
-            30 => array(
-                'id'      => 'espresso_email_settings',
-                'content' => $this->_email_settings_metabox_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 20,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            40 => array(
-                'id'      => 'on-off-email',
-                'content' => $this->_on_off_toggle_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-            50 => array(
-                'id'      => 'active-message-types',
-                'content' => $this->_active_mts_container_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            60 => array(
-                'id'      => 'inactive-message-types',
-                'content' => $this->_inactive_mts_container_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-        );
-    }
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			20 => array(
+				'class'   => 'messenger_links',
+				'content' => $this->_messenger_links_stop(),
+				'options' => array(
+					'tipLocation'    => 'bottom',
+					'tipAdjustmentX' => -5,
+					'tipAdjustmentY' => -25,
+				),
+			),
+			30 => array(
+				'id'      => 'espresso_email_settings',
+				'content' => $this->_email_settings_metabox_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 20,
+					'tipAdjustmentY' => -30,
+				),
+			),
+			40 => array(
+				'id'      => 'on-off-email',
+				'content' => $this->_on_off_toggle_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+			50 => array(
+				'id'      => 'active-message-types',
+				'content' => $this->_active_mts_container_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -30,
+				),
+			),
+			60 => array(
+				'id'      => 'inactive-message-types',
+				'content' => $this->_inactive_mts_container_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Messages Settings', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Messages Settings page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Messages Settings', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Messages Settings page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
 
-    protected function _messenger_links_stop()
-    {
-        return '<p>' . __('Available messengers are shown above.', 'event_espresso') . '</p>';
-    }
+	protected function _messenger_links_stop()
+	{
+		return '<p>' . __('Available messengers are shown above.', 'event_espresso') . '</p>';
+	}
 
-    protected function _email_settings_metabox_stop()
-    {
-        return '<p>' . __('View the different message types that are currently active.', 'event_espresso') . '</p>';
-    }
+	protected function _email_settings_metabox_stop()
+	{
+		return '<p>' . __('View the different message types that are currently active.', 'event_espresso') . '</p>';
+	}
 
-    protected function _on_off_toggle_stop()
-    {
-        return '<p>'
-               . __(
-                   'This toggle will turn all messages on or off for this message type.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _on_off_toggle_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This toggle will turn all messages on or off for this message type.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _active_mts_container_stop()
-    {
-        return '<p>'
-               . __(
-                   'These are your active message types. Click them to see a description and settings for each one.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _active_mts_container_stop()
+	{
+		return '<p>'
+			   . __(
+				   'These are your active message types. Click them to see a description and settings for each one.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _inactive_mts_container_stop()
-    {
-        return '<p>'
-               . __(
-                   'Drag message types here to deactivate them. Drag them from here to the active box to reactivate them.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _inactive_mts_container_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Drag message types here to deactivate them. Drag them from here to the active box to reactivate them.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -78,23 +78,23 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Messages Settings', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Messages Settings', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Messages Settings page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
     protected function _messenger_links_stop()
     {
-        return '<p>' . __('Available messengers are shown above.', 'event_espresso') . '</p>';
+        return '<p>'.__('Available messengers are shown above.', 'event_espresso').'</p>';
     }
 
     protected function _email_settings_metabox_stop()
     {
-        return '<p>' . __('View the different message types that are currently active.', 'event_espresso') . '</p>';
+        return '<p>'.__('View the different message types that are currently active.', 'event_espresso').'</p>';
     }
 
     protected function _on_off_toggle_stop()
@@ -103,7 +103,7 @@ 
                . __(
                    'This toggle will turn all messages on or off for this message type.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _active_mts_container_stop()
@@ -112,7 +112,7 @@ 
                . __(
                    'These are your active message types. Click them to see a description and settings for each one.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _inactive_mts_container_stop()
@@ -121,6 +121,6 @@ 
                . __(
                    'Drag message types here to deactivate them. Drag them from here to the active box to reactivate them.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 }

admin_pages/messages/help_tours/Messages_Overview_Help_Tour.class.php

Indentation +117 added lines, -117 removed lines

@@ -15,131 +15,131 @@
 class Messages_Overview_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Messages Overview Tour', 'event_espresso');
-        $this->_slug = 'messages-overview-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Messages Overview Tour', 'event_espresso');
+		$this->_slug = 'messages-overview-joyride';
+	}
 
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            20 => array(
-                'id'      => 'event',
-                'content' => $this->event_column_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => -5,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            30 => array(
-                'id'      => 'message_type',
-                'content' => $this->_message_type_column_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 20,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            40 => array(
-                'id'      => 'messenger',
-                'content' => $this->_messenger_column_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 5,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            50 => array(
-                'id'      => 'description',
-                'content' => $this->_description_column_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 5,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            60 => array(
-                'class'   => 'bulkactions',
-                'content' => $this->_bulk_actions_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 25,
-                    'tipAdjustmentY' => -35,
-                ),
-            ),
-            70 => array(
-                'id'      => 'ee_messenger_filter_by',
-                'content' => $this->_filters_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 25,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-        );
-    }
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			20 => array(
+				'id'      => 'event',
+				'content' => $this->event_column_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => -5,
+					'tipAdjustmentY' => -30,
+				),
+			),
+			30 => array(
+				'id'      => 'message_type',
+				'content' => $this->_message_type_column_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 20,
+					'tipAdjustmentY' => -30,
+				),
+			),
+			40 => array(
+				'id'      => 'messenger',
+				'content' => $this->_messenger_column_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 5,
+					'tipAdjustmentY' => -30,
+				),
+			),
+			50 => array(
+				'id'      => 'description',
+				'content' => $this->_description_column_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 5,
+					'tipAdjustmentY' => -30,
+				),
+			),
+			60 => array(
+				'class'   => 'bulkactions',
+				'content' => $this->_bulk_actions_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 25,
+					'tipAdjustmentY' => -35,
+				),
+			),
+			70 => array(
+				'id'      => 'ee_messenger_filter_by',
+				'content' => $this->_filters_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 25,
+					'tipAdjustmentY' => -30,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Messages Overview', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Messages Overview page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Messages Overview', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Messages Overview page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
 
-    protected function event_column_stop()
-    {
-        return '<p>'
-               . __(
-                   'View if a message is associated with one event or multiple events. Can be sorted in ascending and descending order.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function event_column_stop()
+	{
+		return '<p>'
+			   . __(
+				   'View if a message is associated with one event or multiple events. Can be sorted in ascending and descending order.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _message_type_column_stop()
-    {
-        return '<p>'
-               . __(
-                   'View the type of message. Can be sorted in ascending or descending order.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _message_type_column_stop()
+	{
+		return '<p>'
+			   . __(
+				   'View the type of message. Can be sorted in ascending or descending order.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _messenger_column_stop()
-    {
-        return '<p>'
-               . __(
-                   'View who messages will be sent to. Can be sorted in ascending or descending order.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _messenger_column_stop()
+	{
+		return '<p>'
+			   . __(
+				   'View who messages will be sent to. Can be sorted in ascending or descending order.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _description_column_stop()
-    {
-        return '<p>' . __('View the description for each message type.', 'event_espresso') . '</p>';
-    }
+	protected function _description_column_stop()
+	{
+		return '<p>' . __('View the description for each message type.', 'event_espresso') . '</p>';
+	}
 
-    protected function _bulk_actions_stop()
-    {
-        return '<p>' . __('Perform bulk actions to multiple message types.', 'event_espresso') . '</p>';
-    }
+	protected function _bulk_actions_stop()
+	{
+		return '<p>' . __('Perform bulk actions to multiple message types.', 'event_espresso') . '</p>';
+	}
 
-    protected function _filters_stop()
-    {
-        return '<p>'
-               . __(
-                   'You can filter by different notifications by making a selection below and clicking on the filter button. To reset your selection, just click on the reset filters button.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _filters_stop()
+	{
+		return '<p>'
+			   . __(
+				   'You can filter by different notifications by making a selection below and clicking on the filter button. To reset your selection, just click on the reset filters button.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -88,12 +88,12 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Messages Overview', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Messages Overview', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Messages Overview page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
@@ -103,7 +103,7 @@ 
                . __(
                    'View if a message is associated with one event or multiple events. Can be sorted in ascending and descending order.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _message_type_column_stop()
@@ -112,7 +112,7 @@ 
                . __(
                    'View the type of message. Can be sorted in ascending or descending order.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _messenger_column_stop()
@@ -121,17 +121,17 @@ 
                . __(
                    'View who messages will be sent to. Can be sorted in ascending or descending order.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _description_column_stop()
     {
-        return '<p>' . __('View the description for each message type.', 'event_espresso') . '</p>';
+        return '<p>'.__('View the description for each message type.', 'event_espresso').'</p>';
     }
 
     protected function _bulk_actions_stop()
     {
-        return '<p>' . __('Perform bulk actions to multiple message types.', 'event_espresso') . '</p>';
+        return '<p>'.__('Perform bulk actions to multiple message types.', 'event_espresso').'</p>';
     }
 
     protected function _filters_stop()
@@ -140,6 +140,6 @@ 
                . __(
                    'You can filter by different notifications by making a selection below and clicking on the filter button. To reset your selection, just click on the reset filters button.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 }

admin_pages/messages/EE_Message_List_Table.class.php

Indentation +430 added lines, -430 removed lines

@@ -12,434 +12,434 @@
 {
 
 
-    /**
-     * @return Messages_Admin_Page
-     */
-    public function get_admin_page()
-    {
-        return $this->_admin_page;
-    }
-
-
-    protected function _setup_data()
-    {
-        $this->_data = $this->_get_messages($this->_per_page, $this->_view);
-        $this->_all_data_count = $this->_get_messages($this->_per_page, $this->_view, true);
-    }
-
-
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => __('Message', 'event_espresso'),
-            'plural'   => __('Messages', 'event_espresso'),
-            'ajax'     => true,
-            'screen'   => $this->get_admin_page()->get_current_screen()->id,
-        );
-
-        $this->_columns = array(
-            'cb'           => '<input type="checkbox" />',
-            'to'           => __('To', 'event_espresso'),
-            'from'         => __('From', 'event_espresso'),
-            'messenger'    => __('Messenger', 'event_espresso'),
-            'message_type' => __('Message Type', 'event_espresso'),
-            'context'      => __('Context', 'event_espresso'),
-            'modified'     => __('Modified', 'event_espresso'),
-            'action'       => __('Actions', 'event_espresso'),
-            'msg_id'       => __('ID', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'modified'     => array('MSG_modified' => true),
-            'message_type' => array('MSG_message_type' => false),
-            'messenger'    => array('MSG_messenger' => false),
-            'to'           => array('MSG_to' => false),
-            'from'         => array('MSG_from' => false),
-            'context'      => array('MSG_context' => false),
-            'msg_id'       => array('MSG_ID', false),
-        );
-
-        $this->_primary_column = 'to';
-
-        $this->_hidden_columns = array(
-            'msg_id',
-        );
-    }
-
-
-    /**
-     * This simply sets up the row class for the table rows.
-     * Allows for easier overriding of child methods for setting up sorting.
-     *
-     * @param  object $item the current item
-     * @return string
-     */
-    protected function _get_row_class($item)
-    {
-        $class = parent::_get_row_class($item);
-        // add status class
-        $class .= ' ee-status-strip msg-status-' . $item->STS_ID();
-        if ($this->_has_checkbox_column) {
-            $class .= ' has-checkbox-column';
-        }
-        return $class;
-    }
-
-
-    /**
-     * _get_table_filters
-     * We use this to assemble and return any filters that are associated with this table that help further refine what
-     * get's shown in the table.
-     *
-     * @abstract
-     * @access protected
-     * @return string
-     * @throws \EE_Error
-     */
-    protected function _get_table_filters()
-    {
-        $filters = array();
-
-        // get select_inputs
-        $select_inputs = array(
-            $this->_get_messengers_dropdown_filter(),
-            $this->_get_message_types_dropdown_filter(),
-            $this->_get_contexts_for_message_types_dropdown_filter(),
-        );
-
-        // set filters to select inputs if they aren't empty
-        foreach ($select_inputs as $select_input) {
-            if ($select_input) {
-                $filters[] = $select_input;
-            }
-        }
-        return $filters;
-    }
-
-
-    protected function _add_view_counts()
-    {
-        foreach ($this->_views as $view => $args) {
-            $this->_views[ $view ]['count'] = $this->_get_messages($this->_per_page, $view, true, true);
-        }
-    }
-
-
-    /**
-     * @param EE_Message $message
-     * @return string   checkbox
-     * @throws \EE_Error
-     */
-    public function column_cb($message)
-    {
-        return sprintf('<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID());
-    }
-
-
-    /**
-     * @param EE_Message $message
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_msg_id(EE_Message $message)
-    {
-        return $message->ID();
-    }
-
-
-    /**
-     * @param EE_Message $message
-     * @return string    The recipient of the message
-     * @throws \EE_Error
-     */
-    public function column_to(EE_Message $message)
-    {
-        EE_Registry::instance()->load_helper('URL');
-        $actions = array();
-        $actions['delete'] = '<a href="'
-                             . EEH_URL::add_query_args_and_nonce(
-                                 array(
-                                    'page'   => 'espresso_messages',
-                                    'action' => 'delete_ee_message',
-                                    'MSG_ID' => $message->ID(),
-                                 ),
-                                 admin_url('admin.php')
-                             )
-                             . '">' . __('Delete', 'event_espresso') . '</a>';
-        return esc_html($message->to()) . $this->row_actions($actions);
-    }
-
-
-    /**
-     * @param EE_Message $message
-     * @return string   The sender of the message
-     */
-    public function column_from(EE_Message $message)
-    {
-        return esc_html($message->from());
-    }
-
-
-    /**
-     * @param EE_Message $message
-     * @return string  The messenger used to send the message.
-     */
-    public function column_messenger(EE_Message $message)
-    {
-        return ucwords($message->messenger_label());
-    }
-
-
-    /**
-     * @param EE_Message $message
-     * @return string  The message type used to generate the message.
-     */
-    public function column_message_type(EE_Message $message)
-    {
-        return ucwords($message->message_type_label());
-    }
-
-
-    /**
-     * @param EE_Message $message
-     * @return string  The context the message was generated for.
-     */
-    public function column_context(EE_Message $message)
-    {
-        return $message->context_label();
-    }
-
-
-    /**
-     * @param EE_Message $message
-     * @return string    The timestamp when this message was last modified.
-     */
-    public function column_modified(EE_Message $message)
-    {
-        return $message->modified();
-    }
-
-
-    /**
-     * @param EE_Message $message
-     * @return string   Actions that can be done on the current message.
-     */
-    public function column_action(EE_Message $message)
-    {
-        EE_Registry::instance()->load_helper('MSG_Template');
-        $action_links = array(
-            'view'                => EEH_MSG_Template::get_message_action_link('view', $message),
-            'error'               => EEH_MSG_Template::get_message_action_link('error', $message),
-            'generate_now'        => EEH_MSG_Template::get_message_action_link('generate_now', $message),
-            'send_now'            => EEH_MSG_Template::get_message_action_link('send_now', $message),
-            'queue_for_resending' => EEH_MSG_Template::get_message_action_link('queue_for_resending', $message),
-            'view_transaction'    => EEH_MSG_Template::get_message_action_link('view_transaction', $message),
-        );
-        $content = '';
-        switch ($message->STS_ID()) {
-            case EEM_Message::status_sent:
-                $content = $action_links['view'] . $action_links['queue_for_resending'] . $action_links['view_transaction'];
-                break;
-            case EEM_Message::status_resend:
-                $content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
-                break;
-            case EEM_Message::status_retry:
-                $content = $action_links['view'] . $action_links['send_now'] . $action_links['error'] . $action_links['view_transaction'];
-                break;
-            case EEM_Message::status_failed:
-            case EEM_Message::status_debug_only:
-                $content = $action_links['error'] . $action_links['view_transaction'];
-                break;
-            case EEM_Message::status_idle:
-                $content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
-                break;
-            case EEM_Message::status_incomplete:
-                $content = $action_links['generate_now'] . $action_links['view_transaction'];
-                break;
-        }
-        return $content;
-    }
-
-
-    /**
-     * Retrieve the EE_Message objects for the list table.
-     *
-     * @param int    $perpage The number of items per page
-     * @param string $view    The view items are being retrieved for
-     * @param bool   $count   Whether to just return a count or not.
-     * @param bool   $all     Disregard any paging info (no limit on data returned).
-     * @return int|EE_Message[]
-     * @throws \EE_Error
-     */
-    protected function _get_messages($perpage = 10, $view = 'all', $count = false, $all = false)
-    {
-
-        $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
-            ? $this->_req_data['paged']
-            : 1;
-
-        $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
-            ? $this->_req_data['perpage']
-            : $perpage;
-
-        $offset = ($current_page - 1) * $per_page;
-        $limit = $all || $count ? null : array($offset, $per_page);
-        $query_params = array(
-            'order_by' => empty($this->_req_data['orderby']) ? 'MSG_modified' : $this->_req_data['orderby'],
-            'order'    => empty($this->_req_data['order']) ? 'DESC' : $this->_req_data['order'],
-            'limit'    => $limit,
-        );
-
-        /**
-         * Any filters coming in from other routes?
-         */
-        if (isset($this->_req_data['filterby'])) {
-            $query_params = array_merge($query_params, EEM_Message::instance()->filter_by_query_params());
-            if (! $count) {
-                $query_params['group_by'] = 'MSG_ID';
-            }
-        }
-
-        // view conditionals
-        if ($view !== 'all' && $count && $all) {
-            $query_params[0]['AND*view_conditional'] = array(
-                'STS_ID' => strtoupper($view),
-            );
-        }
-
-        if (! $all && ! empty($this->_req_data['status']) && $this->_req_data['status'] !== 'all') {
-            $query_params[0]['AND*view_conditional'] = $this->_req_data === EEM_Message::status_failed
-                ? array(
-                    'STS_ID' => array(
-                        'IN',
-                        array(EEM_Message::status_failed, EEM_Message::status_messenger_executing),
-                    ),
-                )
-                : array('STS_ID' => strtoupper($this->_req_data['status']));
-        }
-
-        if (! $all && ! empty($this->_req_data['s'])) {
-            $search_string = '%' . $this->_req_data['s'] . '%';
-            $query_params[0]['OR'] = array(
-                'MSG_to'      => array('LIKE', $search_string),
-                'MSG_from'    => array('LIKE', $search_string),
-                'MSG_subject' => array('LIKE', $search_string),
-                'MSG_content' => array('LIKE', $search_string),
-            );
-        }
-
-        // account for debug only status.  We don't show Messages with the EEM_Message::status_debug_only to clients when
-        // the messages system is in debug mode.
-        // Note: for backward compat with previous iterations, this is necessary because there may be EEM_Message::status_debug_only
-        // messages in the database.
-        if (! EEM_Message::debug()) {
-            $query_params[0]['AND*debug_only_conditional'] = array(
-                'STS_ID' => array('!=', EEM_Message::status_debug_only),
-            );
-        }
-
-        // account for filters
-        if (! $all
-            && isset($this->_req_data['ee_messenger_filter_by'])
-            && $this->_req_data['ee_messenger_filter_by'] !== 'none_selected'
-        ) {
-            $query_params[0]['AND*messenger_filter'] = array(
-                'MSG_messenger' => $this->_req_data['ee_messenger_filter_by'],
-            );
-        }
-        if (! $all
-            && ! empty($this->_req_data['ee_message_type_filter_by'])
-            && $this->_req_data['ee_message_type_filter_by'] !== 'none_selected'
-        ) {
-            $query_params[0]['AND*message_type_filter'] = array(
-                'MSG_message_type' => $this->_req_data['ee_message_type_filter_by'],
-            );
-        }
-
-        if (! $all
-            && ! empty($this->_req_data['ee_context_filter_by'])
-            && $this->_req_data['ee_context_filter_by'] !== 'none_selected'
-        ) {
-            $query_params[0]['AND*context_filter'] = array(
-                'MSG_context' => array('IN', explode(',', $this->_req_data['ee_context_filter_by'])),
-            );
-        }
-
-        return $count
-            /** @type int */
-            ? EEM_Message::instance()->count($query_params, null, true)
-            /** @type EE_Message[] */
-            : EEM_Message::instance()->get_all($query_params);
-    }
-
-
-    /**
-     * Generate dropdown filter select input for messengers.
-     *
-     * @return string
-     */
-    protected function _get_messengers_dropdown_filter()
-    {
-        $messenger_options = array();
-        $active_messages_grouped_by_messenger = EEM_Message::instance()->get_all(array('group_by' => 'MSG_messenger'));
-
-        // setup array of messenger options
-        foreach ($active_messages_grouped_by_messenger as $active_message) {
-            if ($active_message instanceof EE_Message) {
-                $messenger_options[ $active_message->messenger() ] = ucwords($active_message->messenger_label());
-            }
-        }
-        return $this->get_admin_page()->get_messengers_select_input($messenger_options);
-    }
-
-
-    /**
-     * Generate dropdown filter select input for message types
-     *
-     * @return string
-     */
-    protected function _get_message_types_dropdown_filter()
-    {
-        $message_type_options = array();
-        $active_messages_grouped_by_message_type = EEM_Message::instance()->get_all(
-            array('group_by' => 'MSG_message_type')
-        );
-
-        // setup array of message type options
-        foreach ($active_messages_grouped_by_message_type as $active_message) {
-            if ($active_message instanceof EE_Message) {
-                $message_type_options[ $active_message->message_type() ] = ucwords(
-                    $active_message->message_type_label()
-                );
-            }
-        }
-        return $this->get_admin_page()->get_message_types_select_input($message_type_options);
-    }
-
-
-    /**
-     * Generate dropdown filter select input for message type contexts
-     *
-     * @return string
-     */
-    protected function _get_contexts_for_message_types_dropdown_filter()
-    {
-        $context_options = array();
-        $active_messages_grouped_by_context = EEM_Message::instance()->get_all(array('group_by' => 'MSG_context'));
-
-        // setup array of context options
-        foreach ($active_messages_grouped_by_context as $active_message) {
-            if ($active_message instanceof EE_Message) {
-                $message_type = $active_message->message_type_object();
-                if ($message_type instanceof EE_message_type) {
-                    foreach ($message_type->get_contexts() as $context => $context_details) {
-                        if (isset($context_details['label'])) {
-                            $context_options[ $context ] = $context_details['label'];
-                        }
-                    }
-                }
-            }
-        }
-        return $this->get_admin_page()->get_contexts_for_message_types_select_input($context_options);
-    }
+	/**
+	 * @return Messages_Admin_Page
+	 */
+	public function get_admin_page()
+	{
+		return $this->_admin_page;
+	}
+
+
+	protected function _setup_data()
+	{
+		$this->_data = $this->_get_messages($this->_per_page, $this->_view);
+		$this->_all_data_count = $this->_get_messages($this->_per_page, $this->_view, true);
+	}
+
+
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => __('Message', 'event_espresso'),
+			'plural'   => __('Messages', 'event_espresso'),
+			'ajax'     => true,
+			'screen'   => $this->get_admin_page()->get_current_screen()->id,
+		);
+
+		$this->_columns = array(
+			'cb'           => '<input type="checkbox" />',
+			'to'           => __('To', 'event_espresso'),
+			'from'         => __('From', 'event_espresso'),
+			'messenger'    => __('Messenger', 'event_espresso'),
+			'message_type' => __('Message Type', 'event_espresso'),
+			'context'      => __('Context', 'event_espresso'),
+			'modified'     => __('Modified', 'event_espresso'),
+			'action'       => __('Actions', 'event_espresso'),
+			'msg_id'       => __('ID', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'modified'     => array('MSG_modified' => true),
+			'message_type' => array('MSG_message_type' => false),
+			'messenger'    => array('MSG_messenger' => false),
+			'to'           => array('MSG_to' => false),
+			'from'         => array('MSG_from' => false),
+			'context'      => array('MSG_context' => false),
+			'msg_id'       => array('MSG_ID', false),
+		);
+
+		$this->_primary_column = 'to';
+
+		$this->_hidden_columns = array(
+			'msg_id',
+		);
+	}
+
+
+	/**
+	 * This simply sets up the row class for the table rows.
+	 * Allows for easier overriding of child methods for setting up sorting.
+	 *
+	 * @param  object $item the current item
+	 * @return string
+	 */
+	protected function _get_row_class($item)
+	{
+		$class = parent::_get_row_class($item);
+		// add status class
+		$class .= ' ee-status-strip msg-status-' . $item->STS_ID();
+		if ($this->_has_checkbox_column) {
+			$class .= ' has-checkbox-column';
+		}
+		return $class;
+	}
+
+
+	/**
+	 * _get_table_filters
+	 * We use this to assemble and return any filters that are associated with this table that help further refine what
+	 * get's shown in the table.
+	 *
+	 * @abstract
+	 * @access protected
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	protected function _get_table_filters()
+	{
+		$filters = array();
+
+		// get select_inputs
+		$select_inputs = array(
+			$this->_get_messengers_dropdown_filter(),
+			$this->_get_message_types_dropdown_filter(),
+			$this->_get_contexts_for_message_types_dropdown_filter(),
+		);
+
+		// set filters to select inputs if they aren't empty
+		foreach ($select_inputs as $select_input) {
+			if ($select_input) {
+				$filters[] = $select_input;
+			}
+		}
+		return $filters;
+	}
+
+
+	protected function _add_view_counts()
+	{
+		foreach ($this->_views as $view => $args) {
+			$this->_views[ $view ]['count'] = $this->_get_messages($this->_per_page, $view, true, true);
+		}
+	}
+
+
+	/**
+	 * @param EE_Message $message
+	 * @return string   checkbox
+	 * @throws \EE_Error
+	 */
+	public function column_cb($message)
+	{
+		return sprintf('<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID());
+	}
+
+
+	/**
+	 * @param EE_Message $message
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_msg_id(EE_Message $message)
+	{
+		return $message->ID();
+	}
+
+
+	/**
+	 * @param EE_Message $message
+	 * @return string    The recipient of the message
+	 * @throws \EE_Error
+	 */
+	public function column_to(EE_Message $message)
+	{
+		EE_Registry::instance()->load_helper('URL');
+		$actions = array();
+		$actions['delete'] = '<a href="'
+							 . EEH_URL::add_query_args_and_nonce(
+								 array(
+									'page'   => 'espresso_messages',
+									'action' => 'delete_ee_message',
+									'MSG_ID' => $message->ID(),
+								 ),
+								 admin_url('admin.php')
+							 )
+							 . '">' . __('Delete', 'event_espresso') . '</a>';
+		return esc_html($message->to()) . $this->row_actions($actions);
+	}
+
+
+	/**
+	 * @param EE_Message $message
+	 * @return string   The sender of the message
+	 */
+	public function column_from(EE_Message $message)
+	{
+		return esc_html($message->from());
+	}
+
+
+	/**
+	 * @param EE_Message $message
+	 * @return string  The messenger used to send the message.
+	 */
+	public function column_messenger(EE_Message $message)
+	{
+		return ucwords($message->messenger_label());
+	}
+
+
+	/**
+	 * @param EE_Message $message
+	 * @return string  The message type used to generate the message.
+	 */
+	public function column_message_type(EE_Message $message)
+	{
+		return ucwords($message->message_type_label());
+	}
+
+
+	/**
+	 * @param EE_Message $message
+	 * @return string  The context the message was generated for.
+	 */
+	public function column_context(EE_Message $message)
+	{
+		return $message->context_label();
+	}
+
+
+	/**
+	 * @param EE_Message $message
+	 * @return string    The timestamp when this message was last modified.
+	 */
+	public function column_modified(EE_Message $message)
+	{
+		return $message->modified();
+	}
+
+
+	/**
+	 * @param EE_Message $message
+	 * @return string   Actions that can be done on the current message.
+	 */
+	public function column_action(EE_Message $message)
+	{
+		EE_Registry::instance()->load_helper('MSG_Template');
+		$action_links = array(
+			'view'                => EEH_MSG_Template::get_message_action_link('view', $message),
+			'error'               => EEH_MSG_Template::get_message_action_link('error', $message),
+			'generate_now'        => EEH_MSG_Template::get_message_action_link('generate_now', $message),
+			'send_now'            => EEH_MSG_Template::get_message_action_link('send_now', $message),
+			'queue_for_resending' => EEH_MSG_Template::get_message_action_link('queue_for_resending', $message),
+			'view_transaction'    => EEH_MSG_Template::get_message_action_link('view_transaction', $message),
+		);
+		$content = '';
+		switch ($message->STS_ID()) {
+			case EEM_Message::status_sent:
+				$content = $action_links['view'] . $action_links['queue_for_resending'] . $action_links['view_transaction'];
+				break;
+			case EEM_Message::status_resend:
+				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				break;
+			case EEM_Message::status_retry:
+				$content = $action_links['view'] . $action_links['send_now'] . $action_links['error'] . $action_links['view_transaction'];
+				break;
+			case EEM_Message::status_failed:
+			case EEM_Message::status_debug_only:
+				$content = $action_links['error'] . $action_links['view_transaction'];
+				break;
+			case EEM_Message::status_idle:
+				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				break;
+			case EEM_Message::status_incomplete:
+				$content = $action_links['generate_now'] . $action_links['view_transaction'];
+				break;
+		}
+		return $content;
+	}
+
+
+	/**
+	 * Retrieve the EE_Message objects for the list table.
+	 *
+	 * @param int    $perpage The number of items per page
+	 * @param string $view    The view items are being retrieved for
+	 * @param bool   $count   Whether to just return a count or not.
+	 * @param bool   $all     Disregard any paging info (no limit on data returned).
+	 * @return int|EE_Message[]
+	 * @throws \EE_Error
+	 */
+	protected function _get_messages($perpage = 10, $view = 'all', $count = false, $all = false)
+	{
+
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
+			? $this->_req_data['paged']
+			: 1;
+
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
+			? $this->_req_data['perpage']
+			: $perpage;
+
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $all || $count ? null : array($offset, $per_page);
+		$query_params = array(
+			'order_by' => empty($this->_req_data['orderby']) ? 'MSG_modified' : $this->_req_data['orderby'],
+			'order'    => empty($this->_req_data['order']) ? 'DESC' : $this->_req_data['order'],
+			'limit'    => $limit,
+		);
+
+		/**
+		 * Any filters coming in from other routes?
+		 */
+		if (isset($this->_req_data['filterby'])) {
+			$query_params = array_merge($query_params, EEM_Message::instance()->filter_by_query_params());
+			if (! $count) {
+				$query_params['group_by'] = 'MSG_ID';
+			}
+		}
+
+		// view conditionals
+		if ($view !== 'all' && $count && $all) {
+			$query_params[0]['AND*view_conditional'] = array(
+				'STS_ID' => strtoupper($view),
+			);
+		}
+
+		if (! $all && ! empty($this->_req_data['status']) && $this->_req_data['status'] !== 'all') {
+			$query_params[0]['AND*view_conditional'] = $this->_req_data === EEM_Message::status_failed
+				? array(
+					'STS_ID' => array(
+						'IN',
+						array(EEM_Message::status_failed, EEM_Message::status_messenger_executing),
+					),
+				)
+				: array('STS_ID' => strtoupper($this->_req_data['status']));
+		}
+
+		if (! $all && ! empty($this->_req_data['s'])) {
+			$search_string = '%' . $this->_req_data['s'] . '%';
+			$query_params[0]['OR'] = array(
+				'MSG_to'      => array('LIKE', $search_string),
+				'MSG_from'    => array('LIKE', $search_string),
+				'MSG_subject' => array('LIKE', $search_string),
+				'MSG_content' => array('LIKE', $search_string),
+			);
+		}
+
+		// account for debug only status.  We don't show Messages with the EEM_Message::status_debug_only to clients when
+		// the messages system is in debug mode.
+		// Note: for backward compat with previous iterations, this is necessary because there may be EEM_Message::status_debug_only
+		// messages in the database.
+		if (! EEM_Message::debug()) {
+			$query_params[0]['AND*debug_only_conditional'] = array(
+				'STS_ID' => array('!=', EEM_Message::status_debug_only),
+			);
+		}
+
+		// account for filters
+		if (! $all
+			&& isset($this->_req_data['ee_messenger_filter_by'])
+			&& $this->_req_data['ee_messenger_filter_by'] !== 'none_selected'
+		) {
+			$query_params[0]['AND*messenger_filter'] = array(
+				'MSG_messenger' => $this->_req_data['ee_messenger_filter_by'],
+			);
+		}
+		if (! $all
+			&& ! empty($this->_req_data['ee_message_type_filter_by'])
+			&& $this->_req_data['ee_message_type_filter_by'] !== 'none_selected'
+		) {
+			$query_params[0]['AND*message_type_filter'] = array(
+				'MSG_message_type' => $this->_req_data['ee_message_type_filter_by'],
+			);
+		}
+
+		if (! $all
+			&& ! empty($this->_req_data['ee_context_filter_by'])
+			&& $this->_req_data['ee_context_filter_by'] !== 'none_selected'
+		) {
+			$query_params[0]['AND*context_filter'] = array(
+				'MSG_context' => array('IN', explode(',', $this->_req_data['ee_context_filter_by'])),
+			);
+		}
+
+		return $count
+			/** @type int */
+			? EEM_Message::instance()->count($query_params, null, true)
+			/** @type EE_Message[] */
+			: EEM_Message::instance()->get_all($query_params);
+	}
+
+
+	/**
+	 * Generate dropdown filter select input for messengers.
+	 *
+	 * @return string
+	 */
+	protected function _get_messengers_dropdown_filter()
+	{
+		$messenger_options = array();
+		$active_messages_grouped_by_messenger = EEM_Message::instance()->get_all(array('group_by' => 'MSG_messenger'));
+
+		// setup array of messenger options
+		foreach ($active_messages_grouped_by_messenger as $active_message) {
+			if ($active_message instanceof EE_Message) {
+				$messenger_options[ $active_message->messenger() ] = ucwords($active_message->messenger_label());
+			}
+		}
+		return $this->get_admin_page()->get_messengers_select_input($messenger_options);
+	}
+
+
+	/**
+	 * Generate dropdown filter select input for message types
+	 *
+	 * @return string
+	 */
+	protected function _get_message_types_dropdown_filter()
+	{
+		$message_type_options = array();
+		$active_messages_grouped_by_message_type = EEM_Message::instance()->get_all(
+			array('group_by' => 'MSG_message_type')
+		);
+
+		// setup array of message type options
+		foreach ($active_messages_grouped_by_message_type as $active_message) {
+			if ($active_message instanceof EE_Message) {
+				$message_type_options[ $active_message->message_type() ] = ucwords(
+					$active_message->message_type_label()
+				);
+			}
+		}
+		return $this->get_admin_page()->get_message_types_select_input($message_type_options);
+	}
+
+
+	/**
+	 * Generate dropdown filter select input for message type contexts
+	 *
+	 * @return string
+	 */
+	protected function _get_contexts_for_message_types_dropdown_filter()
+	{
+		$context_options = array();
+		$active_messages_grouped_by_context = EEM_Message::instance()->get_all(array('group_by' => 'MSG_context'));
+
+		// setup array of context options
+		foreach ($active_messages_grouped_by_context as $active_message) {
+			if ($active_message instanceof EE_Message) {
+				$message_type = $active_message->message_type_object();
+				if ($message_type instanceof EE_message_type) {
+					foreach ($message_type->get_contexts() as $context => $context_details) {
+						if (isset($context_details['label'])) {
+							$context_options[ $context ] = $context_details['label'];
+						}
+					}
+				}
+			}
+		}
+		return $this->get_admin_page()->get_contexts_for_message_types_select_input($context_options);
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -78,7 +78,7 @@ 
     {
         $class = parent::_get_row_class($item);
         // add status class
-        $class .= ' ee-status-strip msg-status-' . $item->STS_ID();
+        $class .= ' ee-status-strip msg-status-'.$item->STS_ID();
         if ($this->_has_checkbox_column) {
             $class .= ' has-checkbox-column';
         }
@@ -120,7 +120,7 @@ 
     protected function _add_view_counts()
     {
         foreach ($this->_views as $view => $args) {
-            $this->_views[ $view ]['count'] = $this->_get_messages($this->_per_page, $view, true, true);
+            $this->_views[$view]['count'] = $this->_get_messages($this->_per_page, $view, true, true);
         }
     }
 
@@ -165,8 +165,8 @@ 
                                  ),
                                  admin_url('admin.php')
                              )
-                             . '">' . __('Delete', 'event_espresso') . '</a>';
-        return esc_html($message->to()) . $this->row_actions($actions);
+                             . '">'.__('Delete', 'event_espresso').'</a>';
+        return esc_html($message->to()).$this->row_actions($actions);
     }
 
 
@@ -238,23 +238,23 @@ 
         $content = '';
         switch ($message->STS_ID()) {
             case EEM_Message::status_sent:
-                $content = $action_links['view'] . $action_links['queue_for_resending'] . $action_links['view_transaction'];
+                $content = $action_links['view'].$action_links['queue_for_resending'].$action_links['view_transaction'];
                 break;
             case EEM_Message::status_resend:
-                $content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+                $content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
                 break;
             case EEM_Message::status_retry:
-                $content = $action_links['view'] . $action_links['send_now'] . $action_links['error'] . $action_links['view_transaction'];
+                $content = $action_links['view'].$action_links['send_now'].$action_links['error'].$action_links['view_transaction'];
                 break;
             case EEM_Message::status_failed:
             case EEM_Message::status_debug_only:
-                $content = $action_links['error'] . $action_links['view_transaction'];
+                $content = $action_links['error'].$action_links['view_transaction'];
                 break;
             case EEM_Message::status_idle:
-                $content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+                $content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
                 break;
             case EEM_Message::status_incomplete:
-                $content = $action_links['generate_now'] . $action_links['view_transaction'];
+                $content = $action_links['generate_now'].$action_links['view_transaction'];
                 break;
         }
         return $content;
@@ -295,7 +295,7 @@ 
          */
         if (isset($this->_req_data['filterby'])) {
             $query_params = array_merge($query_params, EEM_Message::instance()->filter_by_query_params());
-            if (! $count) {
+            if ( ! $count) {
                 $query_params['group_by'] = 'MSG_ID';
             }
         }
@@ -307,7 +307,7 @@ 
             );
         }
 
-        if (! $all && ! empty($this->_req_data['status']) && $this->_req_data['status'] !== 'all') {
+        if ( ! $all && ! empty($this->_req_data['status']) && $this->_req_data['status'] !== 'all') {
             $query_params[0]['AND*view_conditional'] = $this->_req_data === EEM_Message::status_failed
                 ? array(
                     'STS_ID' => array(
@@ -318,8 +318,8 @@ 
                 : array('STS_ID' => strtoupper($this->_req_data['status']));
         }
 
-        if (! $all && ! empty($this->_req_data['s'])) {
-            $search_string = '%' . $this->_req_data['s'] . '%';
+        if ( ! $all && ! empty($this->_req_data['s'])) {
+            $search_string = '%'.$this->_req_data['s'].'%';
             $query_params[0]['OR'] = array(
                 'MSG_to'      => array('LIKE', $search_string),
                 'MSG_from'    => array('LIKE', $search_string),
@@ -332,14 +332,14 @@ 
         // the messages system is in debug mode.
         // Note: for backward compat with previous iterations, this is necessary because there may be EEM_Message::status_debug_only
         // messages in the database.
-        if (! EEM_Message::debug()) {
+        if ( ! EEM_Message::debug()) {
             $query_params[0]['AND*debug_only_conditional'] = array(
                 'STS_ID' => array('!=', EEM_Message::status_debug_only),
             );
         }
 
         // account for filters
-        if (! $all
+        if ( ! $all
             && isset($this->_req_data['ee_messenger_filter_by'])
             && $this->_req_data['ee_messenger_filter_by'] !== 'none_selected'
         ) {
@@ -347,7 +347,7 @@ 
                 'MSG_messenger' => $this->_req_data['ee_messenger_filter_by'],
             );
         }
-        if (! $all
+        if ( ! $all
             && ! empty($this->_req_data['ee_message_type_filter_by'])
             && $this->_req_data['ee_message_type_filter_by'] !== 'none_selected'
         ) {
@@ -356,7 +356,7 @@ 
             );
         }
 
-        if (! $all
+        if ( ! $all
             && ! empty($this->_req_data['ee_context_filter_by'])
             && $this->_req_data['ee_context_filter_by'] !== 'none_selected'
         ) {
@@ -386,7 +386,7 @@ 
         // setup array of messenger options
         foreach ($active_messages_grouped_by_messenger as $active_message) {
             if ($active_message instanceof EE_Message) {
-                $messenger_options[ $active_message->messenger() ] = ucwords($active_message->messenger_label());
+                $messenger_options[$active_message->messenger()] = ucwords($active_message->messenger_label());
             }
         }
         return $this->get_admin_page()->get_messengers_select_input($messenger_options);
@@ -408,7 +408,7 @@ 
         // setup array of message type options
         foreach ($active_messages_grouped_by_message_type as $active_message) {
             if ($active_message instanceof EE_Message) {
-                $message_type_options[ $active_message->message_type() ] = ucwords(
+                $message_type_options[$active_message->message_type()] = ucwords(
                     $active_message->message_type_label()
                 );
             }
@@ -434,7 +434,7 @@ 
                 if ($message_type instanceof EE_message_type) {
                     foreach ($message_type->get_contexts() as $context => $context_details) {
                         if (isset($context_details['label'])) {
-                            $context_options[ $context ] = $context_details['label'];
+                            $context_options[$context] = $context_details['label'];
                         }
                     }
                 }

modules/events_archive_filters/EED_Events_Archive_Filters.module.php

Doc Comments +14 added lines, -13 removed lines

@@ -247,6 +247,7 @@ 
      * @access    public
      * @param    mixed boolean|string    $join_terms pass TRUE or term string, doesn't really matter since this value
      *                                   doesn't really get used for anything yet
+     * @param string $join_terms
      * @return    string
      */
     public static function posts_join_sql_for_terms($join_terms = null)
@@ -422,7 +423,7 @@ 
      *    or else some of the table references below will result in MySQL errors
      *
      * @access    public
-     * @param    boolean $orderby_params
+     * @param    string[] $orderby_params
      * @return    string
      */
     public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC')
@@ -535,7 +536,7 @@ 
      *
      * @access    public
      * @param        string $content
-     * @return        void
+     * @return        string
      */
     public function event_details($content)
     {
@@ -552,7 +553,7 @@ 
      *
      * @access    public
      * @param        string $content
-     * @return        void
+     * @return        string
      */
     public function event_tickets($content)
     {
@@ -569,7 +570,7 @@ 
      *
      * @access    public
      * @param        string $content
-     * @return        void
+     * @return        string
      */
     public function event_datetimes($content)
     {
@@ -586,7 +587,7 @@ 
      *
      * @access    public
      * @param        string $content
-     * @return        void
+     * @return        string
      */
     public function event_venues($content)
     {
@@ -635,7 +636,7 @@ 
      *    excerpt_length
      *
      * @access    public
-     * @return    void
+     * @return    integer|null
      */
     public function excerpt_length($length)
     {
@@ -665,7 +666,7 @@ 
      *    excerpt_more
      *
      * @access    public
-     * @return    void
+     * @return    string
      */
     public function excerpt_more($more)
     {
@@ -866,7 +867,7 @@ 
      *    get_template_part
      *
      * @access    public
-     * @return    void
+     * @return    string|null
      */
     public static function get_template_part()
     {
@@ -910,7 +911,7 @@ 
      *    event_list_css
      *
      * @access    public
-     * @return    void
+     * @return    string
      */
     public static function event_list_css($extra_class = '')
     {
@@ -946,7 +947,7 @@ 
      *    display_description
      *
      * @access    public
-     * @return    void
+     * @return    boolean
      */
     public static function display_description($value)
     {
@@ -961,7 +962,7 @@ 
      *    display_venue_details
      *
      * @access    public
-     * @return    void
+     * @return    boolean
      */
     public static function display_venue_details()
     {
@@ -977,7 +978,7 @@ 
      *    display_address
      *
      * @access    public
-     * @return    void
+     * @return    boolean
      */
     public static function display_address()
     {
@@ -993,7 +994,7 @@ 
      *    pagination
      *
      * @access    public
-     * @return    void
+     * @return    string
      */
     public static function pagination()
     {

Indentation +1021 added lines, -1021 removed lines

@@ -12,1025 +12,1025 @@
 {
 
 
-    /**
-     * @return EED_Events_Archive_Filters
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     *    Start Date
-     *
-     * @var    $_elf_month
-     * @access    protected
-     */
-    protected $_elf_month = null;
-
-
-    /**
-     *    Category
-     *
-     * @var    $_elf_category
-     * @access    protected
-     */
-    protected $_elf_category = null;
-
-
-    /**
-     *    whether to display expired events in the event list
-     *
-     * @var    $_show_expired
-     * @access    protected
-     */
-    protected $_show_expired = null;
-
-
-    /**
-     *    whether to display the event list as a grid or list
-     *
-     * @var    $_type
-     * @access    protected
-     */
-    protected static $_type = null;
-
-
-    /**
-     *    array of existing event list views
-     *
-     * @var    $_types
-     * @access    protected
-     */
-    protected static $_types = array('grid', 'text', 'dates');
-
-
-
-    /**
-     *    set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-    }
-
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
-
-
-    /**
-     *    set_definitions
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_definitions()
-    {
-    }
-
-
-    /**
-     *    run - initial module setup
-     *
-     * @access    public
-     * @return    void
-     */
-    public function run($WP)
-    {
-    }
-
-
-    /**
-     *    event_list
-     *
-     * @access    public
-     * @return    void
-     */
-    public function event_list()
-    {
-        // load other required components
-        $this->_load_assests();
-    }
-
-
-    /**
-     *    _filter_query_parts
-     *
-     * @access    public
-     * @return    void
-     */
-    private function _filter_query_parts()
-    {
-        // build event list query
-        add_filter('posts_join', array($this, 'posts_join'), 1, 2);
-        add_filter('posts_where', array($this, 'posts_where'), 1, 2);
-        add_filter('posts_orderby', array($this, 'posts_orderby'), 1, 2);
-    }
-
-    /**
-     *    _type - the type of event list : grid, text, dates
-     *
-     * @access    public
-     * @return    string
-     */
-    public static function set_type()
-    {
-        do_action('AHEE__EED_Events_Archive_Filters__before_set_type');
-        EED_Events_Archive_Filters::$_types = apply_filters(
-            'EED_Events_Archive_Filters__set_type__types',
-            EED_Events_Archive_Filters::$_types
-        );
-        $view = isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type']) ? EE_Registry::instance(
-        )->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
-        $elf_type = EE_Registry::instance()->REQ->is_set('elf_type') ? sanitize_text_field(
-            EE_Registry::instance()->REQ->get('elf_type')
-        ) : '';
-        $view = ! empty($elf_type) ? $elf_type : $view;
-        $view = apply_filters('EED_Events_Archive_Filters__set_type__type', $view);
-        if (! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
-            self::$_type = $view;
-        }
-    }
-
-    /**
-     *    _show_expired
-     *
-     * @access    private
-     * @param    boolean $req_only if TRUE, then ignore defaults and only return $_POST value
-     * @return    boolean
-     */
-    private static function _show_expired($req_only = false)
-    {
-        // get default value for "display_expired_events" as set in the EE General Settings > Templates > Event Listings
-        $show_expired = ! $req_only && isset(
-            EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events']
-        ) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : false;
-        // override default expired option if set via filter
-        $show_expired = EE_Registry::instance()->REQ->is_set('elf_expired_chk') ? absint(
-            EE_Registry::instance()->REQ->get('elf_expired_chk')
-        ) : $show_expired;
-        return $show_expired ? true : false;
-    }
-
-    /**
-     *    _event_category_slug
-     *
-     * @access    private
-     * @return    string
-     */
-    private static function _event_category_slug()
-    {
-        return EE_Registry::instance()->REQ->is_set('elf_category_dd') ? sanitize_text_field(
-            EE_Registry::instance()->REQ->get('elf_category_dd')
-        ) : '';
-    }
-
-    /**
-     *    _display_month - what month should the event list display events for?
-     *
-     * @access    private
-     * @return    string
-     */
-    private static function _display_month()
-    {
-        return EE_Registry::instance()->REQ->is_set('elf_month_dd') ? sanitize_text_field(
-            EE_Registry::instance()->REQ->get('elf_month_dd')
-        ) : '';
-    }
-
-
-    /**
-     *    get_post_data
-     *
-     * @access    public
-     * @return    void
-     */
-    public function get_post_data()
-    {
-        $this->_elf_month = EED_Events_Archive_Filters::_display_month();
-        $this->_elf_category = EED_Events_Archive_Filters::_event_category_slug();
-        $this->_show_expired = EED_Events_Archive_Filters::_show_expired(true);
-    }
-
-
-    /**
-     *    posts_join
-     *
-     * @access    public
-     * @return    void
-     */
-    public function posts_join($SQL, WP_Query $wp_query)
-    {
-        if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
-            // Category
-            $SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms(
-                EED_Events_Archive_Filters::_event_category_slug()
-            );
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    posts_join_sql_for_terms
-     *
-     * @access    public
-     * @param    mixed boolean|string    $join_terms pass TRUE or term string, doesn't really matter since this value
-     *                                   doesn't really get used for anything yet
-     * @return    string
-     */
-    public static function posts_join_sql_for_terms($join_terms = null)
-    {
-        $SQL = '';
-        if (! empty($join_terms)) {
-            global $wpdb;
-            $SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
-            $SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
-            $SQL .= " LEFT JOIN $wpdb->terms ON ($wpdb->terms.term_id = $wpdb->term_taxonomy.term_id) ";
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    posts_join_for_orderby
-     *    usage:  $SQL .= EED_Events_Archive_Filters::posts_join_for_orderby( $orderby_params );
-     *
-     * @access    public
-     * @param    array $orderby_params
-     * @return    string
-     */
-    public static function posts_join_for_orderby($orderby_params = array())
-    {
-        global $wpdb;
-        $SQL = '';
-        $orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
-        foreach ($orderby_params as $orderby) {
-            switch ($orderby) {
-                case 'ticket_start':
-                case 'ticket_end':
-                    $SQL .= ' LEFT JOIN ' . EEM_Datetime_Ticket::instance()->table() . ' ON ('
-                            . EEM_Datetime::instance()->table() . '.DTT_ID = '
-                            . EEM_Datetime_Ticket::instance()->table() . '.DTT_ID )';
-                    $SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON ('
-                            . EEM_Datetime_Ticket::instance()->table() . '.TKT_ID = '
-                            . EEM_Ticket::instance()->table() . '.TKT_ID )';
-                    break;
-
-                case 'venue_title':
-                case 'city':
-                    $SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = '
-                            . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
-                    $SQL .= ' LEFT JOIN ' . EEM_Venue::instance()->table() . ' ON ('
-                            . EEM_Event_Venue::instance()->table() . '.VNU_ID = '
-                            . EEM_Venue::instance()->table() . '.VNU_ID )';
-                    break;
-
-                case 'state':
-                    $SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = '
-                            . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
-                    $SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->second_table() . ' ON ('
-                            . EEM_Event_Venue::instance()->table() . '.VNU_ID = '
-                            . EEM_Event_Venue::instance()->second_table() . '.VNU_ID )';
-                    break;
-            }
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    posts_where
-     *
-     * @access    public
-     * @return    void
-     */
-    public function posts_where($SQL, WP_Query $wp_query)
-    {
-        if (isset($wp_query->query_vars) && isset($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'espresso_events') {
-            // Show Expired ?
-            $SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired(
-                EED_Events_Archive_Filters::_show_expired()
-            );
-            // Category
-            // $elf_category = EED_Events_Archive_Filters::_event_category_slug();
-            $SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug(
-                EED_Events_Archive_Filters::_event_category_slug()
-            );
-            // Start Date
-            // $elf_month = EED_Events_Archive_Filters::_display_month();
-            $SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month(
-                EED_Events_Archive_Filters::_display_month()
-            );
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    posts_where_sql_for_show_expired
-     *
-     * @access    public
-     * @param    boolean $show_expired if TRUE, then displayed past events
-     * @return    string
-     */
-    public static function posts_where_sql_for_show_expired($show_expired = false)
-    {
-        return ! $show_expired
-            ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . date('Y-m-d H:s:i') . '" '
-            : '';
-    }
-
-
-    /**
-     *    posts_where_sql_for_event_category_slug
-     *
-     * @access    public
-     * @param    boolean $event_category_slug
-     * @return    string
-     */
-    public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
-    {
-        global $wpdb;
-        return ! empty($event_category_slug) ? ' AND ' . $wpdb->terms . '.slug = "' . $event_category_slug . '" ' : '';
-    }
-
-    /**
-     *    posts_where_sql_for_event_list_month
-     *
-     * @access    public
-     * @param    boolean $month
-     * @return    string
-     */
-    public static function posts_where_sql_for_event_list_month($month = null)
-    {
-        $SQL = '';
-        if (! empty($month)) {
-            // event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
-            $SQL = ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start';
-            $SQL .= ' <= "' . date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '"';
-            // event end date is GREATER than the start of the month ( so nothing that ended before this month )
-            $SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end';
-            $SQL .= ' >= "' . date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '" ';
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    posts_orderby
-     *
-     * @access    public
-     * @return    void
-     */
-    public function posts_orderby($SQL, WP_Query $wp_query)
-    {
-        if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
-            $SQL = EED_Events_Archive_Filters::posts_orderby_sql(array('start_date'));
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    posts_orderby_sql
-     *
-     *    possible parameters:
-     *    ID
-     *    start_date
-     *    end_date
-     *    event_name
-     *    category_slug
-     *    ticket_start
-     *    ticket_end
-     *    venue_title
-     *    city
-     *    state
-     *
-     *    **IMPORTANT**
-     *    make sure to also send the $orderby_params array to the posts_join_for_orderby() method
-     *    or else some of the table references below will result in MySQL errors
-     *
-     * @access    public
-     * @param    boolean $orderby_params
-     * @return    string
-     */
-    public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC')
-    {
-        global $wpdb;
-        $SQL = '';
-        $cntr = 1;
-        $orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
-        foreach ($orderby_params as $orderby) {
-            $glue = $cntr == 1 || $cntr == count($orderby_params) ? ' ' : ', ';
-            switch ($orderby) {
-                case 'id':
-                case 'ID':
-                    $SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
-                    break;
-
-                case 'start_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_start ' . $sort;
-                    break;
-
-                case 'end_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
-                    break;
-
-                case 'event_name':
-                    $SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
-                    break;
-
-                case 'category_slug':
-                    $SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
-                    break;
-
-                case 'ticket_start':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
-                    break;
-
-                case 'ticket_end':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
-                    break;
-
-                case 'venue_title':
-                    $SQL .= $glue . 'venue_title ' . $sort;
-                    break;
-
-                case 'city':
-                    $SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
-                    break;
-
-                case 'state':
-                    $SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
-                    break;
-            }
-            $cntr++;
-        }
-        // echo '<h4>$SQL : ' . $SQL . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
-        return $SQL;
-    }
-
-
-    /**
-     *    template_redirect
-     *
-     * @access    public
-     * @return    void
-     */
-    public function template_redirect()
-    {
-        // add event list filters
-        add_action('loop_start', array($this, 'event_list_template_filters'));
-        // and pagination
-        add_action('loop_start', array($this, 'event_list_pagination'));
-        add_action('loop_end', array($this, 'event_list_pagination'));
-        // if NOT a custom template
-        if (EE_Registry::instance()
-                       ->load_core('Front_Controller', array(), false, true)
-                       ->get_selected_template() != 'archive-espresso_events.php'
-        ) {
-            // don't know if theme uses the_excerpt
-            add_filter('the_excerpt', array($this, 'event_details'), 100);
-            add_filter('the_excerpt', array($this, 'event_tickets'), 110);
-            add_filter('the_excerpt', array($this, 'event_datetimes'), 120);
-            add_filter('the_excerpt', array($this, 'event_venues'), 130);
-            // or the_content
-            add_filter('the_content', array($this, 'event_details'), 100);
-            add_filter('the_content', array($this, 'event_tickets'), 110);
-            add_filter('the_content', array($this, 'event_datetimes'), 120);
-            add_filter('the_content', array($this, 'event_venues'), 130);
-        } else {
-            remove_all_filters('excerpt_length');
-            add_filter('excerpt_length', array($this, 'excerpt_length'), 10);
-            add_filter('excerpt_more', array($this, 'excerpt_more'), 10);
-        }
-    }
-
-
-    /**
-     *    event_list_pagination
-     *
-     * @access    public
-     * @return        void
-     */
-    public function event_list_pagination()
-    {
-        echo '<div class="ee-pagination-dv ee-clear-float">' . espresso_event_list_pagination() . '</div>';
-    }
-
-
-    /**
-     *    event_details
-     *
-     * @access    public
-     * @param        string $content
-     * @return        void
-     */
-    public function event_details($content)
-    {
-        return EEH_Template::display_template(
-            EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-details.php',
-            array('the_content' => $content),
-            true
-        );
-    }
-
-
-    /**
-     *    event_tickets
-     *
-     * @access    public
-     * @param        string $content
-     * @return        void
-     */
-    public function event_tickets($content)
-    {
-        return $content
-               . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-tickets.php',
-                   array(),
-                   true
-               );
-    }
-
-    /**
-     *    event_datetimes
-     *
-     * @access    public
-     * @param        string $content
-     * @return        void
-     */
-    public function event_datetimes($content)
-    {
-        return $content
-               . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-datetimes.php',
-                   array(),
-                   true
-               );
-    }
-
-    /**
-     *    event_venues
-     *
-     * @access    public
-     * @param        string $content
-     * @return        void
-     */
-    public function event_venues($content)
-    {
-        return $content
-               . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-venues.php',
-                   array(),
-                   true
-               );
-    }
-
-
-    /**
-     *    _initial_setup
-     *
-     * @access    public
-     * @return    void
-     */
-    private function _load_assests()
-    {
-        do_action('AHEE__EED_Events_Archive_Filters__before_load_assests');
-        wp_enqueue_style('espresso_default');
-        wp_enqueue_style('espresso_custom_css');
-        add_filter('FHEE_load_EE_Session', '__return_true');
-        add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
-        if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
-            add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
-        }
-        // add_filter( 'the_excerpt', array( $this, 'the_excerpt' ), 999 );
-    }
-
-
-    /**
-     *    _get_template
-     *
-     * @access    private
-     * @return    string
-     */
-    private function _get_template($which = 'part')
-    {
-        return EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
-    }
-
-
-    /**
-     *    excerpt_length
-     *
-     * @access    public
-     * @return    void
-     */
-    public function excerpt_length($length)
-    {
-
-        if (self::$_type == 'grid') {
-            return 36;
-        }
-
-        switch (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) {
-            case 'tiny':
-                return 12;
-                break;
-            case 'small':
-                return 24;
-                break;
-            case 'large':
-                return 48;
-                break;
-            case 'medium':
-            default:
-                return 36;
-        }
-    }
-
-
-    /**
-     *    excerpt_more
-     *
-     * @access    public
-     * @return    void
-     */
-    public function excerpt_more($more)
-    {
-        return '&hellip;';
-    }
-
-
-
-
-    /**
-     *    wp_enqueue_scripts
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp_enqueue_scripts()
-    {
-        // get some style
-        if (apply_filters('FHEE_enable_default_espresso_css', false)) {
-            // first check uploads folder
-            if (is_readable(
-                get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css'
-            )) {
-                wp_register_style(
-                    'archive-espresso_events',
-                    get_stylesheet_directory_uri() . EE_Config::get_current_theme(
-                    ) . DS . 'archive-espresso_events.css',
-                    array('dashicons', 'espresso_default')
-                );
-            } else {
-                wp_register_style(
-                    'archive-espresso_events',
-                    EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css',
-                    array('dashicons', 'espresso_default')
-                );
-            }
-            if (is_readable(
-                get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js'
-            )) {
-                wp_register_script(
-                    'archive-espresso_events',
-                    get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js',
-                    array('jquery-masonry'),
-                    '1.0',
-                    true
-                );
-            } else {
-                wp_register_script(
-                    'archive-espresso_events',
-                    EVENTS_ARCHIVE_ASSETS_URL . 'archive-espresso_events.js',
-                    array('jquery-masonry'),
-                    '1.0',
-                    true
-                );
-            }
-            wp_enqueue_style('archive-espresso_events');
-            wp_enqueue_script('jquery-masonry');
-            wp_enqueue_script('archive-espresso_events');
-            add_action('wp_footer', array('EED_Events_Archive_Filters', 'localize_grid_event_lists'), 1);
-        }
-    }
-
-
-    /**
-     *    template_settings_form
-     *
-     * @access    public
-     * @static
-     * @return    void
-     */
-    public static function localize_grid_event_lists()
-    {
-        wp_localize_script(
-            'archive-espresso_events',
-            'espresso_grid_event_lists',
-            EED_Events_Archive_Filters::$espresso_grid_event_lists
-        );
-    }
-
-
-    /**
-     *    template_settings_form
-     *
-     * @access    public
-     * @static
-     * @return    void
-     */
-    public static function template_settings_form()
-    {
-        $EE = EE_Registry::instance();
-        $EE->CFG->template_settings->EED_Events_Archive_Filters = isset($EE->CFG->template_settings->EED_Events_Archive_Filters)
-            ? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
-        $EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters(
-            'FHEE__Event_List__template_settings_form__event_list_config',
-            $EE->CFG->template_settings->EED_Events_Archive_Filters
-        );
-        EEH_Template::display_template(
-            EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php',
-            $EE->CFG->template_settings->EED_Events_Archive_Filters
-        );
-    }
-
-
-    /**
-     *    set_default_settings
-     *
-     * @access    public
-     * @static
-     * @return    void
-     */
-    public static function set_default_settings($CFG)
-    {
-        // EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-        $CFG->display_description = isset($CFG->display_description) && ! empty($CFG->display_description)
-            ? $CFG->display_description : 1;
-        $CFG->display_address = isset($CFG->display_address) && ! empty($CFG->display_address) ? $CFG->display_address
-            : true;
-        $CFG->display_venue_details = isset($CFG->display_venue_details) && ! empty($CFG->display_venue_details)
-            ? $CFG->display_venue_details : true;
-        $CFG->display_expired_events = isset($CFG->display_expired_events) && ! empty($CFG->display_expired_events)
-            ? $CFG->display_expired_events : false;
-        $CFG->default_type = isset($CFG->default_type) && ! empty($CFG->default_type) ? $CFG->default_type : 'grid';
-        $CFG->event_list_grid_size = isset($CFG->event_list_grid_size) && ! empty($CFG->event_list_grid_size)
-            ? $CFG->event_list_grid_size : 'medium';
-        $CFG->templates['full'] = isset($CFG->templates['full']) && ! empty($CFG->templates['full'])
-            ? $CFG->templates['full']
-            : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
-        $CFG->templates['part'] = isset($CFG->templates['part']) && ! empty($CFG->templates['part'])
-            ? $CFG->templates['part']
-            : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-grid-view.php';
-        return $CFG;
-    }
-
-
-    /**
-     *    filter_config
-     *
-     * @access    public
-     * @return    void
-     */
-    public function filter_config($CFG)
-    {
-        return $CFG;
-    }
-
-
-    /**
-     *    filter_config
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function update_template_settings($CFG, $REQ)
-    {
-        // $CFG->template_settings->EED_Events_Archive_Filters = new stdClass();
-        $CFG->EED_Events_Archive_Filters->display_description = isset($REQ['display_description_in_event_list'])
-            ? absint($REQ['display_description_in_event_list']) : 1;
-        $CFG->EED_Events_Archive_Filters->display_address = isset($REQ['display_address_in_event_list']) ? absint(
-            $REQ['display_address_in_event_list']
-        ) : true;
-        $CFG->EED_Events_Archive_Filters->display_venue_details = isset($REQ['display_venue_details_in_event_list'])
-            ? absint($REQ['display_venue_details_in_event_list']) : true;
-        $CFG->EED_Events_Archive_Filters->display_expired_events = isset($REQ['display_expired_events']) ? absint(
-            $REQ['display_expired_events']
-        ) : false;
-        $CFG->EED_Events_Archive_Filters->default_type = isset($REQ['default_type']) ? sanitize_text_field(
-            $REQ['default_type']
-        ) : 'grid';
-        $CFG->EED_Events_Archive_Filters->event_list_grid_size = isset($REQ['event_list_grid_size'])
-            ? sanitize_text_field($REQ['event_list_grid_size']) : 'medium';
-        $CFG->EED_Events_Archive_Filters->templates = array(
-            'full' => EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php',
-        );
-
-        switch ($CFG->EED_Events_Archive_Filters->default_type) {
-            case 'dates':
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
-                                                                      . DS . 'archive-espresso_events-dates-view.php';
-                break;
-            case 'text':
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
-                                                                      . DS . 'archive-espresso_events-text-view.php';
-                break;
-            default:
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
-                                                                      . DS . 'archive-espresso_events-grid-view.php';
-        }
-
-        $CFG->EED_Events_Archive_Filters = isset($REQ['reset_event_list_settings'])
-                                           && absint($REQ['reset_event_list_settings']) == 1
-            ? new EE_Events_Archive_Config()
-            : $CFG->EED_Events_Archive_Filters;
-        return $CFG;
-    }
-
-
-    /**
-     *    get_template_part
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function get_template_part()
-    {
-        switch (self::$_type) {
-            case 'dates':
-                return 'archive-espresso_events-dates-view.php';
-                break;
-            case 'text':
-                return 'archive-espresso_events-text-view.php';
-                break;
-            default:
-                return 'archive-espresso_events-grid-view.php';
-        }
-    }
-
-
-    /**
-     *    event_list_template_filters
-     *
-     * @access    public
-     * @return    void
-     */
-    public function event_list_template_filters()
-    {
-        $args = array(
-            'form_url'         => get_post_type_archive_link('espresso_events'),
-            // add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
-            'elf_month'        => EED_Events_Archive_Filters::_display_month(),
-            'elf_category'     => EED_Events_Archive_Filters::_event_category_slug(),
-            'elf_show_expired' => EED_Events_Archive_Filters::_show_expired(),
-            'elf_type'         => self::$_type,
-        );
-        EEH_Template::display_template(
-            EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-filters.php',
-            $args
-        );
-    }
-
-
-    /**
-     *    event_list_css
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function event_list_css($extra_class = '')
-    {
-        $EE = EE_Registry::instance();
-        $event_list_css = ! empty($extra_class) ? array($extra_class) : array();
-        $event_list_css[] = 'espresso-event-list-event';
-        if (self::$_type == 'grid') {
-            $event_list_grid_size = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size)
-                ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
-            $event_list_css[] = $event_list_grid_size . '-event-list-grid';
-        }
-        $event_list_css = apply_filters(
-            'EED_Events_Archive_Filters__event_list_css__event_list_css_array',
-            $event_list_css
-        );
-        return implode(' ', $event_list_css);
-    }
-
-
-    /**
-     *    event_categories
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function event_categories()
-    {
-        return EE_Registry::instance()->load_model('Term')->get_all_ee_categories();
-    }
-
-
-    /**
-     *    display_description
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function display_description($value)
-    {
-        $EE = EE_Registry::instance();
-        $display_description = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_description)
-            ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
-        return $display_description === $value ? true : false;
-    }
-
-
-    /**
-     *    display_venue_details
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function display_venue_details()
-    {
-        $EE = EE_Registry::instance();
-        $display_venue_details = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details)
-            ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : true;
-        $venue_name = EEH_Venue_View::venue_name();
-        return $display_venue_details && ! empty($venue_name) ? true : false;
-    }
-
-
-    /**
-     *    display_address
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function display_address()
-    {
-        $EE = EE_Registry::instance();
-        $display_address = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_address)
-            ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : false;
-        $venue_name = EEH_Venue_View::venue_name();
-        return $display_address && ! empty($venue_name) ? true : false;
-    }
-
-
-    /**
-     *    pagination
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function pagination()
-    {
-        global $wp_query;
-        $big = 999999999; // need an unlikely integer
-        $pagination = paginate_links(
-            array(
-                'base'         => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
-                'format'       => '?paged=%#%',
-                'current'      => max(1, get_query_var('paged')),
-                'total'        => $wp_query->max_num_pages,
-                'show_all'     => true,
-                'end_size'     => 10,
-                'mid_size'     => 6,
-                'prev_next'    => true,
-                'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
-                'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
-                'type'         => 'plain',
-                'add_args'     => false,
-                'add_fragment' => '',
-            )
-        );
-        return ! empty($pagination) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
-    }
-
-
-    /**
-     *    event_list_title
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function event_list_title()
-    {
-        return apply_filters(
-            'EED_Events_Archive_Filters__event_list_title__event_list_title',
-            __('Upcoming Events', 'event_espresso')
-        );
-    }
+	/**
+	 * @return EED_Events_Archive_Filters
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 *    Start Date
+	 *
+	 * @var    $_elf_month
+	 * @access    protected
+	 */
+	protected $_elf_month = null;
+
+
+	/**
+	 *    Category
+	 *
+	 * @var    $_elf_category
+	 * @access    protected
+	 */
+	protected $_elf_category = null;
+
+
+	/**
+	 *    whether to display expired events in the event list
+	 *
+	 * @var    $_show_expired
+	 * @access    protected
+	 */
+	protected $_show_expired = null;
+
+
+	/**
+	 *    whether to display the event list as a grid or list
+	 *
+	 * @var    $_type
+	 * @access    protected
+	 */
+	protected static $_type = null;
+
+
+	/**
+	 *    array of existing event list views
+	 *
+	 * @var    $_types
+	 * @access    protected
+	 */
+	protected static $_types = array('grid', 'text', 'dates');
+
+
+
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+	}
+
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
+
+
+	/**
+	 *    set_definitions
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_definitions()
+	{
+	}
+
+
+	/**
+	 *    run - initial module setup
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function run($WP)
+	{
+	}
+
+
+	/**
+	 *    event_list
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function event_list()
+	{
+		// load other required components
+		$this->_load_assests();
+	}
+
+
+	/**
+	 *    _filter_query_parts
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	private function _filter_query_parts()
+	{
+		// build event list query
+		add_filter('posts_join', array($this, 'posts_join'), 1, 2);
+		add_filter('posts_where', array($this, 'posts_where'), 1, 2);
+		add_filter('posts_orderby', array($this, 'posts_orderby'), 1, 2);
+	}
+
+	/**
+	 *    _type - the type of event list : grid, text, dates
+	 *
+	 * @access    public
+	 * @return    string
+	 */
+	public static function set_type()
+	{
+		do_action('AHEE__EED_Events_Archive_Filters__before_set_type');
+		EED_Events_Archive_Filters::$_types = apply_filters(
+			'EED_Events_Archive_Filters__set_type__types',
+			EED_Events_Archive_Filters::$_types
+		);
+		$view = isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type']) ? EE_Registry::instance(
+		)->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
+		$elf_type = EE_Registry::instance()->REQ->is_set('elf_type') ? sanitize_text_field(
+			EE_Registry::instance()->REQ->get('elf_type')
+		) : '';
+		$view = ! empty($elf_type) ? $elf_type : $view;
+		$view = apply_filters('EED_Events_Archive_Filters__set_type__type', $view);
+		if (! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
+			self::$_type = $view;
+		}
+	}
+
+	/**
+	 *    _show_expired
+	 *
+	 * @access    private
+	 * @param    boolean $req_only if TRUE, then ignore defaults and only return $_POST value
+	 * @return    boolean
+	 */
+	private static function _show_expired($req_only = false)
+	{
+		// get default value for "display_expired_events" as set in the EE General Settings > Templates > Event Listings
+		$show_expired = ! $req_only && isset(
+			EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events']
+		) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : false;
+		// override default expired option if set via filter
+		$show_expired = EE_Registry::instance()->REQ->is_set('elf_expired_chk') ? absint(
+			EE_Registry::instance()->REQ->get('elf_expired_chk')
+		) : $show_expired;
+		return $show_expired ? true : false;
+	}
+
+	/**
+	 *    _event_category_slug
+	 *
+	 * @access    private
+	 * @return    string
+	 */
+	private static function _event_category_slug()
+	{
+		return EE_Registry::instance()->REQ->is_set('elf_category_dd') ? sanitize_text_field(
+			EE_Registry::instance()->REQ->get('elf_category_dd')
+		) : '';
+	}
+
+	/**
+	 *    _display_month - what month should the event list display events for?
+	 *
+	 * @access    private
+	 * @return    string
+	 */
+	private static function _display_month()
+	{
+		return EE_Registry::instance()->REQ->is_set('elf_month_dd') ? sanitize_text_field(
+			EE_Registry::instance()->REQ->get('elf_month_dd')
+		) : '';
+	}
+
+
+	/**
+	 *    get_post_data
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function get_post_data()
+	{
+		$this->_elf_month = EED_Events_Archive_Filters::_display_month();
+		$this->_elf_category = EED_Events_Archive_Filters::_event_category_slug();
+		$this->_show_expired = EED_Events_Archive_Filters::_show_expired(true);
+	}
+
+
+	/**
+	 *    posts_join
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function posts_join($SQL, WP_Query $wp_query)
+	{
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
+			// Category
+			$SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms(
+				EED_Events_Archive_Filters::_event_category_slug()
+			);
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    posts_join_sql_for_terms
+	 *
+	 * @access    public
+	 * @param    mixed boolean|string    $join_terms pass TRUE or term string, doesn't really matter since this value
+	 *                                   doesn't really get used for anything yet
+	 * @return    string
+	 */
+	public static function posts_join_sql_for_terms($join_terms = null)
+	{
+		$SQL = '';
+		if (! empty($join_terms)) {
+			global $wpdb;
+			$SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
+			$SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
+			$SQL .= " LEFT JOIN $wpdb->terms ON ($wpdb->terms.term_id = $wpdb->term_taxonomy.term_id) ";
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    posts_join_for_orderby
+	 *    usage:  $SQL .= EED_Events_Archive_Filters::posts_join_for_orderby( $orderby_params );
+	 *
+	 * @access    public
+	 * @param    array $orderby_params
+	 * @return    string
+	 */
+	public static function posts_join_for_orderby($orderby_params = array())
+	{
+		global $wpdb;
+		$SQL = '';
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
+		foreach ($orderby_params as $orderby) {
+			switch ($orderby) {
+				case 'ticket_start':
+				case 'ticket_end':
+					$SQL .= ' LEFT JOIN ' . EEM_Datetime_Ticket::instance()->table() . ' ON ('
+							. EEM_Datetime::instance()->table() . '.DTT_ID = '
+							. EEM_Datetime_Ticket::instance()->table() . '.DTT_ID )';
+					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON ('
+							. EEM_Datetime_Ticket::instance()->table() . '.TKT_ID = '
+							. EEM_Ticket::instance()->table() . '.TKT_ID )';
+					break;
+
+				case 'venue_title':
+				case 'city':
+					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = '
+							. EEM_Event_Venue::instance()->table() . '.EVT_ID )';
+					$SQL .= ' LEFT JOIN ' . EEM_Venue::instance()->table() . ' ON ('
+							. EEM_Event_Venue::instance()->table() . '.VNU_ID = '
+							. EEM_Venue::instance()->table() . '.VNU_ID )';
+					break;
+
+				case 'state':
+					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = '
+							. EEM_Event_Venue::instance()->table() . '.EVT_ID )';
+					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->second_table() . ' ON ('
+							. EEM_Event_Venue::instance()->table() . '.VNU_ID = '
+							. EEM_Event_Venue::instance()->second_table() . '.VNU_ID )';
+					break;
+			}
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    posts_where
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function posts_where($SQL, WP_Query $wp_query)
+	{
+		if (isset($wp_query->query_vars) && isset($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'espresso_events') {
+			// Show Expired ?
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired(
+				EED_Events_Archive_Filters::_show_expired()
+			);
+			// Category
+			// $elf_category = EED_Events_Archive_Filters::_event_category_slug();
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug(
+				EED_Events_Archive_Filters::_event_category_slug()
+			);
+			// Start Date
+			// $elf_month = EED_Events_Archive_Filters::_display_month();
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month(
+				EED_Events_Archive_Filters::_display_month()
+			);
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    posts_where_sql_for_show_expired
+	 *
+	 * @access    public
+	 * @param    boolean $show_expired if TRUE, then displayed past events
+	 * @return    string
+	 */
+	public static function posts_where_sql_for_show_expired($show_expired = false)
+	{
+		return ! $show_expired
+			? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . date('Y-m-d H:s:i') . '" '
+			: '';
+	}
+
+
+	/**
+	 *    posts_where_sql_for_event_category_slug
+	 *
+	 * @access    public
+	 * @param    boolean $event_category_slug
+	 * @return    string
+	 */
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
+	{
+		global $wpdb;
+		return ! empty($event_category_slug) ? ' AND ' . $wpdb->terms . '.slug = "' . $event_category_slug . '" ' : '';
+	}
+
+	/**
+	 *    posts_where_sql_for_event_list_month
+	 *
+	 * @access    public
+	 * @param    boolean $month
+	 * @return    string
+	 */
+	public static function posts_where_sql_for_event_list_month($month = null)
+	{
+		$SQL = '';
+		if (! empty($month)) {
+			// event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
+			$SQL = ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start';
+			$SQL .= ' <= "' . date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '"';
+			// event end date is GREATER than the start of the month ( so nothing that ended before this month )
+			$SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end';
+			$SQL .= ' >= "' . date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '" ';
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    posts_orderby
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function posts_orderby($SQL, WP_Query $wp_query)
+	{
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
+			$SQL = EED_Events_Archive_Filters::posts_orderby_sql(array('start_date'));
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    posts_orderby_sql
+	 *
+	 *    possible parameters:
+	 *    ID
+	 *    start_date
+	 *    end_date
+	 *    event_name
+	 *    category_slug
+	 *    ticket_start
+	 *    ticket_end
+	 *    venue_title
+	 *    city
+	 *    state
+	 *
+	 *    **IMPORTANT**
+	 *    make sure to also send the $orderby_params array to the posts_join_for_orderby() method
+	 *    or else some of the table references below will result in MySQL errors
+	 *
+	 * @access    public
+	 * @param    boolean $orderby_params
+	 * @return    string
+	 */
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC')
+	{
+		global $wpdb;
+		$SQL = '';
+		$cntr = 1;
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
+		foreach ($orderby_params as $orderby) {
+			$glue = $cntr == 1 || $cntr == count($orderby_params) ? ' ' : ', ';
+			switch ($orderby) {
+				case 'id':
+				case 'ID':
+					$SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+					break;
+
+				case 'start_date':
+					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_start ' . $sort;
+					break;
+
+				case 'end_date':
+					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+					break;
+
+				case 'event_name':
+					$SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+					break;
+
+				case 'category_slug':
+					$SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+					break;
+
+				case 'ticket_start':
+					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+					break;
+
+				case 'ticket_end':
+					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+					break;
+
+				case 'venue_title':
+					$SQL .= $glue . 'venue_title ' . $sort;
+					break;
+
+				case 'city':
+					$SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+					break;
+
+				case 'state':
+					$SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+					break;
+			}
+			$cntr++;
+		}
+		// echo '<h4>$SQL : ' . $SQL . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
+		return $SQL;
+	}
+
+
+	/**
+	 *    template_redirect
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function template_redirect()
+	{
+		// add event list filters
+		add_action('loop_start', array($this, 'event_list_template_filters'));
+		// and pagination
+		add_action('loop_start', array($this, 'event_list_pagination'));
+		add_action('loop_end', array($this, 'event_list_pagination'));
+		// if NOT a custom template
+		if (EE_Registry::instance()
+					   ->load_core('Front_Controller', array(), false, true)
+					   ->get_selected_template() != 'archive-espresso_events.php'
+		) {
+			// don't know if theme uses the_excerpt
+			add_filter('the_excerpt', array($this, 'event_details'), 100);
+			add_filter('the_excerpt', array($this, 'event_tickets'), 110);
+			add_filter('the_excerpt', array($this, 'event_datetimes'), 120);
+			add_filter('the_excerpt', array($this, 'event_venues'), 130);
+			// or the_content
+			add_filter('the_content', array($this, 'event_details'), 100);
+			add_filter('the_content', array($this, 'event_tickets'), 110);
+			add_filter('the_content', array($this, 'event_datetimes'), 120);
+			add_filter('the_content', array($this, 'event_venues'), 130);
+		} else {
+			remove_all_filters('excerpt_length');
+			add_filter('excerpt_length', array($this, 'excerpt_length'), 10);
+			add_filter('excerpt_more', array($this, 'excerpt_more'), 10);
+		}
+	}
+
+
+	/**
+	 *    event_list_pagination
+	 *
+	 * @access    public
+	 * @return        void
+	 */
+	public function event_list_pagination()
+	{
+		echo '<div class="ee-pagination-dv ee-clear-float">' . espresso_event_list_pagination() . '</div>';
+	}
+
+
+	/**
+	 *    event_details
+	 *
+	 * @access    public
+	 * @param        string $content
+	 * @return        void
+	 */
+	public function event_details($content)
+	{
+		return EEH_Template::display_template(
+			EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-details.php',
+			array('the_content' => $content),
+			true
+		);
+	}
+
+
+	/**
+	 *    event_tickets
+	 *
+	 * @access    public
+	 * @param        string $content
+	 * @return        void
+	 */
+	public function event_tickets($content)
+	{
+		return $content
+			   . EEH_Template::display_template(
+				   EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-tickets.php',
+				   array(),
+				   true
+			   );
+	}
+
+	/**
+	 *    event_datetimes
+	 *
+	 * @access    public
+	 * @param        string $content
+	 * @return        void
+	 */
+	public function event_datetimes($content)
+	{
+		return $content
+			   . EEH_Template::display_template(
+				   EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-datetimes.php',
+				   array(),
+				   true
+			   );
+	}
+
+	/**
+	 *    event_venues
+	 *
+	 * @access    public
+	 * @param        string $content
+	 * @return        void
+	 */
+	public function event_venues($content)
+	{
+		return $content
+			   . EEH_Template::display_template(
+				   EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-venues.php',
+				   array(),
+				   true
+			   );
+	}
+
+
+	/**
+	 *    _initial_setup
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	private function _load_assests()
+	{
+		do_action('AHEE__EED_Events_Archive_Filters__before_load_assests');
+		wp_enqueue_style('espresso_default');
+		wp_enqueue_style('espresso_custom_css');
+		add_filter('FHEE_load_EE_Session', '__return_true');
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+		if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+			add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
+		}
+		// add_filter( 'the_excerpt', array( $this, 'the_excerpt' ), 999 );
+	}
+
+
+	/**
+	 *    _get_template
+	 *
+	 * @access    private
+	 * @return    string
+	 */
+	private function _get_template($which = 'part')
+	{
+		return EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
+	}
+
+
+	/**
+	 *    excerpt_length
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function excerpt_length($length)
+	{
+
+		if (self::$_type == 'grid') {
+			return 36;
+		}
+
+		switch (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) {
+			case 'tiny':
+				return 12;
+				break;
+			case 'small':
+				return 24;
+				break;
+			case 'large':
+				return 48;
+				break;
+			case 'medium':
+			default:
+				return 36;
+		}
+	}
+
+
+	/**
+	 *    excerpt_more
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function excerpt_more($more)
+	{
+		return '&hellip;';
+	}
+
+
+
+
+	/**
+	 *    wp_enqueue_scripts
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp_enqueue_scripts()
+	{
+		// get some style
+		if (apply_filters('FHEE_enable_default_espresso_css', false)) {
+			// first check uploads folder
+			if (is_readable(
+				get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css'
+			)) {
+				wp_register_style(
+					'archive-espresso_events',
+					get_stylesheet_directory_uri() . EE_Config::get_current_theme(
+					) . DS . 'archive-espresso_events.css',
+					array('dashicons', 'espresso_default')
+				);
+			} else {
+				wp_register_style(
+					'archive-espresso_events',
+					EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css',
+					array('dashicons', 'espresso_default')
+				);
+			}
+			if (is_readable(
+				get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js'
+			)) {
+				wp_register_script(
+					'archive-espresso_events',
+					get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js',
+					array('jquery-masonry'),
+					'1.0',
+					true
+				);
+			} else {
+				wp_register_script(
+					'archive-espresso_events',
+					EVENTS_ARCHIVE_ASSETS_URL . 'archive-espresso_events.js',
+					array('jquery-masonry'),
+					'1.0',
+					true
+				);
+			}
+			wp_enqueue_style('archive-espresso_events');
+			wp_enqueue_script('jquery-masonry');
+			wp_enqueue_script('archive-espresso_events');
+			add_action('wp_footer', array('EED_Events_Archive_Filters', 'localize_grid_event_lists'), 1);
+		}
+	}
+
+
+	/**
+	 *    template_settings_form
+	 *
+	 * @access    public
+	 * @static
+	 * @return    void
+	 */
+	public static function localize_grid_event_lists()
+	{
+		wp_localize_script(
+			'archive-espresso_events',
+			'espresso_grid_event_lists',
+			EED_Events_Archive_Filters::$espresso_grid_event_lists
+		);
+	}
+
+
+	/**
+	 *    template_settings_form
+	 *
+	 * @access    public
+	 * @static
+	 * @return    void
+	 */
+	public static function template_settings_form()
+	{
+		$EE = EE_Registry::instance();
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = isset($EE->CFG->template_settings->EED_Events_Archive_Filters)
+			? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters(
+			'FHEE__Event_List__template_settings_form__event_list_config',
+			$EE->CFG->template_settings->EED_Events_Archive_Filters
+		);
+		EEH_Template::display_template(
+			EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php',
+			$EE->CFG->template_settings->EED_Events_Archive_Filters
+		);
+	}
+
+
+	/**
+	 *    set_default_settings
+	 *
+	 * @access    public
+	 * @static
+	 * @return    void
+	 */
+	public static function set_default_settings($CFG)
+	{
+		// EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
+		$CFG->display_description = isset($CFG->display_description) && ! empty($CFG->display_description)
+			? $CFG->display_description : 1;
+		$CFG->display_address = isset($CFG->display_address) && ! empty($CFG->display_address) ? $CFG->display_address
+			: true;
+		$CFG->display_venue_details = isset($CFG->display_venue_details) && ! empty($CFG->display_venue_details)
+			? $CFG->display_venue_details : true;
+		$CFG->display_expired_events = isset($CFG->display_expired_events) && ! empty($CFG->display_expired_events)
+			? $CFG->display_expired_events : false;
+		$CFG->default_type = isset($CFG->default_type) && ! empty($CFG->default_type) ? $CFG->default_type : 'grid';
+		$CFG->event_list_grid_size = isset($CFG->event_list_grid_size) && ! empty($CFG->event_list_grid_size)
+			? $CFG->event_list_grid_size : 'medium';
+		$CFG->templates['full'] = isset($CFG->templates['full']) && ! empty($CFG->templates['full'])
+			? $CFG->templates['full']
+			: EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
+		$CFG->templates['part'] = isset($CFG->templates['part']) && ! empty($CFG->templates['part'])
+			? $CFG->templates['part']
+			: EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-grid-view.php';
+		return $CFG;
+	}
+
+
+	/**
+	 *    filter_config
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function filter_config($CFG)
+	{
+		return $CFG;
+	}
+
+
+	/**
+	 *    filter_config
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function update_template_settings($CFG, $REQ)
+	{
+		// $CFG->template_settings->EED_Events_Archive_Filters = new stdClass();
+		$CFG->EED_Events_Archive_Filters->display_description = isset($REQ['display_description_in_event_list'])
+			? absint($REQ['display_description_in_event_list']) : 1;
+		$CFG->EED_Events_Archive_Filters->display_address = isset($REQ['display_address_in_event_list']) ? absint(
+			$REQ['display_address_in_event_list']
+		) : true;
+		$CFG->EED_Events_Archive_Filters->display_venue_details = isset($REQ['display_venue_details_in_event_list'])
+			? absint($REQ['display_venue_details_in_event_list']) : true;
+		$CFG->EED_Events_Archive_Filters->display_expired_events = isset($REQ['display_expired_events']) ? absint(
+			$REQ['display_expired_events']
+		) : false;
+		$CFG->EED_Events_Archive_Filters->default_type = isset($REQ['default_type']) ? sanitize_text_field(
+			$REQ['default_type']
+		) : 'grid';
+		$CFG->EED_Events_Archive_Filters->event_list_grid_size = isset($REQ['event_list_grid_size'])
+			? sanitize_text_field($REQ['event_list_grid_size']) : 'medium';
+		$CFG->EED_Events_Archive_Filters->templates = array(
+			'full' => EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php',
+		);
+
+		switch ($CFG->EED_Events_Archive_Filters->default_type) {
+			case 'dates':
+				$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
+																	  . DS . 'archive-espresso_events-dates-view.php';
+				break;
+			case 'text':
+				$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
+																	  . DS . 'archive-espresso_events-text-view.php';
+				break;
+			default:
+				$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
+																	  . DS . 'archive-espresso_events-grid-view.php';
+		}
+
+		$CFG->EED_Events_Archive_Filters = isset($REQ['reset_event_list_settings'])
+										   && absint($REQ['reset_event_list_settings']) == 1
+			? new EE_Events_Archive_Config()
+			: $CFG->EED_Events_Archive_Filters;
+		return $CFG;
+	}
+
+
+	/**
+	 *    get_template_part
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function get_template_part()
+	{
+		switch (self::$_type) {
+			case 'dates':
+				return 'archive-espresso_events-dates-view.php';
+				break;
+			case 'text':
+				return 'archive-espresso_events-text-view.php';
+				break;
+			default:
+				return 'archive-espresso_events-grid-view.php';
+		}
+	}
+
+
+	/**
+	 *    event_list_template_filters
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function event_list_template_filters()
+	{
+		$args = array(
+			'form_url'         => get_post_type_archive_link('espresso_events'),
+			// add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
+			'elf_month'        => EED_Events_Archive_Filters::_display_month(),
+			'elf_category'     => EED_Events_Archive_Filters::_event_category_slug(),
+			'elf_show_expired' => EED_Events_Archive_Filters::_show_expired(),
+			'elf_type'         => self::$_type,
+		);
+		EEH_Template::display_template(
+			EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-filters.php',
+			$args
+		);
+	}
+
+
+	/**
+	 *    event_list_css
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function event_list_css($extra_class = '')
+	{
+		$EE = EE_Registry::instance();
+		$event_list_css = ! empty($extra_class) ? array($extra_class) : array();
+		$event_list_css[] = 'espresso-event-list-event';
+		if (self::$_type == 'grid') {
+			$event_list_grid_size = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size)
+				? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
+			$event_list_css[] = $event_list_grid_size . '-event-list-grid';
+		}
+		$event_list_css = apply_filters(
+			'EED_Events_Archive_Filters__event_list_css__event_list_css_array',
+			$event_list_css
+		);
+		return implode(' ', $event_list_css);
+	}
+
+
+	/**
+	 *    event_categories
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function event_categories()
+	{
+		return EE_Registry::instance()->load_model('Term')->get_all_ee_categories();
+	}
+
+
+	/**
+	 *    display_description
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function display_description($value)
+	{
+		$EE = EE_Registry::instance();
+		$display_description = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_description)
+			? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
+		return $display_description === $value ? true : false;
+	}
+
+
+	/**
+	 *    display_venue_details
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function display_venue_details()
+	{
+		$EE = EE_Registry::instance();
+		$display_venue_details = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details)
+			? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : true;
+		$venue_name = EEH_Venue_View::venue_name();
+		return $display_venue_details && ! empty($venue_name) ? true : false;
+	}
+
+
+	/**
+	 *    display_address
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function display_address()
+	{
+		$EE = EE_Registry::instance();
+		$display_address = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_address)
+			? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : false;
+		$venue_name = EEH_Venue_View::venue_name();
+		return $display_address && ! empty($venue_name) ? true : false;
+	}
+
+
+	/**
+	 *    pagination
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function pagination()
+	{
+		global $wp_query;
+		$big = 999999999; // need an unlikely integer
+		$pagination = paginate_links(
+			array(
+				'base'         => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
+				'format'       => '?paged=%#%',
+				'current'      => max(1, get_query_var('paged')),
+				'total'        => $wp_query->max_num_pages,
+				'show_all'     => true,
+				'end_size'     => 10,
+				'mid_size'     => 6,
+				'prev_next'    => true,
+				'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
+				'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
+				'type'         => 'plain',
+				'add_args'     => false,
+				'add_fragment' => '',
+			)
+		);
+		return ! empty($pagination) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+	}
+
+
+	/**
+	 *    event_list_title
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function event_list_title()
+	{
+		return apply_filters(
+			'EED_Events_Archive_Filters__event_list_title__event_list_title',
+			__('Upcoming Events', 'event_espresso')
+		);
+	}
 }

Spacing +61 added lines, -61 removed lines

@@ -157,7 +157,7 @@ 
         ) : '';
         $view = ! empty($elf_type) ? $elf_type : $view;
         $view = apply_filters('EED_Events_Archive_Filters__set_type__type', $view);
-        if (! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
+        if ( ! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
             self::$_type = $view;
         }
     }
@@ -252,7 +252,7 @@ 
     public static function posts_join_sql_for_terms($join_terms = null)
     {
         $SQL = '';
-        if (! empty($join_terms)) {
+        if ( ! empty($join_terms)) {
             global $wpdb;
             $SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
             $SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
@@ -279,29 +279,29 @@ 
             switch ($orderby) {
                 case 'ticket_start':
                 case 'ticket_end':
-                    $SQL .= ' LEFT JOIN ' . EEM_Datetime_Ticket::instance()->table() . ' ON ('
-                            . EEM_Datetime::instance()->table() . '.DTT_ID = '
-                            . EEM_Datetime_Ticket::instance()->table() . '.DTT_ID )';
-                    $SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON ('
-                            . EEM_Datetime_Ticket::instance()->table() . '.TKT_ID = '
-                            . EEM_Ticket::instance()->table() . '.TKT_ID )';
+                    $SQL .= ' LEFT JOIN '.EEM_Datetime_Ticket::instance()->table().' ON ('
+                            . EEM_Datetime::instance()->table().'.DTT_ID = '
+                            . EEM_Datetime_Ticket::instance()->table().'.DTT_ID )';
+                    $SQL .= ' LEFT JOIN '.EEM_Ticket::instance()->table().' ON ('
+                            . EEM_Datetime_Ticket::instance()->table().'.TKT_ID = '
+                            . EEM_Ticket::instance()->table().'.TKT_ID )';
                     break;
 
                 case 'venue_title':
                 case 'city':
-                    $SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = '
-                            . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
-                    $SQL .= ' LEFT JOIN ' . EEM_Venue::instance()->table() . ' ON ('
-                            . EEM_Event_Venue::instance()->table() . '.VNU_ID = '
-                            . EEM_Venue::instance()->table() . '.VNU_ID )';
+                    $SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->table().' ON ('.$wpdb->posts.'.ID = '
+                            . EEM_Event_Venue::instance()->table().'.EVT_ID )';
+                    $SQL .= ' LEFT JOIN '.EEM_Venue::instance()->table().' ON ('
+                            . EEM_Event_Venue::instance()->table().'.VNU_ID = '
+                            . EEM_Venue::instance()->table().'.VNU_ID )';
                     break;
 
                 case 'state':
-                    $SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = '
-                            . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
-                    $SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->second_table() . ' ON ('
-                            . EEM_Event_Venue::instance()->table() . '.VNU_ID = '
-                            . EEM_Event_Venue::instance()->second_table() . '.VNU_ID )';
+                    $SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->table().' ON ('.$wpdb->posts.'.ID = '
+                            . EEM_Event_Venue::instance()->table().'.EVT_ID )';
+                    $SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->second_table().' ON ('
+                            . EEM_Event_Venue::instance()->table().'.VNU_ID = '
+                            . EEM_Event_Venue::instance()->second_table().'.VNU_ID )';
                     break;
             }
         }
@@ -347,7 +347,7 @@ 
     public static function posts_where_sql_for_show_expired($show_expired = false)
     {
         return ! $show_expired
-            ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . date('Y-m-d H:s:i') . '" '
+            ? ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > "'.date('Y-m-d H:s:i').'" '
             : '';
     }
 
@@ -362,7 +362,7 @@ 
     public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
     {
         global $wpdb;
-        return ! empty($event_category_slug) ? ' AND ' . $wpdb->terms . '.slug = "' . $event_category_slug . '" ' : '';
+        return ! empty($event_category_slug) ? ' AND '.$wpdb->terms.'.slug = "'.$event_category_slug.'" ' : '';
     }
 
     /**
@@ -375,13 +375,13 @@ 
     public static function posts_where_sql_for_event_list_month($month = null)
     {
         $SQL = '';
-        if (! empty($month)) {
+        if ( ! empty($month)) {
             // event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
-            $SQL = ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start';
-            $SQL .= ' <= "' . date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '"';
+            $SQL = ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_start';
+            $SQL .= ' <= "'.date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)).'"';
             // event end date is GREATER than the start of the month ( so nothing that ended before this month )
-            $SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end';
-            $SQL .= ' >= "' . date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '" ';
+            $SQL .= ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end';
+            $SQL .= ' >= "'.date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)).'" ';
         }
         return $SQL;
     }
@@ -436,43 +436,43 @@ 
             switch ($orderby) {
                 case 'id':
                 case 'ID':
-                    $SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+                    $SQL .= $glue.$wpdb->posts.'.ID '.$sort;
                     break;
 
                 case 'start_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_start ' . $sort;
+                    $SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_start '.$sort;
                     break;
 
                 case 'end_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+                    $SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_end '.$sort;
                     break;
 
                 case 'event_name':
-                    $SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+                    $SQL .= $glue.$wpdb->posts.'.post_title '.$sort;
                     break;
 
                 case 'category_slug':
-                    $SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+                    $SQL .= $glue.$wpdb->terms.'.slug '.$sort;
                     break;
 
                 case 'ticket_start':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+                    $SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_start_date '.$sort;
                     break;
 
                 case 'ticket_end':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+                    $SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_end_date '.$sort;
                     break;
 
                 case 'venue_title':
-                    $SQL .= $glue . 'venue_title ' . $sort;
+                    $SQL .= $glue.'venue_title '.$sort;
                     break;
 
                 case 'city':
-                    $SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+                    $SQL .= $glue.EEM_Venue::instance()->second_table().'.VNU_city '.$sort;
                     break;
 
                 case 'state':
-                    $SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+                    $SQL .= $glue.EEM_State::instance()->table().'.STA_name '.$sort;
                     break;
             }
             $cntr++;
@@ -526,7 +526,7 @@ 
      */
     public function event_list_pagination()
     {
-        echo '<div class="ee-pagination-dv ee-clear-float">' . espresso_event_list_pagination() . '</div>';
+        echo '<div class="ee-pagination-dv ee-clear-float">'.espresso_event_list_pagination().'</div>';
     }
 
 
@@ -540,7 +540,7 @@ 
     public function event_details($content)
     {
         return EEH_Template::display_template(
-            EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-details.php',
+            EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-details.php',
             array('the_content' => $content),
             true
         );
@@ -558,7 +558,7 @@ 
     {
         return $content
                . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-tickets.php',
+                   EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-tickets.php',
                    array(),
                    true
                );
@@ -575,7 +575,7 @@ 
     {
         return $content
                . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-datetimes.php',
+                   EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-datetimes.php',
                    array(),
                    true
                );
@@ -592,7 +592,7 @@ 
     {
         return $content
                . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-venues.php',
+                   EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-venues.php',
                    array(),
                    true
                );
@@ -627,7 +627,7 @@ 
      */
     private function _get_template($which = 'part')
     {
-        return EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
+        return EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php';
     }
 
 
@@ -687,27 +687,27 @@ 
         if (apply_filters('FHEE_enable_default_espresso_css', false)) {
             // first check uploads folder
             if (is_readable(
-                get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css'
+                get_stylesheet_directory().EE_Config::get_current_theme().DS.'archive-espresso_events.css'
             )) {
                 wp_register_style(
                     'archive-espresso_events',
-                    get_stylesheet_directory_uri() . EE_Config::get_current_theme(
-                    ) . DS . 'archive-espresso_events.css',
+                    get_stylesheet_directory_uri().EE_Config::get_current_theme(
+                    ).DS.'archive-espresso_events.css',
                     array('dashicons', 'espresso_default')
                 );
             } else {
                 wp_register_style(
                     'archive-espresso_events',
-                    EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css',
+                    EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'archive-espresso_events.css',
                     array('dashicons', 'espresso_default')
                 );
             }
             if (is_readable(
-                get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js'
+                get_stylesheet_directory().EE_Config::get_current_theme().DS.'archive-espresso_events.js'
             )) {
                 wp_register_script(
                     'archive-espresso_events',
-                    get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js',
+                    get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'archive-espresso_events.js',
                     array('jquery-masonry'),
                     '1.0',
                     true
@@ -715,7 +715,7 @@ 
             } else {
                 wp_register_script(
                     'archive-espresso_events',
-                    EVENTS_ARCHIVE_ASSETS_URL . 'archive-espresso_events.js',
+                    EVENTS_ARCHIVE_ASSETS_URL.'archive-espresso_events.js',
                     array('jquery-masonry'),
                     '1.0',
                     true
@@ -763,7 +763,7 @@ 
             $EE->CFG->template_settings->EED_Events_Archive_Filters
         );
         EEH_Template::display_template(
-            EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php',
+            EVENTS_ARCHIVE_TEMPLATES_PATH.'admin-event-list-settings.template.php',
             $EE->CFG->template_settings->EED_Events_Archive_Filters
         );
     }
@@ -792,10 +792,10 @@ 
             ? $CFG->event_list_grid_size : 'medium';
         $CFG->templates['full'] = isset($CFG->templates['full']) && ! empty($CFG->templates['full'])
             ? $CFG->templates['full']
-            : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
+            : EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php';
         $CFG->templates['part'] = isset($CFG->templates['part']) && ! empty($CFG->templates['part'])
             ? $CFG->templates['part']
-            : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-grid-view.php';
+            : EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-grid-view.php';
         return $CFG;
     }
 
@@ -837,21 +837,21 @@ 
         $CFG->EED_Events_Archive_Filters->event_list_grid_size = isset($REQ['event_list_grid_size'])
             ? sanitize_text_field($REQ['event_list_grid_size']) : 'medium';
         $CFG->EED_Events_Archive_Filters->templates = array(
-            'full' => EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php',
+            'full' => EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php',
         );
 
         switch ($CFG->EED_Events_Archive_Filters->default_type) {
             case 'dates':
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
-                                                                      . DS . 'archive-espresso_events-dates-view.php';
+                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme()
+                                                                      . DS.'archive-espresso_events-dates-view.php';
                 break;
             case 'text':
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
-                                                                      . DS . 'archive-espresso_events-text-view.php';
+                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme()
+                                                                      . DS.'archive-espresso_events-text-view.php';
                 break;
             default:
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
-                                                                      . DS . 'archive-espresso_events-grid-view.php';
+                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme()
+                                                                      . DS.'archive-espresso_events-grid-view.php';
         }
 
         $CFG->EED_Events_Archive_Filters = isset($REQ['reset_event_list_settings'])
@@ -900,7 +900,7 @@ 
             'elf_type'         => self::$_type,
         );
         EEH_Template::display_template(
-            EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-filters.php',
+            EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-filters.php',
             $args
         );
     }
@@ -920,7 +920,7 @@ 
         if (self::$_type == 'grid') {
             $event_list_grid_size = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size)
                 ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
-            $event_list_css[] = $event_list_grid_size . '-event-list-grid';
+            $event_list_css[] = $event_list_grid_size.'-event-list-grid';
         }
         $event_list_css = apply_filters(
             'EED_Events_Archive_Filters__event_list_css__event_list_css_array',
@@ -1016,7 +1016,7 @@ 
                 'add_fragment' => '',
             )
         );
-        return ! empty($pagination) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+        return ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
     }
 
 

admin_pages/support/Support_Admin_Page_Init.core.php

Indentation +30 added lines, -30 removed lines

@@ -16,36 +16,36 @@
 {
 
 
-    public function __construct()
-    {
-        // define some help/support page related constants
-        define('EE_SUPPORT_PG_SLUG', 'espresso_support');
-        define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG));
-        define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
-        define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/');
-        define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/');
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		// define some help/support page related constants
+		define('EE_SUPPORT_PG_SLUG', 'espresso_support');
+		define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG));
+		define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
+		define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/');
+		define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/');
+		parent::__construct();
+	}
 
-    protected function _set_init_properties()
-    {
-        $this->label = __('Help & Support', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = __('Help & Support', 'event_espresso');
+	}
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'              => 'extras',
-                'menu_order'              => 30,
-                'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
-                'parent_slug'             => 'espresso_events',
-                'menu_slug'               => EE_SUPPORT_PG_SLUG,
-                'menu_label'              => __('Help & Support', 'event_espresso'),
-                'capability'              => 'ee_read_ee',
-                'maintenance_mode_parent' => 'espresso_maintenance_settings',
-                'admin_init_page'         => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'              => 'extras',
+				'menu_order'              => 30,
+				'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
+				'parent_slug'             => 'espresso_events',
+				'menu_slug'               => EE_SUPPORT_PG_SLUG,
+				'menu_label'              => __('Help & Support', 'event_espresso'),
+				'capability'              => 'ee_read_ee',
+				'maintenance_mode_parent' => 'espresso_maintenance_settings',
+				'admin_init_page'         => $this,
+			)
+		);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -20,10 +20,10 @@
     {
         // define some help/support page related constants
         define('EE_SUPPORT_PG_SLUG', 'espresso_support');
-        define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG));
-        define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
-        define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/');
-        define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/');
+        define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page='.EE_SUPPORT_PG_SLUG));
+        define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES.'support/templates/');
+        define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES.'support/');
+        define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL.'support/assets/');
         parent::__construct();
     }
 

admin_pages/support/Support_Admin_Page.core.php

Indentation +238 added lines, -238 removed lines

@@ -13,242 +13,242 @@
 {
 
 
-    protected function _init_page_props()
-    {
-        $this->page_slug = EE_SUPPORT_PG_SLUG;
-        $this->page_label = esc_html__('Help & Support', 'event_espresso');
-        $this->_admin_base_url = EE_SUPPORT_ADMIN_URL;
-        $this->_admin_base_path = EE_SUPPORT_ADMIN;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_labels = array();
-        $this->_admin_page_title = $this->page_label;
-    }
-
-
-    protected function _set_page_routes()
-    {
-        $this->_page_routes = array(
-            'default'    => array(
-                'func'       => '_contact_support',
-                'capability' => 'ee_read_ee',
-            ),
-            'developers' => array(
-                'func'       => '_developers',
-                'capability' => 'ee_read_ee',
-            ),
-            'shortcodes' => array(
-                'func'       => '_shortcodes',
-                'capability' => 'ee_read_ee',
-            ),
-        );
-    }
-
-
-    protected function _set_page_config()
-    {
-        $this->_page_config = array(
-            'default'    => array(
-                'nav'           => array(
-                    'label' => esc_html__('Support', 'event_espresso'),
-                    'order' => 30,
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_support_boxes')),
-                'require_nonce' => false,
-            ),
-            'developers' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Developers', 'event_espresso'),
-                    'order' => 50,
-                ),
-                'metaboxes'     => $this->_default_espresso_metaboxes,
-                'require_nonce' => false,
-            ),
-            'shortcodes' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Shortcodes', 'event_espresso'),
-                    'order' => 60,
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_shortcodes_boxes')),
-                'require_nonce' => false,
-            ),
-        );
-    }
-
-
-    // none of the below group are currently used for Support pages
-    protected function _add_screen_options()
-    {
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    public function admin_init()
-    {
-    }
-
-
-    public function admin_notices()
-    {
-    }
-
-
-    public function admin_footer_scripts()
-    {
-    }
-
-
-    public function load_scripts_styles()
-    {
-    }
-
-
-    protected function _installation()
-    {
-        $template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            $template_path,
-            '',
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _resources()
-    {
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _add_settings_metabox($box, $label, array $args)
-    {
-        add_meta_box(
-            "espresso_{$box}_settings",
-            $label,
-            function ($post, $metabox) {
-                echo EEH_Template::display_template(
-                    $metabox['args']['template_path'],
-                    $metabox['args']['template_args'],
-                    true
-                );
-            },
-            $this->_current_screen->id,
-            'normal',
-            'high',
-            apply_filters(
-                "FHEE__Support_Admin_Page___add_settings_metabox__{$box}_args_array",
-                $args
-            )
-        );
-    }
-
-
-    protected function _resources_boxes()
-    {
-        $boxes = apply_filters(
-            'FHEE__Support_Admin_Page___resources_boxes__boxes_array',
-            array(
-                'favorite_theme_developers' => esc_html__('Favorite Theme Developers', 'event_espresso'),
-                'highly_recommended_themes' => esc_html__('Highly Recommended Themes', 'event_espresso'),
-                'hire_developer'            => esc_html__('Hire a Developer', 'event_espresso'),
-                'partners'                  => esc_html__('Partners', 'event_espresso'),
-                'recommended_plugins'       => esc_html__('Recommended Plugins', 'event_espresso'),
-                'other_resources'           => esc_html__('Other Resources', 'event_espresso'),
-            )
-        );
-        foreach ($boxes as $box => $label) {
-            $this->_add_settings_metabox(
-                $box,
-                $label,
-                array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
-                    'template_args' => $this->_template_args,
-                )
-            );
-        }
-    }
-
-
-    protected function _shortcodes()
-    {
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _shortcodes_boxes()
-    {
-        $boxes = apply_filters(
-            'FHEE__Support_Admin_Page___shortcodes_boxes__boxes_array',
-            array(
-                'shortcodes_event_listings'  => esc_html__('Event Listings', 'event_espresso'),
-                'shortcodes_ticket_selector' => esc_html__('Event Ticket Selector', 'event_espresso'),
-                'shortcodes_category'        => esc_html__('Event Categories', 'event_espresso'),
-                'shortcodes_attendee'        => esc_html__('Event Attendees', 'event_espresso')
-                /*'shortcodes_single_events' => esc_html__('Single Events', 'event_espresso'),*/
-                /*'shortcodes_attendee_listings' => esc_html__('Attendee Listings', 'event_espresso'),*/
-            )
-        );
-        foreach ($boxes as $box => $label) {
-            $this->_add_settings_metabox(
-                $box,
-                $label,
-                array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
-                    'template_args' => $this->_template_args,
-                )
-            );
-        }
-    }
-
-
-    protected function _contact_support()
-    {
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _support_boxes()
-    {
-        $boxes = apply_filters(
-            'FHEE__Support_Admin_Page___support_boxes__boxes_array',
-            array(
-                'contact_support'       => esc_html__('Contact Support', 'event_espresso'),
-                'important_information' => esc_html__('Important Information', 'event_espresso'),
-            )
-        );
-        foreach ($boxes as $box => $label) {
-            $this->_add_settings_metabox(
-                $box,
-                $label,
-                array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
-                    'template_args' => $this->_template_args,
-                )
-            );
-        }
-    }
-
-
-    protected function _developers()
-    {
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php',
-            array(),
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
+	protected function _init_page_props()
+	{
+		$this->page_slug = EE_SUPPORT_PG_SLUG;
+		$this->page_label = esc_html__('Help & Support', 'event_espresso');
+		$this->_admin_base_url = EE_SUPPORT_ADMIN_URL;
+		$this->_admin_base_path = EE_SUPPORT_ADMIN;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_labels = array();
+		$this->_admin_page_title = $this->page_label;
+	}
+
+
+	protected function _set_page_routes()
+	{
+		$this->_page_routes = array(
+			'default'    => array(
+				'func'       => '_contact_support',
+				'capability' => 'ee_read_ee',
+			),
+			'developers' => array(
+				'func'       => '_developers',
+				'capability' => 'ee_read_ee',
+			),
+			'shortcodes' => array(
+				'func'       => '_shortcodes',
+				'capability' => 'ee_read_ee',
+			),
+		);
+	}
+
+
+	protected function _set_page_config()
+	{
+		$this->_page_config = array(
+			'default'    => array(
+				'nav'           => array(
+					'label' => esc_html__('Support', 'event_espresso'),
+					'order' => 30,
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_support_boxes')),
+				'require_nonce' => false,
+			),
+			'developers' => array(
+				'nav'           => array(
+					'label' => esc_html__('Developers', 'event_espresso'),
+					'order' => 50,
+				),
+				'metaboxes'     => $this->_default_espresso_metaboxes,
+				'require_nonce' => false,
+			),
+			'shortcodes' => array(
+				'nav'           => array(
+					'label' => esc_html__('Shortcodes', 'event_espresso'),
+					'order' => 60,
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_shortcodes_boxes')),
+				'require_nonce' => false,
+			),
+		);
+	}
+
+
+	// none of the below group are currently used for Support pages
+	protected function _add_screen_options()
+	{
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	public function admin_init()
+	{
+	}
+
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	public function load_scripts_styles()
+	{
+	}
+
+
+	protected function _installation()
+	{
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			$template_path,
+			'',
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _resources()
+	{
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _add_settings_metabox($box, $label, array $args)
+	{
+		add_meta_box(
+			"espresso_{$box}_settings",
+			$label,
+			function ($post, $metabox) {
+				echo EEH_Template::display_template(
+					$metabox['args']['template_path'],
+					$metabox['args']['template_args'],
+					true
+				);
+			},
+			$this->_current_screen->id,
+			'normal',
+			'high',
+			apply_filters(
+				"FHEE__Support_Admin_Page___add_settings_metabox__{$box}_args_array",
+				$args
+			)
+		);
+	}
+
+
+	protected function _resources_boxes()
+	{
+		$boxes = apply_filters(
+			'FHEE__Support_Admin_Page___resources_boxes__boxes_array',
+			array(
+				'favorite_theme_developers' => esc_html__('Favorite Theme Developers', 'event_espresso'),
+				'highly_recommended_themes' => esc_html__('Highly Recommended Themes', 'event_espresso'),
+				'hire_developer'            => esc_html__('Hire a Developer', 'event_espresso'),
+				'partners'                  => esc_html__('Partners', 'event_espresso'),
+				'recommended_plugins'       => esc_html__('Recommended Plugins', 'event_espresso'),
+				'other_resources'           => esc_html__('Other Resources', 'event_espresso'),
+			)
+		);
+		foreach ($boxes as $box => $label) {
+			$this->_add_settings_metabox(
+				$box,
+				$label,
+				array(
+					'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+					'template_args' => $this->_template_args,
+				)
+			);
+		}
+	}
+
+
+	protected function _shortcodes()
+	{
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _shortcodes_boxes()
+	{
+		$boxes = apply_filters(
+			'FHEE__Support_Admin_Page___shortcodes_boxes__boxes_array',
+			array(
+				'shortcodes_event_listings'  => esc_html__('Event Listings', 'event_espresso'),
+				'shortcodes_ticket_selector' => esc_html__('Event Ticket Selector', 'event_espresso'),
+				'shortcodes_category'        => esc_html__('Event Categories', 'event_espresso'),
+				'shortcodes_attendee'        => esc_html__('Event Attendees', 'event_espresso')
+				/*'shortcodes_single_events' => esc_html__('Single Events', 'event_espresso'),*/
+				/*'shortcodes_attendee_listings' => esc_html__('Attendee Listings', 'event_espresso'),*/
+			)
+		);
+		foreach ($boxes as $box => $label) {
+			$this->_add_settings_metabox(
+				$box,
+				$label,
+				array(
+					'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+					'template_args' => $this->_template_args,
+				)
+			);
+		}
+	}
+
+
+	protected function _contact_support()
+	{
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _support_boxes()
+	{
+		$boxes = apply_filters(
+			'FHEE__Support_Admin_Page___support_boxes__boxes_array',
+			array(
+				'contact_support'       => esc_html__('Contact Support', 'event_espresso'),
+				'important_information' => esc_html__('Important Information', 'event_espresso'),
+			)
+		);
+		foreach ($boxes as $box => $label) {
+			$this->_add_settings_metabox(
+				$box,
+				$label,
+				array(
+					'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+					'template_args' => $this->_template_args,
+				)
+			);
+		}
+	}
+
+
+	protected function _developers()
+	{
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php',
+			array(),
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -117,7 +117,7 @@ 
 
     protected function _installation()
     {
-        $template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
+        $template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_installation.template.php';
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
             $template_path,
             '',
@@ -138,7 +138,7 @@ 
         add_meta_box(
             "espresso_{$box}_settings",
             $label,
-            function ($post, $metabox) {
+            function($post, $metabox) {
                 echo EEH_Template::display_template(
                     $metabox['args']['template_path'],
                     $metabox['args']['template_args'],
@@ -174,7 +174,7 @@ 
                 $box,
                 $label,
                 array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH."support_admin_details_{$box}.template.php",
                     'template_args' => $this->_template_args,
                 )
             );
@@ -206,7 +206,7 @@ 
                 $box,
                 $label,
                 array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH."support_admin_details_{$box}.template.php",
                     'template_args' => $this->_template_args,
                 )
             );
@@ -234,7 +234,7 @@ 
                 $box,
                 $label,
                 array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH."support_admin_details_{$box}.template.php",
                     'template_args' => $this->_template_args,
                 )
             );
@@ -245,7 +245,7 @@ 
     protected function _developers()
     {
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php',
+            EE_SUPPORT_ADMIN_TEMPLATE_PATH.'developers_admin_details.template.php',
             array(),
             true
         );

admin_pages/support/templates/support_admin_details_contact_support.template.php

Indentation +54 added lines, -54 removed lines

@@ -3,81 +3,81 @@
 
     <h4>
         <?php esc_html_e(
-            'You may be able to find an answer for your question or concern here:',
-            'event_espresso'
-        ); ?>
+			'You may be able to find an answer for your question or concern here:',
+			'event_espresso'
+		); ?>
     </h4>
     <ol>
         <li><strong><em><?php esc_html_e('A known issue.', 'event_espresso'); ?></em></strong>
             <?php printf(
-                esc_html__(
-                    'Some themes and plugins have %1$sknown conflicts%2$s with Event Espresso. (You can also browse the %3$sEvent Espresso support pages%2$s or %4$sEvent Espresso support forums%2$s to see if other members have experienced and solved the problem.)',
-                    'event_espresso'
-                ),
-                '<a href="https://eventespresso.com/wiki/known-third-party-plugin-theme-conflicts/" target="_blank">',
-                '</a>',
-                '<a href="https://eventespresso.com/support/documentation/versioned-docs/?doc_ver=ee4" target="_blank">',
-                '<a href="https://eventespresso.com/support/forums/" target="_blank">'
-            ); ?></li>
+				esc_html__(
+					'Some themes and plugins have %1$sknown conflicts%2$s with Event Espresso. (You can also browse the %3$sEvent Espresso support pages%2$s or %4$sEvent Espresso support forums%2$s to see if other members have experienced and solved the problem.)',
+					'event_espresso'
+				),
+				'<a href="https://eventespresso.com/wiki/known-third-party-plugin-theme-conflicts/" target="_blank">',
+				'</a>',
+				'<a href="https://eventespresso.com/support/documentation/versioned-docs/?doc_ver=ee4" target="_blank">',
+				'<a href="https://eventespresso.com/support/forums/" target="_blank">'
+			); ?></li>
         <li><strong><em><?php esc_html_e('A plugin conflict.', 'event_espresso'); ?></em></strong>
             <?php esc_html_e(
-                'You can check to see if there is a plugin conflict by temporarily deactivating all plugins except for Event Espresso. If the problem goes away, then reactivate your plugins one by one until the issue returns. This will help you pinpoint the source of the conflict.',
-                'event_espresso'
-            ); ?></li>
+				'You can check to see if there is a plugin conflict by temporarily deactivating all plugins except for Event Espresso. If the problem goes away, then reactivate your plugins one by one until the issue returns. This will help you pinpoint the source of the conflict.',
+				'event_espresso'
+			); ?></li>
         <li>
             <strong><em><?php esc_html_e('A theme conflict.', 'event_espresso'); ?></em></strong>
             <?php
-            $default_theme = wp_get_theme(WP_DEFAULT_THEME);
+			$default_theme = wp_get_theme(WP_DEFAULT_THEME);
 
-            if ($default_theme->exists()) {
-                printf(
-                    esc_html__(
-                        'If your problem is not a known issue or caused by a plugin, then try activating %s (the default WordPress theme).',
-                        'event_espresso'
-                    ),
-                    $default_theme->get('Name')
-                );
-            } else {
-                esc_html_e(
-                    'If your problem is not a known issue or caused by a plugin, then try activating the default WordPress theme.',
-                    'event_espresso'
-                );
-            }
-            ?>
+			if ($default_theme->exists()) {
+				printf(
+					esc_html__(
+						'If your problem is not a known issue or caused by a plugin, then try activating %s (the default WordPress theme).',
+						'event_espresso'
+					),
+					$default_theme->get('Name')
+				);
+			} else {
+				esc_html_e(
+					'If your problem is not a known issue or caused by a plugin, then try activating the default WordPress theme.',
+					'event_espresso'
+				);
+			}
+			?>
             <?php esc_html_e(
-                'If this solves the problem for you, then something in your theme is causing this issue. Check to see if an update is available for your WordPress theme or reach out to the theme author.',
-                'event_espresso'
-            ); ?>
+				'If this solves the problem for you, then something in your theme is causing this issue. Check to see if an update is available for your WordPress theme or reach out to the theme author.',
+				'event_espresso'
+			); ?>
         </li>
     </ol>
 
     <p>
         <?php esc_html_e(
-            'If none of the suggestions above help you find a solution, then feel free to reach out to the support team at Event Espresso.',
-            'event_espresso'
-        ); ?></p>
+			'If none of the suggestions above help you find a solution, then feel free to reach out to the support team at Event Espresso.',
+			'event_espresso'
+		); ?></p>
     <p>
         <?php printf(
-            esc_html__(
-                'Login to your account on EventEspresso.com and %1$screate a support post in our member support forums%2$s. Use a %3$sclear and descriptive title%4$s in your support post, %3$sdescribe the issue to the best of your knowledge%4$s, and %3$snever post any sensitive information such as login details%4$s. Be sure to also include %5$simportant information in the section below%2$s about your WordPress site.',
-                'event_espresso'
-            ),
-            '<a href="https://eventespresso.com/support/forums/" target="_blank">',
-            '</a>',
-            '<strong>',
-            '</strong>',
-            '<a href="#espresso_important_information_settings">'
-        ); ?></p>
+			esc_html__(
+				'Login to your account on EventEspresso.com and %1$screate a support post in our member support forums%2$s. Use a %3$sclear and descriptive title%4$s in your support post, %3$sdescribe the issue to the best of your knowledge%4$s, and %3$snever post any sensitive information such as login details%4$s. Be sure to also include %5$simportant information in the section below%2$s about your WordPress site.',
+				'event_espresso'
+			),
+			'<a href="https://eventespresso.com/support/forums/" target="_blank">',
+			'</a>',
+			'<strong>',
+			'</strong>',
+			'<a href="#espresso_important_information_settings">'
+		); ?></p>
 
     <h4><?php esc_html_e('Have an emergency?', 'event_espresso'); ?></h4>
 
     <p>
         <?php printf(
-            esc_html__(
-                'We offer support tokens to members that need help with a time-sensitive issue. A support token will provide you with up to 30 minutes of one-on-one time with a team member at Event Espresso. If you have an emergency and need help quickly, then please %1$spurchase a support token%2$s.',
-                'event_espresso'
-            ),
-            '<a href="https://eventespresso.com/product/premium-support-token/?utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=help_support_tab&utm_content=support_token" target="_blank">',
-            '</a>'
-        ); ?></p>
+			esc_html__(
+				'We offer support tokens to members that need help with a time-sensitive issue. A support token will provide you with up to 30 minutes of one-on-one time with a team member at Event Espresso. If you have an emergency and need help quickly, then please %1$spurchase a support token%2$s.',
+				'event_espresso'
+			),
+			'<a href="https://eventespresso.com/product/premium-support-token/?utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=help_support_tab&utm_content=support_token" target="_blank">',
+			'</a>'
+		); ?></p>
 </div>
\ No newline at end of file

admin_pages/support/templates/support_admin_details_shortcodes_attendee.template.php

Indentation +13 added lines, -13 removed lines

@@ -9,9 +9,9 @@ 
             <strong>[ESPRESSO_EVENT_ATTENDEES]</strong><br>
             <p class="description">
                 <?php _e(
-                    'With no parameters, this shows the attendees for the earliest active event, or if no active event, the earliest upcoming event.  If it is used in Event Description, then it will show the attendees for that event.',
-                    'event_espresso'
-                ); ?>
+					'With no parameters, this shows the attendees for the earliest active event, or if no active event, the earliest upcoming event.  If it is used in Event Description, then it will show the attendees for that event.',
+					'event_espresso'
+				); ?>
             </p>
             <br>
         </li>
@@ -40,18 +40,18 @@ 
             <strong>[ESPRESSO_EVENT_ATTENDEES status=RAP]</strong><br>
             <p class="description">
                 <?php _e(
-                    'You can list attendees that have a specific registration status (use status code) or use "all" to return all attendees regardless of status.  Default when you don\'t have this parameter set is to only return attendees attached to approved contacts.',
-                    'event_espresso'
-                ); ?>
+					'You can list attendees that have a specific registration status (use status code) or use "all" to return all attendees regardless of status.  Default when you don\'t have this parameter set is to only return attendees attached to approved contacts.',
+					'event_espresso'
+				); ?>
             </p>
             <p>
                 <?php _e('The statuses you can use are:', 'event_espresso'); ?>
                 <br>
                 <?php
-                foreach (EEM_Registration::reg_status_array(array(), true) as $status_code => $status_label) {
-                    echo '<strong>' . $status_code . ':</strong>' . ' ' . $status_label . '<br>';
-                }
-                ?>
+				foreach (EEM_Registration::reg_status_array(array(), true) as $status_code => $status_label) {
+					echo '<strong>' . $status_code . ':</strong>' . ' ' . $status_label . '<br>';
+				}
+				?>
 
             </p>
             <br>
@@ -60,9 +60,9 @@ 
             <strong>[ESPRESSO_EVENT_ATTENDEES display_on_archives=true]</strong><br>
             <p class="description">
                 <?php _e(
-                    'Will display the attendees list when events are viewed on archive pages.',
-                    'event_espresso'
-                ); ?>
+					'Will display the attendees list when events are viewed on archive pages.',
+					'event_espresso'
+				); ?>
             </p>
             <br>
         </li>

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
                 <br>
                 <?php
                 foreach (EEM_Registration::reg_status_array(array(), true) as $status_code => $status_label) {
-                    echo '<strong>' . $status_code . ':</strong>' . ' ' . $status_label . '<br>';
+                    echo '<strong>'.$status_code.':</strong>'.' '.$status_label.'<br>';
                 }
                 ?>