eventespresso / event-espresso-core

core/admin/EE_Admin_List_Table.core.php

Indentation +834 added lines, -834 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (! class_exists('WP_List_Table')) {
-    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 
@@ -20,847 +20,847 @@ 
 abstract class EE_Admin_List_Table extends WP_List_Table
 {
 
-    /**
-     * holds the data that will be processed for the table
-     *
-     * @var array $_data
-     */
-    protected $_data;
-
-
-    /**
-     * This holds the value of all the data available for the given view (for all pages).
-     *
-     * @var int $_all_data_count
-     */
-    protected $_all_data_count;
-
-
-    /**
-     * Will contain the count of trashed items for the view label.
-     *
-     * @var int $_trashed_count
-     */
-    protected $_trashed_count;
-
-
-    /**
-     * This is what will be referenced as the slug for the current screen
-     *
-     * @var string $_screen
-     */
-    protected $_screen;
-
-
-    /**
-     * this is the EE_Admin_Page object
-     *
-     * @var EE_Admin_Page $_admin_page
-     */
-    protected $_admin_page;
-
-
-    /**
-     * The current view
-     *
-     * @var string $_view
-     */
-    protected $_view;
-
-
-    /**
-     * array of possible views for this table
-     *
-     * @var array $_views
-     */
-    protected $_views;
-
-
-    /**
-     * An array of key => value pairs containing information about the current table
-     * array(
-     *        'plural' => 'plural label',
-     *        'singular' => 'singular label',
-     *        'ajax' => false, //whether to use ajax or not
-     *        'screen' => null, //string used to reference what screen this is
-     *        (WP_List_table converts to screen object)
-     * )
-     *
-     * @var array $_wp_list_args
-     */
-    protected $_wp_list_args;
-
-    /**
-     * an array of column names
-     * array(
-     *    'internal-name' => 'Title'
-     * )
-     *
-     * @var array $_columns
-     */
-    protected $_columns;
-
-    /**
-     * An array of sortable columns
-     * array(
-     *    'internal-name' => 'orderby' //or
-     *    'internal-name' => array( 'orderby', true )
-     * )
-     *
-     * @var array $_sortable_columns
-     */
-    protected $_sortable_columns;
-
-    /**
-     * callback method used to perform AJAX row reordering
-     *
-     * @var string $_ajax_sorting_callback
-     */
-    protected $_ajax_sorting_callback;
-
-    /**
-     * An array of hidden columns (if needed)
-     * array('internal-name', 'internal-name')
-     *
-     * @var array $_hidden_columns
-     */
-    protected $_hidden_columns;
-
-    /**
-     * holds the per_page value
-     *
-     * @var int $_per_page
-     */
-    protected $_per_page;
-
-    /**
-     * holds what page number is currently being viewed
-     *
-     * @var int $_current_page
-     */
-    protected $_current_page;
-
-    /**
-     * the reference string for the nonce_action
-     *
-     * @var string $_nonce_action_ref
-     */
-    protected $_nonce_action_ref;
-
-    /**
-     * property to hold incoming request data (as set by the admin_page_core)
-     *
-     * @var array $_req_data
-     */
-    protected $_req_data;
-
-
-    /**
-     * yes / no array for admin form fields
-     *
-     * @var array $_yes_no
-     */
-    protected $_yes_no = array();
-
-    /**
-     * Array describing buttons that should appear at the bottom of the page
-     * Keys are strings that represent the button's function (specifically a key in _labels['buttons']),
-     * and the values are another array with the following keys
-     * array(
-     *    'route' => 'page_route',
-     *    'extra_request' => array('evt_id' => 1 ); //extra request vars that need to be included in the button.
-     * )
-     *
-     * @var array $_bottom_buttons
-     */
-    protected $_bottom_buttons = array();
-
-
-    /**
-     * Used to indicate what should be the primary column for the list table.
-     * If not present then falls back to what WP calculates
-     * as the primary column.
-     *
-     * @type string $_primary_column
-     */
-    protected $_primary_column = '';
-
-
-    /**
-     * Used to indicate whether the table has a checkbox column or not.
-     *
-     * @type bool $_has_checkbox_column
-     */
-    protected $_has_checkbox_column = false;
-
-
-    /**
-     * @param \EE_Admin_Page $admin_page we use this for obtaining everything we need in the list table
-     */
-    public function __construct(EE_Admin_Page $admin_page)
-    {
-        $this->_admin_page = $admin_page;
-        $this->_req_data = $this->_admin_page->get_request_data();
-        $this->_view = $this->_admin_page->get_view();
-        $this->_views = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
-        $this->_current_page = $this->get_pagenum();
-        $this->_screen = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view();
-        $this->_yes_no = array(__('No', 'event_espresso'), __('Yes', 'event_espresso'));
-
-        $this->_per_page = $this->get_items_per_page($this->_screen . '_per_page', 20);
-
-        $this->_setup_data();
-        $this->_add_view_counts();
-
-        $this->_nonce_action_ref = $this->_view;
-
-        $this->_set_properties();
-
-        // set primary column
-        add_filter('list_table_primary_column', array($this, 'set_primary_column'));
-
-        // set parent defaults
-        parent::__construct($this->_wp_list_args);
-
-        $this->prepare_items();
-    }
-
-
-    /**
-     * _setup_data
-     * this method is used to setup the $_data, $_all_data_count, and _per_page properties
-     *
-     * @uses $this->_admin_page
-     * @return void
-     */
-    abstract protected function _setup_data();
-
-
-    /**
-     * set the properties that this class needs to be able to execute wp_list_table properly
-     * properties set:
-     * _wp_list_args = what the arguments required for the parent _wp_list_table.
-     * _columns = set the columns in an array.
-     * _sortable_columns = columns that are sortable (array).
-     * _hidden_columns = columns that are hidden (array)
-     * _default_orderby = the default orderby for sorting.
-     *
-     * @abstract
-     * @access protected
-     * @return void
-     */
-    abstract protected function _set_properties();
-
-
-    /**
-     * _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
-     */
-    abstract protected function _get_table_filters();
-
-
-    /**
-     * this is a method that child class will do to add counts to the views array so when views are displayed the
-     * counts of the views is accurate.
-     *
-     * @abstract
-     * @access protected
-     * @return void
-     */
-    abstract protected function _add_view_counts();
-
-
-    /**
-     * _get_hidden_fields
-     * returns a html string of hidden fields so if any table filters are used the current view will be respected.
-     *
-     * @return string
-     */
-    protected function _get_hidden_fields()
-    {
-        $action = isset($this->_req_data['route']) ? $this->_req_data['route'] : '';
-        $action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action;
-        // if action is STILL empty, then we set it to default
-        $action = empty($action) ? 'default' : $action;
-        $field = '<input type="hidden" name="page" value="' . $this->_req_data['page'] . '" />' . "\n";
-        $field .= '<input type="hidden" name="route" value="' . $action . '" />' . "\n";/**/
-        $field .= '<input type="hidden" name="perpage" value="' . $this->_per_page . '" />' . "\n";
-
-        $bulk_actions = $this->_get_bulk_actions();
-        foreach ($bulk_actions as $bulk_action => $label) {
-            $field .= '<input type="hidden" name="' . $bulk_action . '_nonce"'
-                      . ' value="' . wp_create_nonce($bulk_action . '_nonce') . '" />' . "\n";
-        }
-
-        return $field;
-    }
-
-
-    /**
-     * _set_column_info
-     * we're using this to set the column headers property.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _set_column_info()
-    {
-        $columns = $this->get_columns();
-        $hidden = $this->get_hidden_columns();
-        $_sortable = $this->get_sortable_columns();
-
-        /**
-         * Dynamic hook allowing for adding sortable columns in this list table.
-         * Note that $this->screen->id is in the format
-         * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
-         * table it is: event-espresso_page_espresso_messages.
-         * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
-         * hook prefix ("event-espresso") will be different.
-         *
-         * @var array
-         */
-        $_sortable = apply_filters("FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen);
-
-        $sortable = array();
-        foreach ($_sortable as $id => $data) {
-            if (empty($data)) {
-                continue;
-            }
-            // fix for offset errors with WP_List_Table default get_columninfo()
-            if (is_array($data)) {
-                $_data[0] = key($data);
-                $_data[1] = isset($data[1]) ? $data[1] : false;
-            } else {
-                $_data[0] = $data;
-            }
-
-            $data = (array) $data;
-
-            if (! isset($data[1])) {
-                $_data[1] = false;
-            }
-
-            $sortable[ $id ] = $_data;
-        }
-        $primary = $this->get_primary_column_name();
-        $this->_column_headers = array($columns, $hidden, $sortable, $primary);
-    }
-
-
-    /**
-     * Added for WP4.1 backward compat (@see https://events.codebasehq.com/projects/event-espresso/tickets/8814)
-     *
-     * @return string
-     */
-    protected function get_primary_column_name()
-    {
-        foreach (class_parents($this) as $parent) {
-            if ($parent === 'WP_List_Table' && method_exists($parent, 'get_primary_column_name')) {
-                return parent::get_primary_column_name();
-            }
-        }
-        return $this->_primary_column;
-    }
-
-
-    /**
-     * Added for WP4.1 backward compat (@see https://events.codebasehq.com/projects/event-espresso/tickets/8814)
-     *
-     * @param EE_Base_Class $item
-     * @param string        $column_name
-     * @param string        $primary
-     * @return string
-     */
-    protected function handle_row_actions($item, $column_name, $primary)
-    {
-        foreach (class_parents($this) as $parent) {
-            if ($parent === 'WP_List_Table' && method_exists($parent, 'handle_row_actions')) {
-                return parent::handle_row_actions($item, $column_name, $primary);
-            }
-        }
-        return '';
-    }
-
-
-    /**
-     * _get_bulk_actions
-     * This is a wrapper called by WP_List_Table::get_bulk_actions()
-     *
-     * @access protected
-     * @return array bulk_actions
-     */
-    protected function _get_bulk_actions()
-    {
-        $actions = array();
-        // the _views property should have the bulk_actions, so let's go through and extract them into a properly
-        // formatted array for the wp_list_table();
-        foreach ($this->_views as $view => $args) {
-            if ($this->_view === $view && isset($args['bulk_action']) && is_array($args['bulk_action'])) {
-                // each bulk action will correspond with a admin page route, so we can check whatever the capability is
-                // for that page route and skip adding the bulk action if no access for the current logged in user.
-                foreach ($args['bulk_action'] as $route => $label) {
-                    if ($this->_admin_page->check_user_access($route, true)) {
-                        $actions[ $route ] = $label;
-                    }
-                }
-            }
-        }
-        return $actions;
-    }
-
-
-    /**
-     * Generate the table navigation above or below the table.
-     * Overrides the parent table nav in WP_List_Table so we can hide the bulk action div if there are no bulk actions.
-     *
-     * @since 4.9.44.rc.001
-     */
-    public function display_tablenav($which)
-    {
-        if ('top' === $which) {
-            wp_nonce_field('bulk-' . $this->_args['plural']);
-        }
-        ?>
+	/**
+	 * holds the data that will be processed for the table
+	 *
+	 * @var array $_data
+	 */
+	protected $_data;
+
+
+	/**
+	 * This holds the value of all the data available for the given view (for all pages).
+	 *
+	 * @var int $_all_data_count
+	 */
+	protected $_all_data_count;
+
+
+	/**
+	 * Will contain the count of trashed items for the view label.
+	 *
+	 * @var int $_trashed_count
+	 */
+	protected $_trashed_count;
+
+
+	/**
+	 * This is what will be referenced as the slug for the current screen
+	 *
+	 * @var string $_screen
+	 */
+	protected $_screen;
+
+
+	/**
+	 * this is the EE_Admin_Page object
+	 *
+	 * @var EE_Admin_Page $_admin_page
+	 */
+	protected $_admin_page;
+
+
+	/**
+	 * The current view
+	 *
+	 * @var string $_view
+	 */
+	protected $_view;
+
+
+	/**
+	 * array of possible views for this table
+	 *
+	 * @var array $_views
+	 */
+	protected $_views;
+
+
+	/**
+	 * An array of key => value pairs containing information about the current table
+	 * array(
+	 *        'plural' => 'plural label',
+	 *        'singular' => 'singular label',
+	 *        'ajax' => false, //whether to use ajax or not
+	 *        'screen' => null, //string used to reference what screen this is
+	 *        (WP_List_table converts to screen object)
+	 * )
+	 *
+	 * @var array $_wp_list_args
+	 */
+	protected $_wp_list_args;
+
+	/**
+	 * an array of column names
+	 * array(
+	 *    'internal-name' => 'Title'
+	 * )
+	 *
+	 * @var array $_columns
+	 */
+	protected $_columns;
+
+	/**
+	 * An array of sortable columns
+	 * array(
+	 *    'internal-name' => 'orderby' //or
+	 *    'internal-name' => array( 'orderby', true )
+	 * )
+	 *
+	 * @var array $_sortable_columns
+	 */
+	protected $_sortable_columns;
+
+	/**
+	 * callback method used to perform AJAX row reordering
+	 *
+	 * @var string $_ajax_sorting_callback
+	 */
+	protected $_ajax_sorting_callback;
+
+	/**
+	 * An array of hidden columns (if needed)
+	 * array('internal-name', 'internal-name')
+	 *
+	 * @var array $_hidden_columns
+	 */
+	protected $_hidden_columns;
+
+	/**
+	 * holds the per_page value
+	 *
+	 * @var int $_per_page
+	 */
+	protected $_per_page;
+
+	/**
+	 * holds what page number is currently being viewed
+	 *
+	 * @var int $_current_page
+	 */
+	protected $_current_page;
+
+	/**
+	 * the reference string for the nonce_action
+	 *
+	 * @var string $_nonce_action_ref
+	 */
+	protected $_nonce_action_ref;
+
+	/**
+	 * property to hold incoming request data (as set by the admin_page_core)
+	 *
+	 * @var array $_req_data
+	 */
+	protected $_req_data;
+
+
+	/**
+	 * yes / no array for admin form fields
+	 *
+	 * @var array $_yes_no
+	 */
+	protected $_yes_no = array();
+
+	/**
+	 * Array describing buttons that should appear at the bottom of the page
+	 * Keys are strings that represent the button's function (specifically a key in _labels['buttons']),
+	 * and the values are another array with the following keys
+	 * array(
+	 *    'route' => 'page_route',
+	 *    'extra_request' => array('evt_id' => 1 ); //extra request vars that need to be included in the button.
+	 * )
+	 *
+	 * @var array $_bottom_buttons
+	 */
+	protected $_bottom_buttons = array();
+
+
+	/**
+	 * Used to indicate what should be the primary column for the list table.
+	 * If not present then falls back to what WP calculates
+	 * as the primary column.
+	 *
+	 * @type string $_primary_column
+	 */
+	protected $_primary_column = '';
+
+
+	/**
+	 * Used to indicate whether the table has a checkbox column or not.
+	 *
+	 * @type bool $_has_checkbox_column
+	 */
+	protected $_has_checkbox_column = false;
+
+
+	/**
+	 * @param \EE_Admin_Page $admin_page we use this for obtaining everything we need in the list table
+	 */
+	public function __construct(EE_Admin_Page $admin_page)
+	{
+		$this->_admin_page = $admin_page;
+		$this->_req_data = $this->_admin_page->get_request_data();
+		$this->_view = $this->_admin_page->get_view();
+		$this->_views = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
+		$this->_current_page = $this->get_pagenum();
+		$this->_screen = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view();
+		$this->_yes_no = array(__('No', 'event_espresso'), __('Yes', 'event_espresso'));
+
+		$this->_per_page = $this->get_items_per_page($this->_screen . '_per_page', 20);
+
+		$this->_setup_data();
+		$this->_add_view_counts();
+
+		$this->_nonce_action_ref = $this->_view;
+
+		$this->_set_properties();
+
+		// set primary column
+		add_filter('list_table_primary_column', array($this, 'set_primary_column'));
+
+		// set parent defaults
+		parent::__construct($this->_wp_list_args);
+
+		$this->prepare_items();
+	}
+
+
+	/**
+	 * _setup_data
+	 * this method is used to setup the $_data, $_all_data_count, and _per_page properties
+	 *
+	 * @uses $this->_admin_page
+	 * @return void
+	 */
+	abstract protected function _setup_data();
+
+
+	/**
+	 * set the properties that this class needs to be able to execute wp_list_table properly
+	 * properties set:
+	 * _wp_list_args = what the arguments required for the parent _wp_list_table.
+	 * _columns = set the columns in an array.
+	 * _sortable_columns = columns that are sortable (array).
+	 * _hidden_columns = columns that are hidden (array)
+	 * _default_orderby = the default orderby for sorting.
+	 *
+	 * @abstract
+	 * @access protected
+	 * @return void
+	 */
+	abstract protected function _set_properties();
+
+
+	/**
+	 * _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
+	 */
+	abstract protected function _get_table_filters();
+
+
+	/**
+	 * this is a method that child class will do to add counts to the views array so when views are displayed the
+	 * counts of the views is accurate.
+	 *
+	 * @abstract
+	 * @access protected
+	 * @return void
+	 */
+	abstract protected function _add_view_counts();
+
+
+	/**
+	 * _get_hidden_fields
+	 * returns a html string of hidden fields so if any table filters are used the current view will be respected.
+	 *
+	 * @return string
+	 */
+	protected function _get_hidden_fields()
+	{
+		$action = isset($this->_req_data['route']) ? $this->_req_data['route'] : '';
+		$action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action;
+		// if action is STILL empty, then we set it to default
+		$action = empty($action) ? 'default' : $action;
+		$field = '<input type="hidden" name="page" value="' . $this->_req_data['page'] . '" />' . "\n";
+		$field .= '<input type="hidden" name="route" value="' . $action . '" />' . "\n";/**/
+		$field .= '<input type="hidden" name="perpage" value="' . $this->_per_page . '" />' . "\n";
+
+		$bulk_actions = $this->_get_bulk_actions();
+		foreach ($bulk_actions as $bulk_action => $label) {
+			$field .= '<input type="hidden" name="' . $bulk_action . '_nonce"'
+					  . ' value="' . wp_create_nonce($bulk_action . '_nonce') . '" />' . "\n";
+		}
+
+		return $field;
+	}
+
+
+	/**
+	 * _set_column_info
+	 * we're using this to set the column headers property.
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _set_column_info()
+	{
+		$columns = $this->get_columns();
+		$hidden = $this->get_hidden_columns();
+		$_sortable = $this->get_sortable_columns();
+
+		/**
+		 * Dynamic hook allowing for adding sortable columns in this list table.
+		 * Note that $this->screen->id is in the format
+		 * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
+		 * table it is: event-espresso_page_espresso_messages.
+		 * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
+		 * hook prefix ("event-espresso") will be different.
+		 *
+		 * @var array
+		 */
+		$_sortable = apply_filters("FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen);
+
+		$sortable = array();
+		foreach ($_sortable as $id => $data) {
+			if (empty($data)) {
+				continue;
+			}
+			// fix for offset errors with WP_List_Table default get_columninfo()
+			if (is_array($data)) {
+				$_data[0] = key($data);
+				$_data[1] = isset($data[1]) ? $data[1] : false;
+			} else {
+				$_data[0] = $data;
+			}
+
+			$data = (array) $data;
+
+			if (! isset($data[1])) {
+				$_data[1] = false;
+			}
+
+			$sortable[ $id ] = $_data;
+		}
+		$primary = $this->get_primary_column_name();
+		$this->_column_headers = array($columns, $hidden, $sortable, $primary);
+	}
+
+
+	/**
+	 * Added for WP4.1 backward compat (@see https://events.codebasehq.com/projects/event-espresso/tickets/8814)
+	 *
+	 * @return string
+	 */
+	protected function get_primary_column_name()
+	{
+		foreach (class_parents($this) as $parent) {
+			if ($parent === 'WP_List_Table' && method_exists($parent, 'get_primary_column_name')) {
+				return parent::get_primary_column_name();
+			}
+		}
+		return $this->_primary_column;
+	}
+
+
+	/**
+	 * Added for WP4.1 backward compat (@see https://events.codebasehq.com/projects/event-espresso/tickets/8814)
+	 *
+	 * @param EE_Base_Class $item
+	 * @param string        $column_name
+	 * @param string        $primary
+	 * @return string
+	 */
+	protected function handle_row_actions($item, $column_name, $primary)
+	{
+		foreach (class_parents($this) as $parent) {
+			if ($parent === 'WP_List_Table' && method_exists($parent, 'handle_row_actions')) {
+				return parent::handle_row_actions($item, $column_name, $primary);
+			}
+		}
+		return '';
+	}
+
+
+	/**
+	 * _get_bulk_actions
+	 * This is a wrapper called by WP_List_Table::get_bulk_actions()
+	 *
+	 * @access protected
+	 * @return array bulk_actions
+	 */
+	protected function _get_bulk_actions()
+	{
+		$actions = array();
+		// the _views property should have the bulk_actions, so let's go through and extract them into a properly
+		// formatted array for the wp_list_table();
+		foreach ($this->_views as $view => $args) {
+			if ($this->_view === $view && isset($args['bulk_action']) && is_array($args['bulk_action'])) {
+				// each bulk action will correspond with a admin page route, so we can check whatever the capability is
+				// for that page route and skip adding the bulk action if no access for the current logged in user.
+				foreach ($args['bulk_action'] as $route => $label) {
+					if ($this->_admin_page->check_user_access($route, true)) {
+						$actions[ $route ] = $label;
+					}
+				}
+			}
+		}
+		return $actions;
+	}
+
+
+	/**
+	 * Generate the table navigation above or below the table.
+	 * Overrides the parent table nav in WP_List_Table so we can hide the bulk action div if there are no bulk actions.
+	 *
+	 * @since 4.9.44.rc.001
+	 */
+	public function display_tablenav($which)
+	{
+		if ('top' === $which) {
+			wp_nonce_field('bulk-' . $this->_args['plural']);
+		}
+		?>
         <div class="tablenav <?php echo esc_attr($which); ?>">
             <?php if ($this->_get_bulk_actions()) { ?>
                 <div class="alignleft actions bulkactions">
                     <?php $this->bulk_actions(); ?>
                 </div>
             <?php }
-            $this->extra_tablenav($which);
-            $this->pagination($which);
-            ?>
+			$this->extra_tablenav($which);
+			$this->pagination($which);
+			?>
 
             <br class="clear"/>
         </div>
         <?php
-    }
-
-
-    /**
-     * _filters
-     * This receives the filters array from children _get_table_filters() and assembles the string including the filter
-     * button.
-     *
-     * @access private
-     * @return string html showing filters
-     */
-    private function _filters()
-    {
-        $classname = get_class($this);
-        $filters = apply_filters(
-            "FHEE__{$classname}__filters",
-            (array) $this->_get_table_filters(),
-            $this,
-            $this->_screen
-        );
-
-        if (empty($filters)) {
-            return;
-        }
-        foreach ($filters as $filter) {
-            echo $filter;
-        }
-        // add filter button at end
-        echo '<input type="submit" class="button-secondary" value="'
-             . esc_html__('Filter', 'event_espresso')
-             . '" id="post-query-submit" />';
-        // add reset filters button at end
-        echo '<a class="button button-secondary"  href="'
-             . $this->_admin_page->get_current_page_view_url()
-             . '" style="display:inline-block">'
-             . esc_html__('Reset Filters', 'event_espresso')
-             . '</a>';
-    }
-
-
-    /**
-     * Callback for 'list_table_primary_column' WordPress filter
-     * If child EE_Admin_List_Table classes set the _primary_column property then that will be set as the primary
-     * column when class is instantiated.
-     *
-     * @see WP_List_Table::get_primary_column_name
-     * @param string $column_name
-     * @return string
-     */
-    public function set_primary_column($column_name)
-    {
-        return ! empty($this->_primary_column) ? $this->_primary_column : $column_name;
-    }
-
-
-    /**
-     *
-     */
-    public function prepare_items()
-    {
-
-        $this->_set_column_info();
-        // $this->_column_headers = $this->get_column_info();
-        $total_items = $this->_all_data_count;
-        $this->process_bulk_action();
-
-        $this->items = $this->_data;
-        $this->set_pagination_args(
-            array(
-                'total_items' => $total_items,
-                'per_page'    => $this->_per_page,
-                'total_pages' => ceil($total_items / $this->_per_page),
-            )
-        );
-    }
-
-
-    /**
-     * This column is the default for when there is no defined column method for a registered column.
-     * This can be overridden by child classes, but allows for hooking in for custom columns.
-     *
-     * @param EE_Base_Class $item
-     * @param string        $column_name The column being called.
-     * @return string html content for the column
-     */
-    public function column_default($item, $column_name)
-    {
-        /**
-         * Dynamic hook allowing for adding additional column content in this list table.
-         * Note that $this->screen->id is in the format
-         * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
-         * table it is: event-espresso_page_espresso_messages.
-         * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
-         * hook prefix ("event-espresso") will be different.
-         */
-        do_action(
-            'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id,
-            $item,
-            $this->_screen
-        );
-    }
-
-
-    /**
-     * Get a list of columns. The format is:
-     * 'internal-name' => 'Title'
-     *
-     * @since  3.1.0
-     * @access public
-     * @abstract
-     * @return array
-     */
-    public function get_columns()
-    {
-        /**
-         * Dynamic hook allowing for adding additional columns in this list table.
-         * Note that $this->screen->id is in the format
-         * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
-         * table it is: event-espresso_page_espresso_messages.
-         * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
-         * hook prefix ("event-espresso") will be different.
-         *
-         * @var array
-         */
-        $columns = apply_filters('FHEE_manage_' . $this->screen->id . '_columns', $this->_columns, $this->_screen);
-        return $columns;
-    }
-
-
-    /**
-     * Get an associative array ( id => link ) with the list
-     * of views available on this table.
-     *
-     * @since  3.1.0
-     * @access protected
-     * @return array
-     */
-    public function get_views()
-    {
-        return $this->_views;
-    }
-
-
-    /**
-     * Generate the views html.
-     */
-    public function display_views()
-    {
-        $views = $this->get_views();
-        $assembled_views = array();
-
-        if (empty($views)) {
-            return;
-        }
-        echo "<ul class='subsubsub'>\n";
-        foreach ($views as $view) {
-            $count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0;
-            if (isset($view['slug'], $view['class'], $view['url'], $view['label'])) {
-                $assembled_views[ $view['slug'] ] = "\t<li class='" . $view['class'] . "'>"
-                                                    . '<a href="' . $view['url'] . '">' . $view['label'] . '</a>'
-                                                    . ' <span class="count">(' . $count . ')</span>';
-            }
-        }
-
-        echo ! empty($assembled_views) ? implode(" |</li>\n", $assembled_views) . "</li>\n" : '';
-        echo "</ul>";
-    }
-
-
-    /**
-     * Generates content for a single row of the table
-     *
-     * @since  4.1
-     * @access public
-     * @param EE_Base_Class $item The current item
-     */
-    public function single_row($item)
-    {
-        $row_class = $this->_get_row_class($item);
-        echo '<tr class="' . esc_attr($row_class) . '">';
-        $this->single_row_columns($item);
-        echo '</tr>';
-    }
-
-
-    /**
-     * This simply sets up the row class for the table rows.
-     * Allows for easier overriding of child methods for setting up sorting.
-     *
-     * @param  EE_Base_Class $item the current item
-     * @return string
-     */
-    protected function _get_row_class($item)
-    {
-        static $row_class = '';
-        $row_class = ($row_class === '' ? 'alternate' : '');
-
-        $new_row_class = $row_class;
-
-        if (! empty($this->_ajax_sorting_callback)) {
-            $new_row_class .= ' rowsortable';
-        }
-
-        return $new_row_class;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function get_sortable_columns()
-    {
-        return (array) $this->_sortable_columns;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function get_ajax_sorting_callback()
-    {
-        return $this->_ajax_sorting_callback;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function get_hidden_columns()
-    {
-        $user_id = get_current_user_id();
-        $has_default = get_user_option('default' . $this->screen->id . 'columnshidden', $user_id);
-        if (empty($has_default) && ! empty($this->_hidden_columns)) {
-            update_user_option($user_id, 'default' . $this->screen->id . 'columnshidden', true);
-            update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, true);
-        }
-        $ref = 'manage' . $this->screen->id . 'columnshidden';
-        return (array) get_user_option($ref, $user_id);
-    }
-
-
-    /**
-     * Generates the columns for a single row of the table.
-     * Overridden from wp_list_table so as to allow us to filter the column content for a given
-     * column.
-     *
-     * @since 3.1.0
-     * @param EE_Base_Class $item The current item
-     */
-    public function single_row_columns($item)
-    {
-        list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
-
-        global $wp_version;
-        $use_hidden_class = version_compare($wp_version, '4.3-RC', '>=');
-
-        foreach ($columns as $column_name => $column_display_name) {
-
-            /**
-             * With WordPress version 4.3.RC+ WordPress started using the hidden css class to control whether columns
-             * are hidden or not instead of using "display:none;".  This bit of code provides backward compat.
-             */
-            $hidden_class = $use_hidden_class && in_array($column_name, $hidden) ? ' hidden' : '';
-            $style = ! $use_hidden_class && in_array($column_name, $hidden) ? ' style="display:none;"' : '';
-
-            $classes = $column_name . ' column-' . $column_name . $hidden_class;
-            if ($primary === $column_name) {
-                $classes .= ' has-row-actions column-primary';
-            }
-
-            $data = ' data-colname="' . wp_strip_all_tags($column_display_name) . '"';
-
-            $class = "class='$classes'";
-
-            $attributes = "$class$style$data";
-
-            if ($column_name === 'cb') {
-                echo '<th scope="row" class="check-column">';
-                echo apply_filters(
-                    'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content',
-                    $this->column_cb($item),
-                    $item,
-                    $this
-                );
-                echo '</th>';
-            } elseif (method_exists($this, 'column_' . $column_name)) {
-                echo "<td $attributes>";
-                echo apply_filters(
-                    'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content',
-                    call_user_func(array($this, 'column_' . $column_name), $item),
-                    $item,
-                    $this
-                );
-                echo $this->handle_row_actions($item, $column_name, $primary);
-                echo "</td>";
-            } else {
-                echo "<td $attributes>";
-                echo apply_filters(
-                    'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content',
-                    $this->column_default($item, $column_name),
-                    $item,
-                    $column_name,
-                    $this
-                );
-                echo $this->handle_row_actions($item, $column_name, $primary);
-                echo "</td>";
-            }
-        }
-    }
-
-
-    /**
-     * Extra controls to be displayed between bulk actions and pagination
-     *
-     * @access public
-     * @param string $which
-     * @throws \EE_Error
-     */
-    public function extra_tablenav($which)
-    {
-        if ($which === 'top') {
-            $this->_filters();
-            echo $this->_get_hidden_fields();
-        } else {
-            echo '<div class="list-table-bottom-buttons alignleft actions">';
-            foreach ($this->_bottom_buttons as $type => $action) {
-                $route = isset($action['route']) ? $action['route'] : '';
-                $extra_request = isset($action['extra_request']) ? $action['extra_request'] : '';
-                echo $this->_admin_page->get_action_link_or_button(
-                    $route,
-                    $type,
-                    $extra_request,
-                    'button button-secondary',
-                    '',
-                    false
-                );
-            }
-            do_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen);
-            echo '</div>';
-        }
-        // echo $this->_entries_per_page_dropdown;
-    }
-
-
-    /**
-     * Get an associative array ( option_name => option_title ) with the list
-     * of bulk actions available on this table.
-     *
-     * @since  3.1.0
-     * @access protected
-     * @return array
-     */
-    public function get_bulk_actions()
-    {
-        return (array) $this->_get_bulk_actions();
-    }
-
-    /**
-     * Processing bulk actions.
-     */
-    public function process_bulk_action()
-    {
-        // this is not used it is handled by the child EE_Admin_Page class (routes).  However, including here for
-        // reference in case there is a case where it gets used.
-    }
-
-
-    /**
-     * returns the EE admin page this list table is associated with
-     *
-     * @return EE_Admin_Page
-     */
-    public function get_admin_page()
-    {
-        return $this->_admin_page;
-    }
-
-
-    /**
-     * A "helper" function for all children to provide an html string of
-     * actions to output in their content.  It is preferable for child classes
-     * to use this method for generating their actions content so that it's
-     * filterable by plugins
-     *
-     * @param string        $action_container           what are the html container
-     *                                                  elements for this actions string?
-     * @param string        $action_class               What class is for the container
-     *                                                  element.
-     * @param string        $action_items               The contents for the action items
-     *                                                  container.  This is filtered before
-     *                                                  returned.
-     * @param string        $action_id                  What id (optional) is used for the
-     *                                                  container element.
-     * @param EE_Base_Class $item                       The object for the column displaying
-     *                                                  the actions.
-     * @return string The assembled action elements container.
-     */
-    protected function _action_string(
-        $action_items,
-        $item,
-        $action_container = 'ul',
-        $action_class = '',
-        $action_id = ''
-    ) {
-        $content = '';
-        $action_class = ! empty($action_class) ? ' class="' . $action_class . '"' : '';
-        $action_id = ! empty($action_id) ? ' id="' . $action_id . '"' : '';
-        $content .= ! empty($action_container) ? '<' . $action_container . $action_class . $action_id . '>' : '';
-        try {
-            $content .= apply_filters(
-                'FHEE__EE_Admin_List_Table___action_string__action_items',
-                $action_items,
-                $item,
-                $this
-            );
-        } catch (\Exception $e) {
-            if (WP_DEBUG) {
-                \EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-            }
-            $content .= $action_items;
-        }
-        $content .= ! empty($action_container) ? '</' . $action_container . '>' : '';
-        return $content;
-    }
+	}
+
+
+	/**
+	 * _filters
+	 * This receives the filters array from children _get_table_filters() and assembles the string including the filter
+	 * button.
+	 *
+	 * @access private
+	 * @return string html showing filters
+	 */
+	private function _filters()
+	{
+		$classname = get_class($this);
+		$filters = apply_filters(
+			"FHEE__{$classname}__filters",
+			(array) $this->_get_table_filters(),
+			$this,
+			$this->_screen
+		);
+
+		if (empty($filters)) {
+			return;
+		}
+		foreach ($filters as $filter) {
+			echo $filter;
+		}
+		// add filter button at end
+		echo '<input type="submit" class="button-secondary" value="'
+			 . esc_html__('Filter', 'event_espresso')
+			 . '" id="post-query-submit" />';
+		// add reset filters button at end
+		echo '<a class="button button-secondary"  href="'
+			 . $this->_admin_page->get_current_page_view_url()
+			 . '" style="display:inline-block">'
+			 . esc_html__('Reset Filters', 'event_espresso')
+			 . '</a>';
+	}
+
+
+	/**
+	 * Callback for 'list_table_primary_column' WordPress filter
+	 * If child EE_Admin_List_Table classes set the _primary_column property then that will be set as the primary
+	 * column when class is instantiated.
+	 *
+	 * @see WP_List_Table::get_primary_column_name
+	 * @param string $column_name
+	 * @return string
+	 */
+	public function set_primary_column($column_name)
+	{
+		return ! empty($this->_primary_column) ? $this->_primary_column : $column_name;
+	}
+
+
+	/**
+	 *
+	 */
+	public function prepare_items()
+	{
+
+		$this->_set_column_info();
+		// $this->_column_headers = $this->get_column_info();
+		$total_items = $this->_all_data_count;
+		$this->process_bulk_action();
+
+		$this->items = $this->_data;
+		$this->set_pagination_args(
+			array(
+				'total_items' => $total_items,
+				'per_page'    => $this->_per_page,
+				'total_pages' => ceil($total_items / $this->_per_page),
+			)
+		);
+	}
+
+
+	/**
+	 * This column is the default for when there is no defined column method for a registered column.
+	 * This can be overridden by child classes, but allows for hooking in for custom columns.
+	 *
+	 * @param EE_Base_Class $item
+	 * @param string        $column_name The column being called.
+	 * @return string html content for the column
+	 */
+	public function column_default($item, $column_name)
+	{
+		/**
+		 * Dynamic hook allowing for adding additional column content in this list table.
+		 * Note that $this->screen->id is in the format
+		 * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
+		 * table it is: event-espresso_page_espresso_messages.
+		 * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
+		 * hook prefix ("event-espresso") will be different.
+		 */
+		do_action(
+			'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id,
+			$item,
+			$this->_screen
+		);
+	}
+
+
+	/**
+	 * Get a list of columns. The format is:
+	 * 'internal-name' => 'Title'
+	 *
+	 * @since  3.1.0
+	 * @access public
+	 * @abstract
+	 * @return array
+	 */
+	public function get_columns()
+	{
+		/**
+		 * Dynamic hook allowing for adding additional columns in this list table.
+		 * Note that $this->screen->id is in the format
+		 * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
+		 * table it is: event-espresso_page_espresso_messages.
+		 * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
+		 * hook prefix ("event-espresso") will be different.
+		 *
+		 * @var array
+		 */
+		$columns = apply_filters('FHEE_manage_' . $this->screen->id . '_columns', $this->_columns, $this->_screen);
+		return $columns;
+	}
+
+
+	/**
+	 * Get an associative array ( id => link ) with the list
+	 * of views available on this table.
+	 *
+	 * @since  3.1.0
+	 * @access protected
+	 * @return array
+	 */
+	public function get_views()
+	{
+		return $this->_views;
+	}
+
+
+	/**
+	 * Generate the views html.
+	 */
+	public function display_views()
+	{
+		$views = $this->get_views();
+		$assembled_views = array();
+
+		if (empty($views)) {
+			return;
+		}
+		echo "<ul class='subsubsub'>\n";
+		foreach ($views as $view) {
+			$count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0;
+			if (isset($view['slug'], $view['class'], $view['url'], $view['label'])) {
+				$assembled_views[ $view['slug'] ] = "\t<li class='" . $view['class'] . "'>"
+													. '<a href="' . $view['url'] . '">' . $view['label'] . '</a>'
+													. ' <span class="count">(' . $count . ')</span>';
+			}
+		}
+
+		echo ! empty($assembled_views) ? implode(" |</li>\n", $assembled_views) . "</li>\n" : '';
+		echo "</ul>";
+	}
+
+
+	/**
+	 * Generates content for a single row of the table
+	 *
+	 * @since  4.1
+	 * @access public
+	 * @param EE_Base_Class $item The current item
+	 */
+	public function single_row($item)
+	{
+		$row_class = $this->_get_row_class($item);
+		echo '<tr class="' . esc_attr($row_class) . '">';
+		$this->single_row_columns($item);
+		echo '</tr>';
+	}
+
+
+	/**
+	 * This simply sets up the row class for the table rows.
+	 * Allows for easier overriding of child methods for setting up sorting.
+	 *
+	 * @param  EE_Base_Class $item the current item
+	 * @return string
+	 */
+	protected function _get_row_class($item)
+	{
+		static $row_class = '';
+		$row_class = ($row_class === '' ? 'alternate' : '');
+
+		$new_row_class = $row_class;
+
+		if (! empty($this->_ajax_sorting_callback)) {
+			$new_row_class .= ' rowsortable';
+		}
+
+		return $new_row_class;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function get_sortable_columns()
+	{
+		return (array) $this->_sortable_columns;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function get_ajax_sorting_callback()
+	{
+		return $this->_ajax_sorting_callback;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function get_hidden_columns()
+	{
+		$user_id = get_current_user_id();
+		$has_default = get_user_option('default' . $this->screen->id . 'columnshidden', $user_id);
+		if (empty($has_default) && ! empty($this->_hidden_columns)) {
+			update_user_option($user_id, 'default' . $this->screen->id . 'columnshidden', true);
+			update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, true);
+		}
+		$ref = 'manage' . $this->screen->id . 'columnshidden';
+		return (array) get_user_option($ref, $user_id);
+	}
+
+
+	/**
+	 * Generates the columns for a single row of the table.
+	 * Overridden from wp_list_table so as to allow us to filter the column content for a given
+	 * column.
+	 *
+	 * @since 3.1.0
+	 * @param EE_Base_Class $item The current item
+	 */
+	public function single_row_columns($item)
+	{
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
+
+		global $wp_version;
+		$use_hidden_class = version_compare($wp_version, '4.3-RC', '>=');
+
+		foreach ($columns as $column_name => $column_display_name) {
+
+			/**
+			 * With WordPress version 4.3.RC+ WordPress started using the hidden css class to control whether columns
+			 * are hidden or not instead of using "display:none;".  This bit of code provides backward compat.
+			 */
+			$hidden_class = $use_hidden_class && in_array($column_name, $hidden) ? ' hidden' : '';
+			$style = ! $use_hidden_class && in_array($column_name, $hidden) ? ' style="display:none;"' : '';
+
+			$classes = $column_name . ' column-' . $column_name . $hidden_class;
+			if ($primary === $column_name) {
+				$classes .= ' has-row-actions column-primary';
+			}
+
+			$data = ' data-colname="' . wp_strip_all_tags($column_display_name) . '"';
+
+			$class = "class='$classes'";
+
+			$attributes = "$class$style$data";
+
+			if ($column_name === 'cb') {
+				echo '<th scope="row" class="check-column">';
+				echo apply_filters(
+					'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content',
+					$this->column_cb($item),
+					$item,
+					$this
+				);
+				echo '</th>';
+			} elseif (method_exists($this, 'column_' . $column_name)) {
+				echo "<td $attributes>";
+				echo apply_filters(
+					'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content',
+					call_user_func(array($this, 'column_' . $column_name), $item),
+					$item,
+					$this
+				);
+				echo $this->handle_row_actions($item, $column_name, $primary);
+				echo "</td>";
+			} else {
+				echo "<td $attributes>";
+				echo apply_filters(
+					'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content',
+					$this->column_default($item, $column_name),
+					$item,
+					$column_name,
+					$this
+				);
+				echo $this->handle_row_actions($item, $column_name, $primary);
+				echo "</td>";
+			}
+		}
+	}
+
+
+	/**
+	 * Extra controls to be displayed between bulk actions and pagination
+	 *
+	 * @access public
+	 * @param string $which
+	 * @throws \EE_Error
+	 */
+	public function extra_tablenav($which)
+	{
+		if ($which === 'top') {
+			$this->_filters();
+			echo $this->_get_hidden_fields();
+		} else {
+			echo '<div class="list-table-bottom-buttons alignleft actions">';
+			foreach ($this->_bottom_buttons as $type => $action) {
+				$route = isset($action['route']) ? $action['route'] : '';
+				$extra_request = isset($action['extra_request']) ? $action['extra_request'] : '';
+				echo $this->_admin_page->get_action_link_or_button(
+					$route,
+					$type,
+					$extra_request,
+					'button button-secondary',
+					'',
+					false
+				);
+			}
+			do_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen);
+			echo '</div>';
+		}
+		// echo $this->_entries_per_page_dropdown;
+	}
+
+
+	/**
+	 * Get an associative array ( option_name => option_title ) with the list
+	 * of bulk actions available on this table.
+	 *
+	 * @since  3.1.0
+	 * @access protected
+	 * @return array
+	 */
+	public function get_bulk_actions()
+	{
+		return (array) $this->_get_bulk_actions();
+	}
+
+	/**
+	 * Processing bulk actions.
+	 */
+	public function process_bulk_action()
+	{
+		// this is not used it is handled by the child EE_Admin_Page class (routes).  However, including here for
+		// reference in case there is a case where it gets used.
+	}
+
+
+	/**
+	 * returns the EE admin page this list table is associated with
+	 *
+	 * @return EE_Admin_Page
+	 */
+	public function get_admin_page()
+	{
+		return $this->_admin_page;
+	}
+
+
+	/**
+	 * A "helper" function for all children to provide an html string of
+	 * actions to output in their content.  It is preferable for child classes
+	 * to use this method for generating their actions content so that it's
+	 * filterable by plugins
+	 *
+	 * @param string        $action_container           what are the html container
+	 *                                                  elements for this actions string?
+	 * @param string        $action_class               What class is for the container
+	 *                                                  element.
+	 * @param string        $action_items               The contents for the action items
+	 *                                                  container.  This is filtered before
+	 *                                                  returned.
+	 * @param string        $action_id                  What id (optional) is used for the
+	 *                                                  container element.
+	 * @param EE_Base_Class $item                       The object for the column displaying
+	 *                                                  the actions.
+	 * @return string The assembled action elements container.
+	 */
+	protected function _action_string(
+		$action_items,
+		$item,
+		$action_container = 'ul',
+		$action_class = '',
+		$action_id = ''
+	) {
+		$content = '';
+		$action_class = ! empty($action_class) ? ' class="' . $action_class . '"' : '';
+		$action_id = ! empty($action_id) ? ' id="' . $action_id . '"' : '';
+		$content .= ! empty($action_container) ? '<' . $action_container . $action_class . $action_id . '>' : '';
+		try {
+			$content .= apply_filters(
+				'FHEE__EE_Admin_List_Table___action_string__action_items',
+				$action_items,
+				$item,
+				$this
+			);
+		} catch (\Exception $e) {
+			if (WP_DEBUG) {
+				\EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+			}
+			$content .= $action_items;
+		}
+		$content .= ! empty($action_container) ? '</' . $action_container . '>' : '';
+		return $content;
+	}
 }

Spacing +34 added lines, -34 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if (! class_exists('WP_List_Table')) {
-    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+    require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 
@@ -204,10 +204,10 @@ 
         $this->_view = $this->_admin_page->get_view();
         $this->_views = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
         $this->_current_page = $this->get_pagenum();
-        $this->_screen = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view();
+        $this->_screen = $this->_admin_page->get_current_page().'_'.$this->_admin_page->get_current_view();
         $this->_yes_no = array(__('No', 'event_espresso'), __('Yes', 'event_espresso'));
 
-        $this->_per_page = $this->get_items_per_page($this->_screen . '_per_page', 20);
+        $this->_per_page = $this->get_items_per_page($this->_screen.'_per_page', 20);
 
         $this->_setup_data();
         $this->_add_view_counts();
@@ -287,14 +287,14 @@ 
         $action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action;
         // if action is STILL empty, then we set it to default
         $action = empty($action) ? 'default' : $action;
-        $field = '<input type="hidden" name="page" value="' . $this->_req_data['page'] . '" />' . "\n";
-        $field .= '<input type="hidden" name="route" value="' . $action . '" />' . "\n";/**/
-        $field .= '<input type="hidden" name="perpage" value="' . $this->_per_page . '" />' . "\n";
+        $field = '<input type="hidden" name="page" value="'.$this->_req_data['page'].'" />'."\n";
+        $field .= '<input type="hidden" name="route" value="'.$action.'" />'."\n"; /**/
+        $field .= '<input type="hidden" name="perpage" value="'.$this->_per_page.'" />'."\n";
 
         $bulk_actions = $this->_get_bulk_actions();
         foreach ($bulk_actions as $bulk_action => $label) {
-            $field .= '<input type="hidden" name="' . $bulk_action . '_nonce"'
-                      . ' value="' . wp_create_nonce($bulk_action . '_nonce') . '" />' . "\n";
+            $field .= '<input type="hidden" name="'.$bulk_action.'_nonce"'
+                      . ' value="'.wp_create_nonce($bulk_action.'_nonce').'" />'."\n";
         }
 
         return $field;
@@ -341,11 +341,11 @@ 
 
             $data = (array) $data;
 
-            if (! isset($data[1])) {
+            if ( ! isset($data[1])) {
                 $_data[1] = false;
             }
 
-            $sortable[ $id ] = $_data;
+            $sortable[$id] = $_data;
         }
         $primary = $this->get_primary_column_name();
         $this->_column_headers = array($columns, $hidden, $sortable, $primary);
@@ -405,7 +405,7 @@ 
                 // for that page route and skip adding the bulk action if no access for the current logged in user.
                 foreach ($args['bulk_action'] as $route => $label) {
                     if ($this->_admin_page->check_user_access($route, true)) {
-                        $actions[ $route ] = $label;
+                        $actions[$route] = $label;
                     }
                 }
             }
@@ -423,7 +423,7 @@ 
     public function display_tablenav($which)
     {
         if ('top' === $which) {
-            wp_nonce_field('bulk-' . $this->_args['plural']);
+            wp_nonce_field('bulk-'.$this->_args['plural']);
         }
         ?>
         <div class="tablenav <?php echo esc_attr($which); ?>">
@@ -535,7 +535,7 @@ 
          * hook prefix ("event-espresso") will be different.
          */
         do_action(
-            'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id,
+            'AHEE__EE_Admin_List_Table__column_'.$column_name.'__'.$this->screen->id,
             $item,
             $this->_screen
         );
@@ -563,7 +563,7 @@ 
          *
          * @var array
          */
-        $columns = apply_filters('FHEE_manage_' . $this->screen->id . '_columns', $this->_columns, $this->_screen);
+        $columns = apply_filters('FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen);
         return $columns;
     }
 
@@ -597,13 +597,13 @@ 
         foreach ($views as $view) {
             $count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0;
             if (isset($view['slug'], $view['class'], $view['url'], $view['label'])) {
-                $assembled_views[ $view['slug'] ] = "\t<li class='" . $view['class'] . "'>"
-                                                    . '<a href="' . $view['url'] . '">' . $view['label'] . '</a>'
-                                                    . ' <span class="count">(' . $count . ')</span>';
+                $assembled_views[$view['slug']] = "\t<li class='".$view['class']."'>"
+                                                    . '<a href="'.$view['url'].'">'.$view['label'].'</a>'
+                                                    . ' <span class="count">('.$count.')</span>';
             }
         }
 
-        echo ! empty($assembled_views) ? implode(" |</li>\n", $assembled_views) . "</li>\n" : '';
+        echo ! empty($assembled_views) ? implode(" |</li>\n", $assembled_views)."</li>\n" : '';
         echo "</ul>";
     }
 
@@ -618,7 +618,7 @@ 
     public function single_row($item)
     {
         $row_class = $this->_get_row_class($item);
-        echo '<tr class="' . esc_attr($row_class) . '">';
+        echo '<tr class="'.esc_attr($row_class).'">';
         $this->single_row_columns($item);
         echo '</tr>';
     }
@@ -638,7 +638,7 @@ 
 
         $new_row_class = $row_class;
 
-        if (! empty($this->_ajax_sorting_callback)) {
+        if ( ! empty($this->_ajax_sorting_callback)) {
             $new_row_class .= ' rowsortable';
         }
 
@@ -670,12 +670,12 @@ 
     public function get_hidden_columns()
     {
         $user_id = get_current_user_id();
-        $has_default = get_user_option('default' . $this->screen->id . 'columnshidden', $user_id);
+        $has_default = get_user_option('default'.$this->screen->id.'columnshidden', $user_id);
         if (empty($has_default) && ! empty($this->_hidden_columns)) {
-            update_user_option($user_id, 'default' . $this->screen->id . 'columnshidden', true);
-            update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, true);
+            update_user_option($user_id, 'default'.$this->screen->id.'columnshidden', true);
+            update_user_option($user_id, 'manage'.$this->screen->id.'columnshidden', $this->_hidden_columns, true);
         }
-        $ref = 'manage' . $this->screen->id . 'columnshidden';
+        $ref = 'manage'.$this->screen->id.'columnshidden';
         return (array) get_user_option($ref, $user_id);
     }
 
@@ -704,12 +704,12 @@ 
             $hidden_class = $use_hidden_class && in_array($column_name, $hidden) ? ' hidden' : '';
             $style = ! $use_hidden_class && in_array($column_name, $hidden) ? ' style="display:none;"' : '';
 
-            $classes = $column_name . ' column-' . $column_name . $hidden_class;
+            $classes = $column_name.' column-'.$column_name.$hidden_class;
             if ($primary === $column_name) {
                 $classes .= ' has-row-actions column-primary';
             }
 
-            $data = ' data-colname="' . wp_strip_all_tags($column_display_name) . '"';
+            $data = ' data-colname="'.wp_strip_all_tags($column_display_name).'"';
 
             $class = "class='$classes'";
 
@@ -724,11 +724,11 @@ 
                     $this
                 );
                 echo '</th>';
-            } elseif (method_exists($this, 'column_' . $column_name)) {
+            } elseif (method_exists($this, 'column_'.$column_name)) {
                 echo "<td $attributes>";
                 echo apply_filters(
-                    'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content',
-                    call_user_func(array($this, 'column_' . $column_name), $item),
+                    'FHEE__EE_Admin_List_Table__single_row_columns__column_'.$column_name.'__column_content',
+                    call_user_func(array($this, 'column_'.$column_name), $item),
                     $item,
                     $this
                 );
@@ -844,9 +844,9 @@ 
         $action_id = ''
     ) {
         $content = '';
-        $action_class = ! empty($action_class) ? ' class="' . $action_class . '"' : '';
-        $action_id = ! empty($action_id) ? ' id="' . $action_id . '"' : '';
-        $content .= ! empty($action_container) ? '<' . $action_container . $action_class . $action_id . '>' : '';
+        $action_class = ! empty($action_class) ? ' class="'.$action_class.'"' : '';
+        $action_id = ! empty($action_id) ? ' id="'.$action_id.'"' : '';
+        $content .= ! empty($action_container) ? '<'.$action_container.$action_class.$action_id.'>' : '';
         try {
             $content .= apply_filters(
                 'FHEE__EE_Admin_List_Table___action_string__action_items',
@@ -860,7 +860,7 @@ 
             }
             $content .= $action_items;
         }
-        $content .= ! empty($action_container) ? '</' . $action_container . '>' : '';
+        $content .= ! empty($action_container) ? '</'.$action_container.'>' : '';
         return $content;
     }
 }

