eventespresso / event-espresso-core

admin_pages/messages/Messages_Admin_Page_Init.core.php

Indentation +41 added lines, -41 removed lines

@@ -12,52 +12,52 @@
  */
 class Messages_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    /**
-     *constructor
-     *
-     * @Constructor
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
+	/**
+	 *constructor
+	 *
+	 * @Constructor
+	 * @access public
+	 * @return void
+	 */
+	public function __construct()
+	{
 
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-        if (! defined('EE_MSG_PG_SLUG')) {
-            define('EE_MSG_PG_SLUG', 'espresso_messages');
-            define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
-            define('EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages' . DS);
-            define('EE_MSG_ADMIN_URL', admin_url('admin.php?page=' . EE_MSG_PG_SLUG));
-            define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets' . DS);
-            define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/');
-            define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates' . DS);
-            define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/');
-        }
+		if (! defined('EE_MSG_PG_SLUG')) {
+			define('EE_MSG_PG_SLUG', 'espresso_messages');
+			define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
+			define('EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages' . DS);
+			define('EE_MSG_ADMIN_URL', admin_url('admin.php?page=' . EE_MSG_PG_SLUG));
+			define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets' . DS);
+			define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/');
+			define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates' . DS);
+			define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/');
+		}
 
-        parent::__construct();
-    }
+		parent::__construct();
+	}
 
 
-    protected function _set_init_properties()
-    {
-        $this->label = __('Messages System', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = __('Messages System', 'event_espresso');
+	}
 
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'management',
-                'menu_order'      => 10,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => EE_MSG_PG_SLUG,
-                'menu_label'      => __('Messages', 'event_espresso'),
-                'capability'      => 'ee_read_global_messages',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'management',
+				'menu_order'      => 10,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => EE_MSG_PG_SLUG,
+				'menu_label'      => __('Messages', 'event_espresso'),
+				'capability'      => 'ee_read_global_messages',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -24,15 +24,15 @@
 
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-        if (! defined('EE_MSG_PG_SLUG')) {
+        if ( ! defined('EE_MSG_PG_SLUG')) {
             define('EE_MSG_PG_SLUG', 'espresso_messages');
             define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
-            define('EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages' . DS);
-            define('EE_MSG_ADMIN_URL', admin_url('admin.php?page=' . EE_MSG_PG_SLUG));
-            define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets' . DS);
-            define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/');
-            define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates' . DS);
-            define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/');
+            define('EE_MSG_ADMIN', EE_ADMIN_PAGES.'messages'.DS);
+            define('EE_MSG_ADMIN_URL', admin_url('admin.php?page='.EE_MSG_PG_SLUG));
+            define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN.'assets'.DS);
+            define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL.'messages/assets/');
+            define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN.'templates'.DS);
+            define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'messages/templates/');
         }
 
         parent::__construct();

admin_pages/general_settings/help_tabs/general_settings_admin_options.help_tab.php

Indentation +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@
 <?php _e('This option will save all Event Espresso registration form data, and debugging information to a file in the /wp-content/uploads/espresso/logs directory on your server. This will occur each time a page is accessed on your site until this option is turned off.', 'event_espresso'); ?>
 <br/>
 <?php printf(
-    __('Note that if you are accessing your filesystem over FTP or SSH, and logging writes to the filesystem on every request, you should put your credentials in your wp-config.php file, as described %1$shere.%2$s', 'event_espresso'),
-    '<a href="https://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants" target="_blank">',
-    '</a>'
+	__('Note that if you are accessing your filesystem over FTP or SSH, and logging writes to the filesystem on every request, you should put your credentials in your wp-config.php file, as described %1$shere.%2$s', 'event_espresso'),
+	'<a href="https://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants" target="_blank">',
+	'</a>'
 ); ?>
 </li>
 <li>

admin_pages/general_settings/General_Settings_Admin_Page_Init.core.php

Indentation +30 added lines, -30 removed lines

