eventespresso / event-espresso-core

acceptance_tests/Page/CoreAdmin.php

Spacing +5 added lines, -5 removed lines

@@ -66,9 +66,9 @@ 
      */
     public static function adminUrl($page = 'espresso_events', $action = 'default', $additional_params = '')
     {
-        $url = self::URL_PREFIX . $page;
-        $url .= $action ? '&action=' . $action : '';
-        $url .= $additional_params ? '&' . ltrim('&', ltrim('?', $additional_params)) : '';
+        $url = self::URL_PREFIX.$page;
+        $url .= $action ? '&action='.$action : '';
+        $url .= $additional_params ? '&'.ltrim('&', ltrim('?', $additional_params)) : '';
         return $url;
     }
 
@@ -80,7 +80,7 @@ 
      */
     public static function wpEditorTextTabSelector($field_reference)
     {
-        return '#content-' . $field_reference . '-content-html';
+        return '#content-'.$field_reference.'-content-html';
     }
 
 
@@ -91,6 +91,6 @@ 
      */
     public static function wpEditorTextAreaSelector($field_reference)
     {
-        return '#content-' . $field_reference . '-content';
+        return '#content-'.$field_reference.'-content';
     }
 }

Indentation +92 added lines, -92 removed lines

@@ -13,96 +13,96 @@
 class CoreAdmin
 {
 
-    /**
-     * @var string
-     */
-    const URL_PREFIX = 'admin.php?page=';
-
-
-    /**
-     * This is the selector for the next page button on list tables.
-     * @var string
-     */
-    const ADMIN_LIST_TABLE_NEXT_PAGE_CLASS = '.next-page';
-
-
-    /**
-     * The selector for the search input submit button on list table pages
-     * @var string
-     */
-    const LIST_TABLE_SEARCH_SUBMIT_SELECTOR = '#search-submit';
-
-
-    /**
-     * Selector for the screen options dropdown.
-     * @var string
-     */
-    const WP_SCREEN_SETTINGS_LINK_SELECTOR = '#show-settings-link';
-
-
-    /**
-     * Selector for the per page field setting selector (found within screen options dropdown)
-     * @var string
-     */
-    const WP_SCREEN_SETTINGS_PER_PAGE_FIELD_SELECTOR = '.screen-per-page';
-
-
-    /**
-     * Selector for apply screen options settings.
-     * @var string
-     */
-    const WP_SCREEN_OPTIONS_APPLY_SETTINGS_BUTTON_SELECTOR = '#screen-options-apply';
-
-
-    /**
-     * Selector for bulk action select field on list tables.
-     */
-    const SELECTOR_LIST_TABLE_BULK_ACTION_FIELD = '#bulk-action-selector-';
-
-
-    /**
-     * Selector for applying a bulk action.
-     */
-    const SELECTOR_LIST_TABLE_BULK_ACTTION_APPLY = '#doaction';
-
-
-    /**
-     * Get the EE admin url for the given properties.
-     * Note, this is JUST the endpoint for the admin route.  It is expected that the actor/test would be calling this
-     * with `amOnAdminPage` action.
-     *
-     * @param string $page
-     * @param string $action
-     * @param string $additional_params
-     * @return string
-     */
-    public static function adminUrl($page = 'espresso_events', $action = 'default', $additional_params = '')
-    {
-        $url = self::URL_PREFIX . $page;
-        $url .= $action ? '&action=' . $action : '';
-        $url .= $additional_params ? '&' . ltrim('&', ltrim('?', $additional_params)) : '';
-        return $url;
-    }
-
-
-    /**
-     * Returns the selector for the text tab switcher for a wp-editor instance.
-     * @param $field_reference
-     * @return string
-     */
-    public static function wpEditorTextTabSelector($field_reference)
-    {
-        return '#content-' . $field_reference . '-content-html';
-    }
-
-
-    /**
-     * Returns the selector for the textarea exposed when clicing the text tab switcher for a wp-editor instance.
-     * @param $field_reference
-     * @return string
-     */
-    public static function wpEditorTextAreaSelector($field_reference)
-    {
-        return '#content-' . $field_reference . '-content';
-    }
+	/**
+	 * @var string
+	 */
+	const URL_PREFIX = 'admin.php?page=';
+
+
+	/**
+	 * This is the selector for the next page button on list tables.
+	 * @var string
+	 */
+	const ADMIN_LIST_TABLE_NEXT_PAGE_CLASS = '.next-page';
+
+
+	/**
+	 * The selector for the search input submit button on list table pages
+	 * @var string
+	 */
+	const LIST_TABLE_SEARCH_SUBMIT_SELECTOR = '#search-submit';
+
+
+	/**
+	 * Selector for the screen options dropdown.
+	 * @var string
+	 */
+	const WP_SCREEN_SETTINGS_LINK_SELECTOR = '#show-settings-link';
+
+
+	/**
+	 * Selector for the per page field setting selector (found within screen options dropdown)
+	 * @var string
+	 */
+	const WP_SCREEN_SETTINGS_PER_PAGE_FIELD_SELECTOR = '.screen-per-page';
+
+
+	/**
+	 * Selector for apply screen options settings.
+	 * @var string
+	 */
+	const WP_SCREEN_OPTIONS_APPLY_SETTINGS_BUTTON_SELECTOR = '#screen-options-apply';
+
+
+	/**
+	 * Selector for bulk action select field on list tables.
+	 */
+	const SELECTOR_LIST_TABLE_BULK_ACTION_FIELD = '#bulk-action-selector-';
+
+
+	/**
+	 * Selector for applying a bulk action.
+	 */
+	const SELECTOR_LIST_TABLE_BULK_ACTTION_APPLY = '#doaction';
+
+
+	/**
+	 * Get the EE admin url for the given properties.
+	 * Note, this is JUST the endpoint for the admin route.  It is expected that the actor/test would be calling this
+	 * with `amOnAdminPage` action.
+	 *
+	 * @param string $page
+	 * @param string $action
+	 * @param string $additional_params
+	 * @return string
+	 */
+	public static function adminUrl($page = 'espresso_events', $action = 'default', $additional_params = '')
+	{
+		$url = self::URL_PREFIX . $page;
+		$url .= $action ? '&action=' . $action : '';
+		$url .= $additional_params ? '&' . ltrim('&', ltrim('?', $additional_params)) : '';
+		return $url;
+	}
+
+
+	/**
+	 * Returns the selector for the text tab switcher for a wp-editor instance.
+	 * @param $field_reference
+	 * @return string
+	 */
+	public static function wpEditorTextTabSelector($field_reference)
+	{
+		return '#content-' . $field_reference . '-content-html';
+	}
+
+
+	/**
+	 * Returns the selector for the textarea exposed when clicing the text tab switcher for a wp-editor instance.
+	 * @param $field_reference
+	 * @return string
+	 */
+	public static function wpEditorTextAreaSelector($field_reference)
+	{
+		return '#content-' . $field_reference . '-content';
+	}
 }

core/libraries/form_sections/strategies/layout/EE_Two_Column_Layout.strategy.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
             $this->_form_section->html_id(),
             $this->_form_section->html_class(),
             $this->_form_section->html_style()
-        ) . EEH_HTML::tbody();
+        ).EEH_HTML::tbody();
     }
 
 
@@ -31,7 +31,7 @@ 
      */
     public function layout_form_end($additional_args = array())
     {
-        return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
+        return EEH_HTML::tbodyx().EEH_HTML::tablex($this->_form_section->html_id());
     }
 
 
@@ -50,11 +50,11 @@ 
         } else {
             $html_for_input = $input->get_html_for_input();
             $html_for_input .= $input->get_html_for_errors() != ''
-                ? EEH_HTML::nl() . $input->get_html_for_errors()
+                ? EEH_HTML::nl().$input->get_html_for_errors()
                 : '';
-            $html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
+            $html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl().$input->get_html_for_help() : '';
             $html .= EEH_HTML::tr(
-                EEH_HTML::th($input->get_html_for_label()) .
+                EEH_HTML::th($input->get_html_for_label()).
                 EEH_HTML::td($html_for_input)
             );
         }

Indentation +68 added lines, -68 removed lines