core/libraries/form_sections/inputs/EE_Admin_File_Uploader_Input.input.php

Indentation +23 added lines, -23 removed lines

@@ -14,27 +14,27 @@
 class EE_Admin_File_Uploader_Input extends EE_Form_Input_Base
 {
 
-    /**
-     * @param array $input_settings
-     * @throws InvalidArgumentException
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     */
-    public function __construct($input_settings = array())
-    {
-        $this->_set_display_strategy(new EE_Admin_File_Uploader_Display_Strategy());
-        $this->_set_normalization_strategy(new EE_Text_Normalization());
-        $this->_add_validation_strategy(
-            LoaderFactory::getLoader()->getNew(
-                'EE_URL_Validation_Strategy',
-                array(
-                    isset($input_settings['validation_error_message'])
-                        ? $input_settings['validation_error_message']
-                        : null,
-                    false
-                )
-            )
-        );
-        parent::__construct($input_settings);
-    }
+	/**
+	 * @param array $input_settings
+	 * @throws InvalidArgumentException
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 */
+	public function __construct($input_settings = array())
+	{
+		$this->_set_display_strategy(new EE_Admin_File_Uploader_Display_Strategy());
+		$this->_set_normalization_strategy(new EE_Text_Normalization());
+		$this->_add_validation_strategy(
+			LoaderFactory::getLoader()->getNew(
+				'EE_URL_Validation_Strategy',
+				array(
+					isset($input_settings['validation_error_message'])
+						? $input_settings['validation_error_message']
+						: null,
+					false
+				)
+			)
+		);
+		parent::__construct($input_settings);
+	}
 }