@@ -18,37 +18,37 @@
 class General_Settings_Admin_Page_Init extends EE_Admin_Page_Init
 {
 
-    public function __construct()
-    {
-        // define some constants
-        define('GEN_SET_PG_SLUG', 'espresso_general_settings');
-        define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
-        define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings' . DS);
-        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
-        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates' . DS);
-        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
+	public function __construct()
+	{
+		// define some constants
+		define('GEN_SET_PG_SLUG', 'espresso_general_settings');
+		define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
+		define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings' . DS);
+		define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
+		define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates' . DS);
+		define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
 
-        parent::__construct();
-    }
+		parent::__construct();
+	}
 
-    protected function _set_init_properties()
-    {
-        $this->label = GEN_SET_LABEL;
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = GEN_SET_LABEL;
+	}
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'settings',
-                'menu_order'      => 20,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => GEN_SET_PG_SLUG,
-                'menu_label'      => GEN_SET_LABEL,
-                'capability'      => 'manage_options',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'settings',
+				'menu_order'      => 20,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => GEN_SET_PG_SLUG,
+				'menu_label'      => GEN_SET_LABEL,
+				'capability'      => 'manage_options',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -23,10 +23,10 @@
         // define some constants
         define('GEN_SET_PG_SLUG', 'espresso_general_settings');
         define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
-        define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings' . DS);
-        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
-        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates' . DS);
-        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
+        define('GEN_SET_ADMIN', EE_ADMIN_PAGES.'general_settings'.DS);
+        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page='.GEN_SET_PG_SLUG));
+        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN.'templates'.DS);
+        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL.'general_settings/assets/');
 
         parent::__construct();
     }

admin_pages/general_settings/templates/espresso_page_settings.template.php

Indentation +82 added lines, -82 removed lines

@@ -5,15 +5,15 @@ 
     </h2>
     <p class="ee-attention">
         <?php
-        echo sprintf(
-            __(
-                'The following shortcodes and page settings are required for Event Espresso to function properly. These shortcodes should not be replaced with any other shortcodes. Please view %sthis page%s for a list of optional shortcodes you can use on other pages.',
-                'event_espresso'
-            ),
-            '<a href="admin.php?page=espresso_support">',
-            '</a>'
-        );
-        ?>
+		echo sprintf(
+			__(
+				'The following shortcodes and page settings are required for Event Espresso to function properly. These shortcodes should not be replaced with any other shortcodes. Please view %sthis page%s for a list of optional shortcodes you can use on other pages.',
+				'event_espresso'
+			),
+			'<a href="admin.php?page=espresso_support">',
+			'</a>'
+		);
+		?>
     </p>
 
     <table class="form-table">
@@ -39,21 +39,21 @@ 
                 </select>
                 <span>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $reg_page_obj,
-                        '[ESPRESSO_CHECKOUT]'
-                    ); ?>
+						$reg_page_obj,
+						'[ESPRESSO_CHECKOUT]'
+					); ?>
                 </span>
                 <br/>
                 <p class="description">
                     <?php
-                    echo sprintf(
-                        __(
-                            'This page can be hidden from navigation if desired, but should always contain the %s shortcode.',
-                            'event_espresso'
-                        ),
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CHECKOUT]</span>'
-                    );
-                    ?>
+					echo sprintf(
+						__(
+							'This page can be hidden from navigation if desired, but should always contain the %s shortcode.',
+							'event_espresso'
+						),
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CHECKOUT]</span>'
+					);
+					?>
                 </p>
                 <br/><br/>
             </td>
@@ -69,9 +69,9 @@ 
                     <br/>
                     <span class="lt-grey-text">
                         <?php _e(
-                            'Notify URL (processes payments)',
-                            'event_espresso'
-                        ); ?></span><br/>
+							'Notify URL (processes payments)',
+							'event_espresso'
+						); ?></span><br/>
                     <?php echo General_Settings_Admin_Page::edit_view_links($txn_page_id); ?>
                 </label>
             </th>
@@ -84,21 +84,21 @@ 
                 </select>
                 <span>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $txn_page_obj,
