eventespresso / event-espresso-core

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'];
                         }
                     }
                 }

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>';
                 }
                 ?>
 

admin_pages/support/templates/support_admin_details_shortcodes_event_listings.template.php

Indentation +25 added lines, -25 removed lines

@@ -1,16 +1,16 @@ 
 <div class="padding">
     <p>
         <?php esc_html_e(
-            'Displays a list of events based on a set of criteria on a WordPress page or post. Unless otherwise specified, events are sorted by start date.',
-            'event_espresso'
-        ); ?><?php echo sprintf(
-            esc_html__(
-                'For a full list of available shortcodes, please view the %sshortcode documentation%s on our website.',
-                'event_espresso'
-            ),
-            '<a href="https://eventespresso.com/wiki/ee4-shortcodes-template-variables/">',
-            '</a>'
-        ); ?>
+			'Displays a list of events based on a set of criteria on a WordPress page or post. Unless otherwise specified, events are sorted by start date.',
+			'event_espresso'
+		); ?><?php echo sprintf(
+			esc_html__(
+				'For a full list of available shortcodes, please view the %sshortcode documentation%s on our website.',
+				'event_espresso'
+			),
+			'<a href="https://eventespresso.com/wiki/ee4-shortcodes-template-variables/">',
+			'</a>'
+		); ?>
     </p>
     <ul>
         <li><strong><?php esc_html_e('Show a list of all of your events', 'event_espresso'); ?></strong><br/>
@@ -21,15 +21,15 @@ 
         </li>
         <li><strong>
                 <?php esc_html_e(
-                    'Don\'t display a title/heading before the event list',
-                    'event_espresso'
-                ); ?></strong><br/> [ESPRESSO_EVENTS show_title=false]
+					'Don\'t display a title/heading before the event list',
+					'event_espresso'
+				); ?></strong><br/> [ESPRESSO_EVENTS show_title=false]
         </li>
         <li><strong>
                 <?php esc_html_e(
-                    'Limit (paginate) the number of events that are shown in the event list on a page or post',
-                    'event_espresso'
-                ); ?></strong><br/>[ESPRESSO_EVENTS limit=5]
+					'Limit (paginate) the number of events that are shown in the event list on a page or post',
+					'event_espresso'
+				); ?></strong><br/>[ESPRESSO_EVENTS limit=5]
         </li>
         <li><strong>
                 <?php esc_html_e('Add a custom CSS class to each event post/article', 'event_espresso'); ?></strong><br/>
@@ -52,19 +52,19 @@ 
         </li>
         <li><strong>
                 <?php esc_html_e(
-                    'Order the event list by a specific set of parameters (refer to available options below)',
-                    'event_espresso'
-                ); ?></strong><br/>[ESPRESSO_EVENTS order_by=start_date,id]
+					'Order the event list by a specific set of parameters (refer to available options below)',
+					'event_espresso'
+				); ?></strong><br/>[ESPRESSO_EVENTS order_by=start_date,id]
         </li>
     </ul>
     <p>
         <?php echo sprintf(
-            esc_html__(
-                'These parameters (options) are available for the %s shortcode parameter above. Multiple parameters should be separated by a comma.',
-                'event_espresso'
-            ),
-            'order_by'
-        ); ?>
+			esc_html__(
+				'These parameters (options) are available for the %s shortcode parameter above. Multiple parameters should be separated by a comma.',
+				'event_espresso'
+			),
+			'order_by'
+		); ?>
     </p>
     id<br/>
     start_date<br/>

admin_pages/support/templates/support_admin_details_installation.template.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <div class="padding">
     <!-- <p><?php _e(
-        'Download the <a href="https://eventespresso.com/wp-content/plugins/download-monitor/download.php?id=2">Installation Guide</a> as a PDF',
-        'event_espresso'
-    ); ?></p> -->
+		'Download the <a href="https://eventespresso.com/wp-content/plugins/download-monitor/download.php?id=2">Installation Guide</a> as a PDF',
+		'event_espresso'
+	); ?></p> -->
     <p>
         <?php _e('For the latest installation instructions please visit:', 'event_espresso'); ?>
         <a href="https://eventespresso.com/wiki/installing-event-espresso/" target="_blank">https://eventespresso.com/wiki/installing-event-espresso/</a>

admin_pages/support/templates/support_admin_details_important_information.template.php

Indentation +43 added lines, -43 removed lines

@@ -1,50 +1,50 @@ 
 <div class="padding">
     <?php
-    global $wpdb, $wp_version;
-    $wp_req_version = '3.1';
-    $php_req_version = '5.2';
-    $mysql_req_version = '5.0';
-    $is_php_valid = version_compare(phpversion(), $php_req_version, '>');
-    $is_mysql_valid = version_compare($wpdb->db_version(), $mysql_req_version, '>');
+	global $wpdb, $wp_version;
+	$wp_req_version = '3.1';
+	$php_req_version = '5.2';
+	$mysql_req_version = '5.0';
+	$is_php_valid = version_compare(phpversion(), $php_req_version, '>');
+	$is_mysql_valid = version_compare($wpdb->db_version(), $mysql_req_version, '>');
 