admin_pages/events/Event_Categories_Admin_List_Table.class.php

Indentation +138 added lines, -138 removed lines

@@ -16,142 +16,142 @@
 class Event_Categories_Admin_List_Table extends EE_Admin_List_Table
 {
 
-    public function __construct($admin_page)
-    {
-        parent::__construct($admin_page);
-    }
-
-
-    protected function _setup_data()
-    {
-        $this->_data = $this->_admin_page->get_categories($this->_per_page, $this->_current_page);
-        $this->_all_data_count = EEM_Term_Taxonomy::instance()->count(
-            array(array('taxonomy' => 'espresso_event_categories'))
-        );
-    }
-
-
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => esc_html__('event category', 'event_espresso'),
-            'plural'   => esc_html__('event categories', 'event_espresso'),
-            'ajax'     => true, // for now,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-
-        $this->_columns = array(
-            'cb'        => '<input type="checkbox" />',
-            'id'        => esc_html__('ID', 'event_espresso'),
-            'name'      => esc_html__('Name', 'event_espresso'),
-            'shortcode' => esc_html__('Shortcode', 'event_espresso'),
-            'count'     => esc_html__('Events', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'id'    => array('Term.term_id' => true),
-            'name'  => array('Term.slug' => false),
-            'count' => array('term_count' => false),
-        );
-
-        $this->_primary_column = 'id';
-
-        $this->_hidden_columns = array();
-    }
-
-
-    // not needed
-    protected function _get_table_filters()
-    {
-        return array();
-    }
-
-
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count'] = $this->_all_data_count;
-    }
-
-
-    public function column_cb($item)
-    {
-        return sprintf('<input type="checkbox" name="EVT_CAT_ID[]" value="%s" />', $item->get('term_id'));
-    }
-
-
-    public function column_id($item)
-    {
-        $content = $item->get('term_id');
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->get_first_related('Term')->get(
-            'name'
-        ) . '</span>';
-        return $content;
-    }
-
-
-    public function column_name($item)
-    {
-        $edit_query_args = array(
-            'action'     => 'edit_category',
-            'EVT_CAT_ID' => $item->get('term_id'),
-        );
-
-        $delete_query_args = array(
-            'action'     => 'delete_category',
-            'EVT_CAT_ID' => $item->get('term_id'),
-        );
-
-        $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
-        $delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EVENTS_ADMIN_URL);
-
-        $actions = array(
-            'edit' => '<a href="' . $edit_link . '" aria-label="' . esc_attr__(
-                'Edit Category',
-                'event_espresso'
-            ) . '">' . esc_html__('Edit', 'event_espresso') . '</a>',
-        );
-
-        $actions['delete'] = '<a href="' . $delete_link . '" aria-label="' . esc_attr__(
-            'Delete Category',
-            'event_espresso'
-        ) . '">' . esc_html__('Delete', 'event_espresso') . '</a>';
-
-        $actions['view'] = sprintf(
-            '<a href="%s" aria-label="%s">%s</a>',
-            get_term_link($item->get('term_id')),
-            esc_attr(
-                sprintf(
-                    /* translators: %s: event category name */
-                    __('View &#8220;%s&#8221; archive', 'event_espresso'),
-                    $item->get_first_related('Term')->get('name')
-                )
-            ),
-            esc_html__('View', 'event_espresso')
-        );
-
-        $content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->get_first_related('Term')->get(
-            'name'
-        ) . '</a></strong>';
-        $content .= $this->row_actions($actions);
-        return $content;
-    }
-
-
-    public function column_shortcode($item)
-    {
-        $content = '[ESPRESSO_EVENTS category_slug=' . $item->get_first_related('Term')->get('slug') . ']';
-        return $content;
-    }
-
-
-    public function column_count($item)
-    {
-        $e_args = array(
-            'action'  => 'default',
-            'EVT_CAT' => $item->get_first_related('Term')->ID(),
-        );
-        $e_link = EE_Admin_Page::add_query_args_and_nonce($e_args, EVENTS_ADMIN_URL);
-        $content = '<a href="' . $e_link . '">' . $item->get('term_count') . '</a>';
-        return $content;
-    }
+	public function __construct($admin_page)
+	{
+		parent::__construct($admin_page);
+	}
+
+
+	protected function _setup_data()
+	{
+		$this->_data = $this->_admin_page->get_categories($this->_per_page, $this->_current_page);
+		$this->_all_data_count = EEM_Term_Taxonomy::instance()->count(
+			array(array('taxonomy' => 'espresso_event_categories'))
+		);
+	}
+
+
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => esc_html__('event category', 'event_espresso'),
+			'plural'   => esc_html__('event categories', 'event_espresso'),
+			'ajax'     => true, // for now,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+
+		$this->_columns = array(
+			'cb'        => '<input type="checkbox" />',
+			'id'        => esc_html__('ID', 'event_espresso'),
+			'name'      => esc_html__('Name', 'event_espresso'),
+			'shortcode' => esc_html__('Shortcode', 'event_espresso'),
+			'count'     => esc_html__('Events', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'id'    => array('Term.term_id' => true),
+			'name'  => array('Term.slug' => false),
+			'count' => array('term_count' => false),
+		);
+
+		$this->_primary_column = 'id';
+
+		$this->_hidden_columns = array();
+	}
+
+
+	// not needed
+	protected function _get_table_filters()
+	{
+		return array();
+	}
+
+
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count'] = $this->_all_data_count;
+	}
+
+
+	public function column_cb($item)
+	{
+		return sprintf('<input type="checkbox" name="EVT_CAT_ID[]" value="%s" />', $item->get('term_id'));
+	}
+
+
+	public function column_id($item)
+	{
+		$content = $item->get('term_id');
+		$content .= '  <span class="show-on-mobile-view-only">' . $item->get_first_related('Term')->get(
+			'name'
+		) . '</span>';
+		return $content;
+	}
+
+
+	public function column_name($item)
+	{
+		$edit_query_args = array(
+			'action'     => 'edit_category',
+			'EVT_CAT_ID' => $item->get('term_id'),
+		);
+
+		$delete_query_args = array(
+			'action'     => 'delete_category',
+			'EVT_CAT_ID' => $item->get('term_id'),
+		);
+
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EVENTS_ADMIN_URL);
+
+		$actions = array(
+			'edit' => '<a href="' . $edit_link . '" aria-label="' . esc_attr__(
+				'Edit Category',
+				'event_espresso'
+			) . '">' . esc_html__('Edit', 'event_espresso') . '</a>',
+		);
+
+		$actions['delete'] = '<a href="' . $delete_link . '" aria-label="' . esc_attr__(
+			'Delete Category',
+			'event_espresso'
+		) . '">' . esc_html__('Delete', 'event_espresso') . '</a>';
+
+		$actions['view'] = sprintf(
+			'<a href="%s" aria-label="%s">%s</a>',
+			get_term_link($item->get('term_id')),
+			esc_attr(
+				sprintf(
+					/* translators: %s: event category name */
+					__('View &#8220;%s&#8221; archive', 'event_espresso'),
+					$item->get_first_related('Term')->get('name')
+				)
+			),
+			esc_html__('View', 'event_espresso')
+		);
+
+		$content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->get_first_related('Term')->get(
+			'name'
+		) . '</a></strong>';
+		$content .= $this->row_actions($actions);
+		return $content;
+	}
+
+
+	public function column_shortcode($item)
+	{
+		$content = '[ESPRESSO_EVENTS category_slug=' . $item->get_first_related('Term')->get('slug') . ']';
+		return $content;
+	}
+
+
+	public function column_count($item)
+	{
+		$e_args = array(
+			'action'  => 'default',
+			'EVT_CAT' => $item->get_first_related('Term')->ID(),
+		);
+		$e_link = EE_Admin_Page::add_query_args_and_nonce($e_args, EVENTS_ADMIN_URL);
+		$content = '<a href="' . $e_link . '">' . $item->get('term_count') . '</a>';
+		return $content;
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -82,9 +82,9 @@ 
     public function column_id($item)
     {
         $content = $item->get('term_id');
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->get_first_related('Term')->get(
+        $content .= '  <span class="show-on-mobile-view-only">'.$item->get_first_related('Term')->get(
             'name'
-        ) . '</span>';
+        ).'</span>';
         return $content;
     }
 
@@ -105,16 +105,16 @@ 
         $delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EVENTS_ADMIN_URL);
 
         $actions = array(
-            'edit' => '<a href="' . $edit_link . '" aria-label="' . esc_attr__(
+            'edit' => '<a href="'.$edit_link.'" aria-label="'.esc_attr__(
                 'Edit Category',
                 'event_espresso'
-            ) . '">' . esc_html__('Edit', 'event_espresso') . '</a>',
+            ).'">'.esc_html__('Edit', 'event_espresso').'</a>',
         );
 