-                        '[ESPRESSO_TXN_PAGE]'
-                    ); ?>
+						$txn_page_obj,
+						'[ESPRESSO_TXN_PAGE]'
+					); ?>
                 </span>
                 <br/>
                 <p class="description">
                     <?php
-                    echo sprintf(
-                        __(
-                            'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
-                            'event_espresso'
-                        ),
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
-                    );
-                    ?>
+					echo sprintf(
+						__(
+							'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
+							'event_espresso'
+						),
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
+					);
+					?>
                 </p>
                 <br/><br/>
             </td>
@@ -124,21 +124,21 @@ 
                 </select>
                 <span>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $thank_you_page_obj,
-                        '[ESPRESSO_THANK_YOU]'
-                    ); ?>
+						$thank_you_page_obj,
+						'[ESPRESSO_THANK_YOU]'
+					); ?>
                 </span>
                 <br/>
                 <p class="description">
                     <?php
-                    echo sprintf(
-                        __(
-                            'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
-                            'event_espresso'
-                        ),
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
-                    );
-                    ?>
+					echo sprintf(
+						__(
+							'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
+							'event_espresso'
+						),
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
+					);
+					?>
                 </p>
                 <br/><br/>
             </td>
@@ -164,21 +164,21 @@ 
                 </select>
                 <span>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $cancel_page_obj,
-                        '[ESPRESSO_CANCELLED]'
-                    ); ?>
+						$cancel_page_obj,
+						'[ESPRESSO_CANCELLED]'
+					); ?>
                 </span>
                 <br/>
                 <p class="description">
                     <?php
-                    echo sprintf(
-                        __(
-                            'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.',
-                            'event_espresso'
-                        ),
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
-                    );
-                    ?>
+					echo sprintf(
+						__(
+							'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.',
+							'event_espresso'
+						),
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
+					);
+					?>
                 </p>
                 <br/><br/>
             </td>
@@ -194,27 +194,27 @@ 
                     <br/>
                     <a href='<?php echo get_post_type_archive_link('espresso_events') ?>'>
                         <?php _e(
-                            'View',
-                            'event_espresso'
-                        ); ?></a>
+							'View',
+							'event_espresso'
+						); ?></a>
                 </label>
             </th>
             <td>
                 <p class="description">
                     <?php echo __(
-                        'Events are custom post types and use WordPress\' normal archive pages for displaying events.',
-                        'event_espresso'
-                    ) ?>
+						'Events are custom post types and use WordPress\' normal archive pages for displaying events.',
+						'event_espresso'
+					) ?>
                 </p>
                 <p class="description">
                     <?php printf(
-                        __(
-                            'If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
-                            'event_espresso'
-                        ),
-                        '<a href="admin.php?page=espresso_support">',
-                        '</a>'
-                    ) ?>
+						__(
+							'If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
+							'event_espresso'
+						),
+						'<a href="admin.php?page=espresso_support">',
+						'</a>'
+					) ?>
                 </p>
                 <br/><br/>
             </td>
@@ -230,27 +230,27 @@ 
                     <br/>
                     <a href='<?php echo get_post_type_archive_link('espresso_venues') ?>'>
                         <?php _e(
-                            'View',
-                            'event_espresso'
-                        ); ?></a>
+							'View',
+							'event_espresso'
+						); ?></a>
                 </label>
             </th>
             <td>
                 <p class="description">
                     <?php echo __(
-                        'Venues are custom post types and use WordPress\' normal archive pages for displaying events.',
-                        'event_espresso'
-                    ) ?>
+						'Venues are custom post types and use WordPress\' normal archive pages for displaying events.',
+						'event_espresso'
+					) ?>
                 </p>
                 <p class="description">
                     <?php printf(
-                        __(
-                            'If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
-                            'event_espresso'
-                        ),
-                        '<a href="admin.php?page=espresso_support">',
-                        '</a>'
-                    ) ?>
+						__(
+							'If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
+							'event_espresso'
+						),
+						'<a href="admin.php?page=espresso_support">',
+						'</a>'
+					) ?>
                 </p>
             </td>
         </tr>