-    if (! version_compare($wp_version, $wp_req_version, '>=')) {
-        echo '<p class="red_alert">'
-             . __(
-                 'This version of Event Espresso requires WordPress version',
-                 'event_espresso'
-             ) . ' ' . $wp_req_version . '+. '
-             . __(
-                 'Please upgrade to the latest version of WordPress.',
-                 'event_espresso'
-             ) . '</p>';
-    }
-    if (! $is_php_valid) {
-        echo '<p class="red_alert">'
-             . __(
-                 'Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:',
-                 'event_espresso'
-             ) . ' ' . $php_req_version . '</p>';
-    }
-    if (! $is_mysql_valid) {
-        echo '<p class="red_alert">'
-             . __(
-                 'Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:',
-                 'event_espresso'
-             ) . ' ' . $mysql_req_version . '</p>';
-    }
+	if (! version_compare($wp_version, $wp_req_version, '>=')) {
+		echo '<p class="red_alert">'
+			 . __(
+				 'This version of Event Espresso requires WordPress version',
+				 'event_espresso'
+			 ) . ' ' . $wp_req_version . '+. '
+			 . __(
+				 'Please upgrade to the latest version of WordPress.',
+				 'event_espresso'
+			 ) . '</p>';
+	}
+	if (! $is_php_valid) {
+		echo '<p class="red_alert">'
+			 . __(
+				 'Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:',
+				 'event_espresso'
+			 ) . ' ' . $php_req_version . '</p>';
+	}
+	if (! $is_mysql_valid) {
+		echo '<p class="red_alert">'
+			 . __(
+				 'Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:',
+				 'event_espresso'
+			 ) . ' ' . $mysql_req_version . '</p>';
+	}
 
-    $query_args = array(
-        'page'   => 'espresso_maintenance_settings',
-        'action' => 'system_status',
-    );
-    $system_status_link = EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php'));
+	$query_args = array(
+		'page'   => 'espresso_maintenance_settings',
+		'action' => 'system_status',
+	);
+	$system_status_link = EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php'));
 
-    ?>
+	?>
     <a href="<?php echo $system_status_link; ?>" class="button-secondary right">
         <?php _e(
-            'System Information',
-            'event_espresso'
-        ); ?></a>
+			'System Information',
+			'event_espresso'
+		); ?></a>
     <div class="localhost-information">
         <p><strong><?php esc_html_e('WordPress Version:', 'event_espresso'); ?></strong>&nbsp;<?php echo $wp_version; ?>
         </p>
@@ -52,9 +52,9 @@ 
         <p><strong><?php esc_html_e('MySQL Version:', 'event_espresso'); ?></strong>&nbsp;<?php echo $wpdb->db_version(); ?></p>
         <p><strong>
                 <?php esc_html_e(
-                    'Event Espresso Version:',
-                    'event_espresso'
-                ); ?></strong>&nbsp;<?php echo EVENT_ESPRESSO_VERSION ?></p>
+					'Event Espresso Version:',
+					'event_espresso'
+				); ?></strong>&nbsp;<?php echo EVENT_ESPRESSO_VERSION ?></p>
         <p><strong><?php esc_html_e('WordPress Address (URL):', 'event_espresso'); ?></strong>&nbsp;<?php echo site_url(); ?></p>
         <p><strong><?php esc_html_e('Site address (URL):', 'event_espresso'); ?></strong>&nbsp;<?php echo home_url(); ?>
     </div>

Spacing +7 added lines, -7 removed lines

@@ -7,30 +7,30 @@
     $is_php_valid = version_compare(phpversion(), $php_req_version, '>');
     $is_mysql_valid = version_compare($wpdb->db_version(), $mysql_req_version, '>');
 
-    if (! version_compare($wp_version, $wp_req_version, '>=')) {
+    if ( ! version_compare($wp_version, $wp_req_version, '>=')) {
         echo '<p class="red_alert">'
              . __(
                  'This version of Event Espresso requires WordPress version',
                  'event_espresso'
-             ) . ' ' . $wp_req_version . '+. '
+             ).' '.$wp_req_version.'+. '
              . __(
                  'Please upgrade to the latest version of WordPress.',
                  'event_espresso'
-             ) . '</p>';
+             ).'</p>';
     }
-    if (! $is_php_valid) {
+    if ( ! $is_php_valid) {
         echo '<p class="red_alert">'
              . __(
                  'Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:',
                  'event_espresso'
-             ) . ' ' . $php_req_version . '</p>';
+             ).' '.$php_req_version.'</p>';
     }
-    if (! $is_mysql_valid) {
+    if ( ! $is_mysql_valid) {
         echo '<p class="red_alert">'
              . __(
                  'Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:',
                  'event_espresso'
-             ) . ' ' . $mysql_req_version . '</p>';
+             ).' '.$mysql_req_version.'</p>';
     }
 
     $query_args = array(