-        $actions['delete'] = '<a href="' . $delete_link . '" aria-label="' . esc_attr__(
+        $actions['delete'] = '<a href="'.$delete_link.'" aria-label="'.esc_attr__(
             'Delete Category',
             'event_espresso'
-        ) . '">' . esc_html__('Delete', 'event_espresso') . '</a>';
+        ).'">'.esc_html__('Delete', 'event_espresso').'</a>';
 
         $actions['view'] = sprintf(
             '<a href="%s" aria-label="%s">%s</a>',
@@ -129,9 +129,9 @@ 
             esc_html__('View', 'event_espresso')
         );
 
-        $content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->get_first_related('Term')->get(
+        $content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->get_first_related('Term')->get(
             'name'
-        ) . '</a></strong>';
+        ).'</a></strong>';
         $content .= $this->row_actions($actions);
         return $content;
     }
@@ -139,7 +139,7 @@ 
 
     public function column_shortcode($item)
     {
-        $content = '[ESPRESSO_EVENTS category_slug=' . $item->get_first_related('Term')->get('slug') . ']';
+        $content = '[ESPRESSO_EVENTS category_slug='.$item->get_first_related('Term')->get('slug').']';
         return $content;
     }
 
@@ -151,7 +151,7 @@ 
             'EVT_CAT' => $item->get_first_related('Term')->ID(),
         );
         $e_link = EE_Admin_Page::add_query_args_and_nonce($e_args, EVENTS_ADMIN_URL);