admin_pages/general_settings/templates/state_details_settings.template.php

Indentation +15 added lines, -15 removed lines

@@ -5,24 +5,24 @@ 
         <th><?php _e('Name', 'event_espresso'); ?></th>
         <th colspan="2"><span class="small-text">
                 <?php _e(
-                    'State Appears in<br/>Dropdown Select Lists ',
-                    'event_espresso'
-                ); ?></span></th>
+					'State Appears in<br/>Dropdown Select Lists ',
+					'event_espresso'
+				); ?></span></th>
     </tr>
     </thead>
     <tbody>
     <?php
-    if ($states) {
-        foreach ($states as $STA_ID => $state) {
-        ?>
+	if ($states) {
+		foreach ($states as $STA_ID => $state) {
+		?>
         <tr id="state-<?php echo $STA_ID; ?>-tr" class="country-state-columns">
             <?php
-            foreach ($state['inputs'] as $ID => $input) {
-                if ($ID != 'STA_ID' && $ID != 'CNT_ISO') {
-                    echo EEH_Form_Fields::generate_form_input($input);
-                }
-            }
-            ?>
+			foreach ($state['inputs'] as $ID => $input) {
+				if ($ID != 'STA_ID' && $ID != 'CNT_ISO') {
+					echo EEH_Form_Fields::generate_form_input($input);
+				}
+			}
+			?>
             <td class="delete-state-td">
                 <a id="delete-state-<?php echo $STA_ID; ?>-lnk"
                    class="dashicons dashicons-post-trash ee-icon-size-20 delete-state-lnk" rel="<?php echo $STA_ID; ?>"
@@ -31,8 +31,8 @@ 
             </td>
         </tr>
         <?php
-        }
-    ?>
+		}
+	?>
     </tbody>
 </table>
 <br/>
@@ -40,7 +40,7 @@ 
        value="<?php _e('Save States/Provinces', 'event_espresso'); ?>"/><br/>
 
 <?php
-    }
+	}
 ?>
 <table class="form-table add-new-state-tbl">
     <tbody>

admin_pages/venues/Venues_Admin_Page_Init.core.php

Indentation +31 added lines, -31 removed lines