@@ -5,81 +5,81 @@
 class EE_Two_Column_Layout extends EE_Form_Section_Layout_Base
 {
 
-    /**
-     * Should be used to start teh form section (Eg a table tag, or a div tag, etc.)
-     *
-     * @param array $additional_args
-     * @return string
-     */
-    public function layout_form_begin($additional_args = array())
-    {
-        return $this->display_form_wide_errors()
-        . EEH_HTML::table(
-            '',
-            $this->_form_section->html_id(),
-            $this->_form_section->html_class(),
-            $this->_form_section->html_style()
-        ) . EEH_HTML::tbody();
-    }
+	/**
+	 * Should be used to start teh form section (Eg a table tag, or a div tag, etc.)
+	 *
+	 * @param array $additional_args
+	 * @return string
+	 */
+	public function layout_form_begin($additional_args = array())
+	{
+		return $this->display_form_wide_errors()
+		. EEH_HTML::table(
+			'',
+			$this->_form_section->html_id(),
+			$this->_form_section->html_class(),
+			$this->_form_section->html_style()
+		) . EEH_HTML::tbody();
+	}
 
 
 
-    /**
-     * Should be used to end the form section (eg a /table tag, or a /div tag, etc)
-     *
-     * @param array $additional_args
-     * @return string
-     */
-    public function layout_form_end($additional_args = array())
-    {
-        return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
-    }
+	/**
+	 * Should be used to end the form section (eg a /table tag, or a /div tag, etc)
+	 *
+	 * @param array $additional_args
+	 * @return string
+	 */
+	public function layout_form_end($additional_args = array())
+	{
+		return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
+	}
 
 
 
-    /**
-     * Lays out the row for the input, including label and errors
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string
-     */
-    public function layout_input($input)
-    {
-        $html = '';
-        if ($input instanceof EE_Hidden_Input) {
-            $html .= $input->get_html_for_input();
-        } else {
-            $html_for_input = $input->get_html_for_input();
-            $html_for_input .= $input->get_html_for_errors() != ''
-                ? EEH_HTML::nl() . $input->get_html_for_errors()
-                : '';
-            $html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
-            $html .= EEH_HTML::tr(
-                EEH_HTML::th($input->get_html_for_label()) .
-                EEH_HTML::td($html_for_input)
-            );
-        }
-        return $html;
-    }
+	/**
+	 * Lays out the row for the input, including label and errors
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 */
+	public function layout_input($input)
+	{
+		$html = '';
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= $input->get_html_for_input();
+		} else {
+			$html_for_input = $input->get_html_for_input();
+			$html_for_input .= $input->get_html_for_errors() != ''
+				? EEH_HTML::nl() . $input->get_html_for_errors()
+				: '';
+			$html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
+			$html .= EEH_HTML::tr(
+				EEH_HTML::th($input->get_html_for_label()) .
+				EEH_HTML::td($html_for_input)
+			);
+		}
+		return $html;
+	}
 
 
 
-    /**
-     * Lays out a row for the subsection
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-     */
-    public function layout_subsection($form_section)
-    {
-        $html = '';
-        if ($form_section instanceof EE_Form_Section_HTML) {
-            $html .= $form_section->get_html();
-        } else {
-            $html .= EEH_HTML::tr(
-                EEH_HTML::td($form_section->get_html(), '', '', '', 'colspan="2"')
-            );
-        }
-        return $html;
-    }
+	/**
+	 * Lays out a row for the subsection
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 */
+	public function layout_subsection($form_section)
+	{
+		$html = '';
+		if ($form_section instanceof EE_Form_Section_HTML) {
+			$html .= $form_section->get_html();
+		} else {
+			$html .= EEH_HTML::tr(
+				EEH_HTML::td($form_section->get_html(), '', '', '', 'colspan="2"')
+			);
+		}
+		return $html;
+	}
 }

admin_pages/transactions/EE_Admin_Transactions_List_Table.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
      *
      * @abstract
      * @access protected