-        $content = '<a href="' . $e_link . '">' . $item->get('term_count') . '</a>';
+        $content = '<a href="'.$e_link.'">'.$item->get('term_count').'</a>';
         return $content;
     }
 }

core/helpers/EEH_Maps.helper.php

Indentation +169 added lines, -169 removed lines

@@ -12,173 +12,173 @@
 class EEH_Maps
 {
 
-    // array of map settings
-    public static $gmap_vars = array();
-
-
-    /**
-     * google_map - creates a Google Map Link
-     *
-     * @param  array $ee_gmaps_opts array of attributes required for the map link generation
-     * @return string (link to map!)
-     */
-    public static function google_map($ee_gmaps_opts)
-    {
-
-        $ee_map_width        = ! empty($ee_gmaps_opts['ee_map_width']) ? $ee_gmaps_opts['ee_map_width'] : '300';
-        $ee_map_height       = ! empty($ee_gmaps_opts['ee_map_height']) ? $ee_gmaps_opts['ee_map_height'] : '185';
-        $ee_map_zoom         = ! empty($ee_gmaps_opts['ee_map_zoom']) ? $ee_gmaps_opts['ee_map_zoom'] : '12';
-        $ee_map_nav_display  = ! empty($ee_gmaps_opts['ee_map_nav_display']) ? 'true' : 'false';
-        $ee_map_nav_size     = ! empty($ee_gmaps_opts['ee_map_nav_size'])
-            ? $ee_gmaps_opts['ee_map_nav_size']
-            : 'default';
-        $ee_map_type_control = ! empty($ee_gmaps_opts['ee_map_type_control'])
-            ? $ee_gmaps_opts['ee_map_type_control']
-            : 'default';
-        $static_url          = ! empty($ee_gmaps_opts['ee_static_url']) ? $ee_gmaps_opts['ee_static_url'] : false;
-
-        if (! empty($ee_gmaps_opts['ee_map_align'])) {
-            switch ($ee_gmaps_opts['ee_map_align']) {
-                case "left":
-                    $map_align = 'ee-gmap-align-left left';
-                    break;
-                case "right":
-                    $map_align = 'ee-gmap-align-right right';
-                    break;
-                case "center":
-                    $map_align = 'ee-gmap-align-center center';
-                    break;
-                case "none":
-                default:
-                    $map_align = 'ee-gmap-align-none';
-            }
-        } else {
-            $map_align = 'ee-gmap-align-none';
-        }
-
-
-        // Determine whether user has set a hardoded url to use and
-        // if so display a Google static iframe map else run V3 api
-        if ($static_url) {
-            $html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper ' . $map_align . '">';
-            $html .= '<iframe src="' . $static_url . '&output=embed"'
-                . ' style="width: ' . $ee_map_width . 'px; height: ' . $ee_map_height . 'px;"'
-                . ' frameborder="0" scrolling="no">';
-            $html .= '</iframe>';
-            $html .= '<a href="' . $static_url . '">View Large map</a>';
-            $html .= '</div>';
-            return $html;
-        } else {
-            EEH_Maps::$gmap_vars[ $ee_gmaps_opts['map_ID'] ] = array(
-                'map_ID'              => $ee_gmaps_opts['map_ID'],
-                'ee_map_zoom'         => $ee_map_zoom,
-                'ee_map_nav_display'  => $ee_map_nav_display,
-                'ee_map_nav_size'     => $ee_map_nav_size,
-                'ee_map_type_control' => $ee_map_type_control,
-                'location'            => $ee_gmaps_opts['location'],
-            );
-
-            $style = 'width: ' . $ee_map_width . 'px; height: ' . $ee_map_height . 'px;';
-            $html = '<div class="ee-gmap-wrapper ' . $map_align . '">'
-                    . '<div class="ee-gmap" id="map_canvas_' . $ee_gmaps_opts['map_ID'] . '"'
-                    . ' style="' . $style . '"></div>'
-                    . '</div>';
-
-            wp_enqueue_script('gmap_api');
-            wp_enqueue_script('ee_gmap');
-            add_action('wp_footer', array('EEH_Maps', 'footer_enqueue_script'));
-
-            return $html;
-        } // end auto map or static url map check
-    }
-
-
-    /**
-     * enqueue_script
-     *
-     * @return void
-     */
-    public static function footer_enqueue_script()
-    {
-        wp_localize_script('ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars);
-    }
-
-
-    /**
-     * registers scripts for maps
-     */
-    public static function espresso_google_map_js()
-    {
-        $api_url = sprintf(
-            "https://maps.googleapis.com/maps/api/js?key=%s",
-            apply_filters(
-                'FHEE__EEH_Maps__espresso_google_maps_js__api_key',
-                EE_Registry::instance()->CFG->map_settings->google_map_api_key
-            )
-        );
-        wp_register_script('gmap_api', $api_url, array('jquery'), null, true);
-        wp_register_script('ee_gmap', plugin_dir_url(__FILE__) . 'assets/ee_gmap.js', array('gmap_api'), '1.0', true);
-    }
-
-    /**
-     * creates a Google Map Link
-     *
-     * @param  array $atts array of attributes required for the map link generation
-     * @return string (link to map!)
-     */
-    public static function google_map_link($atts)
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        extract($atts);
-        /** @var string $address */
-        /** @var string $city */
-        /** @var string $state */
-        /** @var string $zip */
-        /** @var string $country */
-        $address         = "{$address}";
-        $city            = "{$city}";
-        $state           = "{$state}";
-        $zip             = "{$zip}";
-        $country         = "{$country}";
-        $text            = isset($text) ? "{$text}" : "";
-        $type            = isset($type) ? "{$type}" : "";
-        $map_w           = isset($map_w) ? "{$map_w}" : 400;
-        $map_h           = isset($map_h) ? "{$map_h}" : 400;
-        $id              = isset($id) ? $id : 'not_set';
-        $map_image_class = isset($map_image_class) ? $map_image_class : 'ee_google_map_view';
-
-        $address_string = ($address != '' ? $address : '')
-                          . ($city != '' ? ',' . $city : '')
-                          . ($state != '' ? ',' . $state : '')
-                          . ($zip != '' ? ',' . $zip : '')
-                          . ($country != '' ? ',' . $country : '');
-
-        $google_map = htmlentities2('http://maps.google.com/maps?q=' . urlencode($address_string));
-
-        switch ($type) {
-            case 'text':
-            default:
-                $text = $text == '' ? esc_html__('Map and Directions', 'event_espresso') : $text;
-                break;
-
-            case 'url_only':
-            case 'url':
-                $text = $google_map;
-                break;
-
-            case 'map':
-                $scheme = is_ssl() ? 'https://' : 'http://';
-
-                $api_key = apply_filters(
-                    'FHEE__EEH_Maps__espresso_google_maps_link__api_key',
-                    EE_Registry::instance()->CFG->map_settings->google_map_api_key
-                );
-
-                return '<a class="a_map_image_link" href="' . $google_map . '" target="_blank" rel="noopener noreferrer">' . '<img class="map_image_link" id="venue_map_' . $id . '" ' . $map_image_class . ' src="' . htmlentities2($scheme . 'maps.googleapis.com/maps/api/staticmap?center=' . urlencode($address_string) . '&amp;zoom=14&amp;size=' . $map_w . 'x' . $map_h . '&amp;markers=color:green|label:|' . urlencode($address_string) . '&amp;sensor=false&amp;key=' . $api_key) . '" /></a>';
-        }
-
-        return $type === 'url_only'
-            ? $text
-            : '<a href="' . $google_map . '" target="_blank" rel="noopener noreferrer">' . $text . '</a>';
-    }
+	// array of map settings
+	public static $gmap_vars = array();
+
+
+	/**
+	 * google_map - creates a Google Map Link
+	 *
+	 * @param  array $ee_gmaps_opts array of attributes required for the map link generation
+	 * @return string (link to map!)
+	 */
+	public static function google_map($ee_gmaps_opts)
+	{
+
+		$ee_map_width        = ! empty($ee_gmaps_opts['ee_map_width']) ? $ee_gmaps_opts['ee_map_width'] : '300';
+		$ee_map_height       = ! empty($ee_gmaps_opts['ee_map_height']) ? $ee_gmaps_opts['ee_map_height'] : '185';
+		$ee_map_zoom         = ! empty($ee_gmaps_opts['ee_map_zoom']) ? $ee_gmaps_opts['ee_map_zoom'] : '12';
+		$ee_map_nav_display  = ! empty($ee_gmaps_opts['ee_map_nav_display']) ? 'true' : 'false';
+		$ee_map_nav_size     = ! empty($ee_gmaps_opts['ee_map_nav_size'])
+			? $ee_gmaps_opts['ee_map_nav_size']
+			: 'default';
+		$ee_map_type_control = ! empty($ee_gmaps_opts['ee_map_type_control'])
+			? $ee_gmaps_opts['ee_map_type_control']
+			: 'default';
+		$static_url          = ! empty($ee_gmaps_opts['ee_static_url']) ? $ee_gmaps_opts['ee_static_url'] : false;
+
+		if (! empty($ee_gmaps_opts['ee_map_align'])) {
+			switch ($ee_gmaps_opts['ee_map_align']) {
+				case "left":
+					$map_align = 'ee-gmap-align-left left';
+					break;
+				case "right":
+					$map_align = 'ee-gmap-align-right right';
+					break;
+				case "center":
+					$map_align = 'ee-gmap-align-center center';
+					break;
+				case "none":
+				default:
+					$map_align = 'ee-gmap-align-none';
+			}
+		} else {
+			$map_align = 'ee-gmap-align-none';
+		}
+
+
+		// Determine whether user has set a hardoded url to use and
+		// if so display a Google static iframe map else run V3 api
+		if ($static_url) {
+			$html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper ' . $map_align . '">';
+			$html .= '<iframe src="' . $static_url . '&output=embed"'
+				. ' style="width: ' . $ee_map_width . 'px; height: ' . $ee_map_height . 'px;"'
+				. ' frameborder="0" scrolling="no">';
+			$html .= '</iframe>';
+			$html .= '<a href="' . $static_url . '">View Large map</a>';
+			$html .= '</div>';
+			return $html;
+		} else {
+			EEH_Maps::$gmap_vars[ $ee_gmaps_opts['map_ID'] ] = array(
+				'map_ID'              => $ee_gmaps_opts['map_ID'],
+				'ee_map_zoom'         => $ee_map_zoom,
+				'ee_map_nav_display'  => $ee_map_nav_display,
+				'ee_map_nav_size'     => $ee_map_nav_size,
+				'ee_map_type_control' => $ee_map_type_control,
+				'location'            => $ee_gmaps_opts['location'],
+			);
+
+			$style = 'width: ' . $ee_map_width . 'px; height: ' . $ee_map_height . 'px;';
+			$html = '<div class="ee-gmap-wrapper ' . $map_align . '">'
+					. '<div class="ee-gmap" id="map_canvas_' . $ee_gmaps_opts['map_ID'] . '"'
+					. ' style="' . $style . '"></div>'
+					. '</div>';
+
+			wp_enqueue_script('gmap_api');
+			wp_enqueue_script('ee_gmap');
+			add_action('wp_footer', array('EEH_Maps', 'footer_enqueue_script'));
+
+			return $html;
+		} // end auto map or static url map check
+	}
+
+
+	/**
+	 * enqueue_script
+	 *
+	 * @return void
+	 */
+	public static function footer_enqueue_script()
+	{
+		wp_localize_script('ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars);
+	}
+
+
+	/**
+	 * registers scripts for maps
+	 */
+	public static function espresso_google_map_js()
+	{
+		$api_url = sprintf(
+			"https://maps.googleapis.com/maps/api/js?key=%s",
+			apply_filters(
+				'FHEE__EEH_Maps__espresso_google_maps_js__api_key',
+				EE_Registry::instance()->CFG->map_settings->google_map_api_key
+			)
+		);
+		wp_register_script('gmap_api', $api_url, array('jquery'), null, true);
+		wp_register_script('ee_gmap', plugin_dir_url(__FILE__) . 'assets/ee_gmap.js', array('gmap_api'), '1.0', true);
+	}
+
+	/**
+	 * creates a Google Map Link
+	 *
+	 * @param  array $atts array of attributes required for the map link generation
+	 * @return string (link to map!)
+	 */
+	public static function google_map_link($atts)
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		extract($atts);
+		/** @var string $address */
+		/** @var string $city */
+		/** @var string $state */
+		/** @var string $zip */
+		/** @var string $country */
+		$address         = "{$address}";
+		$city            = "{$city}";
+		$state           = "{$state}";
+		$zip             = "{$zip}";
+		$country         = "{$country}";
+		$text            = isset($text) ? "{$text}" : "";
+		$type            = isset($type) ? "{$type}" : "";
+		$map_w           = isset($map_w) ? "{$map_w}" : 400;
+		$map_h           = isset($map_h) ? "{$map_h}" : 400;
+		$id              = isset($id) ? $id : 'not_set';
+		$map_image_class = isset($map_image_class) ? $map_image_class : 'ee_google_map_view';
+
+		$address_string = ($address != '' ? $address : '')
+						  . ($city != '' ? ',' . $city : '')
+						  . ($state != '' ? ',' . $state : '')
+						  . ($zip != '' ? ',' . $zip : '')
+						  . ($country != '' ? ',' . $country : '');
+
+		$google_map = htmlentities2('http://maps.google.com/maps?q=' . urlencode($address_string));
+
+		switch ($type) {
+			case 'text':
+			default:
+				$text = $text == '' ? esc_html__('Map and Directions', 'event_espresso') : $text;
+				break;
+
+			case 'url_only':
+			case 'url':
+				$text = $google_map;
+				break;
+
+			case 'map':
+				$scheme = is_ssl() ? 'https://' : 'http://';
+
+				$api_key = apply_filters(
+					'FHEE__EEH_Maps__espresso_google_maps_link__api_key',
+					EE_Registry::instance()->CFG->map_settings->google_map_api_key
+				);
+
+				return '<a class="a_map_image_link" href="' . $google_map . '" target="_blank" rel="noopener noreferrer">' . '<img class="map_image_link" id="venue_map_' . $id . '" ' . $map_image_class . ' src="' . htmlentities2($scheme . 'maps.googleapis.com/maps/api/staticmap?center=' . urlencode($address_string) . '&amp;zoom=14&amp;size=' . $map_w . 'x' . $map_h . '&amp;markers=color:green|label:|' . urlencode($address_string) . '&amp;sensor=false&amp;key=' . $api_key) . '" /></a>';
+		}
+
+		return $type === 'url_only'
+			? $text
+			: '<a href="' . $google_map . '" target="_blank" rel="noopener noreferrer">' . $text . '</a>';
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -37,7 +37,7 @@ 
             : 'default';
         $static_url          = ! empty($ee_gmaps_opts['ee_static_url']) ? $ee_gmaps_opts['ee_static_url'] : false;
 
-        if (! empty($ee_gmaps_opts['ee_map_align'])) {
+        if ( ! empty($ee_gmaps_opts['ee_map_align'])) {
             switch ($ee_gmaps_opts['ee_map_align']) {
                 case "left":
                     $map_align = 'ee-gmap-align-left left';
@@ -60,16 +60,16 @@ 
         // Determine whether user has set a hardoded url to use and
         // if so display a Google static iframe map else run V3 api
         if ($static_url) {
-            $html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper ' . $map_align . '">';
-            $html .= '<iframe src="' . $static_url . '&output=embed"'
-                . ' style="width: ' . $ee_map_width . 'px; height: ' . $ee_map_height . 'px;"'
+            $html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper '.$map_align.'">';
+            $html .= '<iframe src="'.$static_url.'&output=embed"'
+                . ' style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;"'
                 . ' frameborder="0" scrolling="no">';
             $html .= '</iframe>';
-            $html .= '<a href="' . $static_url . '">View Large map</a>';
+            $html .= '<a href="'.$static_url.'">View Large map</a>';
             $html .= '</div>';
             return $html;
         } else {
-            EEH_Maps::$gmap_vars[ $ee_gmaps_opts['map_ID'] ] = array(
+            EEH_Maps::$gmap_vars[$ee_gmaps_opts['map_ID']] = array(
                 'map_ID'              => $ee_gmaps_opts['map_ID'],
                 'ee_map_zoom'         => $ee_map_zoom,
                 'ee_map_nav_display'  => $ee_map_nav_display,
@@ -78,10 +78,10 @@ 
                 'location'            => $ee_gmaps_opts['location'],
             );
 
-            $style = 'width: ' . $ee_map_width . 'px; height: ' . $ee_map_height . 'px;';
-            $html = '<div class="ee-gmap-wrapper ' . $map_align . '">'
-                    . '<div class="ee-gmap" id="map_canvas_' . $ee_gmaps_opts['map_ID'] . '"'
-                    . ' style="' . $style . '"></div>'
+            $style = 'width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;';
+            $html = '<div class="ee-gmap-wrapper '.$map_align.'">'
+                    . '<div class="ee-gmap" id="map_canvas_'.$ee_gmaps_opts['map_ID'].'"'
+                    . ' style="'.$style.'"></div>'
                     . '</div>';
 
             wp_enqueue_script('gmap_api');
@@ -117,7 +117,7 @@ 
             )
         );
         wp_register_script('gmap_api', $api_url, array('jquery'), null, true);
-        wp_register_script('ee_gmap', plugin_dir_url(__FILE__) . 'assets/ee_gmap.js', array('gmap_api'), '1.0', true);
+        wp_register_script('ee_gmap', plugin_dir_url(__FILE__).'assets/ee_gmap.js', array('gmap_api'), '1.0', true);
     }
 
     /**
@@ -148,12 +148,12 @@ 
         $map_image_class = isset($map_image_class) ? $map_image_class : 'ee_google_map_view';
 
         $address_string = ($address != '' ? $address : '')
-                          . ($city != '' ? ',' . $city : '')
-                          . ($state != '' ? ',' . $state : '')
-                          . ($zip != '' ? ',' . $zip : '')
-                          . ($country != '' ? ',' . $country : '');
+                          . ($city != '' ? ','.$city : '')
+                          . ($state != '' ? ','.$state : '')
+                          . ($zip != '' ? ','.$zip : '')
+                          . ($country != '' ? ','.$country : '');
 
-        $google_map = htmlentities2('http://maps.google.com/maps?q=' . urlencode($address_string));
+        $google_map = htmlentities2('http://maps.google.com/maps?q='.urlencode($address_string));
 
         switch ($type) {
             case 'text':
@@ -174,11 +174,11 @@ 
                     EE_Registry::instance()->CFG->map_settings->google_map_api_key
                 );
 
-                return '<a class="a_map_image_link" href="' . $google_map . '" target="_blank" rel="noopener noreferrer">' . '<img class="map_image_link" id="venue_map_' . $id . '" ' . $map_image_class . ' src="' . htmlentities2($scheme . 'maps.googleapis.com/maps/api/staticmap?center=' . urlencode($address_string) . '&amp;zoom=14&amp;size=' . $map_w . 'x' . $map_h . '&amp;markers=color:green|label:|' . urlencode($address_string) . '&amp;sensor=false&amp;key=' . $api_key) . '" /></a>';
+                return '<a class="a_map_image_link" href="'.$google_map.'" target="_blank" rel="noopener noreferrer">'.'<img class="map_image_link" id="venue_map_'.$id.'" '.$map_image_class.' src="'.htmlentities2($scheme.'maps.googleapis.com/maps/api/staticmap?center='.urlencode($address_string).'&amp;zoom=14&amp;size='.$map_w.'x'.$map_h.'&amp;markers=color:green|label:|'.urlencode($address_string).'&amp;sensor=false&amp;key='.$api_key).'" /></a>';
         }
 
         return $type === 'url_only'
             ? $text
-            : '<a href="' . $google_map . '" target="_blank" rel="noopener noreferrer">' . $text . '</a>';
+            : '<a href="'.$google_map.'" target="_blank" rel="noopener noreferrer">'.$text.'</a>';
     }
 }

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

Indentation +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@
 <div class="padding">
     <p><?php
-        printf(
-            esc_html__('Check out the %1$sroadmap for Event Espresso%2$s.', 'event_espresso'),
-            '<a href="https://trello.com/b/zg9DCIpe/event-espresso-public-roadmap" target="_blank" rel="noopener noreferrer">',
-            '</a>'
-        ); ?></p>
+		printf(
+			esc_html__('Check out the %1$sroadmap for Event Espresso%2$s.', 'event_espresso'),
+			'<a href="https://trello.com/b/zg9DCIpe/event-espresso-public-roadmap" target="_blank" rel="noopener noreferrer">',
+			'</a>'
+		); ?></p>
 </div>
\ No newline at end of file

caffeinated/payment_methods/Paypal_Pro/templates/paypal_pro_debug_info.template.php

Indentation +32 added lines, -32 removed lines

@@ -16,39 +16,39 @@ 
     <div class="sandbox-panel">
     <h2 class="section-title"><?php _e('PayPal Sandbox Mode', 'event_espresso'); ?></h2>
     <h3 style="color:#ff0000;"><?php
-        _e(
-            'Debug Mode Is Turned On. Payments will not be processed',
-            'event_espresso'
-        ); ?></h3>
+		_e(
+			'Debug Mode Is Turned On. Payments will not be processed',
+			'event_espresso'
+		); ?></h3>
 
     <p class="test-credit-cards-info-pg" style="margin-bottom:0;">
         <strong><?php _e('Testing Guidelines', 'event_espresso'); ?></strong>
     </p>
     <ul style="margin:1em 2em 1.5em; line-height:1.2em;">
         <li><?php
-            _e(
-                'While testing, use the credit card number associated with your sandbox account.',
-                'event_espresso'
-            ); ?></li>
+			_e(
+				'While testing, use the credit card number associated with your sandbox account.',
+				'event_espresso'
+			); ?></li>
         <li><?php
-            printf(
-                __(
-                    'To find the sandbox account\'s credit card, go to %1$s, then "Dashboard", then under Sandbox click "Accounts", then click your account and click "Profile", then in the popup that appears click on the "Funding" tab. Your testing card is listed there.',
-                    'event_espresso'
-                ),
-                '<a href="http://developer.paypal.com">developer.paypal.com</a>'
-            ); ?></li>
+			printf(
+				__(
+					'To find the sandbox account\'s credit card, go to %1$s, then "Dashboard", then under Sandbox click "Accounts", then click your account and click "Profile", then in the popup that appears click on the "Funding" tab. Your testing card is listed there.',
+					'event_espresso'
+				),
+				'<a href="http://developer.paypal.com">developer.paypal.com</a>'
+			); ?></li>
         <li><?php
-            esc_html_e('CVV2 should be 115', 'event_espresso'); ?></li>
+			esc_html_e('CVV2 should be 115', 'event_espresso'); ?></li>
     </ul>
 
     <p class="test-credit-cards-info-pg">
         <strong><?php _e('Credit Card Numbers Used for Testing', 'event_espresso'); ?></strong><br/>
         <span class="small-text"><?php
-            _e(
-                'Use the following credit card numbers for testing. Any other card number produces a general failure.',
-                'event_espresso'
-            ); ?></span>
+			_e(
+				'Use the following credit card numbers for testing. Any other card number produces a general failure.',
+				'event_espresso'
+			); ?></span>
     </p>
 
     <div class="tbl-wrap">
@@ -72,18 +72,18 @@ 
     <p class="test-credit-cards-info-pg">
         <strong><?php _e('Testing Result Code Responses', 'event_espresso'); ?></strong><br/>
         <span class="small-text"><?php
-            printf(
-                __(
-                    'You can use the amount of the transaction to generate a particular result code (see %s PayPal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox PayPal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this PayPal doc %s',
-                    'event_espresso'
-                ),
-                "<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>",
-                "</a>",
-                "<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>",
-                "</a>",
-                "<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>",
-                "</a>"
-            ); ?></span>
+			printf(
+				__(
+					'You can use the amount of the transaction to generate a particular result code (see %s PayPal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox PayPal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this PayPal doc %s',
+					'event_espresso'
+				),
+				"<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>",
+				"</a>",
+				"<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>",
+				"</a>",
+				"<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>",
+				"</a>"
+			); ?></span>
     </p>
 
     <div class="tbl-wrap">

admin_pages/registration_form/help_tabs/registration_form_reg_form_settings.help_tab.php

Spacing +2 added lines, -2 removed lines

@@ -3,10 +3,10 @@
 <?php esc_html_e('This page shows options for Email Validation, the EE "Bot Trap" and reCAPTCHA which can help prevent SPAM registrations on your site.', 'event_espresso'); ?>
 </p>
 <div id="email_validation_info">
-<p><strong><?php esc_html_e('Email Validation', 'event_espresso');?></strong></p>
+<p><strong><?php esc_html_e('Email Validation', 'event_espresso'); ?></strong></p>
 <p><?php esc_html_e("Validating an email address is extremely difficult to do correctly. Your server's configuration, as well as your own tolerances and needs, can affect the type of validation needed. We offer different types of validation so that you can control how strict your registration form responds to entered email addresses. If you are receiving too many bogus email addresses, then you can try the WordPress Default validation setting. If you find that the form validation is blocking a valid email address you can try the Basic setting, or if available, the International validation settings.", 'event_espresso'); ?>
 </p>
-<p><strong><?php esc_html_e('Validation Options:', 'event_espresso');?></strong></p>
+<p><strong><?php esc_html_e('Validation Options:', 'event_espresso'); ?></strong></p>
 <ul>
 <li>
     <?php esc_html_e('"Basic" - only checks that an email address follows the most basic structure guidelines ( ie: text@text.text ). Will work with the widest range of email addresses but will also allow the most garbage through.', 'event_espresso'); ?></li>

admin_pages/support/templates/developers_admin_details.template.php

Indentation +55 added lines, -55 removed lines

@@ -1,93 +1,93 @@
 <div class="padding">
     <?php esc_html_e(
-        'If you want to integrate with Event Espresso or participate in building code, then you are in the right place. The following resources can help you get started.',
-        'event_espresso'
-    ); ?>
+		'If you want to integrate with Event Espresso or participate in building code, then you are in the right place. The following resources can help you get started.',
+		'event_espresso'
+	); ?>
     <h2><?php esc_html_e('Developer Resources', 'event_espresso'); ?></h2>
     <ul>
         <li>
             <?php printf(
-                esc_html__('%1$sEvent Espresso 4 Developer Documentation%2$s', 'event_espresso'),
-                '<a href="https://github.com/eventespresso/event-espresso-core/tree/master/docs#getting-started-with-the-ee-developer-docs" target="_blank" rel="noopener noreferrer">',
-                '</a>'
-            ); ?></li>
+				esc_html__('%1$sEvent Espresso 4 Developer Documentation%2$s', 'event_espresso'),
+				'<a href="https://github.com/eventespresso/event-espresso-core/tree/master/docs#getting-started-with-the-ee-developer-docs" target="_blank" rel="noopener noreferrer">',
+				'</a>'
+			); ?></li>
         <li>
             <?php printf(
-                esc_html__('%1$sEvent Espresso 4 Developer News%2$s', 'event_espresso'),
-                '<a href="http://developer.eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
-                '</a>'
-            ); ?></li>
+				esc_html__('%1$sEvent Espresso 4 Developer News%2$s', 'event_espresso'),
+				'<a href="http://developer.eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
+				'</a>'
+			); ?></li>
         <li>
             <?php printf(
-                esc_html__('%1$sApply%2$s to be listed as an %3$sEvent Espresso Professional%2$s', 'event_espresso'),
-                '<a href="https://eventespresso.com/developers/event-espresso-pros-application/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
-                '</a>',
-                '<a href="https://eventespresso.com/developers/event-espresso-pros/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">'
-            ); ?></li>
+				esc_html__('%1$sApply%2$s to be listed as an %3$sEvent Espresso Professional%2$s', 'event_espresso'),
+				'<a href="https://eventespresso.com/developers/event-espresso-pros-application/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
+				'</a>',
+				'<a href="https://eventespresso.com/developers/event-espresso-pros/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">'
+			); ?></li>
     </ul>
 
     <h2><?php esc_html_e('Event Espresso 4 Articles for Developers', 'event_espresso'); ?></h2>
     <ul>
         <li>
             <?php printf(
-                esc_html__('%1$sCustom Post Types Usage%2$s', 'event_espresso'),
-                '<a href="https://eventespresso.com/2014/02/epsresso-brewery-custom-post-types-event-espresso/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
-                '</a>'
-            ); ?></li>
+				esc_html__('%1$sCustom Post Types Usage%2$s', 'event_espresso'),
+				'<a href="https://eventespresso.com/2014/02/epsresso-brewery-custom-post-types-event-espresso/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
+				'</a>'
+			); ?></li>
         <li>
             <?php printf(
-                esc_html__('%1$sTheme Development%2$s', 'event_espresso'),
-                '<a href="https://eventespresso.com/2014/02/developers-corner-theming-event-espresso-4/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
-                '</a>'
-            ); ?></li>
+				esc_html__('%1$sTheme Development%2$s', 'event_espresso'),
+				'<a href="https://eventespresso.com/2014/02/developers-corner-theming-event-espresso-4/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
+				'</a>'
+			); ?></li>
         <li>
             <?php printf(
-                esc_html__('%1$sCapability System%2$s', 'event_espresso'),
-                '<a href="http://developer.eventespresso.com/docs/ee-capability-system-overview/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
-                '</a>'
-            ); ?></li>
+				esc_html__('%1$sCapability System%2$s', 'event_espresso'),
+				'<a href="http://developer.eventespresso.com/docs/ee-capability-system-overview/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
+				'</a>'
+			); ?></li>
         <li>
             <?php printf(
-                esc_html__('%1$sPayment Method Development%2$s', 'event_espresso'),
-                '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/L--Payment-Methods-and-Gateways/creating-a-payment-method.md" target="_blank" rel="noopener noreferrer">',
-                '</a>'
-            ); ?></li>
+				esc_html__('%1$sPayment Method Development%2$s', 'event_espresso'),
+				'<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/L--Payment-Methods-and-Gateways/creating-a-payment-method.md" target="_blank" rel="noopener noreferrer">',
+				'</a>'
+			); ?></li>
         <li>
             <?php printf(
-                esc_html__('%1$sMessages System in Event Espresso 4%2$s', 'event_espresso'),
-                '<a href="https://eventespresso.com/2014/03/messages-systemyour-tool-getting-word/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
-                '</a>'
-            ); ?></li>
+				esc_html__('%1$sMessages System in Event Espresso 4%2$s', 'event_espresso'),
+				'<a href="https://eventespresso.com/2014/03/messages-systemyour-tool-getting-word/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
+				'</a>'
+			); ?></li>
         <li>
             <?php printf(
-                esc_html__(
-                    '%1$sDatabase Model System%2$s (used for interfacing with EE4 data via WordPress plugins and server side querying)',
-                    'event_espresso'
-                ),
-                '<a href="http://developer.eventespresso.com/docs/using-ee4-model-objects/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
-                '</a>'
-            ); ?></li>
+				esc_html__(
+					'%1$sDatabase Model System%2$s (used for interfacing with EE4 data via WordPress plugins and server side querying)',
+					'event_espresso'
+				),
+				'<a href="http://developer.eventespresso.com/docs/using-ee4-model-objects/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">',
+				'</a>'
+			); ?></li>
     </ul>
 
     <h2><?php esc_html_e('REST API Resources', 'event_espresso'); ?></h2>
     <ul>
         <li>
             <?php printf(
-                esc_html__('%1$sREST API: Introduction%2$s', 'event_espresso'),
-                '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-introduction.md" target="_blank" rel="noopener noreferrer">',
-                '</a>'
-            ); ?></li>
+				esc_html__('%1$sREST API: Introduction%2$s', 'event_espresso'),
+				'<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-introduction.md" target="_blank" rel="noopener noreferrer">',
+				'</a>'
+			); ?></li>
         <li>
             <?php printf(
-                esc_html__('%1$sREST API: Reading Data%2$s', 'event_espresso'),
-                '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-reading-data.md" target="_blank" rel="noopener noreferrer">',
-                '</a>'
-            ); ?></li>
+				esc_html__('%1$sREST API: Reading Data%2$s', 'event_espresso'),
+				'<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-reading-data.md" target="_blank" rel="noopener noreferrer">',
+				'</a>'
+			); ?></li>
         <li>
             <?php printf(
-                esc_html__('%1$sBuilding an EE4 Add-on Using the REST API%2$s', 'event_espresso'),
-                '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/T--Tutorials/building-an-ee4-addon-that-uses-angular-js-and-the-ee4-json-rest-api.md" target="_blank" rel="noopener noreferrer">',
-                '</a>'
-            ); ?></li>
+				esc_html__('%1$sBuilding an EE4 Add-on Using the REST API%2$s', 'event_espresso'),
+				'<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/T--Tutorials/building-an-ee4-addon-that-uses-angular-js-and-the-ee4-json-rest-api.md" target="_blank" rel="noopener noreferrer">',
+				'</a>'
+			); ?></li>
     </ul>
 </div>
\ No newline at end of file

admin_pages/venues/templates/google_map.template.php

Indentation +42 added lines, -42 removed lines

@@ -11,20 +11,20 @@ 
             </th>
             <td>
                 <?php echo EEH_Form_Fields::select_input(
-                    'use_google_maps',
-                    $values,
-                    $map_settings->use_google_maps,
-                    'id="ee-display-map-no-shortcodes"'
-                ); ?>
+					'use_google_maps',
+					$values,
+					$map_settings->use_google_maps,
+					'id="ee-display-map-no-shortcodes"'
+				); ?>
                 <p class="description">
                     <?php esc_html_e(
-                        'Turn Google maps on or off site wide for Event Espresso.',
-                        'event_espresso'
-                    ); ?></p>
+						'Turn Google maps on or off site wide for Event Espresso.',
+						'event_espresso'
+					); ?></p>
             </td>
         </tr>
         <?php
-        if (apply_filters('FHEE__google_map__show_api_key_input', true)) { ?>
+		if (apply_filters('FHEE__google_map__show_api_key_input', true)) { ?>
             <tr>
                 <th>
                     <label for="ee-google-map-api-key">
@@ -36,15 +36,15 @@ 
                            value="<?php echo $map_settings->google_map_api_key; ?>"/>
                     <p class="description">
                         <?php
-                        printf(
-                            __(
-                                'An API key is now required to use the Google Maps API: %1$sclick here to get an API key%2$s',
-                                'event_espresso'
-                            ),
-                            '<a href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend,geocoding_backend,directions_backend,distance_matrix_backend,elevation_backend,static_maps_backend&keyType=CLIENT_SIDE&reusekey=true" target="_blank" rel="noopener noreferrer">',
-                            '</a>'
-                        );
-                        ?>
+						printf(
+							__(
+								'An API key is now required to use the Google Maps API: %1$sclick here to get an API key%2$s',
+								'event_espresso'
+							),
+							'<a href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend,geocoding_backend,directions_backend,distance_matrix_backend,elevation_backend,static_maps_backend&keyType=CLIENT_SIDE&reusekey=true" target="_blank" rel="noopener noreferrer">',
+							'</a>'
+						);
+						?>
                     </p>
                 </td>
             </tr>
@@ -105,11 +105,11 @@ 
             </th>
             <td>
                 <?php echo EEH_Form_Fields::select_input(
-                    'event_details_display_nav',
-                    $values,
-                    $map_settings->event_details_display_nav,
-                    'id="event_details_display_nav" '
-                ); ?>
+					'event_details_display_nav',
+					$values,
+					$map_settings->event_details_display_nav,
+					'id="event_details_display_nav" '
+				); ?>
             </td>
         </tr>
 
@@ -121,11 +121,11 @@ 
             </th>
             <td>
                 <?php echo EEH_Form_Fields::select_input(
-                    'event_details_nav_size',
-                    $values,
-                    $map_settings->event_details_nav_size,
-                    'id="event_details_nav_size"'
-                ); ?>
+					'event_details_nav_size',
+					$values,
+					$map_settings->event_details_nav_size,
+					'id="event_details_nav_size"'
+				); ?>
             </td>
         </tr>
 
@@ -136,7 +136,7 @@ 
             <td>
                 <label for="event_details_control_type-default" class="ee-admin-radio-lbl">
                     <?php $checked = $map_settings->event_details_control_type == 'default' ? 'checked="checked"'
-                        : ''; ?>
+						: ''; ?>
                     <input id="event_details_control_type-default" type="radio" name="event_details_control_type"
                            value="default"<?php echo $checked; ?>/>
                     <?php esc_html_e(' Default', 'event_espresso') ?>
@@ -144,7 +144,7 @@ 
 
                 <label for="event_details_control_type-horizontal" class="ee-admin-radio-lbl">
                     <?php $checked = $map_settings->event_details_control_type == 'horizontal' ? 'checked="checked"'
-                        : ''; ?>
+						: ''; ?>
                     <input id="event_details_control_type-horizontal" type="radio" name="event_details_control_type"
                            value="horizontal"<?php echo $checked; ?>/>
                     <?php esc_html_e(' Horizontal', 'event_espresso') ?>
@@ -152,7 +152,7 @@ 
 
                 <label for="event_details_control_type-dropdown" class="ee-admin-radio-lbl">
                     <?php $checked = $map_settings->event_details_control_type == 'dropdown' ? 'checked="checked"'
-                        : ''; ?>
+						: ''; ?>
                     <input id="event_details_control_type-dropdown" type="radio" name="event_details_control_type"
                            value="dropdown"<?php echo $checked; ?>/>
                     <?php esc_html_e(' Dropdown', 'event_espresso') ?>
@@ -246,11 +246,11 @@ 
             </th>
             <td>
                 <?php echo EEH_Form_Fields::select_input(
-                    'event_list_display_nav',
-                    $values,
-                    $map_settings->event_list_display_nav,
-                    'id="event_list_display_nav"'
-                ); ?>
+					'event_list_display_nav',
+					$values,
+					$map_settings->event_list_display_nav,
+					'id="event_list_display_nav"'
+				); ?>
             </td>
         </tr>
 
@@ -262,11 +262,11 @@ 
             </th>
             <td>
                 <?php echo EEH_Form_Fields::select_input(
-                    'event_list_nav_size',
-                    $values,
-                    $map_settings->event_list_nav_size,
-                    'id="event_list_nav_size"'
-                ); ?>
+					'event_list_nav_size',
+					$values,
+					$map_settings->event_list_nav_size,
+					'id="event_list_nav_size"'
+				); ?>
             </td>
         </tr>
 
@@ -284,7 +284,7 @@ 
 
                 <label for="event_list_control_type-horizontal" class="ee-admin-radio-lbl">
                     <?php $checked = $map_settings->event_list_control_type == 'horizontal' ? 'checked="checked"'
-                        : ''; ?>
+						: ''; ?>
                     <input id="event_list_control_type-horizontal" type="radio" name="event_list_control_type"
                            value="horizontal"<?php echo $checked; ?>/>
                     <?php esc_html_e(' Horizontal', 'event_espresso') ?>