@@ -17,39 +17,39 @@
 {
 
 
-    public function __construct()
-    {
-        // define some event categories related constants
-        define('EE_VENUES_PG_SLUG', 'espresso_venues');
-        define('EE_VENUES_ADMIN_URL', admin_url('admin.php?page=' . EE_VENUES_PG_SLUG));
-        define('EE_VENUES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'venues/assets/');
-        define('EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES . 'venues/templates/');
+	public function __construct()
+	{
+		// define some event categories related constants
+		define('EE_VENUES_PG_SLUG', 'espresso_venues');
+		define('EE_VENUES_ADMIN_URL', admin_url('admin.php?page=' . EE_VENUES_PG_SLUG));
+		define('EE_VENUES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'venues/assets/');
+		define('EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES . 'venues/templates/');
 
-        parent::__construct();
-        $this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . DS;
-    }
+		parent::__construct();
+		$this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . DS;
+	}
 
-    protected function _set_init_properties()
-    {
-        $this->label = __('Event Venues', 'event_espresso');
-        $this->menu_label = __('Venues', 'event_espresso');
-        $this->menu_slug = EE_VENUES_PG_SLUG;
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = __('Event Venues', 'event_espresso');
+		$this->menu_label = __('Venues', 'event_espresso');
+		$this->menu_slug = EE_VENUES_PG_SLUG;
+	}
 
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'management',
-                'menu_order'      => 40,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => EE_VENUES_PG_SLUG,
-                'menu_label'      => __('Venues', 'event_espresso'),
-                'capability'      => 'ee_read_venues',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'management',
+				'menu_order'      => 40,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => EE_VENUES_PG_SLUG,
+				'menu_label'      => __('Venues', 'event_espresso'),
+				'capability'      => 'ee_read_venues',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
     {
         // define some event categories related constants
         define('EE_VENUES_PG_SLUG', 'espresso_venues');
-        define('EE_VENUES_ADMIN_URL', admin_url('admin.php?page=' . EE_VENUES_PG_SLUG));
-        define('EE_VENUES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'venues/assets/');
-        define('EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES . 'venues/templates/');
+        define('EE_VENUES_ADMIN_URL', admin_url('admin.php?page='.EE_VENUES_PG_SLUG));
+        define('EE_VENUES_ASSETS_URL', EE_ADMIN_PAGES_URL.'venues/assets/');
+        define('EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES.'venues/templates/');
 
         parent::__construct();
-        $this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . DS;
+        $this->_folder_path = EE_ADMIN_PAGES.$this->_folder_name.DS;
     }
 
     protected function _set_init_properties()

admin_pages/venues/Venues_Admin_Page.core.php

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'),
         );
 

admin_pages/venues/templates/venue_virtual_location_metabox_content.template.php

Indentation +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
                     </label>
                     <textarea id="url-event" cols="30" rows="4" tabindex="112" name="vnu_virtual_url">
                         <?php $_venue->f(
-                            'VNU_virtual_url'
-                        ); ?></textarea>
+							'VNU_virtual_url'
+						); ?></textarea>
                 </p>
                 <p>
                     <label for="call-in-num" style="display:inline-block; width:100px;">

admin_pages/venues/templates/venue_gmap_metabox_content.template.php

Indentation +18 added lines, -18 removed lines

@@ -3,10 +3,10 @@ 
         <td valign="top">
             <fieldset>
                 <?php
-                if (isset(EE_Registry::instance()->CFG->map_settings)
-                    && isset(EE_Registry::instance()->CFG->map_settings->use_google_maps)
-                    && EE_Registry::instance()->CFG->map_settings->use_google_maps
-                ) { ?>
+				if (isset(EE_Registry::instance()->CFG->map_settings)
+					&& isset(EE_Registry::instance()->CFG->map_settings->use_google_maps)
+					&& EE_Registry::instance()->CFG->map_settings->use_google_maps
+				) { ?>
                     <p>
                         <label for="enable_for_gmap">
                             <?php _e('Display Google Map for this venue? ', 'event_espresso') ?>
@@ -19,22 +19,22 @@ 
                     </p> -->
                 <?php } ?>
                 <?php
-                if (! isset(EE_Registry::instance()->CFG->map_settings)
-                    || ! isset(EE_Registry::instance()->CFG->map_settings->use_google_maps)
-                    || ! EE_Registry::instance()->CFG->map_settings->use_google_maps
-                ) { ?>
+				if (! isset(EE_Registry::instance()->CFG->map_settings)
+					|| ! isset(EE_Registry::instance()->CFG->map_settings->use_google_maps)
+					|| ! EE_Registry::instance()->CFG->map_settings->use_google_maps
+				) { ?>
                     <p class="ee-notice">
                         <?php
-                        echo sprintf(
-                            __(
-                                'To display a Google Map for event venues, go to %sEvent Espresso General Settings%sGoogle Maps%s, and set "Activate Google Maps" to "Yes"',
-                                'event_espresso'
-                            ),
-                            '<b>',
-                            '</b> &raquo; <b>',
-                            '</b>'
-                        );
-                        ?>
+						echo sprintf(
+							__(
+								'To display a Google Map for event venues, go to %sEvent Espresso General Settings%sGoogle Maps%s, and set "Activate Google Maps" to "Yes"',
+								'event_espresso'
+							),
+							'<b>',
+							'</b> &raquo; <b>',
+							'</b>'
+						);
+						?>
                     </p>
                 <?php } ?>
 

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
                     </p> -->
                 <?php } ?>
                 <?php
-                if (! isset(EE_Registry::instance()->CFG->map_settings)
+                if ( ! isset(EE_Registry::instance()->CFG->map_settings)
                     || ! isset(EE_Registry::instance()->CFG->map_settings->use_google_maps)
                     || ! EE_Registry::instance()->CFG->map_settings->use_google_maps
                 ) { ?>