-     * @return array
+     * @return string[]
      */
     protected function _get_table_filters()
     {
@@ -265,7 +265,7 @@ 
      *    column_TXN_paid
      *
      * @param \EE_Transaction $transaction
-     * @return mixed|string
+     * @return string
      * @throws \EE_Error
      */
     public function column_TXN_paid(EE_Transaction $transaction)

Indentation +658 added lines, -658 removed lines

@@ -15,121 +15,121 @@ 
 class EE_Admin_Transactions_List_Table extends EE_Admin_List_Table
 {
 
-    /**
-     * @var SessionLifespan $session_lifespan
-     */
-    private $session_lifespan;
-
-    private $_status;
-
-
-    /**
-     * @param \Transactions_Admin_Page $admin_page
-     * @param SessionLifespan          $lifespan
-     */
-    public function __construct(\Transactions_Admin_Page $admin_page, SessionLifespan $lifespan)
-    {
-        parent::__construct($admin_page);
-        $this->session_lifespan = $lifespan;
-        $this->_status = $this->_admin_page->get_transaction_status_array();
-    }
-
-
-    /**
-     *_setup_data
-     */
-    protected function _setup_data()
-    {
-        $this->_data = $this->_admin_page->get_transactions($this->_per_page);
-        $status = ! empty($this->_req_data['status']) ? $this->_req_data['status'] : 'all';
-        $this->_all_data_count = $this->_admin_page->get_transactions($this->_per_page, true, $status);
-    }
-
-
-    /**
-     *_set_properties
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => __('transaction', 'event_espresso'),
-            'plural'   => __('transactions', 'event_espresso'),
-            'ajax'     => true,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-        $ID_column_name = __('ID', 'event_espresso');
-        $ID_column_name .= ' : <span class="show-on-mobile-view-only" style="float:none">';
-        $ID_column_name .= __('Transaction Date', 'event_espresso');
-        $ID_column_name .= '</span> ';
-        $this->_columns = array(
-            'TXN_ID'        => $ID_column_name,
-            'TXN_timestamp' => __('Transaction Date', 'event_espresso'),
-            'TXN_total'     => __('Total', 'event_espresso'),
-            'TXN_paid'      => __('Paid', 'event_espresso'),
-            'ATT_fname'     => __('Primary Registrant', 'event_espresso'),
-            'event_name'    => __('Event', 'event_espresso'),
-            'actions'       => __('Actions', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'TXN_ID'        => array('TXN_ID' => false),
-            'event_name'    => array('event_name' => false),
-            'ATT_fname'     => array('ATT_fname' => false),
-            'TXN_timestamp' => array('TXN_timestamp' => true) // true means its already sorted
-        );
-
-        $this->_primary_column = 'TXN_ID';
-
-        $this->_hidden_columns = array();
-    }
-
-
-    /**
-     * This simply sets up the row class for the table rows.
-     * Allows for easier overriding of child methods for setting up sorting.
-     *
-     * @param  EE_Transaction $transaction the current item
-     * @return string
-     * @throws \EE_Error
-     */
-    protected function _get_row_class($transaction)
-    {
-        $class = parent::_get_row_class($transaction);
-        // add status class
-        $class .= ' ee-status-strip txn-status-' . $transaction->status_ID();
-        if ($this->_has_checkbox_column) {
-            $class .= ' has-checkbox-column';
-        }
-        return $class;
-    }
-
-
-    /**
-     * _get_table_filters
-     * We use this to assemble and return any filters that are associated with this table that help further refine what
-     * get's shown in the table.
-     *
-     * @abstract
-     * @access protected
-     * @return array
-     */
-    protected function _get_table_filters()
-    {
-        $filters = array();
-        $start_date = isset($this->_req_data['txn-filter-start-date'])
-            ? wp_strip_all_tags($this->_req_data['txn-filter-start-date'])
-            : date(
-                'm/d/Y',
-                strtotime('-10 year')
-            );
-        $end_date = isset($this->_req_data['txn-filter-end-date'])
-            ? wp_strip_all_tags($this->_req_data['txn-filter-end-date'])
-            : date(
-                'm/d/Y',
-                current_time('timestamp')
-            );
-        ob_start();
-        ?>
+	/**
+	 * @var SessionLifespan $session_lifespan
+	 */
+	private $session_lifespan;
+
+	private $_status;
+
+
+	/**
+	 * @param \Transactions_Admin_Page $admin_page
+	 * @param SessionLifespan          $lifespan
+	 */
+	public function __construct(\Transactions_Admin_Page $admin_page, SessionLifespan $lifespan)
+	{
+		parent::__construct($admin_page);
+		$this->session_lifespan = $lifespan;
+		$this->_status = $this->_admin_page->get_transaction_status_array();
+	}
+
+
+	/**
+	 *_setup_data
+	 */
+	protected function _setup_data()
+	{
+		$this->_data = $this->_admin_page->get_transactions($this->_per_page);
+		$status = ! empty($this->_req_data['status']) ? $this->_req_data['status'] : 'all';
+		$this->_all_data_count = $this->_admin_page->get_transactions($this->_per_page, true, $status);
+	}
+
+
+	/**
+	 *_set_properties
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => __('transaction', 'event_espresso'),
+			'plural'   => __('transactions', 'event_espresso'),
+			'ajax'     => true,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+		$ID_column_name = __('ID', 'event_espresso');
+		$ID_column_name .= ' : <span class="show-on-mobile-view-only" style="float:none">';
+		$ID_column_name .= __('Transaction Date', 'event_espresso');
+		$ID_column_name .= '</span> ';
+		$this->_columns = array(
+			'TXN_ID'        => $ID_column_name,
+			'TXN_timestamp' => __('Transaction Date', 'event_espresso'),
+			'TXN_total'     => __('Total', 'event_espresso'),
+			'TXN_paid'      => __('Paid', 'event_espresso'),
+			'ATT_fname'     => __('Primary Registrant', 'event_espresso'),
+			'event_name'    => __('Event', 'event_espresso'),
+			'actions'       => __('Actions', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'TXN_ID'        => array('TXN_ID' => false),
+			'event_name'    => array('event_name' => false),
+			'ATT_fname'     => array('ATT_fname' => false),
+			'TXN_timestamp' => array('TXN_timestamp' => true) // true means its already sorted
+		);
+
+		$this->_primary_column = 'TXN_ID';
+
+		$this->_hidden_columns = array();
+	}
+
+
+	/**
+	 * This simply sets up the row class for the table rows.
+	 * Allows for easier overriding of child methods for setting up sorting.
+	 *
+	 * @param  EE_Transaction $transaction the current item
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	protected function _get_row_class($transaction)
+	{
+		$class = parent::_get_row_class($transaction);
+		// add status class
+		$class .= ' ee-status-strip txn-status-' . $transaction->status_ID();
+		if ($this->_has_checkbox_column) {
+			$class .= ' has-checkbox-column';
+		}
+		return $class;
+	}
+
+
+	/**
+	 * _get_table_filters
+	 * We use this to assemble and return any filters that are associated with this table that help further refine what
+	 * get's shown in the table.
+	 *
+	 * @abstract
+	 * @access protected
+	 * @return array
+	 */
+	protected function _get_table_filters()
+	{
+		$filters = array();
+		$start_date = isset($this->_req_data['txn-filter-start-date'])
+			? wp_strip_all_tags($this->_req_data['txn-filter-start-date'])
+			: date(
+				'm/d/Y',
+				strtotime('-10 year')
+			);
+		$end_date = isset($this->_req_data['txn-filter-end-date'])
+			? wp_strip_all_tags($this->_req_data['txn-filter-end-date'])
+			: date(
+				'm/d/Y',
+				current_time('timestamp')
+			);
+		ob_start();
+		?>
         <label for="txn-filter-start-date">Display Transactions from </label>
         <input id="txn-filter-start-date" class="datepicker" type="text" value="<?php echo $start_date; ?>"
                name="txn-filter-start-date" size="15"/>
@@ -137,578 +137,578 @@ 
         <input id="txn-filter-end-date" class="datepicker" type="text" value="<?php echo $end_date; ?>"
                name="txn-filter-end-date" size="15"/>
         <?php
-        $filters[] = ob_get_contents();
-        ob_end_clean();
-        return $filters;
-    }
-
-
-    /**
-     *_add_view_counts
-     */
-    protected function _add_view_counts()
-    {
-        foreach ($this->_views as $view) {
-            $this->_views[ $view['slug'] ]['count'] = $this->_admin_page->get_transactions($this->_per_page, true, $view['slug']);
-        }
-    }
-
-
-    /**
-     *    column TXN_ID
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_TXN_ID(EE_Transaction $transaction)
-    {
-        $view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action' => 'view_transaction',
-                'TXN_ID' => $transaction->ID(),
-            ),
-            TXN_ADMIN_URL
-        );
-        $content = '<a href="' . $view_lnk_url . '"'
-                   . ' title="' . esc_attr__('Go to Transaction Details', 'event_espresso') . '">'
-                   . $transaction->ID()
-                   . '</a>';
-
-        // txn timestamp
-        $content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp($transaction) . '</span>';
-        return $content;
-    }
-
-
-    /**
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _get_txn_timestamp(EE_Transaction $transaction)
-    {
-        // is TXN less than 2 hours old ?
-        if (($transaction->failed() || $transaction->is_abandoned())
-            && $this->session_lifespan->expiration() < $transaction->datetime(false, true)
-        ) {
-            $timestamp = esc_html__('TXN in progress...', 'event_espresso');
-        } else {
-            $timestamp = $transaction->get_i18n_datetime('TXN_timestamp');
-        }
-        return $timestamp;
-    }
-
-
-    /**
-     *    column_cb
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_cb($transaction)
-    {
-        return sprintf(
-            '<input type="checkbox" name="%1$s[]" value="%2$s" />',
-            $this->_wp_list_args['singular'],
-            $transaction->ID()
-        );
-    }
-
-
-    /**
-     *    column_TXN_timestamp
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_TXN_timestamp(EE_Transaction $transaction)
-    {
-        $view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action' => 'view_transaction',
-                'TXN_ID' => $transaction->ID(),
-            ),
-            TXN_ADMIN_URL
-        );
-        $txn_date = '<a href="' . $view_lnk_url . '"'
-                    . ' title="'
-                    . esc_attr__('View Transaction Details for TXN #', 'event_espresso') . $transaction->ID() . '">'
-                    . $this->_get_txn_timestamp($transaction)
-                    . '</a>';
-        // status
-        $txn_date .= '<br><span class="ee-status-text-small">'
-                    . EEH_Template::pretty_status(
-                        $transaction->status_ID(),
-                        false,
-                        'sentence'
-                    )
-                     . '</span>';
-        return $txn_date;
-    }
-
-
-    /**
-     *    column_TXN_total
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_TXN_total(EE_Transaction $transaction)
-    {
-        if ($transaction->get('TXN_total') > 0) {
-            return '<span class="txn-pad-rght">'
-                   . apply_filters(
-                       'FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total',
-                       $transaction->get_pretty('TXN_total'),
-                       $transaction
-                   )
-                   . '</span>';
-        } else {
-            return '<span class="txn-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
-        }
-    }
-
-
-    /**
-     *    column_TXN_paid
-     *
-     * @param \EE_Transaction $transaction
-     * @return mixed|string
-     * @throws \EE_Error
-     */
-    public function column_TXN_paid(EE_Transaction $transaction)
-    {
-        $transaction_total = $transaction->get('TXN_total');
-        $transaction_paid = $transaction->get('TXN_paid');
-
-        if (\EEH_Money::compare_floats($transaction_total, 0, '>')) {
-            // monies owing
-            $span_class = 'txn-overview-part-payment-spn';
-            if (\EEH_Money::compare_floats($transaction_paid, $transaction_total, '>=')) {
-                // paid in full
-                $span_class = 'txn-overview-full-payment-spn';
-            } elseif (\EEH_Money::compare_floats($transaction_paid, 0, '==')) {
-                // no payments made
-                $span_class = 'txn-overview-no-payment-spn';
-            }
-        } else {
-            // transaction_total == 0 so this is a free event
-            $span_class = 'txn-overview-free-event-spn';
-        }
-
-        $payment_method = $transaction->payment_method();
-        $payment_method_name = $payment_method instanceof EE_Payment_Method
-            ? $payment_method->admin_name()
-            : esc_html__('Unknown', 'event_espresso');
-
-        $content = '<span class="' . $span_class . ' txn-pad-rght">'
-                   . $transaction->get_pretty('TXN_paid')
-                   . '</span>';
-        if ($transaction_paid > 0) {
-            $content .= '<br><span class="ee-status-text-small">'
-                        . sprintf(
-                            esc_html__('...via %s', 'event_espresso'),
-                            $payment_method_name
-                        )
-                        . '</span>';
-        }
-        return $content;
-    }
-
-
-    /**
-     *    column_ATT_fname
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function column_ATT_fname(EE_Transaction $transaction)
-    {
-        $primary_reg = $transaction->primary_registration();
-        $attendee = $primary_reg->get_first_related('Attendee');
-        if ($attendee instanceof EE_Attendee) {
-            $edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action'  => 'view_registration',
-                    '_REG_ID' => $primary_reg->ID(),
-                ),
-                REG_ADMIN_URL
-            );
-            $content = EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_registration',
-                'espresso_registrations_view_registration',
-                $primary_reg->ID()
-            )
-                ? '<a href="' . $edit_lnk_url . '"'
-                  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '">'
-                  . $attendee->full_name()
-                  . '</a>'
-                : $attendee->full_name();
-            $content .= '<br>' . $attendee->email();
-            return $content;
-        }
-        return $transaction->failed() || $transaction->is_abandoned()
-            ? esc_html__('no contact record.', 'event_espresso')
-            : esc_html__(
-                'No contact record, because the transaction was abandoned or the registration process failed.',
-                'event_espresso'
-            );
-    }
-
-
-    /**
-     *    column_ATT_email
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_ATT_email(EE_Transaction $transaction)
-    {
-        $attendee = $transaction->primary_registration()->get_first_related('Attendee');
-        if (! empty($attendee)) {
-            return '<a href="mailto:' . $attendee->get('ATT_email') . '">'
-                   . $attendee->get('ATT_email')
-                   . '</a>';
-        } else {
-            return $transaction->failed() || $transaction->is_abandoned()
-                ? esc_html__('no contact record.', 'event_espresso')
-                : esc_html__(
-                    'No contact record, because the transaction was abandoned or the registration process failed.',
-                    'event_espresso'
-                );
-        }
-    }
-
-
-    /**
-     *    column_event_name
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function column_event_name(EE_Transaction $transaction)
-    {
-        $actions = array();
-        $event = $transaction->primary_registration()->get_first_related('Event');
-        if (! empty($event)) {
-            $edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
-                array('action' => 'edit', 'post' => $event->ID()),
-                EVENTS_ADMIN_URL
-            );
-            $event_name = $event->get('EVT_name');
-
-            // filter this view by transactions for this event
-            $txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action' => 'default',
-                    'EVT_ID' => $event->ID(),
-                )
-            );
-            if (empty($this->_req_data['EVT_ID'])
-                && EE_Registry::instance()->CAP->current_user_can(
-                    'ee_edit_event',
-                    'espresso_events_edit',
-                    $event->ID()
-                )
-            ) {
-                $actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '"'
-                                              . ' title="' . esc_attr__(
-                                                  'Filter transactions by this event',
-                                                  'event_espresso'
-                                              ) . '">'
-                                              . esc_html__('View Transactions for this event', 'event_espresso')
-                                              . '</a>';
-            }
-
-            return sprintf(
-                '%1$s %2$s',
-                EE_Registry::instance()->CAP->current_user_can(
-                    'ee_edit_event',
-                    'espresso_events_edit',
-                    $event->ID()
-                )
-                    ? '<a href="' . $edit_event_url . '"'
-                      . ' title="'
-                      . sprintf(
-                          esc_attr__('Edit Event: %s', 'event_espresso'),
-                          $event->get('EVT_name')
-                      )
-                      . '">'
-                      . wp_trim_words(
-                          $event_name,
-                          30,
-                          '...'
-                      )
-                      . '</a>'
-                    : wp_trim_words($event_name, 30, '...'),
-                $this->row_actions($actions)
-            );
-        } else {
-            return esc_html__(
-                'The event associated with this transaction via the primary registration cannot be retrieved.',
-                'event_espresso'
-            );
-        }
-    }
-
-
-    /**
-     *    column_actions
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_actions(EE_Transaction $transaction)
-    {
-        return $this->_action_string(
-            $this->get_transaction_details_link($transaction)
-            . $this->get_invoice_link($transaction)
-            . $this->get_receipt_link($transaction)
-            . $this->get_primary_registration_details_link($transaction)
-            . $this->get_send_payment_reminder_trigger_link($transaction)
-            . $this->get_payment_overview_link($transaction)
-            . $this->get_related_messages_link($transaction),
-            $transaction,
-            'ul',
-            'txn-overview-actions-ul'
-        );
-    }
-
-
-    /**
-     * Get the transaction details link.
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     */
-    protected function get_transaction_details_link(EE_Transaction $transaction)
-    {
-        $url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action' => 'view_transaction',
-                'TXN_ID' => $transaction->ID(),
-            ),
-            TXN_ADMIN_URL
-        );
-        return '
+		$filters[] = ob_get_contents();
+		ob_end_clean();
+		return $filters;
+	}
+
+
+	/**
+	 *_add_view_counts
+	 */
+	protected function _add_view_counts()
+	{
+		foreach ($this->_views as $view) {
+			$this->_views[ $view['slug'] ]['count'] = $this->_admin_page->get_transactions($this->_per_page, true, $view['slug']);
+		}
+	}
+
+
+	/**
+	 *    column TXN_ID
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_TXN_ID(EE_Transaction $transaction)
+	{
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action' => 'view_transaction',
+				'TXN_ID' => $transaction->ID(),
+			),
+			TXN_ADMIN_URL
+		);
+		$content = '<a href="' . $view_lnk_url . '"'
+				   . ' title="' . esc_attr__('Go to Transaction Details', 'event_espresso') . '">'
+				   . $transaction->ID()
+				   . '</a>';
+
+		// txn timestamp
+		$content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp($transaction) . '</span>';
+		return $content;
+	}
+
+
+	/**
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _get_txn_timestamp(EE_Transaction $transaction)
+	{
+		// is TXN less than 2 hours old ?
+		if (($transaction->failed() || $transaction->is_abandoned())
+			&& $this->session_lifespan->expiration() < $transaction->datetime(false, true)
+		) {
+			$timestamp = esc_html__('TXN in progress...', 'event_espresso');
+		} else {
+			$timestamp = $transaction->get_i18n_datetime('TXN_timestamp');
+		}
+		return $timestamp;
+	}
+
+
+	/**
+	 *    column_cb
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_cb($transaction)
+	{
+		return sprintf(
+			'<input type="checkbox" name="%1$s[]" value="%2$s" />',
+			$this->_wp_list_args['singular'],
+			$transaction->ID()
+		);
+	}
+
+
+	/**
+	 *    column_TXN_timestamp
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_TXN_timestamp(EE_Transaction $transaction)
+	{
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action' => 'view_transaction',
+				'TXN_ID' => $transaction->ID(),
+			),
+			TXN_ADMIN_URL
+		);
+		$txn_date = '<a href="' . $view_lnk_url . '"'
+					. ' title="'
+					. esc_attr__('View Transaction Details for TXN #', 'event_espresso') . $transaction->ID() . '">'
+					. $this->_get_txn_timestamp($transaction)
+					. '</a>';
+		// status
+		$txn_date .= '<br><span class="ee-status-text-small">'
+					. EEH_Template::pretty_status(
+						$transaction->status_ID(),
+						false,
+						'sentence'
+					)
+					 . '</span>';
+		return $txn_date;
+	}
+
+
+	/**
+	 *    column_TXN_total
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_TXN_total(EE_Transaction $transaction)
+	{
+		if ($transaction->get('TXN_total') > 0) {
+			return '<span class="txn-pad-rght">'
+				   . apply_filters(
+					   'FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total',
+					   $transaction->get_pretty('TXN_total'),
+					   $transaction
+				   )
+				   . '</span>';
+		} else {
+			return '<span class="txn-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
+		}
+	}
+
+
+	/**
+	 *    column_TXN_paid
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return mixed|string
+	 * @throws \EE_Error
+	 */
+	public function column_TXN_paid(EE_Transaction $transaction)
+	{
+		$transaction_total = $transaction->get('TXN_total');
+		$transaction_paid = $transaction->get('TXN_paid');
+
+		if (\EEH_Money::compare_floats($transaction_total, 0, '>')) {
+			// monies owing
+			$span_class = 'txn-overview-part-payment-spn';
+			if (\EEH_Money::compare_floats($transaction_paid, $transaction_total, '>=')) {
+				// paid in full
+				$span_class = 'txn-overview-full-payment-spn';
+			} elseif (\EEH_Money::compare_floats($transaction_paid, 0, '==')) {
+				// no payments made
+				$span_class = 'txn-overview-no-payment-spn';
+			}
+		} else {
+			// transaction_total == 0 so this is a free event
+			$span_class = 'txn-overview-free-event-spn';
+		}
+
+		$payment_method = $transaction->payment_method();
+		$payment_method_name = $payment_method instanceof EE_Payment_Method
+			? $payment_method->admin_name()
+			: esc_html__('Unknown', 'event_espresso');
+
+		$content = '<span class="' . $span_class . ' txn-pad-rght">'
+				   . $transaction->get_pretty('TXN_paid')
+				   . '</span>';
+		if ($transaction_paid > 0) {
+			$content .= '<br><span class="ee-status-text-small">'
+						. sprintf(
+							esc_html__('...via %s', 'event_espresso'),
+							$payment_method_name
+						)
+						. '</span>';
+		}
+		return $content;
+	}
+
+
+	/**
+	 *    column_ATT_fname
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function column_ATT_fname(EE_Transaction $transaction)
+	{
+		$primary_reg = $transaction->primary_registration();
+		$attendee = $primary_reg->get_first_related('Attendee');
+		if ($attendee instanceof EE_Attendee) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action'  => 'view_registration',
+					'_REG_ID' => $primary_reg->ID(),
+				),
+				REG_ADMIN_URL
+			);
+			$content = EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_registration',
+				'espresso_registrations_view_registration',
+				$primary_reg->ID()
+			)
+				? '<a href="' . $edit_lnk_url . '"'
+				  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '">'
+				  . $attendee->full_name()
+				  . '</a>'
+				: $attendee->full_name();
+			$content .= '<br>' . $attendee->email();
+			return $content;
+		}
+		return $transaction->failed() || $transaction->is_abandoned()
+			? esc_html__('no contact record.', 'event_espresso')
+			: esc_html__(
+				'No contact record, because the transaction was abandoned or the registration process failed.',
+				'event_espresso'
+			);
+	}
+
+
+	/**
+	 *    column_ATT_email
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_ATT_email(EE_Transaction $transaction)
+	{
+		$attendee = $transaction->primary_registration()->get_first_related('Attendee');
+		if (! empty($attendee)) {
+			return '<a href="mailto:' . $attendee->get('ATT_email') . '">'
+				   . $attendee->get('ATT_email')
+				   . '</a>';
+		} else {
+			return $transaction->failed() || $transaction->is_abandoned()
+				? esc_html__('no contact record.', 'event_espresso')
+				: esc_html__(
+					'No contact record, because the transaction was abandoned or the registration process failed.',
+					'event_espresso'
+				);
+		}
+	}
+
+
+	/**
+	 *    column_event_name
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function column_event_name(EE_Transaction $transaction)
+	{
+		$actions = array();
+		$event = $transaction->primary_registration()->get_first_related('Event');
+		if (! empty($event)) {
+			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
+				array('action' => 'edit', 'post' => $event->ID()),
+				EVENTS_ADMIN_URL
+			);
+			$event_name = $event->get('EVT_name');
+
+			// filter this view by transactions for this event
+			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action' => 'default',
+					'EVT_ID' => $event->ID(),
+				)
+			);
+			if (empty($this->_req_data['EVT_ID'])
+				&& EE_Registry::instance()->CAP->current_user_can(
+					'ee_edit_event',
+					'espresso_events_edit',
+					$event->ID()
+				)
+			) {
+				$actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '"'
+											  . ' title="' . esc_attr__(
+												  'Filter transactions by this event',
+												  'event_espresso'
+											  ) . '">'
+											  . esc_html__('View Transactions for this event', 'event_espresso')
+											  . '</a>';
+			}
+
+			return sprintf(
+				'%1$s %2$s',
+				EE_Registry::instance()->CAP->current_user_can(
+					'ee_edit_event',
+					'espresso_events_edit',
+					$event->ID()
+				)
+					? '<a href="' . $edit_event_url . '"'
+					  . ' title="'
+					  . sprintf(
+						  esc_attr__('Edit Event: %s', 'event_espresso'),
+						  $event->get('EVT_name')
+					  )
+					  . '">'
+					  . wp_trim_words(
+						  $event_name,
+						  30,
+						  '...'
+					  )
+					  . '</a>'
+					: wp_trim_words($event_name, 30, '...'),
+				$this->row_actions($actions)
+			);
+		} else {
+			return esc_html__(
+				'The event associated with this transaction via the primary registration cannot be retrieved.',
+				'event_espresso'
+			);
+		}
+	}
+
+
+	/**
+	 *    column_actions
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_actions(EE_Transaction $transaction)
+	{
+		return $this->_action_string(
+			$this->get_transaction_details_link($transaction)
+			. $this->get_invoice_link($transaction)
+			. $this->get_receipt_link($transaction)
+			. $this->get_primary_registration_details_link($transaction)
+			. $this->get_send_payment_reminder_trigger_link($transaction)
+			. $this->get_payment_overview_link($transaction)
+			. $this->get_related_messages_link($transaction),
+			$transaction,
+			'ul',
+			'txn-overview-actions-ul'
+		);
+	}
+
+
+	/**
+	 * Get the transaction details link.
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function get_transaction_details_link(EE_Transaction $transaction)
+	{
+		$url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action' => 'view_transaction',
+				'TXN_ID' => $transaction->ID(),
+			),
+			TXN_ADMIN_URL
+		);
+		return '
 			<li>
 				<a href="' . $url . '"'
-               . ' title="' . esc_attr__('View Transaction Details', 'event_espresso') . '" class="tiny-text">
+			   . ' title="' . esc_attr__('View Transaction Details', 'event_espresso') . '" class="tiny-text">
 					<span class="dashicons dashicons-cart"></span>
 				</a>
 			</li>';
-    }
-
-
-    /**
-     * Get the invoice link for the given registration.
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     */
-    protected function get_invoice_link(EE_Transaction $transaction)
-    {
-        $registration = $transaction->primary_registration();
-        if ($registration instanceof EE_Registration) {
-            $url = $registration->invoice_url();
-            // only show invoice link if message type is active.
-            if ($registration->attendee() instanceof EE_Attendee
-                && EEH_MSG_Template::is_mt_active('invoice')
-            ) {
-                return '
+	}
+
+
+	/**
+	 * Get the invoice link for the given registration.
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function get_invoice_link(EE_Transaction $transaction)
+	{
+		$registration = $transaction->primary_registration();
+		if ($registration instanceof EE_Registration) {
+			$url = $registration->invoice_url();
+			// only show invoice link if message type is active.
+			if ($registration->attendee() instanceof EE_Attendee
+				&& EEH_MSG_Template::is_mt_active('invoice')
+			) {
+				return '
                 <li>
                     <a title="' . esc_attr__('View Transaction Invoice', 'event_espresso') . '"'
-                       . ' target="_blank" href="' . $url . '" class="tiny-text">
+					   . ' target="_blank" href="' . $url . '" class="tiny-text">
                         <span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
                     </a>
                 </li>';
-            }
-        }
-        return '';
-    }
-
-
-    /**
-     * Get the receipt link for the transaction.
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     */
-    protected function get_receipt_link(EE_Transaction $transaction)
-    {
-        $registration = $transaction->primary_registration();
-        if ($registration instanceof EE_Registration) {
-            $url = $registration->receipt_url();
-            // only show receipt link if message type is active.
-            if ($registration->attendee() instanceof EE_Attendee
-                && EEH_MSG_Template::is_mt_active('receipt')) {
-                return '
+			}
+		}
+		return '';
+	}
+
+
+	/**
+	 * Get the receipt link for the transaction.
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function get_receipt_link(EE_Transaction $transaction)
+	{
+		$registration = $transaction->primary_registration();
+		if ($registration instanceof EE_Registration) {
+			$url = $registration->receipt_url();
+			// only show receipt link if message type is active.
+			if ($registration->attendee() instanceof EE_Attendee
+				&& EEH_MSG_Template::is_mt_active('receipt')) {
+				return '
 			<li>
 				<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso') . '"'
-                       . ' target="_blank" href="' . $url . '" class="tiny-text">
+					   . ' target="_blank" href="' . $url . '" class="tiny-text">
 					<span class="dashicons dashicons-media-default ee-icon-size-18"></span>
 				</a>
 			</li>';
-            }
-        }
-        return '';
-    }
-
-
-    /**
-     * Get the link to view the details for the primary registration.
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function get_primary_registration_details_link(EE_Transaction $transaction)
-    {
-        $registration = $transaction->primary_registration();
-        if ($registration instanceof EE_Registration) {
-            $url = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action'  => 'view_registration',
-                    '_REG_ID' => $registration->ID(),
-                ),
-                REG_ADMIN_URL
-            );
-            return EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_registration',
-                'espresso_registrations_view_registration',
-                $registration->ID()
-            )
-                ? '
+			}
+		}
+		return '';
+	}
+
+
+	/**
+	 * Get the link to view the details for the primary registration.
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function get_primary_registration_details_link(EE_Transaction $transaction)
+	{
+		$registration = $transaction->primary_registration();
+		if ($registration instanceof EE_Registration) {
+			$url = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action'  => 'view_registration',
+					'_REG_ID' => $registration->ID(),
+				),
+				REG_ADMIN_URL
+			);
+			return EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_registration',
+				'espresso_registrations_view_registration',
+				$registration->ID()
+			)
+				? '
 				<li>
 					<a href="' . $url . '"'
-                  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '" class="tiny-text">
+				  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '" class="tiny-text">
 						<span class="dashicons dashicons-clipboard"></span>
 					</a>
 				</li>'
-                : '';
-        }
-        return '';
-    }
-
-
-    /**
-     * Get send payment reminder trigger link
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function get_send_payment_reminder_trigger_link(EE_Transaction $transaction)
-    {
-        $registration = $transaction->primary_registration();
-        if ($registration instanceof EE_Registration
-            && $registration->attendee() instanceof EE_Attendee
-            && EEH_MSG_Template::is_mt_active('payment_reminder')
-            && ! in_array(
-                $transaction->status_ID(),
-                array(EEM_Transaction::complete_status_code, EEM_Transaction::overpaid_status_code),
-                true
-            )
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_send_message',
-                'espresso_transactions_send_payment_reminder'
-            )
-        ) {
-            $url = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action' => 'send_payment_reminder',
-                    'TXN_ID' => $transaction->ID(),
-                ),
-                TXN_ADMIN_URL
-            );
-            return '
+				: '';
+		}
+		return '';
+	}
+
+
+	/**
+	 * Get send payment reminder trigger link
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function get_send_payment_reminder_trigger_link(EE_Transaction $transaction)
+	{
+		$registration = $transaction->primary_registration();
+		if ($registration instanceof EE_Registration
+			&& $registration->attendee() instanceof EE_Attendee
+			&& EEH_MSG_Template::is_mt_active('payment_reminder')
+			&& ! in_array(
+				$transaction->status_ID(),
+				array(EEM_Transaction::complete_status_code, EEM_Transaction::overpaid_status_code),
+				true
+			)
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_send_message',
+				'espresso_transactions_send_payment_reminder'
+			)
+		) {
+			$url = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action' => 'send_payment_reminder',
+					'TXN_ID' => $transaction->ID(),
+				),
+				TXN_ADMIN_URL
+			);
+			return '
             <li>
                 <a href="' . $url . '"'
-                   . ' title="' . esc_attr__('Send Payment Reminder', 'event_espresso') . '" class="tiny-text">
+				   . ' title="' . esc_attr__('Send Payment Reminder', 'event_espresso') . '" class="tiny-text">
                     <span class="dashicons dashicons-email-alt"></span>
                 </a>
             </li>';
-        }
-        return '';
-    }
-
-
-    /**
-     * Get link to filtered view in the message activity list table of messages for this transaction.
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function get_related_messages_link(EE_Transaction $transaction)
-    {
-        $url = EEH_MSG_Template::get_message_action_link(
-            'see_notifications_for',
-            null,
-            array('TXN_ID' => $transaction->ID())
-        );
-        return EE_Registry::instance()->CAP->current_user_can(
-            'ee_read_global_messages',
-            'view_filtered_messages'
-        )
-            ? '<li>' . $url . '</li>'
-            : '';
-    }
-
-
-    /**
-     * Return the link to make a payment on the frontend
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     */
-    protected function get_payment_overview_link(EE_Transaction $transaction)
-    {
-        $registration = $transaction->primary_registration();
-        if ($registration instanceof EE_Registration
-            && $transaction->status_ID() !== EEM_Transaction::complete_status_code
-            && $registration->owes_monies_and_can_pay()
-        ) {
-            return '
+		}
+		return '';
+	}
+
+
+	/**
+	 * Get link to filtered view in the message activity list table of messages for this transaction.
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function get_related_messages_link(EE_Transaction $transaction)
+	{
+		$url = EEH_MSG_Template::get_message_action_link(
+			'see_notifications_for',
+			null,
+			array('TXN_ID' => $transaction->ID())
+		);
+		return EE_Registry::instance()->CAP->current_user_can(
+			'ee_read_global_messages',
+			'view_filtered_messages'
+		)
+			? '<li>' . $url . '</li>'
+			: '';
+	}
+
+
+	/**
+	 * Return the link to make a payment on the frontend
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function get_payment_overview_link(EE_Transaction $transaction)
+	{
+		$registration = $transaction->primary_registration();
+		if ($registration instanceof EE_Registration
+			&& $transaction->status_ID() !== EEM_Transaction::complete_status_code
+			&& $registration->owes_monies_and_can_pay()
+		) {
+			return '
             <li>
                 <a title="' . esc_attr__('Make Payment from the Frontend.', 'event_espresso') . '"'
-                   . ' target="_blank" href="' . $registration->payment_overview_url(true) . '"'
-                   . ' class="tiny-text">
+				   . ' target="_blank" href="' . $registration->payment_overview_url(true) . '"'
+				   . ' class="tiny-text">
                     <span class="dashicons dashicons-money ee-icon-size-18"></span>
                 </a>
             </li>
             ';
-        }
-        return '';
-    }
+		}
+		return '';
+	}
 }

Spacing +32 added lines, -32 removed lines

@@ -96,7 +96,7 @@ 
     {
         $class = parent::_get_row_class($transaction);
         // add status class
-        $class .= ' ee-status-strip txn-status-' . $transaction->status_ID();
+        $class .= ' ee-status-strip txn-status-'.$transaction->status_ID();
         if ($this->_has_checkbox_column) {
             $class .= ' has-checkbox-column';
         }
@@ -149,7 +149,7 @@ 
     protected function _add_view_counts()
     {
         foreach ($this->_views as $view) {
-            $this->_views[ $view['slug'] ]['count'] = $this->_admin_page->get_transactions($this->_per_page, true, $view['slug']);
+            $this->_views[$view['slug']]['count'] = $this->_admin_page->get_transactions($this->_per_page, true, $view['slug']);
         }
     }
 
@@ -170,13 +170,13 @@ 
             ),
             TXN_ADMIN_URL
         );
-        $content = '<a href="' . $view_lnk_url . '"'
-                   . ' title="' . esc_attr__('Go to Transaction Details', 'event_espresso') . '">'
+        $content = '<a href="'.$view_lnk_url.'"'
+                   . ' title="'.esc_attr__('Go to Transaction Details', 'event_espresso').'">'
                    . $transaction->ID()
                    . '</a>';
 
         // txn timestamp
-        $content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp($transaction) . '</span>';
+        $content .= '  <span class="show-on-mobile-view-only">'.$this->_get_txn_timestamp($transaction).'</span>';
         return $content;
     }
 
@@ -236,9 +236,9 @@ 
             ),
             TXN_ADMIN_URL
         );
-        $txn_date = '<a href="' . $view_lnk_url . '"'
+        $txn_date = '<a href="'.$view_lnk_url.'"'
                     . ' title="'
-                    . esc_attr__('View Transaction Details for TXN #', 'event_espresso') . $transaction->ID() . '">'
+                    . esc_attr__('View Transaction Details for TXN #', 'event_espresso').$transaction->ID().'">'
                     . $this->_get_txn_timestamp($transaction)
                     . '</a>';
         // status
@@ -271,7 +271,7 @@ 
                    )
                    . '</span>';
         } else {
-            return '<span class="txn-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
+            return '<span class="txn-overview-free-event-spn">'.esc_html__('free', 'event_espresso').'</span>';
         }
     }
 
@@ -308,7 +308,7 @@ 
             ? $payment_method->admin_name()
             : esc_html__('Unknown', 'event_espresso');
 
-        $content = '<span class="' . $span_class . ' txn-pad-rght">'
+        $content = '<span class="'.$span_class.' txn-pad-rght">'
                    . $transaction->get_pretty('TXN_paid')
                    . '</span>';
         if ($transaction_paid > 0) {
@@ -350,12 +350,12 @@ 
                 'espresso_registrations_view_registration',
                 $primary_reg->ID()
             )
-                ? '<a href="' . $edit_lnk_url . '"'
-                  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '">'
+                ? '<a href="'.$edit_lnk_url.'"'
+                  . ' title="'.esc_attr__('View Registration Details', 'event_espresso').'">'
                   . $attendee->full_name()
                   . '</a>'
                 : $attendee->full_name();
-            $content .= '<br>' . $attendee->email();
+            $content .= '<br>'.$attendee->email();
             return $content;
         }
         return $transaction->failed() || $transaction->is_abandoned()
@@ -377,8 +377,8 @@ 
     public function column_ATT_email(EE_Transaction $transaction)
     {
         $attendee = $transaction->primary_registration()->get_first_related('Attendee');
-        if (! empty($attendee)) {
-            return '<a href="mailto:' . $attendee->get('ATT_email') . '">'
+        if ( ! empty($attendee)) {
+            return '<a href="mailto:'.$attendee->get('ATT_email').'">'
                    . $attendee->get('ATT_email')
                    . '</a>';
         } else {
@@ -406,7 +406,7 @@ 
     {
         $actions = array();
         $event = $transaction->primary_registration()->get_first_related('Event');
-        if (! empty($event)) {
+        if ( ! empty($event)) {
             $edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
                 array('action' => 'edit', 'post' => $event->ID()),
                 EVENTS_ADMIN_URL
@@ -427,11 +427,11 @@ 
                     $event->ID()
                 )
             ) {
-                $actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '"'
-                                              . ' title="' . esc_attr__(
+                $actions['filter_by_event'] = '<a href="'.$txn_by_event_lnk.'"'
+                                              . ' title="'.esc_attr__(
                                                   'Filter transactions by this event',
                                                   'event_espresso'
-                                              ) . '">'
+                                              ).'">'
                                               . esc_html__('View Transactions for this event', 'event_espresso')
                                               . '</a>';
             }
@@ -443,7 +443,7 @@ 
                     'espresso_events_edit',
                     $event->ID()
                 )
-                    ? '<a href="' . $edit_event_url . '"'
+                    ? '<a href="'.$edit_event_url.'"'
                       . ' title="'
                       . sprintf(
                           esc_attr__('Edit Event: %s', 'event_espresso'),
@@ -510,8 +510,8 @@ 
         );
         return '
 			<li>
-				<a href="' . $url . '"'
-               . ' title="' . esc_attr__('View Transaction Details', 'event_espresso') . '" class="tiny-text">
+				<a href="' . $url.'"'
+               . ' title="'.esc_attr__('View Transaction Details', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-cart"></span>
 				</a>
 			</li>';
@@ -536,8 +536,8 @@ 
             ) {
                 return '
                 <li>
-                    <a title="' . esc_attr__('View Transaction Invoice', 'event_espresso') . '"'
-                       . ' target="_blank" href="' . $url . '" class="tiny-text">
+                    <a title="' . esc_attr__('View Transaction Invoice', 'event_espresso').'"'
+                       . ' target="_blank" href="'.$url.'" class="tiny-text">
                         <span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
                     </a>
                 </li>';
@@ -564,8 +564,8 @@ 
                 && EEH_MSG_Template::is_mt_active('receipt')) {
                 return '
 			<li>
-				<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso') . '"'
-                       . ' target="_blank" href="' . $url . '" class="tiny-text">
+				<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso').'"'
+                       . ' target="_blank" href="'.$url.'" class="tiny-text">
 					<span class="dashicons dashicons-media-default ee-icon-size-18"></span>
 				</a>
 			</li>';
@@ -603,8 +603,8 @@ 
             )
                 ? '
 				<li>
-					<a href="' . $url . '"'
-                  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '" class="tiny-text">
+					<a href="' . $url.'"'
+                  . ' title="'.esc_attr__('View Registration Details', 'event_espresso').'" class="tiny-text">
 						<span class="dashicons dashicons-clipboard"></span>
 					</a>
 				</li>'
@@ -649,8 +649,8 @@ 
             );
             return '
             <li>
-                <a href="' . $url . '"'
-                   . ' title="' . esc_attr__('Send Payment Reminder', 'event_espresso') . '" class="tiny-text">
+                <a href="' . $url.'"'
+                   . ' title="'.esc_attr__('Send Payment Reminder', 'event_espresso').'" class="tiny-text">
                     <span class="dashicons dashicons-email-alt"></span>
                 </a>
             </li>';
@@ -680,7 +680,7 @@ 
             'ee_read_global_messages',
             'view_filtered_messages'
         )
-            ? '<li>' . $url . '</li>'
+            ? '<li>'.$url.'</li>'
             : '';
     }
 
@@ -701,8 +701,8 @@ 
         ) {
             return '
             <li>
-                <a title="' . esc_attr__('Make Payment from the Frontend.', 'event_espresso') . '"'
-                   . ' target="_blank" href="' . $registration->payment_overview_url(true) . '"'
+                <a title="' . esc_attr__('Make Payment from the Frontend.', 'event_espresso').'"'
+                   . ' target="_blank" href="'.$registration->payment_overview_url(true).'"'
                    . ' class="tiny-text">
                     <span class="dashicons dashicons-money ee-icon-size-18"></span>
                 </a>

acceptance_tests/Helpers/CountrySettingsAdmin.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace EventEspresso\Codeception\helpers;
 
-use Page\CoreAdmin;
 use Page\CountrySettingsAdmin as CountrySettings;
 
 trait CountrySettingsAdmin

Indentation +47 added lines, -47 removed lines

@@ -6,59 +6,59 @@
 
 trait CountrySettingsAdmin
 {
-    /**
-     * Instructs the actor to browse to the country settings page.
-     * Assumes the actor is already logged in.
-     * @param string $additional_params
-     */
-    public function amOnCountrySettingsAdminPage($additional_params = '')
-    {
-        $this->actor()->amOnAdminPage(CountrySettings::url($additional_params));
-    }
+	/**
+	 * Instructs the actor to browse to the country settings page.
+	 * Assumes the actor is already logged in.
+	 * @param string $additional_params
+	 */
+	public function amOnCountrySettingsAdminPage($additional_params = '')
+	{
+		$this->actor()->amOnAdminPage(CountrySettings::url($additional_params));
+	}
 
 
-    /**
-     * Instructs the actor to select the given decimal places radio option.
-     * Assumes the actor is already on the country settings page.
-     * @param string $decimal_places
-     * @param string $country_code
-     */
-    public function setCurrencyDecimalPlacesTo($decimal_places = '2', $country_code = 'US')
-    {
-        $this->actor()->click(CountrySettings::currencyDecimalPlacesRadioField($decimal_places, $country_code));
-    }
+	/**
+	 * Instructs the actor to select the given decimal places radio option.
+	 * Assumes the actor is already on the country settings page.
+	 * @param string $decimal_places
+	 * @param string $country_code
+	 */
+	public function setCurrencyDecimalPlacesTo($decimal_places = '2', $country_code = 'US')
+	{
+		$this->actor()->click(CountrySettings::currencyDecimalPlacesRadioField($decimal_places, $country_code));
+	}
 
 
-    /**
-     * Instructs the actor to select the given decimal mark radio option.
-     * Assumes the actor is already on the country settings page.
-     * @param string $decimal_mark
-     */
-    public function setCurrencyDecimalMarkTo($decimal_mark = '.')
-    {
-        $this->actor()->click(CountrySettings::currencyDecimalMarkRadioField($decimal_mark));
-    }
+	/**
+	 * Instructs the actor to select the given decimal mark radio option.
+	 * Assumes the actor is already on the country settings page.
+	 * @param string $decimal_mark
+	 */
+	public function setCurrencyDecimalMarkTo($decimal_mark = '.')
+	{
+		$this->actor()->click(CountrySettings::currencyDecimalMarkRadioField($decimal_mark));
+	}
 
 
-    /**
-     * Instructs the actor to select the given thousands separator radio option.
-     * Assumes the actor is already on the country settings page.
-     * @param string $thousands_seperator
-     */
-    public function setCurrencyThousandsSeparatorTo($thousands_seperator = ',')
-    {
-        $this->actor()->click(CountrySettings::currencyThousandsSeparatorField($thousands_seperator));
-    }
+	/**
+	 * Instructs the actor to select the given thousands separator radio option.
+	 * Assumes the actor is already on the country settings page.
+	 * @param string $thousands_seperator
+	 */
+	public function setCurrencyThousandsSeparatorTo($thousands_seperator = ',')
+	{
+		$this->actor()->click(CountrySettings::currencyThousandsSeparatorField($thousands_seperator));
+	}
 
 
-    /**
-     * Clicks the country settings submit button.
-     * Assumes the actor is on the country settings admin page.
-     */
-    public function saveCountrySettings()
-    {
-        $this->actor()->click(CountrySettings::COUNTRY_SETTINGS_SAVE_BUTTON);
-        //no indicator on the page when stuff has been updated so just give a bit of time for it to finish.
-        $this->actor()->wait(10);
-    }
+	/**
+	 * Clicks the country settings submit button.
+	 * Assumes the actor is on the country settings admin page.
+	 */
+	public function saveCountrySettings()
+	{
+		$this->actor()->click(CountrySettings::COUNTRY_SETTINGS_SAVE_BUTTON);
+		//no indicator on the page when stuff has been updated so just give a bit of time for it to finish.
+		$this->actor()->wait(10);
+	}
 }
\ No newline at end of file

acceptance_tests/Page/CountrySettingsAdmin.php

Indentation +38 added lines, -38 removed lines

@@ -14,51 +14,51 @@
 {
 
 
-    const COUNTRY_SETTINGS_SAVE_BUTTON = '#country_settings_save_2';
+	const COUNTRY_SETTINGS_SAVE_BUTTON = '#country_settings_save_2';
 
 
 
-    /**
-     * Return the url for the country settings admin page.
-     * @param string $additional_params
-     * @return string
-     */
-    public static function url($additional_params = '')
-    {
-        return self::adminUrl('espresso_general_settings', 'country_settings', $additional_params);
-    }
+	/**
+	 * Return the url for the country settings admin page.
+	 * @param string $additional_params
+	 * @return string
+	 */
+	public static function url($additional_params = '')
+	{
+		return self::adminUrl('espresso_general_settings', 'country_settings', $additional_params);
+	}
 
 
-    /**
-     * Return the decimal places (precision) radio field locator for selection.
-     * @param int    $decimal_place_value
-     * @param string $country_code
-     * @return string
-     */
-    public static function currencyDecimalPlacesRadioField($decimal_place_value = 2, $country_code = 'US')
-    {
-        return "//input[@id='CNT_cur_dec_plc-$country_code-$decimal_place_value']";
-    }
+	/**
+	 * Return the decimal places (precision) radio field locator for selection.
+	 * @param int    $decimal_place_value
+	 * @param string $country_code
+	 * @return string
+	 */
+	public static function currencyDecimalPlacesRadioField($decimal_place_value = 2, $country_code = 'US')
+	{
+		return "//input[@id='CNT_cur_dec_plc-$country_code-$decimal_place_value']";
+	}
 
 
-    /**
-     * Return the currency decimal mark field locator for selection.
-     * @param string $decimal_mark
-     * @return string
-     */
-    public static function currencyDecimalMarkRadioField($decimal_mark = '.')
-    {
-        return "//input[@class='CNT_cur_dec_mrk' and @value='$decimal_mark']";
-    }
+	/**
+	 * Return the currency decimal mark field locator for selection.
+	 * @param string $decimal_mark
+	 * @return string
+	 */
+	public static function currencyDecimalMarkRadioField($decimal_mark = '.')
+	{
+		return "//input[@class='CNT_cur_dec_mrk' and @value='$decimal_mark']";
+	}
 
 
-    /**
-     * Return the currency thousands separator field locator for selection.
-     * @param string $thousands_separator
-     * @return string
-     */
-    public static function currencyThousandsSeparatorField($thousands_separator = ',')
-    {
-        return "//input[@class='CNT_cur_thsnds' and @value='$thousands_separator']";
-    }
+	/**
+	 * Return the currency thousands separator field locator for selection.
+	 * @param string $thousands_separator
+	 * @return string
+	 */
+	public static function currencyThousandsSeparatorField($thousands_separator = ',')
+	{
+		return "//input[@class='CNT_cur_thsnds' and @value='$thousands_separator']";
+	}
 }
\ No newline at end of file

core/db_models/fields/EE_Email_Field.php

Indentation +31 added lines, -31 removed lines

@@ -16,38 +16,38 @@
 {
 
 
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @throws InvalidArgumentException
-     */
-    public function __construct($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        parent::__construct($table_column, $nice_name, $nullable, $default_value);
-        $this->setSchemaFormat('email');
-    }
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		parent::__construct($table_column, $nice_name, $nullable, $default_value);
+		$this->setSchemaFormat('email');
+	}
 
 
 
-    /**
-     * In form inputs, we should have called htmlentities and addslashes() on form inputs,
-     * so we need to undo that on setting of these fields
-     *
-     * @param string $email_address
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public function prepare_for_set($email_address)
-    {
-        try {
-            $email_address = EmailAddressFactory::create($email_address);
-            return $email_address->get();
-        } catch (EmailValidationException $e) {
-            return '';
-        }
-    }
+	/**
+	 * In form inputs, we should have called htmlentities and addslashes() on form inputs,
+	 * so we need to undo that on setting of these fields
+	 *
+	 * @param string $email_address
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public function prepare_for_set($email_address)
+	{
+		try {
+			$email_address = EmailAddressFactory::create($email_address);
+			return $email_address->get();
+		} catch (EmailValidationException $e) {
+			return '';
+		}
+	}
 }

core/domain/services/validation/email/strategies/InternationalDNS.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
             $email_address,
             $this->getAtIndex($email_address)
         );
-        if (! checkdnsrr($domain, 'MX')) {
+        if ( ! checkdnsrr($domain, 'MX')) {
             // domain not found in MX records
             throw new EmailValidationException(
                 __(
@@ -45,7 +45,7 @@ 
                 )
             );
         }
-        if (! checkdnsrr($domain, 'A')) {
+        if ( ! checkdnsrr($domain, 'A')) {
             // domain not found in A records
             throw new EmailValidationException(
                 __(

Indentation +39 added lines, -39 removed lines

@@ -15,43 +15,43 @@
 class InternationalDNS extends International
 {
 
-    /**
-     * Validates the email in teh same way as the parent, but also
-     * verifies the domain exists.
-     *
-     * @param string $email_address
-     * @return bool
-     * @throws EmailValidationException
-     */
-    public function validate($email_address)
-    {
-        parent::validate($email_address);
-        $domain = $this->getDomainPartOfEmail(
-            $email_address,
-            $this->getAtIndex($email_address)
-        );
-        if (! checkdnsrr($domain, 'MX')) {
-            // domain not found in MX records
-            throw new EmailValidationException(
-                __(
-                // @codingStandardsIgnoreStart
-                    'Although the email address provided is formatted correctly, a valid "MX record" could not be located for that address and domain. Please enter a valid email address.',
-                    // @codingStandardsIgnoreEnd
-                    'event_espresso'
-                )
-            );
-        }
-        if (! checkdnsrr($domain, 'A')) {
-            // domain not found in A records
-            throw new EmailValidationException(
-                __(
-                // @codingStandardsIgnoreStart
-                    'Although the email address provided is formatted correctly, a valid "A record" could not be located for that address and domain. Please enter a valid email address.',
-                    // @codingStandardsIgnoreEnd
-                    'event_espresso'
-                )
-            );
-        }
-        return true;
-    }
+	/**
+	 * Validates the email in teh same way as the parent, but also
+	 * verifies the domain exists.
+	 *
+	 * @param string $email_address
+	 * @return bool
+	 * @throws EmailValidationException
+	 */
+	public function validate($email_address)
+	{
+		parent::validate($email_address);
+		$domain = $this->getDomainPartOfEmail(
+			$email_address,
+			$this->getAtIndex($email_address)
+		);
+		if (! checkdnsrr($domain, 'MX')) {
+			// domain not found in MX records
+			throw new EmailValidationException(
+				__(
+				// @codingStandardsIgnoreStart
+					'Although the email address provided is formatted correctly, a valid "MX record" could not be located for that address and domain. Please enter a valid email address.',
+					// @codingStandardsIgnoreEnd
+					'event_espresso'
+				)
+			);
+		}
+		if (! checkdnsrr($domain, 'A')) {
+			// domain not found in A records
+			throw new EmailValidationException(
+				__(
+				// @codingStandardsIgnoreStart
+					'Although the email address provided is formatted correctly, a valid "A record" could not be located for that address and domain. Please enter a valid email address.',
+					// @codingStandardsIgnoreEnd
+					'event_espresso'
+				)
+			);
+		}
+		return true;
+	}
 }

core/domain/services/validation/email/EmailValidatorInterface.php

Indentation +8 added lines, -8 removed lines

@@ -18,14 +18,14 @@
 interface EmailValidatorInterface
 {
 
-    /**
-     * Validates the supplied email address. If it is invalid, throws EmailValidationException
-     *
-     * @param string $email_address
-     * @return boolean
-     * @throws EmailValidationException
-     */
-    public function validate($email_address);
+	/**
+	 * Validates the supplied email address. If it is invalid, throws EmailValidationException
+	 *
+	 * @param string $email_address
+	 * @return boolean
+	 * @throws EmailValidationException
+	 */
+	public function validate($email_address);
 
 
 }

core/libraries/form_sections/strategies/validation/EE_Email_Validation_Strategy.strategy.php

Indentation +59 added lines, -59 removed lines

@@ -18,72 +18,72 @@
 {
 
 
-    /**
-     * @param string               $validation_error_message
-     */
-    public function __construct($validation_error_message = '')
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = esc_html__('Please enter a valid email address.', 'event_espresso');
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param string               $validation_error_message
+	 */
+	public function __construct($validation_error_message = '')
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = esc_html__('Please enter a valid email address.', 'event_espresso');
+		}
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * just checks the field isn't blank
-     *
-     * @param $normalized_value
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        if ($normalized_value && ! $this->_validate_email($normalized_value)) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
-        }
-        return true;
-    }
+	/**
+	 * just checks the field isn't blank
+	 *
+	 * @param $normalized_value
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		if ($normalized_value && ! $this->_validate_email($normalized_value)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
+		}
+		return true;
+	}
 
 
 
-    /**
-     * @return array
-     */
-    public function get_jquery_validation_rule_array()
-    {
-        return array('email' => true, 'messages' => array('email' => $this->get_validation_error_message()));
-    }
+	/**
+	 * @return array
+	 */
+	public function get_jquery_validation_rule_array()
+	{
+		return array('email' => true, 'messages' => array('email' => $this->get_validation_error_message()));
+	}
 
 
 
-    /**
-     * Validate an email address.
-     * Provide email address (raw input)
-     *
-     * @param $email
-     * @return bool of whether the email is valid or not
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Validation_Error
-     */
-    private function _validate_email($email)
-    {
-        try {
-            EmailAddressFactory::create($email);
-        } catch (EmailValidationException $e) {
-            throw new EE_Validation_Error(
-                $e->getMessage(),
-                'invalid_email',
-                $this->_input,
-                $e
-            );
-        }
-        return true;
-    }
+	/**
+	 * Validate an email address.
+	 * Provide email address (raw input)
+	 *
+	 * @param $email
+	 * @return bool of whether the email is valid or not
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Validation_Error
+	 */
+	private function _validate_email($email)
+	{
+		try {
+			EmailAddressFactory::create($email);
+		} catch (EmailValidationException $e) {
+			throw new EE_Validation_Error(
+				$e->getMessage(),
+				'invalid_email',
+				$this->_input,
+				$e
+			);
+		}
+		return true;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      */
     public function __construct($validation_error_message = '')
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = esc_html__('Please enter a valid email address.', 'event_espresso');
         }
         parent::__construct($validation_error_message);