eventespresso / event-espresso-core

admin_pages/registration_form/Registration_Form_Questions_Admin_List_Table.class.php

Indentation +158 added lines, -158 removed lines

@@ -18,162 +18,162 @@
 {
 
 
-    public function __construct($admin_page)
-    {
-        parent::__construct($admin_page);
-    }
-
-
-    protected function _setup_data()
-    {
-        if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash') {
-            $this->_data = $this->_admin_page->get_trashed_questions($this->_per_page, $this->_current_page, false);
-        } else {
-            $this->_data = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, false);
-        }
-        $this->_all_data_count = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, true);
-    }
-
-
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => __('question', 'event_espresso'),
-            'plural'   => __('questions', 'event_espresso'),
-            'ajax'     => true, // for now,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-
-        $this->_columns = array(
-            'cb'           => '<input type="checkbox" />',
-            'id'           => __('ID', 'event_espresso'),
-            'display_text' => __('Question', 'event_espresso'),
-            'admin_label'  => __('Admin Label', 'event_espresso'),
-            'type'         => __('Type', 'event_espresso'),
-            'values'       => __('Values', 'event_espresso'),
-            'required'     => __('Req', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'id'           => array('QST_ID' => false),
-            'display_text' => array('QST_display_text' => false),
-        );
-
-        $this->_hidden_columns = array();
-    }
-
-
-    // not needed
-    protected function _get_table_filters()
-    {
-        return array();
-    }
-
-
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count'] = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, true);
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_delete_questions',
-            'espresso_registration_form_trash_question'
-        )) {
-            $this->_views['trash']['count'] = $this->_admin_page->get_trashed_questions(-1, $this->_current_page, true);
-        }
-    }
-
-
-    public function column_cb($item)
-    {
-        $system_question = $item->is_system_question();
-        $related_answer_count = $item->count_related('Answer');
-        $lock_icon = (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
-            ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
-        return $system_question || (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
-            ? '<span class="' . $lock_icon . '"></span>' . sprintf(
-                '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />',
-                $item->ID()
-            ) : sprintf('<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
-    }
-
-
-    public function column_id(EE_Question $item)
-    {
-        $content = $item->ID();
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->display_text() . '</span>';
-        return $content;
-    }
-
-
-    public function column_display_text(EE_Question $item)
-    {
-        $system_question = $item->is_system_question();
-
-        if (! defined('REG_ADMIN_URL')) {
-            define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
-        }
-
-        $edit_query_args = array(
-            'action' => 'edit_question',
-            'QST_ID' => $item->ID(),
-        );
-
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_question',
-            'espresso_registration_form_edit_question',
-            $item->ID()
-        )) {
-            $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
-
-            $actions = array(
-                'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__(
-                    'Edit Event',
-                    'event_espresso'
-                ) . '">' . __('Edit', 'event_espresso') . '</a>',
-            );
-        }
-
-
-        $content = EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_question',
-            'espresso_registration_form_edit_question',
-            $item->ID()
-        ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>'
-            : $item->display_text();
-        $content .= $this->row_actions($actions);
-        return $content;
-    }
-
-
-    public function column_admin_label(EE_Question $item)
-    {
-        return $item->admin_label();
-    }
-
-
-    public function column_values(EE_Question $item)
-    {
-        $optionNames = array();
-        $options = $item->options();
-        if (empty($options)) {
-            return "N/A";
-        } else {
-            foreach ($options as $optionID => $option) {
-                /* @var $option EE_Question_Option */
-                $optionNames[] = $option->value();
-            }
-            return implode(', ', $optionNames);
-        }
-    }
-
-
-    public function column_type(EE_Question $item)
-    {
-        return $item->type();
-    }
-
-
-    public function column_required(EE_Question $item)
-    {
-        return $item->required() ? 'Yes' : '';
-    }
+	public function __construct($admin_page)
+	{
+		parent::__construct($admin_page);
+	}
+
+
+	protected function _setup_data()
+	{
+		if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash') {
+			$this->_data = $this->_admin_page->get_trashed_questions($this->_per_page, $this->_current_page, false);
+		} else {
+			$this->_data = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, false);
+		}
+		$this->_all_data_count = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, true);
+	}
+
+
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => __('question', 'event_espresso'),
+			'plural'   => __('questions', 'event_espresso'),
+			'ajax'     => true, // for now,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+
+		$this->_columns = array(
+			'cb'           => '<input type="checkbox" />',
+			'id'           => __('ID', 'event_espresso'),
+			'display_text' => __('Question', 'event_espresso'),
+			'admin_label'  => __('Admin Label', 'event_espresso'),
+			'type'         => __('Type', 'event_espresso'),
+			'values'       => __('Values', 'event_espresso'),
+			'required'     => __('Req', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'id'           => array('QST_ID' => false),
+			'display_text' => array('QST_display_text' => false),
+		);
+
+		$this->_hidden_columns = array();
+	}
+
+
+	// not needed
+	protected function _get_table_filters()
+	{
+		return array();
+	}
+
+
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count'] = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, true);
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_delete_questions',
+			'espresso_registration_form_trash_question'
+		)) {
+			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_questions(-1, $this->_current_page, true);
+		}
+	}
+
+
+	public function column_cb($item)
+	{
+		$system_question = $item->is_system_question();
+		$related_answer_count = $item->count_related('Answer');
+		$lock_icon = (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
+			? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
+		return $system_question || (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
+			? '<span class="' . $lock_icon . '"></span>' . sprintf(
+				'<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />',
+				$item->ID()
+			) : sprintf('<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
+	}
+
+
+	public function column_id(EE_Question $item)
+	{
+		$content = $item->ID();
+		$content .= '  <span class="show-on-mobile-view-only">' . $item->display_text() . '</span>';
+		return $content;
+	}
+
+
+	public function column_display_text(EE_Question $item)
+	{
+		$system_question = $item->is_system_question();
+
+		if (! defined('REG_ADMIN_URL')) {
+			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
+
+		$edit_query_args = array(
+			'action' => 'edit_question',
+			'QST_ID' => $item->ID(),
+		);
+
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_question',
+			'espresso_registration_form_edit_question',
+			$item->ID()
+		)) {
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+
+			$actions = array(
+				'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__(
+					'Edit Event',
+					'event_espresso'
+				) . '">' . __('Edit', 'event_espresso') . '</a>',
+			);
+		}
+
+
+		$content = EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_question',
+			'espresso_registration_form_edit_question',
+			$item->ID()
+		) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>'
+			: $item->display_text();
+		$content .= $this->row_actions($actions);
+		return $content;
+	}
+
+
+	public function column_admin_label(EE_Question $item)
+	{
+		return $item->admin_label();
+	}
+
+
+	public function column_values(EE_Question $item)
+	{
+		$optionNames = array();
+		$options = $item->options();
+		if (empty($options)) {
+			return "N/A";
+		} else {
+			foreach ($options as $optionID => $option) {
+				/* @var $option EE_Question_Option */
+				$optionNames[] = $option->value();
+			}
+			return implode(', ', $optionNames);
+		}
+	}
+
+
+	public function column_type(EE_Question $item)
+	{
+		return $item->type();
+	}
+
+
+	public function column_required(EE_Question $item)
+	{
+		return $item->required() ? 'Yes' : '';
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -86,10 +86,10 @@ 
     {
         $system_question = $item->is_system_question();
         $related_answer_count = $item->count_related('Answer');
-        $lock_icon = (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
+        $lock_icon = ( ! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
             ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
-        return $system_question || (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
-            ? '<span class="' . $lock_icon . '"></span>' . sprintf(
+        return $system_question || ( ! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
+            ? '<span class="'.$lock_icon.'"></span>'.sprintf(
                 '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />',
                 $item->ID()
             ) : sprintf('<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
@@ -99,7 +99,7 @@ 
     public function column_id(EE_Question $item)
     {
         $content = $item->ID();
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->display_text() . '</span>';
+        $content .= '  <span class="show-on-mobile-view-only">'.$item->display_text().'</span>';
         return $content;
     }
 
@@ -108,7 +108,7 @@ 
     {
         $system_question = $item->is_system_question();
 
-        if (! defined('REG_ADMIN_URL')) {
+        if ( ! defined('REG_ADMIN_URL')) {
             define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
         }
 
@@ -125,10 +125,10 @@ 
             $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
 
             $actions = array(
-                'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__(
+                'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__(
                     'Edit Event',
                     'event_espresso'
-                ) . '">' . __('Edit', 'event_espresso') . '</a>',
+                ).'">'.__('Edit', 'event_espresso').'</a>',
             );
         }
 
@@ -137,7 +137,7 @@ 
             'ee_edit_question',
             'espresso_registration_form_edit_question',
             $item->ID()
-        ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>'
+        ) ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->display_text().'</a></strong>'
             : $item->display_text();
         $content .= $this->row_actions($actions);
         return $content;

admin_pages/general_settings/help_tours/Countries_Help_Tour.class.php

Indentation +70 added lines, -70 removed lines

@@ -15,80 +15,80 @@
 class Countries_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Countries Tour', 'event_espresso');
-        $this->_slug = 'countries-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Countries Tour', 'event_espresso');
+		$this->_slug = 'countries-joyride';
+	}
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            20 => array(
-                'id'      => 'country',
-                'content' => $this->_country_selector_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            30 => array(
-                'id'      => 'country-details-dv',
-                'content' => $this->_country_details_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -80,
-                    'tipAdjustmentX' => 0,
-                ),
-            ),
-            40 => array(
-                'id'      => 'country-states-settings-dv',
-                'content' => $this->_country_states_settings_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -20,
-                    'tipAdjustmentX' => 50,
-                ),
-            ),
-        );
-    }
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			20 => array(
+				'id'      => 'country',
+				'content' => $this->_country_selector_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			30 => array(
+				'id'      => 'country-details-dv',
+				'content' => $this->_country_details_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -80,
+					'tipAdjustmentX' => 0,
+				),
+			),
+			40 => array(
+				'id'      => 'country-states-settings-dv',
+				'content' => $this->_country_states_settings_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -20,
+					'tipAdjustmentX' => 50,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Countries Settings', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Countries Page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Countries Settings', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Countries Page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
 
-    protected function _country_selector_stop()
-    {
-        return '<p>'
-               . __(
-                   'Select the country where your business or organization is located. This affects the currency that is used in Event Espresso.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _country_selector_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Select the country where your business or organization is located. This affects the currency that is used in Event Espresso.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _country_details_stop()
-    {
-        return '<p>' . __('Here you can fine tune country and currency settings.', 'event_espresso') . '</p>';
-    }
+	protected function _country_details_stop()
+	{
+		return '<p>' . __('Here you can fine tune country and currency settings.', 'event_espresso') . '</p>';
+	}
 
-    protected function _country_states_settings_stop()
-    {
-        return '<p>'
-               . __(
-                   'Used in certain areas of the plugin, here you can define what states/provinces will be displayed in case you do not do business in certain areas.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _country_states_settings_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Used in certain areas of the plugin, here you can define what states/provinces will be displayed in case you do not do business in certain areas.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -60,12 +60,12 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Countries Settings', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Countries Settings', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Countries Page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
@@ -75,12 +75,12 @@ 
                . __(
                    'Select the country where your business or organization is located. This affects the currency that is used in Event Espresso.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _country_details_stop()
     {
-        return '<p>' . __('Here you can fine tune country and currency settings.', 'event_espresso') . '</p>';
+        return '<p>'.__('Here you can fine tune country and currency settings.', 'event_espresso').'</p>';
     }
 
     protected function _country_states_settings_stop()
@@ -89,6 +89,6 @@ 
                . __(
                    'Used in certain areas of the plugin, here you can define what states/provinces will be displayed in case you do not do business in certain areas.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 }

admin_pages/general_settings/help_tours/Critical_Pages_Help_Tour.class.php

Indentation +96 added lines, -96 removed lines

@@ -15,107 +15,107 @@
 class Critical_Pages_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Critical Pages Tour', 'event_espresso');
-        $this->_slug = 'critical-pages-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Critical Pages Tour', 'event_espresso');
+		$this->_slug = 'critical-pages-joyride';
+	}
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            20 => array(
-                'id'      => 'reg_page_id',
-                'content' => $this->_reg_page_id_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            30 => array(
-                'id'      => 'txn_page_id',
-                'content' => $this->_txn_page_id_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            40 => array(
-                'id'      => 'thank_you_page_id',
-                'content' => $this->_thank_you_page_id_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            50 => array(
-                'id'      => 'cancel_page_id',
-                'content' => $this->_cancel_page_id_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-        );
-    }
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			20 => array(
+				'id'      => 'reg_page_id',
+				'content' => $this->_reg_page_id_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			30 => array(
+				'id'      => 'txn_page_id',
+				'content' => $this->_txn_page_id_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			40 => array(
+				'id'      => 'thank_you_page_id',
+				'content' => $this->_thank_you_page_id_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			50 => array(
+				'id'      => 'cancel_page_id',
+				'content' => $this->_cancel_page_id_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Critical Pages', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This section lists the pages that Event Espresso needs in order to function. Should you wish to change a page that is used you will need to move the shortcode to the new page and then allocate it here. Otherwise your registrations will not work correctly.',
-                        'event_espresso'
-                    ) . '</p>';
-        $content .= '<p>'
-                    . __(
-                        'This section also provides a status of the page to show you at a glance if something is not right.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Critical Pages', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This section lists the pages that Event Espresso needs in order to function. Should you wish to change a page that is used you will need to move the shortcode to the new page and then allocate it here. Otherwise your registrations will not work correctly.',
+						'event_espresso'
+					) . '</p>';
+		$content .= '<p>'
+					. __(
+						'This section also provides a status of the page to show you at a glance if something is not right.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
 
-    protected function _reg_page_id_stop()
-    {
-        return '<p>'
-               . __(
-                   'This page processes the registrations and is required, even if it is not visible in your menus. ',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _reg_page_id_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This page processes the registrations and is required, even if it is not visible in your menus. ',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _txn_page_id_stop()
-    {
-        return '<p>'
-               . __(
-                   'This page processes payments. It should not be visible on your menus, and the page should not contain anything other than the shortcode.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _txn_page_id_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This page processes payments. It should not be visible on your menus, and the page should not contain anything other than the shortcode.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _thank_you_page_id_stop()
-    {
-        return '<p>'
-               . __(
-                   'This page is displayed after a successful transaction. Feel free to add extra content to this page to personalise it!',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _thank_you_page_id_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This page is displayed after a successful transaction. Feel free to add extra content to this page to personalise it!',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _cancel_page_id_stop()
-    {
-        return '<p>'
-               . __(
-                   'This page is displayed after an unsuccessful transaction. Feel free to add extra content to this page to personalise it!',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _cancel_page_id_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This page is displayed after an unsuccessful transaction. Feel free to add extra content to this page to personalise it!',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -69,17 +69,17 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Critical Pages', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Critical Pages', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This section lists the pages that Event Espresso needs in order to function. Should you wish to change a page that is used you will need to move the shortcode to the new page and then allocate it here. Otherwise your registrations will not work correctly.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         $content .= '<p>'
                     . __(
                         'This section also provides a status of the page to show you at a glance if something is not right.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
@@ -89,7 +89,7 @@ 
                . __(
                    'This page processes the registrations and is required, even if it is not visible in your menus. ',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _txn_page_id_stop()
@@ -98,7 +98,7 @@ 
                . __(
                    'This page processes payments. It should not be visible on your menus, and the page should not contain anything other than the shortcode.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _thank_you_page_id_stop()
@@ -107,7 +107,7 @@ 
                . __(
                    'This page is displayed after a successful transaction. Feel free to add extra content to this page to personalise it!',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _cancel_page_id_stop()
@@ -116,6 +116,6 @@ 
                . __(
                    'This page is displayed after an unsuccessful transaction. Feel free to add extra content to this page to personalise it!',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 }

admin_pages/general_settings/help_tours/Your_Organization_Help_Tour.class.php

Indentation +120 added lines, -120 removed lines

@@ -15,136 +15,136 @@
 class Your_Organization_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Your Organization Tour', 'event_espresso');
-        $this->_slug = 'your-organization-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Your Organization Tour', 'event_espresso');
+		$this->_slug = 'your-organization-joyride';
+	}
 
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            30 => array(
-                'id'      => 'contact_info_h4',
-                'content' => $this->_contact_information_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            40 => array(
-                'id'      => 'upload_image',
-                'content' => $this->_upload_image_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            50 => array(
-                'id'      => 'organization_facebook',
-                'content' => $this->_organization_facebook_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            60 => array(
-                'id'      => 'ueip_optin',
-                'content' => $this->_ueip_option_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            70 => array(
-                'id'      => 'espresso_major_buttons_wrapper',
-                'content' => $this->_end_tour_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 185,
-                ),
-            ),
-        );
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			30 => array(
+				'id'      => 'contact_info_h4',
+				'content' => $this->_contact_information_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			40 => array(
+				'id'      => 'upload_image',
+				'content' => $this->_upload_image_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			50 => array(
+				'id'      => 'organization_facebook',
+				'content' => $this->_organization_facebook_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			60 => array(
+				'id'      => 'ueip_optin',
+				'content' => $this->_ueip_option_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			70 => array(
+				'id'      => 'espresso_major_buttons_wrapper',
+				'content' => $this->_end_tour_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 185,
+				),
+			),
+		);
 
-        if (is_main_site()) {
-            $this->_stops[20] = array(
-                'id'      => 'site_license_key',
-                'content' => $this->_site_license_key_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            );
-        }
-        ksort($this->_stops);
-    }
+		if (is_main_site()) {
+			$this->_stops[20] = array(
+				'id'      => 'site_license_key',
+				'content' => $this->_site_license_key_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			);
+		}
+		ksort($this->_stops);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
+	protected function _start()
+	{
+		$content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
 
-        return $content;
-    }
+		return $content;
+	}
 
-    protected function _site_license_key_stop()
-    {
-        return '<p>'
-               . __(
-                   'Enter your support license key here to enable one-click updates.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _site_license_key_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Enter your support license key here to enable one-click updates.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _contact_information_stop()
-    {
-        return '<p>'
-               . __(
-                   'You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _contact_information_stop()
+	{
+		return '<p>'
+			   . __(
+				   'You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _upload_image_stop()
-    {
-        return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
-    }
+	protected function _upload_image_stop()
+	{
+		return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
+	}
 
-    protected function _organization_facebook_stop()
-    {
-        return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
-    }
+	protected function _organization_facebook_stop()
+	{
+		return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
+	}
 
-    protected function _ueip_option_stop()
-    {
-        return '<p>'
-               . __(
-                   'Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _ueip_option_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _end_tour_stop()
-    {
-        return '<p>'
-               . __(
-                   'You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _end_tour_stop()
+	{
+		return '<p>'
+			   . __(
+				   'You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -92,12 +92,12 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Organization Settings', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
 
         return $content;
     }
@@ -108,7 +108,7 @@ 
                . __(
                    'Enter your support license key here to enable one-click updates.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _contact_information_stop()
@@ -117,17 +117,17 @@ 
                . __(
                    'You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _upload_image_stop()
     {
-        return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
+        return '<p>'.__('Add a logo. This can be used for invoices and tickets.', 'event_espresso').'</p>';
     }
 
     protected function _organization_facebook_stop()
     {
-        return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
+        return '<p>'.__('Add links to various social media networks.', 'event_espresso').'</p>';
     }
 
     protected function _ueip_option_stop()
@@ -136,7 +136,7 @@ 
                . __(
                    'Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _end_tour_stop()
@@ -145,6 +145,6 @@ 
                . __(
                    'You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 }

admin_pages/messages/help_tours/Message_Templates_Edit_Help_Tour.class.php

Indentation +133 added lines, -133 removed lines

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

Spacing +8 added lines, -8 removed lines

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

admin_pages/messages/help_tours/Messages_Settings_Help_Tour.class.php

Indentation +99 added lines, -99 removed lines

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

Spacing +7 added lines, -7 removed lines

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

admin_pages/messages/help_tours/Messages_Overview_Help_Tour.class.php

Indentation +117 added lines, -117 removed lines

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

Spacing +8 added lines, -8 removed lines

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

admin_pages/messages/EE_Message_List_Table.class.php

Indentation +430 added lines, -430 removed lines

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

Spacing +21 added lines, -21 removed lines

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

admin_pages/venues/Venues_Admin_Page.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -1006,7 +1006,7 @@
      * @access  private
      * @param  int    $VNU_ID
      * @param  string $venue_status
-     * @return void
+     * @return boolean
      */
     private function _change_venue_status($VNU_ID = 0, $venue_status = '')
     {

Indentation +1512 added lines, -1512 removed lines

@@ -17,1518 +17,1518 @@
 {
 
 
-    /**
-     * _venue
-     * This will hold the venue object for venue_details screen.
-     *
-     * @access protected
-     * @var object
-     */
-    protected $_venue;
-
-
-    /**
-     * This will hold the category object for category_details screen.
-     *
-     * @var object
-     */
-    protected $_category;
-
-
-    /**
-     * This property will hold the venue model instance
-     *
-     * @var object
-     */
-    protected $_venue_model;
-
-
-    protected function _init_page_props()
-    {
-        require_once(EE_MODELS . 'EEM_Venue.model.php');
-        $this->page_slug = EE_VENUES_PG_SLUG;
-        $this->_admin_base_url = EE_VENUES_ADMIN_URL;
-        $this->_admin_base_path = EE_ADMIN_PAGES . 'venues';
-        $this->page_label = __('Event Venues', 'event_espresso');
-        $this->_cpt_model_names = array(
-            'create_new' => 'EEM_Venue',
-            'edit'       => 'EEM_Venue',
-        );
-        $this->_cpt_edit_routes = array(
-            'espresso_venues' => 'edit',
-        );
-        $this->_venue_model = EEM_Venue::instance();
-    }
-
-
-    protected function _ajax_hooks()
-    {
-        // todo: all hooks for ee_venues ajax goes in here.
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = $this->page_label;
-        $this->_labels = array(
-            'buttons'      => array(
-                'add'             => __('Add New Venue', 'event_espresso'),
-                'edit'            => __('Edit Venue', 'event_espresso'),
-                'delete'          => __('Delete Venue', 'event_espresso'),
-                'add_category'    => __('Add New Category', 'event_espresso'),
-                'edit_category'   => __('Edit Category', 'event_espresso'),
-                'delete_category' => __('Delete Category', 'event_espresso'),
-            ),
-            'editor_title' => array(
-                'espresso_venues' => __('Enter Venue name here', 'event_espresso'),
-            ),
-            'publishbox'   => array(
-                'create_new'          => __('Save New Venue', 'event_espresso'),
-                'edit'                => __('Update Venue', 'event_espresso'),
-                'add_category'        => __('Save New Category', 'event_espresso'),
-                'edit_category'       => __('Update Category', 'event_espresso'),
-                'google_map_settings' => __('Update Settings', 'event_espresso'),
-            ),
-        );
-    }
-
-
-    protected function _set_page_routes()
-    {
-
-        // load formatter helper
-        // load field generator helper
-
-        // is there a vnu_id in the request?
-        $vnu_id = ! empty($this->_req_data['VNU_ID']) && ! is_array($this->_req_data['VNU_ID'])
-            ? $this->_req_data['VNU_ID'] : 0;
-        $vnu_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $vnu_id;
-
-        $this->_page_routes = array(
-            'default'                    => array(
-                'func'       => '_overview_list_table',
-                'capability' => 'ee_read_venues',
-            ),
-            'create_new'                 => array(
-                'func'       => '_create_new_cpt_item',
-                'capability' => 'ee_edit_venues',
-            ),
-            'edit'                       => array(
-                'func'       => '_edit_cpt_item',
-                'capability' => 'ee_edit_venue',
-                'obj_id'     => $vnu_id,
-            ),
-            'trash_venue'                => array(
-                'func'       => '_trash_or_restore_venue',
-                'args'       => array('venue_status' => 'trash'),
-                'noheader'   => true,
-                'capability' => 'ee_delete_venue',
-                'obj_id'     => $vnu_id,
-            ),
-            'trash_venues'               => array(
-                'func'       => '_trash_or_restore_venues',
-                'args'       => array('venue_status' => 'trash'),
-                'noheader'   => true,
-                'capability' => 'ee_delete_venues',
-            ),
-            'restore_venue'              => array(
-                'func'       => '_trash_or_restore_venue',
-                'args'       => array('venue_status' => 'draft'),
-                'noheader'   => true,
-                'capability' => 'ee_delete_venue',
-                'obj_id'     => $vnu_id,
-            ),
-            'restore_venues'             => array(
-                'func'       => '_trash_or_restore_venues',
-                'args'       => array('venue_status' => 'draft'),
-                'noheader'   => true,
-                'capability' => 'ee_delete_venues',
-            ),
-            'delete_venues'              => array(
-                'func'       => '_delete_venues',
-                'noheader'   => true,
-                'capability' => 'ee_delete_venues',
-            ),
-            'delete_venue'               => array(
-                'func'       => '_delete_venue',
-                'noheader'   => true,
-                'capability' => 'ee_delete_venue',
-                'obj_id'     => $vnu_id,
-            ),
-            // settings related
-            'google_map_settings'        => array(
-                'func'       => '_google_map_settings',
-                'capability' => 'manage_options',
-            ),
-            'update_google_map_settings' => array(
-                'func'       => '_update_google_map_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
-            // venue category tab related
-            'add_category'               => array(
-                'func'       => '_category_details',
-                'args'       => array('add'),
-                'capability' => 'ee_edit_venue_category',
-            ),
-            'edit_category'              => array(
-                'func'       => '_category_details',
-                'args'       => array('edit'),
-                'capability' => 'ee_edit_venue_category',
-            ),
-            'delete_categories'          => array(
-                'func'       => '_delete_categories',
-                'noheader'   => true,
-                'capability' => 'ee_delete_venue_category',
-            ),
-
-            'delete_category' => array(
-                'func'       => '_delete_categories',
-                'noheader'   => true,
-                'capability' => 'ee_delete_venue_category',
-            ),
-
-            'insert_category' => array(
-                'func'       => '_insert_or_update_category',
-                'args'       => array('new_category' => true),
-                'noheader'   => true,
-                'capability' => 'ee_edit_venue_category',
-            ),
-
-            'update_category'   => array(
-                'func'       => '_insert_or_update_category',
-                'args'       => array('new_category' => false),
-                'noheader'   => true,
-                'capability' => 'ee_edit_venue_category',
-            ),
-            'export_categories' => array(
-                'func'       => '_categories_export',
-                'noheader'   => true,
-                'capability' => 'export',
-            ),
-            'import_categories' => array(
-                'func'       => '_import_categories',
-                'capability' => 'import',
-            ),
-            'category_list'     => array(
-                'func'       => '_category_list_table',
-                'capability' => 'ee_manage_venue_categories',
-            ),
-        );
-    }
-
-
-    protected function _set_page_config()
-    {
-        $this->_page_config = array(
-            'default'             => array(
-                'nav'           => array(
-                    'label' => __('Overview', 'event_espresso'),
-                    'order' => 10,
-                ),
-                'list_table'    => 'Venues_Admin_List_Table',
-                'help_tabs'     => array(
-                    'venues_overview_help_tab'                           => array(
-                        'title'    => __('Venues Overview', 'event_espresso'),
-                        'filename' => 'venues_overview',
-                    ),
-                    'venues_overview_table_column_headings_help_tab'     => array(
-                        'title'    => __('Venues Overview Table Column Headings', 'event_espresso'),
-                        'filename' => 'venues_overview_table_column_headings',
-                    ),
-                    'venues_overview_views_bulk_actions_search_help_tab' => array(
-                        'title'    => __('Venues Overview Views & Bulk Actions & Search', 'event_espresso'),
-                        'filename' => 'venues_overview_views_bulk_actions_search',
-                    ),
-                ),
-                'help_tour'     => array('Venues_Overview_Help_Tour'),
-                'metaboxes'     => array('_espresso_news_post_box', '_espresso_links_post_box'),
-                'require_nonce' => false,
-            ),
-            'create_new'          => array(
-                'nav'           => array(
-                    'label'      => __('Add Venue', 'event_espresso'),
-                    'order'      => 5,
-                    'persistent' => false,
-                ),
-                'help_tabs'     => array(
-                    'venues_editor_help_tab'                                               => array(
-                        'title'    => __('Venue Editor', 'event_espresso'),
-                        'filename' => 'venues_editor',
-                    ),
-                    'venues_editor_title_richtexteditor_help_tab'                          => array(
-                        'title'    => __('Venue Title & Rich Text Editor', 'event_espresso'),
-                        'filename' => 'venues_editor_title_richtexteditor',
-                    ),
-                    'venues_editor_tags_categories_help_tab'                               => array(
-                        'title'    => __('Venue Tags & Categories', 'event_espresso'),
-                        'filename' => 'venues_editor_tags_categories',
-                    ),
-                    'venues_editor_physical_location_google_map_virtual_location_help_tab' => array(
-                        'title'    => __(
-                            'Venue Editor Physical Location & Google Map & Virtual Location',
-                            'event_espresso'
-                        ),
-                        'filename' => 'venues_editor_physical_location_google_map_virtual_location',
-                    ),
-                    'venues_editor_save_new_venue_help_tab'                                => array(
-                        'title'    => __('Save New Venue', 'event_espresso'),
-                        'filename' => 'venues_editor_save_new_venue',
-                    ),
-                    'venues_editor_other_help_tab'                                         => array(
-                        'title'    => __('Venue Editor Other', 'event_espresso'),
-                        'filename' => 'venues_editor_other',
-                    ),
-                ),
-                'help_tour'     => array('Venues_Add_Venue_Help_Tour'),
-                'metaboxes'     => array('_venue_editor_metaboxes'),
-                'require_nonce' => false,
-            ),
-            'edit'                => array(
-                'nav'           => array(
-                    'label'      => __('Edit Venue', 'event_espresso'),
-                    'order'      => 5,
-                    'persistent' => false,
-                    'url'        => isset($this->_req_data['post']) ? add_query_arg(
-                        array('post' => $this->_req_data['post']),
-                        $this->_current_page_view_url
-                    ) : $this->_admin_base_url,
-                ),
-                'help_tabs'     => array(
-                    'venues_editor_help_tab'                                               => array(
-                        'title'    => __('Venue Editor', 'event_espresso'),
-                        'filename' => 'venues_editor',
-                    ),
-                    'venues_editor_title_richtexteditor_help_tab'                          => array(
-                        'title'    => __('Venue Title & Rich Text Editor', 'event_espresso'),
-                        'filename' => 'venues_editor_title_richtexteditor',
-                    ),
-                    'venues_editor_tags_categories_help_tab'                               => array(
-                        'title'    => __('Venue Tags & Categories', 'event_espresso'),
-                        'filename' => 'venues_editor_tags_categories',
-                    ),
-                    'venues_editor_physical_location_google_map_virtual_location_help_tab' => array(
-                        'title'    => __(
-                            'Venue Editor Physical Location & Google Map & Virtual Location',
-                            'event_espresso'
-                        ),
-                        'filename' => 'venues_editor_physical_location_google_map_virtual_location',
-                    ),
-                    'venues_editor_save_new_venue_help_tab'                                => array(
-                        'title'    => __('Save New Venue', 'event_espresso'),
-                        'filename' => 'venues_editor_save_new_venue',
-                    ),
-                    'venues_editor_other_help_tab'                                         => array(
-                        'title'    => __('Venue Editor Other', 'event_espresso'),
-                        'filename' => 'venues_editor_other',
-                    ),
-                ),
-                /*'help_tour' => array( 'Venues_Edit_Venue_Help_Tour' ),*/
-                'metaboxes'     => array('_venue_editor_metaboxes'),
-                'require_nonce' => false,
-            ),
-            'google_map_settings' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Google Maps', 'event_espresso'),
-                    'order' => 40,
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
-                'help_tabs'     => array(
-                    'general_settings_google_maps_help_tab' => array(
-                        'title'    => __('Google Maps', 'event_espresso'),
-                        'filename' => 'general_settings_google_maps',
-                    ),
-                ),
-                'help_tour'     => array('Google_Maps_Help_Tour'),
-                'require_nonce' => false,
-            ),
-            // venue category stuff
-            'add_category'        => array(
-                'nav'           => array(
-                    'label'      => __('Add Category', 'event_espresso'),
-                    'order'      => 15,
-                    'persistent' => false,
-                ),
-                'metaboxes'     => array('_publish_post_box'),
-                'help_tabs'     => array(
-                    'venues_add_category_help_tab' => array(
-                        'title'    => __('Add New Venue Category', 'event_espresso'),
-                        'filename' => 'venues_add_category',
-                    ),
-                ),
-                'help_tour'     => array('Venues_Add_Category_Help_Tour'),
-                'require_nonce' => false,
-            ),
-            'edit_category'       => array(
-                'nav'           => array(
-                    'label'      => __('Edit Category', 'event_espresso'),
-                    'order'      => 15,
-                    'persistent' => false,
-                    'url'        => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(
-                        array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']),
-                        $this->_current_page_view_url
-                    ) : $this->_admin_base_url,
-                ),
-                'metaboxes'     => array('_publish_post_box'),
-                'help_tabs'     => array(
-                    'venues_edit_category_help_tab' => array(
-                        'title'    => __('Edit Venue Category', 'event_espresso'),
-                        'filename' => 'venues_edit_category',
-                    ),
-                ),
-                /*'help_tour' => array( 'Venues_Edit_Category_Help_Tour' ),*/
-                'require_nonce' => false,
-            ),
-            'category_list'       => array(
-                'nav'           => array(
-                    'label' => __('Categories', 'event_espresso'),
-                    'order' => 20,
-                ),
-                'list_table'    => 'Venue_Categories_Admin_List_Table',
-                'help_tabs'     => array(
-                    'venues_categories_help_tab'                       => array(
-                        'title'    => __('Venue Categories', 'event_espresso'),
-                        'filename' => 'venues_categories',
-                    ),
-                    'venues_categories_table_column_headings_help_tab' => array(
-                        'title'    => __('Venue Categories Table Column Headings', 'event_espresso'),
-                        'filename' => 'venues_categories_table_column_headings',
-                    ),
-                    'venues_categories_views_help_tab'                 => array(
-                        'title'    => __('Venue Categories Views', 'event_espresso'),
-                        'filename' => 'venues_categories_views',
-                    ),
-                    'venues_categories_other_help_tab'                 => array(
-                        'title'    => __('Venue Categories Other', 'event_espresso'),
-                        'filename' => 'venues_categories_other',
-                    ),
-                ),
-                'help_tour'     => array('Venues_Categories_Help_Tour'),
-                'metaboxes'     => $this->_default_espresso_metaboxes,
-                'require_nonce' => false,
-            ),
-        );
-    }
-
-
-    protected function _add_screen_options()
-    {
-        // todo
-    }
-
-
-    protected function _add_screen_options_default()
-    {
-        $this->_per_page_screen_option();
-    }
-
-
-    protected function _add_screen_options_category_list()
-    {
-        $page_title = $this->_admin_page_title;
-        $this->_admin_page_title = __('Venue Categories', 'event_espresso');
-        $this->_per_page_screen_option();
-        $this->_admin_page_title = $page_title;
-    }
-
-
-    // none of the below group are currently used for Event Venues
-    protected function _add_feature_pointers()
-    {
-    }
-
-    public function admin_init()
-    {
-    }
-
-    public function admin_notices()
-    {
-    }
-
-    public function admin_footer_scripts()
-    {
-    }
-
-
-    public function load_scripts_styles_create_new()
-    {
-        $this->load_scripts_styles_edit();
-    }
-
-
-    public function load_scripts_styles()
-    {
-        wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
-        wp_enqueue_style('ee-cat-admin');
-    }
-
-
-    public function load_scripts_styles_add_category()
-    {
-        $this->load_scripts_styles_edit_category();
-    }
-
-
-    public function load_scripts_styles_edit_category()
-    {
-    }
-
-
-    public function load_scripts_styles_edit()
-    {
-        // styles
-        wp_enqueue_style('espresso-ui-theme');
-        wp_register_style(
-            'espresso_venues',
-            EE_VENUES_ASSETS_URL . 'ee-venues-admin.css',
-            array(),
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('espresso_venues');
-    }
-
-
-    protected function _set_list_table_views_default()
-    {
-        $this->_views = array(
-            'all' => array(
-                'slug'        => 'all',
-                'label'       => __('View All Venues', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(),
-            ),
-        );
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venues', 'espresso_venues_trash_venues')) {
-            $this->_views['all']['bulk_action'] = array(
-                'trash_venues' => __('Move to Trash', 'event_espresso'),
-            );
-            $this->_views['trash'] = array(
-                'slug'        => 'trash',
-                'label'       => __('Trash', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'restore_venues' => __('Restore from Trash', 'event_espresso'),
-                    'delete_venues'  => __('Delete', 'event_espresso'),
-                ),
-            );
-        }
-    }
-
-
-    protected function _set_list_table_views_category_list()
-    {
-        $this->_views = array(
-            'all' => array(
-                'slug'        => 'all',
-                'label'       => __('All', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'delete_categories' => __('Delete Permanently', 'event_espresso'),
-                ),
-            ),
-        );
-    }
-
-
-    protected function _overview_list_table()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(
-            get_post_type_archive_link('espresso_venues'),
-            __("View Venue Archive Page", "event_espresso"),
-            'button'
-        );
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2');
-        $this->_search_btn_label = __('Venues', 'event_espresso');
-        $this->display_admin_list_table_page_with_sidebar();
-    }
-
-
-    public function extra_misc_actions_publish_box()
-    {
-        $extra_rows = array(
-            'vnu_capacity' => $this->_cpt_model_obj->get_f('VNU_capacity'),
-            'vnu_url'      => $this->_cpt_model_obj->get_f('VNU_url'),
-            'vnu_phone'    => $this->_cpt_model_obj->get_f('VNU_phone'),
-        );
-        $template = EE_VENUES_TEMPLATE_PATH . 'venue_publish_box_extras.template.php';
-        EEH_Template::display_template($template, $extra_rows);
-    }
-
-
-    /*************        Google Maps        *************/
-
-
-    protected function _google_map_settings()
-    {
-
-
-        $this->_template_args['values'] = $this->_yes_no_values;
-        $default_map_settings = new stdClass();
-        $default_map_settings->use_google_maps = true;
-        $default_map_settings->google_map_api_key = '';
-        // for event details pages (reg page)
-        $default_map_settings->event_details_map_width = 585;            // ee_map_width_single
-        $default_map_settings->event_details_map_height = 362;            // ee_map_height_single
-        $default_map_settings->event_details_map_zoom = 14;            // ee_map_zoom_single
-        $default_map_settings->event_details_display_nav = true;            // ee_map_nav_display_single
-        $default_map_settings->event_details_nav_size = false;            // ee_map_nav_size_single
-        $default_map_settings->event_details_control_type = 'default';        // ee_map_type_control_single
-        $default_map_settings->event_details_map_align = 'center';            // ee_map_align_single
-        // for event list pages
-        $default_map_settings->event_list_map_width = 300;            // ee_map_width
-        $default_map_settings->event_list_map_height = 185;        // ee_map_height
-        $default_map_settings->event_list_map_zoom = 12;            // ee_map_zoom
-        $default_map_settings->event_list_display_nav = false;        // ee_map_nav_display
-        $default_map_settings->event_list_nav_size = true;            // ee_map_nav_size
-        $default_map_settings->event_list_control_type = 'dropdown';        // ee_map_type_control
-        $default_map_settings->event_list_map_align = 'center';            // ee_map_align
-
-        $this->_template_args['map_settings'] =
-            isset(EE_Registry::instance()->CFG->map_settings)
-            && ! empty(EE_Registry::instance()->CFG->map_settings)
-                ? (object) array_merge(
-                    (array) $default_map_settings,
-                    (array) EE_Registry::instance()->CFG->map_settings
-                )
-                : $default_map_settings;
-
-        $this->_set_add_edit_form_tags('update_google_map_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            EE_VENUES_TEMPLATE_PATH . 'google_map.template.php',
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-    protected function _update_google_map_settings()
-    {
-
-        EE_Registry::instance()->CFG->map_settings->use_google_maps =
-            isset($this->_req_data['use_google_maps'])
-                ? absint($this->_req_data['use_google_maps'])
-                : EE_Registry::instance()->CFG->map_settings->use_google_maps;
-
-        EE_Registry::instance()->CFG->map_settings->google_map_api_key =
-            isset($this->_req_data['google_map_api_key'])
-                ? sanitize_text_field($this->_req_data['google_map_api_key'])
-                : EE_Registry::instance()->CFG->map_settings->google_map_api_key;
-
-        EE_Registry::instance()->CFG->map_settings->event_details_map_width =
-            isset($this->_req_data['event_details_map_width'])
-                ? absint($this->_req_data['event_details_map_width'])
-                : EE_Registry::instance()->CFG->map_settings->event_details_map_width;
-
-        EE_Registry::instance()->CFG->map_settings->event_details_map_height =
-            isset($this->_req_data['event_details_map_height'])
-                ? absint($this->_req_data['event_details_map_height'])
-                : EE_Registry::instance()->CFG->map_settings->event_details_map_height;
-
-        EE_Registry::instance()->CFG->map_settings->event_details_map_zoom =
-            isset($this->_req_data['event_details_map_zoom'])
-                ? absint($this->_req_data['event_details_map_zoom'])
-                : EE_Registry::instance()->CFG->map_settings->event_details_map_zoom;
-
-        EE_Registry::instance()->CFG->map_settings->event_details_display_nav =
-            isset($this->_req_data['event_details_display_nav'])
-                ? absint($this->_req_data['event_details_display_nav'])
-                : EE_Registry::instance()->CFG->map_settings->event_details_display_nav;
-
-        EE_Registry::instance()->CFG->map_settings->event_details_nav_size =
-            isset($this->_req_data['event_details_nav_size'])
-                ? absint($this->_req_data['event_details_nav_size'])
-                : EE_Registry::instance()->CFG->map_settings->event_details_nav_size;
-
-        EE_Registry::instance()->CFG->map_settings->event_details_control_type =
-            isset($this->_req_data['event_details_control_type'])
-                ? sanitize_text_field($this->_req_data['event_details_control_type'])
-                : EE_Registry::instance()->CFG->map_settings->event_details_control_type;
-
-        EE_Registry::instance()->CFG->map_settings->event_details_map_align =
-            isset($this->_req_data['event_details_map_align'])
-                ? sanitize_text_field($this->_req_data['event_details_map_align'])
-                : EE_Registry::instance()->CFG->map_settings->event_details_map_align;
-
-        EE_Registry::instance()->CFG->map_settings->event_list_map_width =
-            isset($this->_req_data['event_list_map_width'])
-                ? absint($this->_req_data['event_list_map_width'])
-                : EE_Registry::instance()->CFG->map_settings->event_list_map_width;
-
-        EE_Registry::instance()->CFG->map_settings->event_list_map_height =
-            isset($this->_req_data['event_list_map_height'])
-                ? absint($this->_req_data['event_list_map_height'])
-                : EE_Registry::instance()->CFG->map_settings->event_list_map_height;
-
-        EE_Registry::instance()->CFG->map_settings->event_list_map_zoom =
-            isset($this->_req_data['event_list_map_zoom'])
-                ? absint($this->_req_data['event_list_map_zoom'])
-                : EE_Registry::instance()->CFG->map_settings->event_list_map_zoom;
-
-        EE_Registry::instance()->CFG->map_settings->event_list_display_nav =
-            isset($this->_req_data['event_list_display_nav'])
-                ? absint($this->_req_data['event_list_display_nav'])
-                : EE_Registry::instance()->CFG->map_settings->event_list_display_nav;
-
-        EE_Registry::instance()->CFG->map_settings->event_list_nav_size =
-            isset($this->_req_data['event_list_nav_size'])
-                ? absint($this->_req_data['event_list_nav_size'])
-                : EE_Registry::instance()->CFG->map_settings->event_list_nav_size;
-
-        EE_Registry::instance()->CFG->map_settings->event_list_control_type =
-            isset($this->_req_data['event_list_control_type'])
-                ? sanitize_text_field($this->_req_data['event_list_control_type'])
-                : EE_Registry::instance()->CFG->map_settings->event_list_control_type;
-
-        EE_Registry::instance()->CFG->map_settings->event_list_map_align =
-            isset($this->_req_data['event_list_map_align'])
-                ? sanitize_text_field($this->_req_data['event_list_map_align'])
-                : EE_Registry::instance()->CFG->map_settings->event_list_map_align;
-
-        EE_Registry::instance()->CFG->map_settings = apply_filters(
-            'FHEE__Extend_General_Settings_Admin_Page___update_google_map_settings__CFG_map_settings',
-            EE_Registry::instance()->CFG->map_settings
-        );
-
-        $what = 'Google Map Settings';
-        $success = $this->_update_espresso_configuration(
-            $what,
-            EE_Registry::instance()->CFG->map_settings,
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        $this->_redirect_after_action($success, $what, 'updated', array('action' => 'google_map_settings'));
-    }
-
-
-    protected function _venue_editor_metaboxes()
-    {
-        $this->verify_cpt_object();
-
-        add_meta_box(
-            'espresso_venue_address_options',
-            __('Physical Location', 'event_espresso'),
-            array($this, 'venue_address_metabox'),
-            $this->page_slug,
-            'side',
-            'default'
-        );
-        add_meta_box(
-            'espresso_venue_gmap_options',
-            __('Google Map', 'event_espresso'),
-            array($this, 'venue_gmap_metabox'),
-            $this->page_slug,
-            'side',
-            'default'
-        );
-        add_meta_box(
-            'espresso_venue_virtual_loc_options',
-            __('Virtual Location', 'event_espresso'),
-            array($this, 'venue_virtual_loc_metabox'),
-            $this->page_slug,
-            'side',
-            'default'
-        );
-    }
-
-
-    public function venue_gmap_metabox()
-    {
-        $template_args = array(
-            'vnu_enable_for_gmap' => EEH_Form_Fields::select_input(
-                'vnu_enable_for_gmap',
-                $this->get_yes_no_values(),
-                $this->_cpt_model_obj->enable_for_gmap()
-            ),
-            'vnu_google_map_link' => $this->_cpt_model_obj->google_map_link(),
-        );
-        $template = EE_VENUES_TEMPLATE_PATH . 'venue_gmap_metabox_content.template.php';
-        EEH_Template::display_template($template, $template_args);
-    }
-
-
-    public function venue_address_metabox()
-    {
-
-        $template_args['_venue'] = $this->_cpt_model_obj;
-
-        $template_args['states_dropdown'] = EEH_Form_Fields::generate_form_input(
-            $QFI = new EE_Question_Form_Input(
-                EE_Question::new_instance(
-                    array('QST_display_text' => esc_html__('State', 'event_espresso'), 'QST_system' => 'state')
-                ),
-                EE_Answer::new_instance(array('ANS_value' => $this->_cpt_model_obj->state_ID())),
-                array(
-                    'input_name'     => 'sta_id',
-                    'input_id'       => 'sta_id',
-                    'input_class'    => '',
-                    'input_prefix'   => '',
-                    'append_qstn_id' => false,
-                )
-            )
-        );
-        $template_args['countries_dropdown'] = EEH_Form_Fields::generate_form_input(
-            $QFI = new EE_Question_Form_Input(
-                EE_Question::new_instance(
-                    array('QST_display_text' => esc_html__('Country', 'event_espresso'), 'QST_system' => 'country')
-                ),
-                EE_Answer::new_instance(array('ANS_value' => $this->_cpt_model_obj->country_ID())),
-                array(
-                    'input_name'     => 'cnt_iso',
-                    'input_id'       => 'cnt_iso',
-                    'input_class'    => '',
-                    'input_prefix'   => '',
-                    'append_qstn_id' => false,
-                )
-            )
-        );
-
-        $template = EE_VENUES_TEMPLATE_PATH . 'venue_address_metabox_content.template.php';
-        EEH_Template::display_template($template, $template_args);
-    }
-
-
-    public function venue_virtual_loc_metabox()
-    {
-        $template_args = array(
-            '_venue' => $this->_cpt_model_obj,
-        );
-        $template = EE_VENUES_TEMPLATE_PATH . 'venue_virtual_location_metabox_content.template.php';
-        EEH_Template::display_template($template, $template_args);
-    }
-
-
-    protected function _restore_cpt_item($post_id, $revision_id)
-    {
-        $venue_obj = $this->_venue_model->get_one_by_ID($post_id);
-
-        // meta revision restore
-        $venue_obj->restore_revision($revision_id);
-    }
-
-
-    /**
-     * Handles updates for venue cpts
-     *
-     * @param  int    $post_id ID of Venue CPT
-     * @param  object $post    Post object (with "blessed" WP properties)
-     * @return void
-     */
-    protected function _insert_update_cpt_item($post_id, $post)
-    {
-
-        if ($post instanceof WP_Post && $post->post_type !== 'espresso_venues') {
-            return;// get out we're not processing the saving of venues.
-        }
-
-        $wheres = array($this->_venue_model->primary_key_name() => $post_id);
-
-        $venue_values = array(
-            'VNU_address'         => ! empty($this->_req_data['vnu_address']) ? $this->_req_data['vnu_address'] : null,
-            'VNU_address2'        => ! empty($this->_req_data['vnu_address2']) ? $this->_req_data['vnu_address2']
-                : null,
-            'VNU_city'            => ! empty($this->_req_data['vnu_city']) ? $this->_req_data['vnu_city'] : null,
-            'STA_ID'              => ! empty($this->_req_data['sta_id']) ? $this->_req_data['sta_id'] : null,
-            'CNT_ISO'             => ! empty($this->_req_data['cnt_iso']) ? $this->_req_data['cnt_iso'] : null,
-            'VNU_zip'             => ! empty($this->_req_data['vnu_zip']) ? $this->_req_data['vnu_zip'] : null,
-            'VNU_phone'           => ! empty($this->_req_data['vnu_phone']) ? $this->_req_data['vnu_phone'] : null,
-            'VNU_capacity'        => ! empty($this->_req_data['vnu_capacity']) ? str_replace(
-                ',',
-                '',
-                $this->_req_data['vnu_capacity']
-            ) : EE_INF,
-            'VNU_url'             => ! empty($this->_req_data['vnu_url']) ? $this->_req_data['vnu_url'] : null,
-            'VNU_virtual_phone'   => ! empty($this->_req_data['vnu_virtual_phone'])
-                ? $this->_req_data['vnu_virtual_phone'] : null,
-            'VNU_virtual_url'     => ! empty($this->_req_data['vnu_virtual_url']) ? $this->_req_data['vnu_virtual_url']
-                : null,
-            'VNU_enable_for_gmap' => ! empty($this->_req_data['vnu_enable_for_gmap']) ? true : false,
-            'VNU_google_map_link' => ! empty($this->_req_data['vnu_google_map_link'])
-                ? $this->_req_data['vnu_google_map_link'] : null,
-        );
-
-        // update venue
-        $success = $this->_venue_model->update($venue_values, array($wheres));
-
-        // get venue_object for other metaboxes that might be added via the filter... though it would seem to make sense to just use $this->_venue_model->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
-        $get_one_where = array($this->_venue_model->primary_key_name() => $post_id, 'status' => $post->post_status);
-        $venue = $this->_venue_model->get_one(array($get_one_where));
-
-        // notice we've applied a filter for venue metabox callbacks but we don't actually have any default venue metaboxes in use.  So this is just here for addons to more easily hook into venue saves.
-        $venue_update_callbacks = apply_filters(
-            'FHEE__Venues_Admin_Page___insert_update_cpt_item__venue_update_callbacks',
-            array()
-        );
-
-        $att_success = true;
-
-        foreach ($venue_update_callbacks as $v_callback) {
-            $_succ = call_user_func_array($v_callback, array($venue, $this->_req_data));
-            $att_success = ! $att_success ? $att_success
-                : $_succ; // if ANY of these updates fail then we want the appropriate global error message
-        }
-
-        // any errors?
-        if ($success && ! $att_success) {
-            EE_Error::add_error(
-                __(
-                    'Venue Details saved successfully but something went wrong with saving attachments.',
-                    'event_espresso'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        } elseif ($success === false) {
-            EE_Error::add_error(
-                __('Venue Details did not save successfully.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-    }
-
-
-    public function trash_cpt_item($post_id)
-    {
-        $this->_req_data['VNU_ID'] = $post_id;
-        $this->_trash_or_restore_venue('trash', false);
-    }
-
-
-    public function restore_cpt_item($post_id)
-    {
-        $this->_req_data['VNU_ID'] = $post_id;
-        $this->_trash_or_restore_venue('draft', false);
-    }
-
-
-    public function delete_cpt_item($post_id)
-    {
-        $this->_req_data['VNU_ID'] = $post_id;
-        $this->_delete_venue(false);
-    }
-
-
-    public function get_venue_object()
-    {
-        return $this->_cpt_model_obj;
-    }
-
-
-    protected function _trash_or_restore_venue($venue_status = 'trash', $redirect_after = true)
-    {
-        $VNU_ID = isset($this->_req_data['VNU_ID']) ? absint($this->_req_data['VNU_ID']) : false;
-
-        // loop thru venues
-        if ($VNU_ID) {
-            // clean status
-            $venue_status = sanitize_key($venue_status);
-            // grab status
-            if (! empty($venue_status)) {
-                $success = $this->_change_venue_status($VNU_ID, $venue_status);
-            } else {
-                $success = false;
-                $msg = __(
-                    'An error occurred. The venue could not be moved to the trash because a valid venue status was not not supplied.',
-                    'event_espresso'
-                );
-                EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            }
-        } else {
-            $success = false;
-            $msg = __(
-                'An error occurred. The venue could not be moved to the trash because a valid venue ID was not not supplied.',
-                'event_espresso'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-        $action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
-
-        if ($redirect_after) {
-            $this->_redirect_after_action($success, 'Venue', $action, array('action' => 'default'));
-        }
-    }
-
-
-    protected function _trash_or_restore_venues($venue_status = 'trash')
-    {
-        // clean status
-        $venue_status = sanitize_key($venue_status);
-        // grab status
-        if (! empty($venue_status)) {
-            $success = true;
-            // determine the event id and set to array.
-            $VNU_IDs = isset($this->_req_data['venue_id']) ? (array) $this->_req_data['venue_id'] : array();
-            // loop thru events
-            foreach ($VNU_IDs as $VNU_ID) {
-                if ($VNU_ID = absint($VNU_ID)) {
-                    $results = $this->_change_venue_status($VNU_ID, $venue_status);
-                    $success = $results !== false ? $success : false;
-                } else {
-                    $msg = sprintf(
-                        __(
-                            'An error occurred. Venue #%d could not be moved to the trash because a valid venue ID was not not supplied.',
-                            'event_espresso'
-                        ),
-                        $VNU_ID
-                    );
-                    EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-                    $success = false;
-                }
-            }
-        } else {
-            $success = false;
-            $msg = __(
-                'An error occurred. The venue could not be moved to the trash because a valid venue status was not not supplied.',
-                'event_espresso'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-        // in order to force a pluralized result message we need to send back a success status greater than 1
-        $success = $success ? 2 : false;
-        $action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
-        $this->_redirect_after_action($success, 'Venues', $action, array('action' => 'default'));
-    }
-
-
-    /**
-     * _trash_or_restore_venues
-     *
-     * //todo this is pretty much the same as the corresponding change_event_status method in Events_Admin_Page.  We
-     * should probably abstract this up to the EE_Admin_Page_CPT (or even EE_Admin_Page) and make this a common method
-     * accepting a certain number of params.
-     *
-     * @access  private
-     * @param  int    $VNU_ID
-     * @param  string $venue_status
-     * @return void
-     */
-    private function _change_venue_status($VNU_ID = 0, $venue_status = '')
-    {
-        // grab venue id
-        if (! $VNU_ID) {
-            $msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-
-        $this->_cpt_model_obj = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
-
-        // clean status
-        $venue_status = sanitize_key($venue_status);
-        // grab status
-        if (! $venue_status) {
-            $msg = __('An error occurred. No Venue Status or an invalid Venue Status was received.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-
-        // was event trashed or restored ?
-        switch ($venue_status) {
-            case 'draft':
-                $action = 'restored from the trash';
-                $hook = 'AHEE_venue_restored_from_trash';
-                break;
-            case 'trash':
-                $action = 'moved to the trash';
-                $hook = 'AHEE_venue_moved_to_trash';
-                break;
-            default:
-                $action = 'updated';
-                $hook = false;
-        }
-        // use class to change status
-        $this->_cpt_model_obj->set_status($venue_status);
-        $success = $this->_cpt_model_obj->save();
-
-        if ($success === false) {
-            $msg = sprintf(__('An error occurred. The venue could not be %s.', 'event_espresso'), $action);
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        if ($hook) {
-            do_action($hook);
-        }
-        return true;
-    }
-
-
-    /**
-     * @param  bool $redirect_after
-     * @return void
-     */
-    protected function _delete_venue($redirect_after = true)
-    {
-        // determine the venue id and set to array.
-        $VNU_ID = isset($this->_req_data['VNU_ID']) ? absint($this->_req_data['VNU_ID']) : null;
-        $VNU_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : $VNU_ID;
-
-
-        // loop thru venues
-        if ($VNU_ID) {
-            $success = $this->_delete_or_trash_venue($VNU_ID);
-        } else {
-            $success = false;
-            $msg = __(
-                'An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.',
-                'event_espresso'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-        if ($redirect_after) {
-            $this->_redirect_after_action($success, 'Venue', 'deleted', array('action' => 'default'));
-        }
-    }
-
-
-    protected function _delete_venues()
-    {
-        $success = true;
-        // determine the event id and set to array.
-        $VNU_IDs = isset($this->_req_data['venue_id']) ? (array) $this->_req_data['venue_id'] : array();
-        // loop thru events
-        foreach ($VNU_IDs as $VNU_ID) {
-            if ($VNU_ID = absint($VNU_ID)) {
-                $results = $this->_delete_or_trash_venue($VNU_ID);
-                $success = $results !== false ? $success : false;
-            } else {
-                $success = false;
-                $msg = __(
-                    'An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.',
-                    'event_espresso'
-                );
-                EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            }
-        }
-        // in order to force a pluralized result message we need to send back a success status greater than 1
-        $success = $success ? 2 : false;
-        $this->_redirect_after_action(
-            $success,
-            __('Venues', 'event_espresso'),
-            __('deleted', 'event_espresso'),
-            array('action' => 'default')
-        );
-    }
-
-
-    // todo: put in parent
-    private function _delete_or_trash_venue($VNU_ID = false)
-    {
-        // grab event id
-        if (! $VNU_ID = absint($VNU_ID)) {
-            $msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-
-
-        $venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
-        // first need to remove all term relationships
-        $venue->_remove_relations('Term_Taxonomy');
-        $success = $venue->delete_permanently();
-        // did it all go as planned ?
-        if ($success) {
-            $msg = sprintf(__('Venue ID # %d has been deleted.', 'event_espresso'), $VNU_ID);
-            EE_Error::add_success($msg);
-        } else {
-            $msg = sprintf(__('An error occurred. Venue ID # %d could not be deleted.', 'event_espresso'), $VNU_ID);
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        do_action('AHEE__Venues_Admin_Page___delete_or_trash_venue__after_venue_deleted');
-        return true;
-    }
-
-
-
-
-    /***********/
-    /* QUERIES */
-
-
-    public function get_venues($per_page = 10, $count = false)
-    {
-
-        $_orderby = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
-
-        switch ($_orderby) {
-            case 'id':
-                $orderby = 'VNU_ID';
-                break;
-
-            case 'capacity':
-                $orderby = 'VNU_capacity';
-                break;
-
-            case 'city':
-                $orderby = 'VNU_city';
-                break;
-
-            default:
-                $orderby = 'VNU_name';
-        }
-
-
-        $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order']
-            : 'ASC';
-
-        $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
-            ? $this->_req_data['paged'] : 1;
-        $per_page = isset($per_page) && ! empty($per_page) ? $per_page : 10;
-        $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
-            ? $this->_req_data['perpage'] : $per_page;
-
-
-        $offset = ($current_page - 1) * $per_page;
-        $limit = array($offset, $per_page);
-
-        $category = isset($this->_req_data['category']) && $this->_req_data['category'] > 0
-            ? $this->_req_data['category'] : null;
-        $where = array();
-
-        // only set initial status if it is in the incoming request.  Otherwise the "all" view display's all statuses.
-        if (isset($this->_req_data['status']) && $this->_req_data['status'] != 'all') {
-            $where['status'] = $this->_req_data['status'];
-        }
-
-        if (isset($this->_req_data['venue_status'])) {
-            $where['status'] = $this->_req_data['venue_status'];
-        }
-
-
-        if ($category) {
-            $where['Term_Taxonomy.taxonomy'] = 'espresso_venue_categories';
-            $where['Term_Taxonomy.term_id'] = $category;
-        }
-
-
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
-            $where['VNU_wp_user'] = get_current_user_id();
-        } else {
-            if (! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
-                $where['OR'] = array(
-                    'status*restrict_private' => array('!=', 'private'),
-                    'AND'                     => array(
-                        'status*inclusive' => array('=', 'private'),
-                        'VNU_wp_user'      => get_current_user_id(),
-                    ),
-                );
-            }
-        }
-
-
-        if (isset($this->_req_data['s'])) {
-            $sstr = '%' . $this->_req_data['s'] . '%';
-            $where['OR'] = array(
-                'VNU_name'               => array('LIKE', $sstr),
-                'VNU_desc'               => array('LIKE', $sstr),
-                'VNU_short_desc'         => array('LIKE', $sstr),
-                'VNU_address'            => array('LIKE', $sstr),
-                'VNU_address2'           => array('LIKE', $sstr),
-                'VNU_city'               => array('LIKE', $sstr),
-                'VNU_zip'                => array('LIKE', $sstr),
-                'VNU_phone'              => array('LIKE', $sstr),
-                'VNU_url'                => array('LIKE', $sstr),
-                'VNU_virtual_phone'      => array('LIKE', $sstr),
-                'VNU_virtual_url'        => array('LIKE', $sstr),
-                'VNU_google_map_link'    => array('LIKE', $sstr),
-                'Event.EVT_name'         => array('LIKE', $sstr),
-                'Event.EVT_desc'         => array('LIKE', $sstr),
-                'Event.EVT_phone'        => array('LIKE', $sstr),
-                'Event.EVT_external_URL' => array('LIKE', $sstr),
-            );
-        }
+	/**
+	 * _venue
+	 * This will hold the venue object for venue_details screen.
+	 *
+	 * @access protected
+	 * @var object
+	 */
+	protected $_venue;
+
+
+	/**
+	 * This will hold the category object for category_details screen.
+	 *
+	 * @var object
+	 */
+	protected $_category;
+
+
+	/**
+	 * This property will hold the venue model instance
+	 *
+	 * @var object
+	 */
+	protected $_venue_model;
+
+
+	protected function _init_page_props()
+	{
+		require_once(EE_MODELS . 'EEM_Venue.model.php');
+		$this->page_slug = EE_VENUES_PG_SLUG;
+		$this->_admin_base_url = EE_VENUES_ADMIN_URL;
+		$this->_admin_base_path = EE_ADMIN_PAGES . 'venues';
+		$this->page_label = __('Event Venues', 'event_espresso');
+		$this->_cpt_model_names = array(
+			'create_new' => 'EEM_Venue',
+			'edit'       => 'EEM_Venue',
+		);
+		$this->_cpt_edit_routes = array(
+			'espresso_venues' => 'edit',
+		);
+		$this->_venue_model = EEM_Venue::instance();
+	}
+
+
+	protected function _ajax_hooks()
+	{
+		// todo: all hooks for ee_venues ajax goes in here.
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = $this->page_label;
+		$this->_labels = array(
+			'buttons'      => array(
+				'add'             => __('Add New Venue', 'event_espresso'),
+				'edit'            => __('Edit Venue', 'event_espresso'),
+				'delete'          => __('Delete Venue', 'event_espresso'),
+				'add_category'    => __('Add New Category', 'event_espresso'),
+				'edit_category'   => __('Edit Category', 'event_espresso'),
+				'delete_category' => __('Delete Category', 'event_espresso'),
+			),
+			'editor_title' => array(
+				'espresso_venues' => __('Enter Venue name here', 'event_espresso'),
+			),
+			'publishbox'   => array(
+				'create_new'          => __('Save New Venue', 'event_espresso'),
+				'edit'                => __('Update Venue', 'event_espresso'),
+				'add_category'        => __('Save New Category', 'event_espresso'),
+				'edit_category'       => __('Update Category', 'event_espresso'),
+				'google_map_settings' => __('Update Settings', 'event_espresso'),
+			),
+		);
+	}
+
+
+	protected function _set_page_routes()
+	{
+
+		// load formatter helper
+		// load field generator helper
+
+		// is there a vnu_id in the request?
+		$vnu_id = ! empty($this->_req_data['VNU_ID']) && ! is_array($this->_req_data['VNU_ID'])
+			? $this->_req_data['VNU_ID'] : 0;
+		$vnu_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $vnu_id;
+
+		$this->_page_routes = array(
+			'default'                    => array(
+				'func'       => '_overview_list_table',
+				'capability' => 'ee_read_venues',
+			),
+			'create_new'                 => array(
+				'func'       => '_create_new_cpt_item',
+				'capability' => 'ee_edit_venues',
+			),
+			'edit'                       => array(
+				'func'       => '_edit_cpt_item',
+				'capability' => 'ee_edit_venue',
+				'obj_id'     => $vnu_id,
+			),
+			'trash_venue'                => array(
+				'func'       => '_trash_or_restore_venue',
+				'args'       => array('venue_status' => 'trash'),
+				'noheader'   => true,
+				'capability' => 'ee_delete_venue',
+				'obj_id'     => $vnu_id,
+			),
+			'trash_venues'               => array(
+				'func'       => '_trash_or_restore_venues',
+				'args'       => array('venue_status' => 'trash'),
+				'noheader'   => true,
+				'capability' => 'ee_delete_venues',
+			),
+			'restore_venue'              => array(
+				'func'       => '_trash_or_restore_venue',
+				'args'       => array('venue_status' => 'draft'),
+				'noheader'   => true,
+				'capability' => 'ee_delete_venue',
+				'obj_id'     => $vnu_id,
+			),
+			'restore_venues'             => array(
+				'func'       => '_trash_or_restore_venues',
+				'args'       => array('venue_status' => 'draft'),
+				'noheader'   => true,
+				'capability' => 'ee_delete_venues',
+			),
+			'delete_venues'              => array(
+				'func'       => '_delete_venues',
+				'noheader'   => true,
+				'capability' => 'ee_delete_venues',
+			),
+			'delete_venue'               => array(
+				'func'       => '_delete_venue',
+				'noheader'   => true,
+				'capability' => 'ee_delete_venue',
+				'obj_id'     => $vnu_id,
+			),
+			// settings related
+			'google_map_settings'        => array(
+				'func'       => '_google_map_settings',
+				'capability' => 'manage_options',
+			),
+			'update_google_map_settings' => array(
+				'func'       => '_update_google_map_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
+			// venue category tab related
+			'add_category'               => array(
+				'func'       => '_category_details',
+				'args'       => array('add'),
+				'capability' => 'ee_edit_venue_category',
+			),
+			'edit_category'              => array(
+				'func'       => '_category_details',
+				'args'       => array('edit'),
+				'capability' => 'ee_edit_venue_category',
+			),
+			'delete_categories'          => array(
+				'func'       => '_delete_categories',
+				'noheader'   => true,
+				'capability' => 'ee_delete_venue_category',
+			),
+
+			'delete_category' => array(
+				'func'       => '_delete_categories',
+				'noheader'   => true,
+				'capability' => 'ee_delete_venue_category',
+			),
+
+			'insert_category' => array(
+				'func'       => '_insert_or_update_category',
+				'args'       => array('new_category' => true),
+				'noheader'   => true,
+				'capability' => 'ee_edit_venue_category',
+			),
+
+			'update_category'   => array(
+				'func'       => '_insert_or_update_category',
+				'args'       => array('new_category' => false),
+				'noheader'   => true,
+				'capability' => 'ee_edit_venue_category',
+			),
+			'export_categories' => array(
+				'func'       => '_categories_export',
+				'noheader'   => true,
+				'capability' => 'export',
+			),
+			'import_categories' => array(
+				'func'       => '_import_categories',
+				'capability' => 'import',
+			),
+			'category_list'     => array(
+				'func'       => '_category_list_table',
+				'capability' => 'ee_manage_venue_categories',
+			),
+		);
+	}
+
+
+	protected function _set_page_config()
+	{
+		$this->_page_config = array(
+			'default'             => array(
+				'nav'           => array(
+					'label' => __('Overview', 'event_espresso'),
+					'order' => 10,
+				),
+				'list_table'    => 'Venues_Admin_List_Table',
+				'help_tabs'     => array(
+					'venues_overview_help_tab'                           => array(
+						'title'    => __('Venues Overview', 'event_espresso'),
+						'filename' => 'venues_overview',
+					),
+					'venues_overview_table_column_headings_help_tab'     => array(
+						'title'    => __('Venues Overview Table Column Headings', 'event_espresso'),
+						'filename' => 'venues_overview_table_column_headings',
+					),
+					'venues_overview_views_bulk_actions_search_help_tab' => array(
+						'title'    => __('Venues Overview Views & Bulk Actions & Search', 'event_espresso'),
+						'filename' => 'venues_overview_views_bulk_actions_search',
+					),
+				),
+				'help_tour'     => array('Venues_Overview_Help_Tour'),
+				'metaboxes'     => array('_espresso_news_post_box', '_espresso_links_post_box'),
+				'require_nonce' => false,
+			),
+			'create_new'          => array(
+				'nav'           => array(
+					'label'      => __('Add Venue', 'event_espresso'),
+					'order'      => 5,
+					'persistent' => false,
+				),
+				'help_tabs'     => array(
+					'venues_editor_help_tab'                                               => array(
+						'title'    => __('Venue Editor', 'event_espresso'),
+						'filename' => 'venues_editor',
+					),
+					'venues_editor_title_richtexteditor_help_tab'                          => array(
+						'title'    => __('Venue Title & Rich Text Editor', 'event_espresso'),
+						'filename' => 'venues_editor_title_richtexteditor',
+					),
+					'venues_editor_tags_categories_help_tab'                               => array(
+						'title'    => __('Venue Tags & Categories', 'event_espresso'),
+						'filename' => 'venues_editor_tags_categories',
+					),
+					'venues_editor_physical_location_google_map_virtual_location_help_tab' => array(
+						'title'    => __(
+							'Venue Editor Physical Location & Google Map & Virtual Location',
+							'event_espresso'
+						),
+						'filename' => 'venues_editor_physical_location_google_map_virtual_location',
+					),
+					'venues_editor_save_new_venue_help_tab'                                => array(
+						'title'    => __('Save New Venue', 'event_espresso'),
+						'filename' => 'venues_editor_save_new_venue',
+					),
+					'venues_editor_other_help_tab'                                         => array(
+						'title'    => __('Venue Editor Other', 'event_espresso'),
+						'filename' => 'venues_editor_other',
+					),
+				),
+				'help_tour'     => array('Venues_Add_Venue_Help_Tour'),
+				'metaboxes'     => array('_venue_editor_metaboxes'),
+				'require_nonce' => false,
+			),
+			'edit'                => array(
+				'nav'           => array(
+					'label'      => __('Edit Venue', 'event_espresso'),
+					'order'      => 5,
+					'persistent' => false,
+					'url'        => isset($this->_req_data['post']) ? add_query_arg(
+						array('post' => $this->_req_data['post']),
+						$this->_current_page_view_url
+					) : $this->_admin_base_url,
+				),
+				'help_tabs'     => array(
+					'venues_editor_help_tab'                                               => array(
+						'title'    => __('Venue Editor', 'event_espresso'),
+						'filename' => 'venues_editor',
+					),
+					'venues_editor_title_richtexteditor_help_tab'                          => array(
+						'title'    => __('Venue Title & Rich Text Editor', 'event_espresso'),
+						'filename' => 'venues_editor_title_richtexteditor',
+					),
+					'venues_editor_tags_categories_help_tab'                               => array(
+						'title'    => __('Venue Tags & Categories', 'event_espresso'),
+						'filename' => 'venues_editor_tags_categories',
+					),
+					'venues_editor_physical_location_google_map_virtual_location_help_tab' => array(
+						'title'    => __(
+							'Venue Editor Physical Location & Google Map & Virtual Location',
+							'event_espresso'
+						),
+						'filename' => 'venues_editor_physical_location_google_map_virtual_location',
+					),
+					'venues_editor_save_new_venue_help_tab'                                => array(
+						'title'    => __('Save New Venue', 'event_espresso'),
+						'filename' => 'venues_editor_save_new_venue',
+					),
+					'venues_editor_other_help_tab'                                         => array(
+						'title'    => __('Venue Editor Other', 'event_espresso'),
+						'filename' => 'venues_editor_other',
+					),
+				),
+				/*'help_tour' => array( 'Venues_Edit_Venue_Help_Tour' ),*/
+				'metaboxes'     => array('_venue_editor_metaboxes'),
+				'require_nonce' => false,
+			),
+			'google_map_settings' => array(
+				'nav'           => array(
+					'label' => esc_html__('Google Maps', 'event_espresso'),
+					'order' => 40,
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
+				'help_tabs'     => array(
+					'general_settings_google_maps_help_tab' => array(
+						'title'    => __('Google Maps', 'event_espresso'),
+						'filename' => 'general_settings_google_maps',
+					),
+				),
+				'help_tour'     => array('Google_Maps_Help_Tour'),
+				'require_nonce' => false,
+			),
+			// venue category stuff
+			'add_category'        => array(
+				'nav'           => array(
+					'label'      => __('Add Category', 'event_espresso'),
+					'order'      => 15,
+					'persistent' => false,
+				),
+				'metaboxes'     => array('_publish_post_box'),
+				'help_tabs'     => array(
+					'venues_add_category_help_tab' => array(
+						'title'    => __('Add New Venue Category', 'event_espresso'),
+						'filename' => 'venues_add_category',
+					),
+				),
+				'help_tour'     => array('Venues_Add_Category_Help_Tour'),
+				'require_nonce' => false,
+			),
+			'edit_category'       => array(
+				'nav'           => array(
+					'label'      => __('Edit Category', 'event_espresso'),
+					'order'      => 15,
+					'persistent' => false,
+					'url'        => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(
+						array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']),
+						$this->_current_page_view_url
+					) : $this->_admin_base_url,
+				),
+				'metaboxes'     => array('_publish_post_box'),
+				'help_tabs'     => array(
+					'venues_edit_category_help_tab' => array(
+						'title'    => __('Edit Venue Category', 'event_espresso'),
+						'filename' => 'venues_edit_category',
+					),
+				),
+				/*'help_tour' => array( 'Venues_Edit_Category_Help_Tour' ),*/
+				'require_nonce' => false,
+			),
+			'category_list'       => array(
+				'nav'           => array(
+					'label' => __('Categories', 'event_espresso'),
+					'order' => 20,
+				),
+				'list_table'    => 'Venue_Categories_Admin_List_Table',
+				'help_tabs'     => array(
+					'venues_categories_help_tab'                       => array(
+						'title'    => __('Venue Categories', 'event_espresso'),
+						'filename' => 'venues_categories',
+					),
+					'venues_categories_table_column_headings_help_tab' => array(
+						'title'    => __('Venue Categories Table Column Headings', 'event_espresso'),
+						'filename' => 'venues_categories_table_column_headings',
+					),
+					'venues_categories_views_help_tab'                 => array(
+						'title'    => __('Venue Categories Views', 'event_espresso'),
+						'filename' => 'venues_categories_views',
+					),
+					'venues_categories_other_help_tab'                 => array(
+						'title'    => __('Venue Categories Other', 'event_espresso'),
+						'filename' => 'venues_categories_other',
+					),
+				),
+				'help_tour'     => array('Venues_Categories_Help_Tour'),
+				'metaboxes'     => $this->_default_espresso_metaboxes,
+				'require_nonce' => false,
+			),
+		);
+	}
+
+
+	protected function _add_screen_options()
+	{
+		// todo
+	}
+
+
+	protected function _add_screen_options_default()
+	{
+		$this->_per_page_screen_option();
+	}
+
+
+	protected function _add_screen_options_category_list()
+	{
+		$page_title = $this->_admin_page_title;
+		$this->_admin_page_title = __('Venue Categories', 'event_espresso');
+		$this->_per_page_screen_option();
+		$this->_admin_page_title = $page_title;
+	}
+
+
+	// none of the below group are currently used for Event Venues
+	protected function _add_feature_pointers()
+	{
+	}
+
+	public function admin_init()
+	{
+	}
+
+	public function admin_notices()
+	{
+	}
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	public function load_scripts_styles_create_new()
+	{
+		$this->load_scripts_styles_edit();
+	}
+
+
+	public function load_scripts_styles()
+	{
+		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('ee-cat-admin');
+	}
+
+
+	public function load_scripts_styles_add_category()
+	{
+		$this->load_scripts_styles_edit_category();
+	}
+
+
+	public function load_scripts_styles_edit_category()
+	{
+	}
+
+
+	public function load_scripts_styles_edit()
+	{
+		// styles
+		wp_enqueue_style('espresso-ui-theme');
+		wp_register_style(
+			'espresso_venues',
+			EE_VENUES_ASSETS_URL . 'ee-venues-admin.css',
+			array(),
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('espresso_venues');
+	}
+
+
+	protected function _set_list_table_views_default()
+	{
+		$this->_views = array(
+			'all' => array(
+				'slug'        => 'all',
+				'label'       => __('View All Venues', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(),
+			),
+		);
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venues', 'espresso_venues_trash_venues')) {
+			$this->_views['all']['bulk_action'] = array(
+				'trash_venues' => __('Move to Trash', 'event_espresso'),
+			);
+			$this->_views['trash'] = array(
+				'slug'        => 'trash',
+				'label'       => __('Trash', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'restore_venues' => __('Restore from Trash', 'event_espresso'),
+					'delete_venues'  => __('Delete', 'event_espresso'),
+				),
+			);
+		}
+	}
+
+
+	protected function _set_list_table_views_category_list()
+	{
+		$this->_views = array(
+			'all' => array(
+				'slug'        => 'all',
+				'label'       => __('All', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'delete_categories' => __('Delete Permanently', 'event_espresso'),
+				),
+			),
+		);
+	}
+
+
+	protected function _overview_list_table()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(
+			get_post_type_archive_link('espresso_venues'),
+			__("View Venue Archive Page", "event_espresso"),
+			'button'
+		);
+		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2');
+		$this->_search_btn_label = __('Venues', 'event_espresso');
+		$this->display_admin_list_table_page_with_sidebar();
+	}
+
+
+	public function extra_misc_actions_publish_box()
+	{
+		$extra_rows = array(
+			'vnu_capacity' => $this->_cpt_model_obj->get_f('VNU_capacity'),
+			'vnu_url'      => $this->_cpt_model_obj->get_f('VNU_url'),
+			'vnu_phone'    => $this->_cpt_model_obj->get_f('VNU_phone'),
+		);
+		$template = EE_VENUES_TEMPLATE_PATH . 'venue_publish_box_extras.template.php';
+		EEH_Template::display_template($template, $extra_rows);
+	}
+
+
+	/*************        Google Maps        *************/
+
+
+	protected function _google_map_settings()
+	{
+
+
+		$this->_template_args['values'] = $this->_yes_no_values;
+		$default_map_settings = new stdClass();
+		$default_map_settings->use_google_maps = true;
+		$default_map_settings->google_map_api_key = '';
+		// for event details pages (reg page)
+		$default_map_settings->event_details_map_width = 585;            // ee_map_width_single
+		$default_map_settings->event_details_map_height = 362;            // ee_map_height_single
+		$default_map_settings->event_details_map_zoom = 14;            // ee_map_zoom_single
+		$default_map_settings->event_details_display_nav = true;            // ee_map_nav_display_single
+		$default_map_settings->event_details_nav_size = false;            // ee_map_nav_size_single
+		$default_map_settings->event_details_control_type = 'default';        // ee_map_type_control_single
+		$default_map_settings->event_details_map_align = 'center';            // ee_map_align_single
+		// for event list pages
+		$default_map_settings->event_list_map_width = 300;            // ee_map_width
+		$default_map_settings->event_list_map_height = 185;        // ee_map_height
+		$default_map_settings->event_list_map_zoom = 12;            // ee_map_zoom
+		$default_map_settings->event_list_display_nav = false;        // ee_map_nav_display
+		$default_map_settings->event_list_nav_size = true;            // ee_map_nav_size
+		$default_map_settings->event_list_control_type = 'dropdown';        // ee_map_type_control
+		$default_map_settings->event_list_map_align = 'center';            // ee_map_align
+
+		$this->_template_args['map_settings'] =
+			isset(EE_Registry::instance()->CFG->map_settings)
+			&& ! empty(EE_Registry::instance()->CFG->map_settings)
+				? (object) array_merge(
+					(array) $default_map_settings,
+					(array) EE_Registry::instance()->CFG->map_settings
+				)
+				: $default_map_settings;
+
+		$this->_set_add_edit_form_tags('update_google_map_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			EE_VENUES_TEMPLATE_PATH . 'google_map.template.php',
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+	protected function _update_google_map_settings()
+	{
+
+		EE_Registry::instance()->CFG->map_settings->use_google_maps =
+			isset($this->_req_data['use_google_maps'])
+				? absint($this->_req_data['use_google_maps'])
+				: EE_Registry::instance()->CFG->map_settings->use_google_maps;
+
+		EE_Registry::instance()->CFG->map_settings->google_map_api_key =
+			isset($this->_req_data['google_map_api_key'])
+				? sanitize_text_field($this->_req_data['google_map_api_key'])
+				: EE_Registry::instance()->CFG->map_settings->google_map_api_key;
+
+		EE_Registry::instance()->CFG->map_settings->event_details_map_width =
+			isset($this->_req_data['event_details_map_width'])
+				? absint($this->_req_data['event_details_map_width'])
+				: EE_Registry::instance()->CFG->map_settings->event_details_map_width;
+
+		EE_Registry::instance()->CFG->map_settings->event_details_map_height =
+			isset($this->_req_data['event_details_map_height'])
+				? absint($this->_req_data['event_details_map_height'])
+				: EE_Registry::instance()->CFG->map_settings->event_details_map_height;
+
+		EE_Registry::instance()->CFG->map_settings->event_details_map_zoom =
+			isset($this->_req_data['event_details_map_zoom'])
+				? absint($this->_req_data['event_details_map_zoom'])
+				: EE_Registry::instance()->CFG->map_settings->event_details_map_zoom;
+
+		EE_Registry::instance()->CFG->map_settings->event_details_display_nav =
+			isset($this->_req_data['event_details_display_nav'])
+				? absint($this->_req_data['event_details_display_nav'])
+				: EE_Registry::instance()->CFG->map_settings->event_details_display_nav;
+
+		EE_Registry::instance()->CFG->map_settings->event_details_nav_size =
+			isset($this->_req_data['event_details_nav_size'])
+				? absint($this->_req_data['event_details_nav_size'])
+				: EE_Registry::instance()->CFG->map_settings->event_details_nav_size;
+
+		EE_Registry::instance()->CFG->map_settings->event_details_control_type =
+			isset($this->_req_data['event_details_control_type'])
+				? sanitize_text_field($this->_req_data['event_details_control_type'])
+				: EE_Registry::instance()->CFG->map_settings->event_details_control_type;
+
+		EE_Registry::instance()->CFG->map_settings->event_details_map_align =
+			isset($this->_req_data['event_details_map_align'])
+				? sanitize_text_field($this->_req_data['event_details_map_align'])
+				: EE_Registry::instance()->CFG->map_settings->event_details_map_align;
+
+		EE_Registry::instance()->CFG->map_settings->event_list_map_width =
+			isset($this->_req_data['event_list_map_width'])
+				? absint($this->_req_data['event_list_map_width'])
+				: EE_Registry::instance()->CFG->map_settings->event_list_map_width;
+
+		EE_Registry::instance()->CFG->map_settings->event_list_map_height =
+			isset($this->_req_data['event_list_map_height'])
+				? absint($this->_req_data['event_list_map_height'])
+				: EE_Registry::instance()->CFG->map_settings->event_list_map_height;
+
+		EE_Registry::instance()->CFG->map_settings->event_list_map_zoom =
+			isset($this->_req_data['event_list_map_zoom'])
+				? absint($this->_req_data['event_list_map_zoom'])
+				: EE_Registry::instance()->CFG->map_settings->event_list_map_zoom;
+
+		EE_Registry::instance()->CFG->map_settings->event_list_display_nav =
+			isset($this->_req_data['event_list_display_nav'])
+				? absint($this->_req_data['event_list_display_nav'])
+				: EE_Registry::instance()->CFG->map_settings->event_list_display_nav;
+
+		EE_Registry::instance()->CFG->map_settings->event_list_nav_size =
+			isset($this->_req_data['event_list_nav_size'])
+				? absint($this->_req_data['event_list_nav_size'])
+				: EE_Registry::instance()->CFG->map_settings->event_list_nav_size;
+
+		EE_Registry::instance()->CFG->map_settings->event_list_control_type =
+			isset($this->_req_data['event_list_control_type'])
+				? sanitize_text_field($this->_req_data['event_list_control_type'])
+				: EE_Registry::instance()->CFG->map_settings->event_list_control_type;
+
+		EE_Registry::instance()->CFG->map_settings->event_list_map_align =
+			isset($this->_req_data['event_list_map_align'])
+				? sanitize_text_field($this->_req_data['event_list_map_align'])
+				: EE_Registry::instance()->CFG->map_settings->event_list_map_align;
+
+		EE_Registry::instance()->CFG->map_settings = apply_filters(
+			'FHEE__Extend_General_Settings_Admin_Page___update_google_map_settings__CFG_map_settings',
+			EE_Registry::instance()->CFG->map_settings
+		);
+
+		$what = 'Google Map Settings';
+		$success = $this->_update_espresso_configuration(
+			$what,
+			EE_Registry::instance()->CFG->map_settings,
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'google_map_settings'));
+	}
+
+
+	protected function _venue_editor_metaboxes()
+	{
+		$this->verify_cpt_object();
+
+		add_meta_box(
+			'espresso_venue_address_options',
+			__('Physical Location', 'event_espresso'),
+			array($this, 'venue_address_metabox'),
+			$this->page_slug,
+			'side',
+			'default'
+		);
+		add_meta_box(
+			'espresso_venue_gmap_options',
+			__('Google Map', 'event_espresso'),
+			array($this, 'venue_gmap_metabox'),
+			$this->page_slug,
+			'side',
+			'default'
+		);
+		add_meta_box(
+			'espresso_venue_virtual_loc_options',
+			__('Virtual Location', 'event_espresso'),
+			array($this, 'venue_virtual_loc_metabox'),
+			$this->page_slug,
+			'side',
+			'default'
+		);
+	}
+
+
+	public function venue_gmap_metabox()
+	{
+		$template_args = array(
+			'vnu_enable_for_gmap' => EEH_Form_Fields::select_input(
+				'vnu_enable_for_gmap',
+				$this->get_yes_no_values(),
+				$this->_cpt_model_obj->enable_for_gmap()
+			),
+			'vnu_google_map_link' => $this->_cpt_model_obj->google_map_link(),
+		);
+		$template = EE_VENUES_TEMPLATE_PATH . 'venue_gmap_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
+	}
+
+
+	public function venue_address_metabox()
+	{
+
+		$template_args['_venue'] = $this->_cpt_model_obj;
+
+		$template_args['states_dropdown'] = EEH_Form_Fields::generate_form_input(
+			$QFI = new EE_Question_Form_Input(
+				EE_Question::new_instance(
+					array('QST_display_text' => esc_html__('State', 'event_espresso'), 'QST_system' => 'state')
+				),
+				EE_Answer::new_instance(array('ANS_value' => $this->_cpt_model_obj->state_ID())),
+				array(
+					'input_name'     => 'sta_id',
+					'input_id'       => 'sta_id',
+					'input_class'    => '',
+					'input_prefix'   => '',
+					'append_qstn_id' => false,
+				)
+			)
+		);
+		$template_args['countries_dropdown'] = EEH_Form_Fields::generate_form_input(
+			$QFI = new EE_Question_Form_Input(
+				EE_Question::new_instance(
+					array('QST_display_text' => esc_html__('Country', 'event_espresso'), 'QST_system' => 'country')
+				),
+				EE_Answer::new_instance(array('ANS_value' => $this->_cpt_model_obj->country_ID())),
+				array(
+					'input_name'     => 'cnt_iso',
+					'input_id'       => 'cnt_iso',
+					'input_class'    => '',
+					'input_prefix'   => '',
+					'append_qstn_id' => false,
+				)
+			)
+		);
+
+		$template = EE_VENUES_TEMPLATE_PATH . 'venue_address_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
+	}
+
+
+	public function venue_virtual_loc_metabox()
+	{
+		$template_args = array(
+			'_venue' => $this->_cpt_model_obj,
+		);
+		$template = EE_VENUES_TEMPLATE_PATH . 'venue_virtual_location_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
+	}
+
+
+	protected function _restore_cpt_item($post_id, $revision_id)
+	{
+		$venue_obj = $this->_venue_model->get_one_by_ID($post_id);
+
+		// meta revision restore
+		$venue_obj->restore_revision($revision_id);
+	}
+
+
+	/**
+	 * Handles updates for venue cpts
+	 *
+	 * @param  int    $post_id ID of Venue CPT
+	 * @param  object $post    Post object (with "blessed" WP properties)
+	 * @return void
+	 */
+	protected function _insert_update_cpt_item($post_id, $post)
+	{
+
+		if ($post instanceof WP_Post && $post->post_type !== 'espresso_venues') {
+			return;// get out we're not processing the saving of venues.
+		}
+
+		$wheres = array($this->_venue_model->primary_key_name() => $post_id);
+
+		$venue_values = array(
+			'VNU_address'         => ! empty($this->_req_data['vnu_address']) ? $this->_req_data['vnu_address'] : null,
+			'VNU_address2'        => ! empty($this->_req_data['vnu_address2']) ? $this->_req_data['vnu_address2']
+				: null,
+			'VNU_city'            => ! empty($this->_req_data['vnu_city']) ? $this->_req_data['vnu_city'] : null,
+			'STA_ID'              => ! empty($this->_req_data['sta_id']) ? $this->_req_data['sta_id'] : null,
+			'CNT_ISO'             => ! empty($this->_req_data['cnt_iso']) ? $this->_req_data['cnt_iso'] : null,
+			'VNU_zip'             => ! empty($this->_req_data['vnu_zip']) ? $this->_req_data['vnu_zip'] : null,
+			'VNU_phone'           => ! empty($this->_req_data['vnu_phone']) ? $this->_req_data['vnu_phone'] : null,
+			'VNU_capacity'        => ! empty($this->_req_data['vnu_capacity']) ? str_replace(
+				',',
+				'',
+				$this->_req_data['vnu_capacity']
+			) : EE_INF,
+			'VNU_url'             => ! empty($this->_req_data['vnu_url']) ? $this->_req_data['vnu_url'] : null,
+			'VNU_virtual_phone'   => ! empty($this->_req_data['vnu_virtual_phone'])
+				? $this->_req_data['vnu_virtual_phone'] : null,
+			'VNU_virtual_url'     => ! empty($this->_req_data['vnu_virtual_url']) ? $this->_req_data['vnu_virtual_url']
+				: null,
+			'VNU_enable_for_gmap' => ! empty($this->_req_data['vnu_enable_for_gmap']) ? true : false,
+			'VNU_google_map_link' => ! empty($this->_req_data['vnu_google_map_link'])
+				? $this->_req_data['vnu_google_map_link'] : null,
+		);
+
+		// update venue
+		$success = $this->_venue_model->update($venue_values, array($wheres));
+
+		// get venue_object for other metaboxes that might be added via the filter... though it would seem to make sense to just use $this->_venue_model->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
+		$get_one_where = array($this->_venue_model->primary_key_name() => $post_id, 'status' => $post->post_status);
+		$venue = $this->_venue_model->get_one(array($get_one_where));
+
+		// notice we've applied a filter for venue metabox callbacks but we don't actually have any default venue metaboxes in use.  So this is just here for addons to more easily hook into venue saves.
+		$venue_update_callbacks = apply_filters(
+			'FHEE__Venues_Admin_Page___insert_update_cpt_item__venue_update_callbacks',
+			array()
+		);
+
+		$att_success = true;
+
+		foreach ($venue_update_callbacks as $v_callback) {
+			$_succ = call_user_func_array($v_callback, array($venue, $this->_req_data));
+			$att_success = ! $att_success ? $att_success
+				: $_succ; // if ANY of these updates fail then we want the appropriate global error message
+		}
+
+		// any errors?
+		if ($success && ! $att_success) {
+			EE_Error::add_error(
+				__(
+					'Venue Details saved successfully but something went wrong with saving attachments.',
+					'event_espresso'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		} elseif ($success === false) {
+			EE_Error::add_error(
+				__('Venue Details did not save successfully.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+	}
+
+
+	public function trash_cpt_item($post_id)
+	{
+		$this->_req_data['VNU_ID'] = $post_id;
+		$this->_trash_or_restore_venue('trash', false);
+	}
+
+
+	public function restore_cpt_item($post_id)
+	{
+		$this->_req_data['VNU_ID'] = $post_id;
+		$this->_trash_or_restore_venue('draft', false);
+	}
+
+
+	public function delete_cpt_item($post_id)
+	{
+		$this->_req_data['VNU_ID'] = $post_id;
+		$this->_delete_venue(false);
+	}
+
+
+	public function get_venue_object()
+	{
+		return $this->_cpt_model_obj;
+	}
+
+
+	protected function _trash_or_restore_venue($venue_status = 'trash', $redirect_after = true)
+	{
+		$VNU_ID = isset($this->_req_data['VNU_ID']) ? absint($this->_req_data['VNU_ID']) : false;
+
+		// loop thru venues
+		if ($VNU_ID) {
+			// clean status
+			$venue_status = sanitize_key($venue_status);
+			// grab status
+			if (! empty($venue_status)) {
+				$success = $this->_change_venue_status($VNU_ID, $venue_status);
+			} else {
+				$success = false;
+				$msg = __(
+					'An error occurred. The venue could not be moved to the trash because a valid venue status was not not supplied.',
+					'event_espresso'
+				);
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			}
+		} else {
+			$success = false;
+			$msg = __(
+				'An error occurred. The venue could not be moved to the trash because a valid venue ID was not not supplied.',
+				'event_espresso'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+		$action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
+
+		if ($redirect_after) {
+			$this->_redirect_after_action($success, 'Venue', $action, array('action' => 'default'));
+		}
+	}
+
+
+	protected function _trash_or_restore_venues($venue_status = 'trash')
+	{
+		// clean status
+		$venue_status = sanitize_key($venue_status);
+		// grab status
+		if (! empty($venue_status)) {
+			$success = true;
+			// determine the event id and set to array.
+			$VNU_IDs = isset($this->_req_data['venue_id']) ? (array) $this->_req_data['venue_id'] : array();
+			// loop thru events
+			foreach ($VNU_IDs as $VNU_ID) {
+				if ($VNU_ID = absint($VNU_ID)) {
+					$results = $this->_change_venue_status($VNU_ID, $venue_status);
+					$success = $results !== false ? $success : false;
+				} else {
+					$msg = sprintf(
+						__(
+							'An error occurred. Venue #%d could not be moved to the trash because a valid venue ID was not not supplied.',
+							'event_espresso'
+						),
+						$VNU_ID
+					);
+					EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+					$success = false;
+				}
+			}
+		} else {
+			$success = false;
+			$msg = __(
+				'An error occurred. The venue could not be moved to the trash because a valid venue status was not not supplied.',
+				'event_espresso'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+		// in order to force a pluralized result message we need to send back a success status greater than 1
+		$success = $success ? 2 : false;
+		$action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
+		$this->_redirect_after_action($success, 'Venues', $action, array('action' => 'default'));
+	}
+
+
+	/**
+	 * _trash_or_restore_venues
+	 *
+	 * //todo this is pretty much the same as the corresponding change_event_status method in Events_Admin_Page.  We
+	 * should probably abstract this up to the EE_Admin_Page_CPT (or even EE_Admin_Page) and make this a common method
+	 * accepting a certain number of params.
+	 *
+	 * @access  private
+	 * @param  int    $VNU_ID
+	 * @param  string $venue_status
+	 * @return void
+	 */
+	private function _change_venue_status($VNU_ID = 0, $venue_status = '')
+	{
+		// grab venue id
+		if (! $VNU_ID) {
+			$msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+
+		$this->_cpt_model_obj = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
+
+		// clean status
+		$venue_status = sanitize_key($venue_status);
+		// grab status
+		if (! $venue_status) {
+			$msg = __('An error occurred. No Venue Status or an invalid Venue Status was received.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+
+		// was event trashed or restored ?
+		switch ($venue_status) {
+			case 'draft':
+				$action = 'restored from the trash';
+				$hook = 'AHEE_venue_restored_from_trash';
+				break;
+			case 'trash':
+				$action = 'moved to the trash';
+				$hook = 'AHEE_venue_moved_to_trash';
+				break;
+			default:
+				$action = 'updated';
+				$hook = false;
+		}
+		// use class to change status
+		$this->_cpt_model_obj->set_status($venue_status);
+		$success = $this->_cpt_model_obj->save();
+
+		if ($success === false) {
+			$msg = sprintf(__('An error occurred. The venue could not be %s.', 'event_espresso'), $action);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		if ($hook) {
+			do_action($hook);
+		}
+		return true;
+	}
+
+
+	/**
+	 * @param  bool $redirect_after
+	 * @return void
+	 */
+	protected function _delete_venue($redirect_after = true)
+	{
+		// determine the venue id and set to array.
+		$VNU_ID = isset($this->_req_data['VNU_ID']) ? absint($this->_req_data['VNU_ID']) : null;
+		$VNU_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : $VNU_ID;
+
+
+		// loop thru venues
+		if ($VNU_ID) {
+			$success = $this->_delete_or_trash_venue($VNU_ID);
+		} else {
+			$success = false;
+			$msg = __(
+				'An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.',
+				'event_espresso'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+		if ($redirect_after) {
+			$this->_redirect_after_action($success, 'Venue', 'deleted', array('action' => 'default'));
+		}
+	}
+
+
+	protected function _delete_venues()
+	{
+		$success = true;
+		// determine the event id and set to array.
+		$VNU_IDs = isset($this->_req_data['venue_id']) ? (array) $this->_req_data['venue_id'] : array();
+		// loop thru events
+		foreach ($VNU_IDs as $VNU_ID) {
+			if ($VNU_ID = absint($VNU_ID)) {
+				$results = $this->_delete_or_trash_venue($VNU_ID);
+				$success = $results !== false ? $success : false;
+			} else {
+				$success = false;
+				$msg = __(
+					'An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.',
+					'event_espresso'
+				);
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			}
+		}
+		// in order to force a pluralized result message we need to send back a success status greater than 1
+		$success = $success ? 2 : false;
+		$this->_redirect_after_action(
+			$success,
+			__('Venues', 'event_espresso'),
+			__('deleted', 'event_espresso'),
+			array('action' => 'default')
+		);
+	}
+
+
+	// todo: put in parent
+	private function _delete_or_trash_venue($VNU_ID = false)
+	{
+		// grab event id
+		if (! $VNU_ID = absint($VNU_ID)) {
+			$msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+
+
+		$venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
+		// first need to remove all term relationships
+		$venue->_remove_relations('Term_Taxonomy');
+		$success = $venue->delete_permanently();
+		// did it all go as planned ?
+		if ($success) {
+			$msg = sprintf(__('Venue ID # %d has been deleted.', 'event_espresso'), $VNU_ID);
+			EE_Error::add_success($msg);
+		} else {
+			$msg = sprintf(__('An error occurred. Venue ID # %d could not be deleted.', 'event_espresso'), $VNU_ID);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		do_action('AHEE__Venues_Admin_Page___delete_or_trash_venue__after_venue_deleted');
+		return true;
+	}
+
+
+
+
+	/***********/
+	/* QUERIES */
+
+
+	public function get_venues($per_page = 10, $count = false)
+	{
+
+		$_orderby = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
+
+		switch ($_orderby) {
+			case 'id':
+				$orderby = 'VNU_ID';
+				break;
+
+			case 'capacity':
+				$orderby = 'VNU_capacity';
+				break;
+
+			case 'city':
+				$orderby = 'VNU_city';
+				break;
+
+			default:
+				$orderby = 'VNU_name';
+		}
+
+
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order']
+			: 'ASC';
+
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
+			? $this->_req_data['paged'] : 1;
+		$per_page = isset($per_page) && ! empty($per_page) ? $per_page : 10;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
+			? $this->_req_data['perpage'] : $per_page;
+
+
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
+
+		$category = isset($this->_req_data['category']) && $this->_req_data['category'] > 0
+			? $this->_req_data['category'] : null;
+		$where = array();
+
+		// only set initial status if it is in the incoming request.  Otherwise the "all" view display's all statuses.
+		if (isset($this->_req_data['status']) && $this->_req_data['status'] != 'all') {
+			$where['status'] = $this->_req_data['status'];
+		}
+
+		if (isset($this->_req_data['venue_status'])) {
+			$where['status'] = $this->_req_data['venue_status'];
+		}
+
+
+		if ($category) {
+			$where['Term_Taxonomy.taxonomy'] = 'espresso_venue_categories';
+			$where['Term_Taxonomy.term_id'] = $category;
+		}
+
+
+		if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
+			$where['VNU_wp_user'] = get_current_user_id();
+		} else {
+			if (! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
+				$where['OR'] = array(
+					'status*restrict_private' => array('!=', 'private'),
+					'AND'                     => array(
+						'status*inclusive' => array('=', 'private'),
+						'VNU_wp_user'      => get_current_user_id(),
+					),
+				);
+			}
+		}
+
+
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%' . $this->_req_data['s'] . '%';
+			$where['OR'] = array(
+				'VNU_name'               => array('LIKE', $sstr),
+				'VNU_desc'               => array('LIKE', $sstr),
+				'VNU_short_desc'         => array('LIKE', $sstr),
+				'VNU_address'            => array('LIKE', $sstr),
+				'VNU_address2'           => array('LIKE', $sstr),
+				'VNU_city'               => array('LIKE', $sstr),
+				'VNU_zip'                => array('LIKE', $sstr),
+				'VNU_phone'              => array('LIKE', $sstr),
+				'VNU_url'                => array('LIKE', $sstr),
+				'VNU_virtual_phone'      => array('LIKE', $sstr),
+				'VNU_virtual_url'        => array('LIKE', $sstr),
+				'VNU_google_map_link'    => array('LIKE', $sstr),
+				'Event.EVT_name'         => array('LIKE', $sstr),
+				'Event.EVT_desc'         => array('LIKE', $sstr),
+				'Event.EVT_phone'        => array('LIKE', $sstr),
+				'Event.EVT_external_URL' => array('LIKE', $sstr),
+			);
+		}
 
 
-        $venues = $count
-            ? $this->_venue_model->count(array($where), 'VNU_ID')
-            : $this->_venue_model->get_all(
-                array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $sort)
-            );
-
-        return $venues;
-    }
-
-
-
-
-    /** Venue Category Stuff **/
-
-    /**
-     * set the _category property with the category object for the loaded page.
-     *
-     * @access private
-     * @return void
-     */
-    private function _set_category_object()
-    {
-        if (isset($this->_category->id) && ! empty($this->_category->id)) {
-            return;
-        } // already have the category object so get out.
-
-        // set default category object
-        $this->_set_empty_category_object();
-
-        // only set if we've got an id
-        if (! isset($this->_req_data['VEN_CAT_ID'])) {
-            return;
-        }
-
-        $category_id = absint($this->_req_data['VEN_CAT_ID']);
-        $term = get_term($category_id, 'espresso_venue_categories');
-
-
-        if (! empty($term)) {
-            $this->_category->category_name = $term->name;
-            $this->_category->category_identifier = $term->slug;
-            $this->_category->category_desc = $term->description;
-            $this->_category->id = $term->term_id;
-            $this->_category->parent = $term->parent;
-        }
-    }
-
-
-    private function _set_empty_category_object()
-    {
-        $this->_category = new stdClass();
-        $this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = '';
-        $this->_category->id = $this->_category->parent = 0;
-    }
-
-
-    protected function _category_list_table()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
-            'add_category',
-            'add_category',
-            array(),
-            'add-new-h2'
-        );
-        $this->_search_btn_label = __('Venue Categories', 'event_espresso');
-        $this->display_admin_list_table_page_with_sidebar();
-    }
-
-
-    protected function _category_details($view)
-    {
-
-        // load formatter helper
-        // load field generator helper
-
-        $route = $view == 'edit' ? 'update_category' : 'insert_category';
-        $this->_set_add_edit_form_tags($route);
-
-        $this->_set_category_object();
-        $id = ! empty($this->_category->id) ? $this->_category->id : '';
-
-        $delete_action = 'delete_category';
-
-        $redirect = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'category_list'), $this->_admin_base_url);
-
-        $this->_set_publish_post_box_vars('VEN_CAT_ID', $id, $delete_action, $redirect);
-
-        // take care of contents
-        $this->_template_args['admin_page_content'] = $this->_category_details_content();
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _category_details_content()
-    {
-        $editor_args['category_desc'] = array(
-            'type'          => 'wp_editor',
-            'value'         => EEH_Formatter::admin_format_content($this->_category->category_desc),
-            'class'         => 'my_editor_custom',
-            'wpeditor_args' => array('media_buttons' => false),
-        );
-        $_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array');
-
-        $all_terms = get_terms(
-            array('espresso_venue_categories'),
-            array('hide_empty' => 0, 'exclude' => array($this->_category->id))
-        );
-
-        // setup category select for term parents.
-        $category_select_values[] = array(
-            'text' => __('No Parent', 'event_espresso'),
-            'id'   => 0,
-        );
-        foreach ($all_terms as $term) {
-            $category_select_values[] = array(
-                'text' => $term->name,
-                'id'   => $term->term_id,
-            );
-        }
-
-        $category_select = EEH_Form_Fields::select_input(
-            'category_parent',
-            $category_select_values,
-            $this->_category->parent
-        );
-        $template_args = array(
-            'category'                 => $this->_category,
-            'category_select'          => $category_select,
-            'unique_id_info_help_link' => $this->_get_help_tab_link('unique_id_info'),
-            'category_desc_editor'     => $_wp_editor['category_desc']['field'],
-            'disable'                  => '',
-            'disabled_message'         => false,
-        );
-        $template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
-        return EEH_Template::display_template($template, $template_args, true);
-    }
-
-
-    protected function _delete_categories()
-    {
-        $cat_ids = isset($this->_req_data['VEN_CAT_ID']) ? (array) $this->_req_data['VEN_CAT_ID']
-            : (array) $this->_req_data['category_id'];
-
-        foreach ($cat_ids as $cat_id) {
-            $this->_delete_category($cat_id);
-        }
-
-        // doesn't matter what page we're coming from... we're going to the same place after delete.
-        $query_args = array(
-            'action' => 'category_list',
-        );
-        $this->_redirect_after_action(0, '', '', $query_args);
-    }
-
-
-    protected function _delete_category($cat_id)
-    {
-        $cat_id = absint($cat_id);
-        wp_delete_term($cat_id, 'espresso_venue_categories');
-    }
-
-
-    protected function _insert_or_update_category($new_category)
-    {
-
-        $cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(true);
-        $success = 0; // we already have a success message so lets not send another.
-        if ($cat_id) {
-            $query_args = array(
-                'action'     => 'edit_category',
-                'VEN_CAT_ID' => $cat_id,
-            );
-        } else {
-            $query_args = array('action' => 'add_category');
-        }
-        $this->_redirect_after_action($success, '', '', $query_args, true);
-    }
-
-
-    private function _insert_category($update = false)
-    {
-        $cat_id = $update ? $this->_req_data['VEN_CAT_ID'] : '';
-        $category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : '';
-        $category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : '';
-        $category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0;
-
-        if (empty($category_name)) {
-            $msg = __('You must add a name for the category.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-
-
-        $term_args = array(
-            'name'        => $category_name,
-            'description' => $category_desc,
-            'parent'      => $category_parent,
-        );
-
-        $insert_ids = $update
-            ? wp_update_term($cat_id, 'espresso_venue_categories', $term_args)
-            : wp_insert_term(
-                $category_name,
-                'espresso_venue_categories',
-                $term_args
-            );
-
-        if (! is_array($insert_ids)) {
-            $msg = __('An error occurred and the category has not been saved to the database.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        } else {
-            $cat_id = $insert_ids['term_id'];
-            $msg = sprintf(__('The category %s was successfully created', 'event_espresso'), $category_name);
-            EE_Error::add_success($msg);
-        }
-
-        return $cat_id;
-    }
-
-
-    /**
-     * TODO handle category exports()
-     *
-     * @return file export
-     */
-    protected function _categories_export()
-    {
-
-        // todo: I don't like doing this but it'll do until we modify EE_Export Class.
-        $new_request_args = array(
-            'export'       => 'report',
-            'action'       => 'categories',
-            'category_ids' => $this->_req_data['VEN_CAT_ID'],
-        );
-
-        $this->_req_data = array_merge($this->_req_data, $new_request_args);
-
-        if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-            require_once(EE_CLASSES . 'EE_Export.class.php');
-            $EE_Export = EE_Export::instance($this->_req_data);
-            $EE_Export->export();
-        }
-    }
-
-
-    protected function _import_categories()
-    {
-
-        require_once(EE_CLASSES . 'EE_Import.class.php');
-        EE_Import::instance()->import();
-    }
-
-
-    public function get_categories($per_page = 10, $current_page = 1, $count = false)
-    {
-
-        // testing term stuff
-        $orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id';
-        $order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC';
-        $limit = ($current_page - 1) * $per_page;
-        $where = array('taxonomy' => 'espresso_venue_categories');
-        if (isset($this->_req_data['s'])) {
-            $sstr = '%' . $this->_req_data['s'] . '%';
-            $where['OR'] = array(
-                'Term.name'   => array('LIKE', $sstr),
-                'description' => array('LIKE', $sstr),
-            );
-        }
-
-        $query_params = array(
-            $where,
-            'order_by'   => array($orderby => $order),
-            'limit'      => $limit . ',' . $per_page,
-            'force_join' => array('Term'),
-        );
-
-        $categories = $count ? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id')
-            : EEM_Term_Taxonomy::instance()->get_all($query_params);
-
-        return $categories;
-    }
-
-
-    /* end category stuff */
-    /**************/
+		$venues = $count
+			? $this->_venue_model->count(array($where), 'VNU_ID')
+			: $this->_venue_model->get_all(
+				array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $sort)
+			);
+
+		return $venues;
+	}
+
+
+
+
+	/** Venue Category Stuff **/
+
+	/**
+	 * set the _category property with the category object for the loaded page.
+	 *
+	 * @access private
+	 * @return void
+	 */
+	private function _set_category_object()
+	{
+		if (isset($this->_category->id) && ! empty($this->_category->id)) {
+			return;
+		} // already have the category object so get out.
+
+		// set default category object
+		$this->_set_empty_category_object();
+
+		// only set if we've got an id
+		if (! isset($this->_req_data['VEN_CAT_ID'])) {
+			return;
+		}
+
+		$category_id = absint($this->_req_data['VEN_CAT_ID']);
+		$term = get_term($category_id, 'espresso_venue_categories');
+
+
+		if (! empty($term)) {
+			$this->_category->category_name = $term->name;
+			$this->_category->category_identifier = $term->slug;
+			$this->_category->category_desc = $term->description;
+			$this->_category->id = $term->term_id;
+			$this->_category->parent = $term->parent;
+		}
+	}
+
+
+	private function _set_empty_category_object()
+	{
+		$this->_category = new stdClass();
+		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = '';
+		$this->_category->id = $this->_category->parent = 0;
+	}
+
+
+	protected function _category_list_table()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+			'add_category',
+			'add_category',
+			array(),
+			'add-new-h2'
+		);
+		$this->_search_btn_label = __('Venue Categories', 'event_espresso');
+		$this->display_admin_list_table_page_with_sidebar();
+	}
+
+
+	protected function _category_details($view)
+	{
+
+		// load formatter helper
+		// load field generator helper
+
+		$route = $view == 'edit' ? 'update_category' : 'insert_category';
+		$this->_set_add_edit_form_tags($route);
+
+		$this->_set_category_object();
+		$id = ! empty($this->_category->id) ? $this->_category->id : '';
+
+		$delete_action = 'delete_category';
+
+		$redirect = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'category_list'), $this->_admin_base_url);
+
+		$this->_set_publish_post_box_vars('VEN_CAT_ID', $id, $delete_action, $redirect);
+
+		// take care of contents
+		$this->_template_args['admin_page_content'] = $this->_category_details_content();
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _category_details_content()
+	{
+		$editor_args['category_desc'] = array(
+			'type'          => 'wp_editor',
+			'value'         => EEH_Formatter::admin_format_content($this->_category->category_desc),
+			'class'         => 'my_editor_custom',
+			'wpeditor_args' => array('media_buttons' => false),
+		);
+		$_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array');
+
+		$all_terms = get_terms(
+			array('espresso_venue_categories'),
+			array('hide_empty' => 0, 'exclude' => array($this->_category->id))
+		);
+
+		// setup category select for term parents.
+		$category_select_values[] = array(
+			'text' => __('No Parent', 'event_espresso'),
+			'id'   => 0,
+		);
+		foreach ($all_terms as $term) {
+			$category_select_values[] = array(
+				'text' => $term->name,
+				'id'   => $term->term_id,
+			);
+		}
+
+		$category_select = EEH_Form_Fields::select_input(
+			'category_parent',
+			$category_select_values,
+			$this->_category->parent
+		);
+		$template_args = array(
+			'category'                 => $this->_category,
+			'category_select'          => $category_select,
+			'unique_id_info_help_link' => $this->_get_help_tab_link('unique_id_info'),
+			'category_desc_editor'     => $_wp_editor['category_desc']['field'],
+			'disable'                  => '',
+			'disabled_message'         => false,
+		);
+		$template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
+		return EEH_Template::display_template($template, $template_args, true);
+	}
+
+
+	protected function _delete_categories()
+	{
+		$cat_ids = isset($this->_req_data['VEN_CAT_ID']) ? (array) $this->_req_data['VEN_CAT_ID']
+			: (array) $this->_req_data['category_id'];
+
+		foreach ($cat_ids as $cat_id) {
+			$this->_delete_category($cat_id);
+		}
+
+		// doesn't matter what page we're coming from... we're going to the same place after delete.
+		$query_args = array(
+			'action' => 'category_list',
+		);
+		$this->_redirect_after_action(0, '', '', $query_args);
+	}
+
+
+	protected function _delete_category($cat_id)
+	{
+		$cat_id = absint($cat_id);
+		wp_delete_term($cat_id, 'espresso_venue_categories');
+	}
+
+
+	protected function _insert_or_update_category($new_category)
+	{
+
+		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(true);
+		$success = 0; // we already have a success message so lets not send another.
+		if ($cat_id) {
+			$query_args = array(
+				'action'     => 'edit_category',
+				'VEN_CAT_ID' => $cat_id,
+			);
+		} else {
+			$query_args = array('action' => 'add_category');
+		}
+		$this->_redirect_after_action($success, '', '', $query_args, true);
+	}
+
+
+	private function _insert_category($update = false)
+	{
+		$cat_id = $update ? $this->_req_data['VEN_CAT_ID'] : '';
+		$category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : '';
+		$category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : '';
+		$category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0;
+
+		if (empty($category_name)) {
+			$msg = __('You must add a name for the category.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+
+
+		$term_args = array(
+			'name'        => $category_name,
+			'description' => $category_desc,
+			'parent'      => $category_parent,
+		);
+
+		$insert_ids = $update
+			? wp_update_term($cat_id, 'espresso_venue_categories', $term_args)
+			: wp_insert_term(
+				$category_name,
+				'espresso_venue_categories',
+				$term_args
+			);
+
+		if (! is_array($insert_ids)) {
+			$msg = __('An error occurred and the category has not been saved to the database.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		} else {
+			$cat_id = $insert_ids['term_id'];
+			$msg = sprintf(__('The category %s was successfully created', 'event_espresso'), $category_name);
+			EE_Error::add_success($msg);
+		}
+
+		return $cat_id;
+	}
+
+
+	/**
+	 * TODO handle category exports()
+	 *
+	 * @return file export
+	 */
+	protected function _categories_export()
+	{
+
+		// todo: I don't like doing this but it'll do until we modify EE_Export Class.
+		$new_request_args = array(
+			'export'       => 'report',
+			'action'       => 'categories',
+			'category_ids' => $this->_req_data['VEN_CAT_ID'],
+		);
+
+		$this->_req_data = array_merge($this->_req_data, $new_request_args);
+
+		if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
+			require_once(EE_CLASSES . 'EE_Export.class.php');
+			$EE_Export = EE_Export::instance($this->_req_data);
+			$EE_Export->export();
+		}
+	}
+
+
+	protected function _import_categories()
+	{
+
+		require_once(EE_CLASSES . 'EE_Import.class.php');
+		EE_Import::instance()->import();
+	}
+
+
+	public function get_categories($per_page = 10, $current_page = 1, $count = false)
+	{
+
+		// testing term stuff
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC';
+		$limit = ($current_page - 1) * $per_page;
+		$where = array('taxonomy' => 'espresso_venue_categories');
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%' . $this->_req_data['s'] . '%';
+			$where['OR'] = array(
+				'Term.name'   => array('LIKE', $sstr),
+				'description' => array('LIKE', $sstr),
+			);
+		}
+
+		$query_params = array(
+			$where,
+			'order_by'   => array($orderby => $order),
+			'limit'      => $limit . ',' . $per_page,
+			'force_join' => array('Term'),
+		);
+
+		$categories = $count ? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id')
+			: EEM_Term_Taxonomy::instance()->get_all($query_params);
+
+		return $categories;
+	}
+
+
+	/* end category stuff */
+	/**************/
 }

Spacing +43 added lines, -43 removed lines

@@ -45,10 +45,10 @@ 
 
     protected function _init_page_props()
     {
-        require_once(EE_MODELS . 'EEM_Venue.model.php');
+        require_once(EE_MODELS.'EEM_Venue.model.php');
         $this->page_slug = EE_VENUES_PG_SLUG;
         $this->_admin_base_url = EE_VENUES_ADMIN_URL;
-        $this->_admin_base_path = EE_ADMIN_PAGES . 'venues';
+        $this->_admin_base_path = EE_ADMIN_PAGES.'venues';
         $this->page_label = __('Event Venues', 'event_espresso');
         $this->_cpt_model_names = array(
             'create_new' => 'EEM_Venue',
@@ -458,7 +458,7 @@ 
 
     public function load_scripts_styles()
     {
-        wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
+        wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL.'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
         wp_enqueue_style('ee-cat-admin');
     }
 
@@ -480,7 +480,7 @@ 
         wp_enqueue_style('espresso-ui-theme');
         wp_register_style(
             'espresso_venues',
-            EE_VENUES_ASSETS_URL . 'ee-venues-admin.css',
+            EE_VENUES_ASSETS_URL.'ee-venues-admin.css',
             array(),
             EVENT_ESPRESSO_VERSION
         );
@@ -539,7 +539,7 @@ 
             __("View Venue Archive Page", "event_espresso"),
             'button'
         );
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2');
+        $this->_admin_page_title .= ' '.$this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2');
         $this->_search_btn_label = __('Venues', 'event_espresso');
         $this->display_admin_list_table_page_with_sidebar();
     }
@@ -552,7 +552,7 @@ 
             'vnu_url'      => $this->_cpt_model_obj->get_f('VNU_url'),
             'vnu_phone'    => $this->_cpt_model_obj->get_f('VNU_phone'),
         );
-        $template = EE_VENUES_TEMPLATE_PATH . 'venue_publish_box_extras.template.php';
+        $template = EE_VENUES_TEMPLATE_PATH.'venue_publish_box_extras.template.php';
         EEH_Template::display_template($template, $extra_rows);
     }
 
@@ -569,21 +569,21 @@ 
         $default_map_settings->use_google_maps = true;
         $default_map_settings->google_map_api_key = '';
         // for event details pages (reg page)
-        $default_map_settings->event_details_map_width = 585;            // ee_map_width_single
-        $default_map_settings->event_details_map_height = 362;            // ee_map_height_single
-        $default_map_settings->event_details_map_zoom = 14;            // ee_map_zoom_single
-        $default_map_settings->event_details_display_nav = true;            // ee_map_nav_display_single
-        $default_map_settings->event_details_nav_size = false;            // ee_map_nav_size_single
-        $default_map_settings->event_details_control_type = 'default';        // ee_map_type_control_single
-        $default_map_settings->event_details_map_align = 'center';            // ee_map_align_single
+        $default_map_settings->event_details_map_width = 585; // ee_map_width_single
+        $default_map_settings->event_details_map_height = 362; // ee_map_height_single
+        $default_map_settings->event_details_map_zoom = 14; // ee_map_zoom_single
+        $default_map_settings->event_details_display_nav = true; // ee_map_nav_display_single
+        $default_map_settings->event_details_nav_size = false; // ee_map_nav_size_single
+        $default_map_settings->event_details_control_type = 'default'; // ee_map_type_control_single
+        $default_map_settings->event_details_map_align = 'center'; // ee_map_align_single
         // for event list pages
-        $default_map_settings->event_list_map_width = 300;            // ee_map_width
-        $default_map_settings->event_list_map_height = 185;        // ee_map_height
-        $default_map_settings->event_list_map_zoom = 12;            // ee_map_zoom
-        $default_map_settings->event_list_display_nav = false;        // ee_map_nav_display
-        $default_map_settings->event_list_nav_size = true;            // ee_map_nav_size
-        $default_map_settings->event_list_control_type = 'dropdown';        // ee_map_type_control
-        $default_map_settings->event_list_map_align = 'center';            // ee_map_align
+        $default_map_settings->event_list_map_width = 300; // ee_map_width
+        $default_map_settings->event_list_map_height = 185; // ee_map_height
+        $default_map_settings->event_list_map_zoom = 12; // ee_map_zoom
+        $default_map_settings->event_list_display_nav = false; // ee_map_nav_display
+        $default_map_settings->event_list_nav_size = true; // ee_map_nav_size
+        $default_map_settings->event_list_control_type = 'dropdown'; // ee_map_type_control
+        $default_map_settings->event_list_map_align = 'center'; // ee_map_align
 
         $this->_template_args['map_settings'] =
             isset(EE_Registry::instance()->CFG->map_settings)
@@ -597,7 +597,7 @@ 
         $this->_set_add_edit_form_tags('update_google_map_settings');
         $this->_set_publish_post_box_vars(null, false, false, null, false);
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            EE_VENUES_TEMPLATE_PATH . 'google_map.template.php',
+            EE_VENUES_TEMPLATE_PATH.'google_map.template.php',
             $this->_template_args,
             true
         );
@@ -745,7 +745,7 @@ 
             ),
             'vnu_google_map_link' => $this->_cpt_model_obj->google_map_link(),
         );
-        $template = EE_VENUES_TEMPLATE_PATH . 'venue_gmap_metabox_content.template.php';
+        $template = EE_VENUES_TEMPLATE_PATH.'venue_gmap_metabox_content.template.php';
         EEH_Template::display_template($template, $template_args);
     }
 
@@ -786,7 +786,7 @@ 
             )
         );
 
-        $template = EE_VENUES_TEMPLATE_PATH . 'venue_address_metabox_content.template.php';
+        $template = EE_VENUES_TEMPLATE_PATH.'venue_address_metabox_content.template.php';
         EEH_Template::display_template($template, $template_args);
     }
 
@@ -796,7 +796,7 @@ 
         $template_args = array(
             '_venue' => $this->_cpt_model_obj,
         );
-        $template = EE_VENUES_TEMPLATE_PATH . 'venue_virtual_location_metabox_content.template.php';
+        $template = EE_VENUES_TEMPLATE_PATH.'venue_virtual_location_metabox_content.template.php';
         EEH_Template::display_template($template, $template_args);
     }
 
@@ -821,7 +821,7 @@ 
     {
 
         if ($post instanceof WP_Post && $post->post_type !== 'espresso_venues') {
-            return;// get out we're not processing the saving of venues.
+            return; // get out we're not processing the saving of venues.
         }
 
         $wheres = array($this->_venue_model->primary_key_name() => $post_id);
@@ -929,7 +929,7 @@ 
             // clean status
             $venue_status = sanitize_key($venue_status);
             // grab status
-            if (! empty($venue_status)) {
+            if ( ! empty($venue_status)) {
                 $success = $this->_change_venue_status($VNU_ID, $venue_status);
             } else {
                 $success = false;
@@ -960,7 +960,7 @@ 
         // clean status
         $venue_status = sanitize_key($venue_status);
         // grab status
-        if (! empty($venue_status)) {
+        if ( ! empty($venue_status)) {
             $success = true;
             // determine the event id and set to array.
             $VNU_IDs = isset($this->_req_data['venue_id']) ? (array) $this->_req_data['venue_id'] : array();
@@ -1011,7 +1011,7 @@ 
     private function _change_venue_status($VNU_ID = 0, $venue_status = '')
     {
         // grab venue id
-        if (! $VNU_ID) {
+        if ( ! $VNU_ID) {
             $msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
             EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
             return false;
@@ -1022,7 +1022,7 @@ 
         // clean status
         $venue_status = sanitize_key($venue_status);
         // grab status
-        if (! $venue_status) {
+        if ( ! $venue_status) {
             $msg = __('An error occurred. No Venue Status or an invalid Venue Status was received.', 'event_espresso');
             EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
             return false;
@@ -1120,7 +1120,7 @@ 
     private function _delete_or_trash_venue($VNU_ID = false)
     {
         // grab event id
-        if (! $VNU_ID = absint($VNU_ID)) {
+        if ( ! $VNU_ID = absint($VNU_ID)) {
             $msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
             EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
             return false;
@@ -1207,10 +1207,10 @@ 
         }
 
 
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
+        if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
             $where['VNU_wp_user'] = get_current_user_id();
         } else {
-            if (! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
+            if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
                 $where['OR'] = array(
                     'status*restrict_private' => array('!=', 'private'),
                     'AND'                     => array(
@@ -1223,7 +1223,7 @@ 
 
 
         if (isset($this->_req_data['s'])) {
-            $sstr = '%' . $this->_req_data['s'] . '%';
+            $sstr = '%'.$this->_req_data['s'].'%';
             $where['OR'] = array(
                 'VNU_name'               => array('LIKE', $sstr),
                 'VNU_desc'               => array('LIKE', $sstr),
@@ -1275,7 +1275,7 @@ 
         $this->_set_empty_category_object();
 
         // only set if we've got an id
-        if (! isset($this->_req_data['VEN_CAT_ID'])) {
+        if ( ! isset($this->_req_data['VEN_CAT_ID'])) {
             return;
         }
 
@@ -1283,7 +1283,7 @@ 
         $term = get_term($category_id, 'espresso_venue_categories');
 
 
-        if (! empty($term)) {
+        if ( ! empty($term)) {
             $this->_category->category_name = $term->name;
             $this->_category->category_identifier = $term->slug;
             $this->_category->category_desc = $term->description;
@@ -1304,7 +1304,7 @@ 
     protected function _category_list_table()
     {
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+        $this->_admin_page_title .= ' '.$this->get_action_link_or_button(
             'add_category',
             'add_category',
             array(),
@@ -1379,7 +1379,7 @@ 
             'disable'                  => '',
             'disabled_message'         => false,
         );
-        $template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
+        $template = EVENTS_TEMPLATE_PATH.'event_category_details.template.php';
         return EEH_Template::display_template($template, $template_args, true);
     }
 
@@ -1453,7 +1453,7 @@ 
                 $term_args
             );
 
-        if (! is_array($insert_ids)) {
+        if ( ! is_array($insert_ids)) {
             $msg = __('An error occurred and the category has not been saved to the database.', 'event_espresso');
             EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
         } else {
@@ -1483,8 +1483,8 @@ 
 
         $this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-        if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-            require_once(EE_CLASSES . 'EE_Export.class.php');
+        if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+            require_once(EE_CLASSES.'EE_Export.class.php');
             $EE_Export = EE_Export::instance($this->_req_data);
             $EE_Export->export();
         }
@@ -1494,7 +1494,7 @@ 
     protected function _import_categories()
     {
 
-        require_once(EE_CLASSES . 'EE_Import.class.php');
+        require_once(EE_CLASSES.'EE_Import.class.php');
         EE_Import::instance()->import();
     }
 
@@ -1508,7 +1508,7 @@ 
         $limit = ($current_page - 1) * $per_page;
         $where = array('taxonomy' => 'espresso_venue_categories');
         if (isset($this->_req_data['s'])) {
-            $sstr = '%' . $this->_req_data['s'] . '%';
+            $sstr = '%'.$this->_req_data['s'].'%';
             $where['OR'] = array(
                 'Term.name'   => array('LIKE', $sstr),
                 'description' => array('LIKE', $sstr),
@@ -1518,7 +1518,7 @@ 
         $query_params = array(
             $where,
             'order_by'   => array($orderby => $order),
-            'limit'      => $limit . ',' . $per_page,
+            'limit'      => $limit.','.$per_page,
             'force_join' => array('Term'),
         );