eventespresso / event-espresso-core

admin_pages/events/Events_Admin_Page_Init.core.php

Spacing +5 added lines, -5 removed lines

@@ -21,13 +21,13 @@
          * define some events related constants but only if not defined (need to check because unit tests
          *  may load)
          */
-        if (! defined('EVENTS_PG_SLUG')) {
+        if ( ! defined('EVENTS_PG_SLUG')) {
             define('EVENTS_PG_SLUG', 'espresso_events');
             define('EVENTS_LABEL', esc_html__('Events', 'event_espresso'));
-            define('EVENTS_ADMIN', EE_ADMIN_PAGES . 'events/');
-            define('EVENTS_ADMIN_URL', admin_url('admin.php?page=' . EVENTS_PG_SLUG));
-            define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN . 'templates/');
-            define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'events/assets/');
+            define('EVENTS_ADMIN', EE_ADMIN_PAGES.'events/');
+            define('EVENTS_ADMIN_URL', admin_url('admin.php?page='.EVENTS_PG_SLUG));
+            define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN.'templates/');
+            define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'events/assets/');
         }
         parent::__construct();
     }

Indentation +36 added lines, -36 removed lines

@@ -14,42 +14,42 @@
  */
 class Events_Admin_Page_Init extends EE_Admin_Page_CPT_Init
 {
-    public function __construct()
-    {
-        /**
-         * define some events related constants but only if not defined (need to check because unit tests
-         *  may load)
-         */
-        if (! defined('EVENTS_PG_SLUG')) {
-            define('EVENTS_PG_SLUG', 'espresso_events');
-            define('EVENTS_LABEL', esc_html__('Events', 'event_espresso'));
-            define('EVENTS_ADMIN', EE_ADMIN_PAGES . 'events/');
-            define('EVENTS_ADMIN_URL', admin_url('admin.php?page=' . EVENTS_PG_SLUG));
-            define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN . 'templates/');
-            define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'events/assets/');
-        }
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		/**
+		 * define some events related constants but only if not defined (need to check because unit tests
+		 *  may load)
+		 */
+		if (! defined('EVENTS_PG_SLUG')) {
+			define('EVENTS_PG_SLUG', 'espresso_events');
+			define('EVENTS_LABEL', esc_html__('Events', 'event_espresso'));
+			define('EVENTS_ADMIN', EE_ADMIN_PAGES . 'events/');
+			define('EVENTS_ADMIN_URL', admin_url('admin.php?page=' . EVENTS_PG_SLUG));
+			define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN . 'templates/');
+			define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'events/assets/');
+		}
+		parent::__construct();
+	}
 
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Event Espresso - Event Details', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Event Espresso - Event Details', 'event_espresso');
+	}
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Main_Menu(
-            array(
-                'menu_group'      => 'main',
-                'menu_order'      => 10,
-                'subtitle'        => esc_html__('Events', 'event_espresso'),
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => 'espresso_events',
-                'menu_label'      => esc_html__('Event Espresso', 'event_espresso'),
-                'capability'      => 'ee_read_events',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Main_Menu(
+			array(
+				'menu_group'      => 'main',
+				'menu_order'      => 10,
+				'subtitle'        => esc_html__('Events', 'event_espresso'),
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => 'espresso_events',
+				'menu_label'      => esc_html__('Event Espresso', 'event_espresso'),
+				'capability'      => 'ee_read_events',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

admin_pages/venues/Venues_Admin_List_Table.class.php

Spacing +15 added lines, -15 removed lines

@@ -90,7 +90,7 @@ 
     public function column_id($item)
     {
         $content = $item->ID();
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
+        $content .= '  <span class="show-on-mobile-view-only">'.$item->name().'</span>';
         return $content;
     }
 
@@ -107,10 +107,10 @@ 
         $statuses = EEM_Venue::instance()->get_status_array();
         $actions = $this->_column_name_action_setup($item);
         $content = EE_Registry::instance()->CAP->current_user_can('ee_edit_venue', 'espresso_venues_edit', $item->ID())
-            ? '<strong><a class="row-title" href="' . $edit_link . '">' . stripslashes_deep(
+            ? '<strong><a class="row-title" href="'.$edit_link.'">'.stripslashes_deep(
                 $item->name()
-            ) . '</a></strong>' : $item->name();
-        $content .= $item->status() == 'draft' ? ' - <span class="post-state">' . $statuses['draft'] . '</span>' : '';
+            ).'</a></strong>' : $item->name();
+        $content .= $item->status() == 'draft' ? ' - <span class="post-state">'.$statuses['draft'].'</span>' : '';
         $content .= $this->row_actions($actions);
         return $content;
     }
@@ -132,10 +132,10 @@ 
                 'post'   => $item->ID(),
             );
             $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_VENUES_ADMIN_URL);
-            $actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__(
+            $actions['edit'] = '<a href="'.$edit_link.'" title="'.esc_attr__(
                 'Edit Venue',
                 'event_espresso'
-            ) . '">' . esc_html__('Edit', 'event_espresso') . '</a>';
+            ).'">'.esc_html__('Edit', 'event_espresso').'</a>';
         }
 
 
@@ -195,10 +195,10 @@ 
                         $item->ID()
                     )
                 ) {
-                    $actions['restore_from_trash'] = '<a href="' . $restore_venue_link . '" title="' . esc_attr__(
+                    $actions['restore_from_trash'] = '<a href="'.$restore_venue_link.'" title="'.esc_attr__(
                         'Restore from Trash',
                         'event_espresso'
-                    ) . '">' . esc_html__('Restore from Trash', 'event_espresso') . '</a>';
+                    ).'">'.esc_html__('Restore from Trash', 'event_espresso').'</a>';
                 }
                 if (
                     $item->count_related('Event') === 0 && EE_Registry::instance()->CAP->current_user_can(
@@ -207,17 +207,17 @@ 
                         $item->ID()
                     )
                 ) {
-                    $actions['delete permanently'] = '<a href="' . $delete_venue_link . '" title="' . esc_attr__(
+                    $actions['delete permanently'] = '<a href="'.$delete_venue_link.'" title="'.esc_attr__(
                         'Delete Permanently',
                         'event_espresso'
-                    ) . '">' . esc_html__('Delete Permanently', 'event_espresso') . '</a>';
+                    ).'">'.esc_html__('Delete Permanently', 'event_espresso').'</a>';
                 }
                 break;
             default:
-                $actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__(
+                $actions['view'] = '<a href="'.$view_link.'" title="'.esc_attr__(
                     'View Venue',
                     'event_espresso'
-                ) . '">' . esc_html__('View', 'event_espresso') . '</a>';
+                ).'">'.esc_html__('View', 'event_espresso').'</a>';
                 if (
                     EE_Registry::instance()->CAP->current_user_can(
                         'ee_delete_venue',
@@ -225,10 +225,10 @@ 
                         $item->ID()
                     )
                 ) {
-                    $actions['move to trash'] = '<a href="' . $trash_venue_link . '" title="' . esc_attr__(
+                    $actions['move to trash'] = '<a href="'.$trash_venue_link.'" title="'.esc_attr__(
                         'Trash Event',
                         'event_espresso'
-                    ) . '">' . esc_html__('Trash', 'event_espresso') . '</a>';
+                    ).'">'.esc_html__('Trash', 'event_espresso').'</a>';
                 }
         }
         return $actions;
@@ -255,7 +255,7 @@ 
 
     public function column_shortcode($item)
     {
-        $content = '[ESPRESSO_VENUE id=' . $item->ID() . ']';
+        $content = '[ESPRESSO_VENUE id='.$item->ID().']';
         return $content;
     }
 }

Indentation +242 added lines, -242 removed lines

@@ -15,246 +15,246 @@
  */
 class Venues_Admin_List_Table extends EE_Admin_List_Table
 {
-    public function __construct($admin_page)
-    {
-        parent::__construct($admin_page);
-    }
-
-
-    protected function _setup_data()
-    {
-        $this->_data = $this->_admin_page->get_venues($this->_per_page);
-        $this->_all_data_count = $this->_admin_page->get_venues($this->_per_page, true);
-    }
-
-
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => esc_html__('Event Venue', 'event_espresso'),
-            'plural'   => esc_html__('Event Venues', 'event_espresso'),
-            'ajax'     => true, // for now,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-
-        $this->_columns = array(
-            'cb'       => '<input type="checkbox" />',
-            'id'       => esc_html__('ID', 'event_espresso'),
-            'name'     => esc_html__('Name', 'event_espresso'),
-            'address'  => esc_html__('Address', 'event_espresso'),
-            'city'     => esc_html__('City', 'event_espresso'),
-            'capacity' => esc_html__('Capacity', 'event_espresso'),
-            // 'shortcode' => esc_html__('Shortcode', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'id'       => array('id' => true),
-            'name'     => array('name' => false),
-            'city'     => array('city' => false),
-            'capacity' => array('capacity' => false),
-        );
-
-        $this->_hidden_columns = array();
-    }
-
-
-    // todo... add _venue_status in here (which we'll define a EE_Admin_CPT_List_Table for common properties)
-    protected function _get_table_filters()
-    {
-        return array();
-    }
-
-
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count'] = EEM_Venue::instance()->count();
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venues', 'espresso_venues_trash_venues')) {
-            $this->_views['trash']['count'] = EEM_Venue::instance()->count_deleted();
-        }
-    }
-
-
-    public function column_cb($item)
-    {
-
-        return $item->count_related('Event') > 0 && $item->get('status') === 'trash'
-            ? '<span class="ee-lock-icon"></span>'
-            : sprintf(
-                '<input type="checkbox" name="venue_id[]" value="%s" />',
-                $item->ID()
-            );
-    }
-
-
-    public function column_id($item)
-    {
-        $content = $item->ID();
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
-        return $content;
-    }
-
-
-    public function column_name($item)
-    {
-        $edit_query_args = array(
-            'action' => 'edit',
-            'post'   => $item->ID(),
-        );
-
-        $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_VENUES_ADMIN_URL);
-
-        $statuses = EEM_Venue::instance()->get_status_array();
-        $actions = $this->_column_name_action_setup($item);
-        $content = EE_Registry::instance()->CAP->current_user_can('ee_edit_venue', 'espresso_venues_edit', $item->ID())
-            ? '<strong><a class="row-title" href="' . $edit_link . '">' . stripslashes_deep(
-                $item->name()
-            ) . '</a></strong>' : $item->name();
-        $content .= $item->status() == 'draft' ? ' - <span class="post-state">' . $statuses['draft'] . '</span>' : '';
-        $content .= $this->row_actions($actions);
-        return $content;
-    }
-
-
-    /**
-     * Used to setup the actions for the Venue name column
-     *
-     * @param EE_Venue $item
-     * @return array()
-     */
-    protected function _column_name_action_setup(EE_Venue $item)
-    {
-        $actions = array();
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_edit_venue', 'espresso_venues_edit', $item->ID())) {
-            $edit_query_args = array(
-                'action' => 'edit',
-                'post'   => $item->ID(),
-            );
-            $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_VENUES_ADMIN_URL);
-            $actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__(
-                'Edit Venue',
-                'event_espresso'
-            ) . '">' . esc_html__('Edit', 'event_espresso') . '</a>';
-        }
-
-
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_venue',
-                'espresso_venues_trash_venue',
-                $item->ID()
-            )
-        ) {
-            $trash_event_query_arg = array(
-                'action' => 'trash_venue',
-                'VNU_ID' => $item->ID(),
-            );
-            $trash_venue_link = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_arg, EE_VENUES_ADMIN_URL);
-        }
-
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_venue',
-                'espresso_venues_restore_venue',
-                $item->ID()
-            )
-        ) {
-            $restore_venue_query_args = array(
-                'action' => 'restore_venue',
-                'VNU_ID' => $item->ID(),
-            );
-            $restore_venue_link = EE_Admin_Page::add_query_args_and_nonce(
-                $restore_venue_query_args,
-                EE_VENUES_ADMIN_URL
-            );
-        }
-
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_venue',
-                'espresso_venues_delete_venue',
-                $item->ID()
-            )
-        ) {
-            $delete_venue_query_args = array(
-                'action' => 'delete_venue',
-                'VNU_ID' => $item->ID(),
-            );
-            $delete_venue_link = EE_Admin_Page::add_query_args_and_nonce($delete_venue_query_args, EE_VENUES_ADMIN_URL);
-        }
-
-        $view_link = get_permalink($item->ID());
-
-        switch ($item->get('status')) {
-            case 'trash':
-                if (
-                    EE_Registry::instance()->CAP->current_user_can(
-                        'ee_delete_venue',
-                        'espresso_venues_restore_venue',
-                        $item->ID()
-                    )
-                ) {
-                    $actions['restore_from_trash'] = '<a href="' . $restore_venue_link . '" title="' . esc_attr__(
-                        'Restore from Trash',
-                        'event_espresso'
-                    ) . '">' . esc_html__('Restore from Trash', 'event_espresso') . '</a>';
-                }
-                if (
-                    $item->count_related('Event') === 0 && EE_Registry::instance()->CAP->current_user_can(
-                        'ee_delete_venue',
-                        'espresso_venues_delete_venue',
-                        $item->ID()
-                    )
-                ) {
-                    $actions['delete permanently'] = '<a href="' . $delete_venue_link . '" title="' . esc_attr__(
-                        'Delete Permanently',
-                        'event_espresso'
-                    ) . '">' . esc_html__('Delete Permanently', 'event_espresso') . '</a>';
-                }
-                break;
-            default:
-                $actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__(
-                    'View Venue',
-                    'event_espresso'
-                ) . '">' . esc_html__('View', 'event_espresso') . '</a>';
-                if (
-                    EE_Registry::instance()->CAP->current_user_can(
-                        'ee_delete_venue',
-                        'espresso_venues_trash_venue',
-                        $item->ID()
-                    )
-                ) {
-                    $actions['move to trash'] = '<a href="' . $trash_venue_link . '" title="' . esc_attr__(
-                        'Trash Event',
-                        'event_espresso'
-                    ) . '">' . esc_html__('Trash', 'event_espresso') . '</a>';
-                }
-        }
-        return $actions;
-    }
-
-
-    public function column_address($item)
-    {
-        return $item->address();
-    }
-
-
-    public function column_city($item)
-    {
-        return $item->city();
-    }
-
-
-    public function column_capacity($item)
-    {
-        return $item->capacity();
-    }
-
-
-    public function column_shortcode($item)
-    {
-        $content = '[ESPRESSO_VENUE id=' . $item->ID() . ']';
-        return $content;
-    }
+	public function __construct($admin_page)
+	{
+		parent::__construct($admin_page);
+	}
+
+
+	protected function _setup_data()
+	{
+		$this->_data = $this->_admin_page->get_venues($this->_per_page);
+		$this->_all_data_count = $this->_admin_page->get_venues($this->_per_page, true);
+	}
+
+
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => esc_html__('Event Venue', 'event_espresso'),
+			'plural'   => esc_html__('Event Venues', 'event_espresso'),
+			'ajax'     => true, // for now,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+
+		$this->_columns = array(
+			'cb'       => '<input type="checkbox" />',
+			'id'       => esc_html__('ID', 'event_espresso'),
+			'name'     => esc_html__('Name', 'event_espresso'),
+			'address'  => esc_html__('Address', 'event_espresso'),
+			'city'     => esc_html__('City', 'event_espresso'),
+			'capacity' => esc_html__('Capacity', 'event_espresso'),
+			// 'shortcode' => esc_html__('Shortcode', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'id'       => array('id' => true),
+			'name'     => array('name' => false),
+			'city'     => array('city' => false),
+			'capacity' => array('capacity' => false),
+		);
+
+		$this->_hidden_columns = array();
+	}
+
+
+	// todo... add _venue_status in here (which we'll define a EE_Admin_CPT_List_Table for common properties)
+	protected function _get_table_filters()
+	{
+		return array();
+	}
+
+
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count'] = EEM_Venue::instance()->count();
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venues', 'espresso_venues_trash_venues')) {
+			$this->_views['trash']['count'] = EEM_Venue::instance()->count_deleted();
+		}
+	}
+
+
+	public function column_cb($item)
+	{
+
+		return $item->count_related('Event') > 0 && $item->get('status') === 'trash'
+			? '<span class="ee-lock-icon"></span>'
+			: sprintf(
+				'<input type="checkbox" name="venue_id[]" value="%s" />',
+				$item->ID()
+			);
+	}
+
+
+	public function column_id($item)
+	{
+		$content = $item->ID();
+		$content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
+		return $content;
+	}
+
+
+	public function column_name($item)
+	{
+		$edit_query_args = array(
+			'action' => 'edit',
+			'post'   => $item->ID(),
+		);
+
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_VENUES_ADMIN_URL);
+
+		$statuses = EEM_Venue::instance()->get_status_array();
+		$actions = $this->_column_name_action_setup($item);
+		$content = EE_Registry::instance()->CAP->current_user_can('ee_edit_venue', 'espresso_venues_edit', $item->ID())
+			? '<strong><a class="row-title" href="' . $edit_link . '">' . stripslashes_deep(
+				$item->name()
+			) . '</a></strong>' : $item->name();
+		$content .= $item->status() == 'draft' ? ' - <span class="post-state">' . $statuses['draft'] . '</span>' : '';
+		$content .= $this->row_actions($actions);
+		return $content;
+	}
+
+
+	/**
+	 * Used to setup the actions for the Venue name column
+	 *
+	 * @param EE_Venue $item
+	 * @return array()
+	 */
+	protected function _column_name_action_setup(EE_Venue $item)
+	{
+		$actions = array();
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_venue', 'espresso_venues_edit', $item->ID())) {
+			$edit_query_args = array(
+				'action' => 'edit',
+				'post'   => $item->ID(),
+			);
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_VENUES_ADMIN_URL);
+			$actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__(
+				'Edit Venue',
+				'event_espresso'
+			) . '">' . esc_html__('Edit', 'event_espresso') . '</a>';
+		}
+
+
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_venue',
+				'espresso_venues_trash_venue',
+				$item->ID()
+			)
+		) {
+			$trash_event_query_arg = array(
+				'action' => 'trash_venue',
+				'VNU_ID' => $item->ID(),
+			);
+			$trash_venue_link = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_arg, EE_VENUES_ADMIN_URL);
+		}
+
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_venue',
+				'espresso_venues_restore_venue',
+				$item->ID()
+			)
+		) {
+			$restore_venue_query_args = array(
+				'action' => 'restore_venue',
+				'VNU_ID' => $item->ID(),
+			);
+			$restore_venue_link = EE_Admin_Page::add_query_args_and_nonce(
+				$restore_venue_query_args,
+				EE_VENUES_ADMIN_URL
+			);
+		}
+
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_venue',
+				'espresso_venues_delete_venue',
+				$item->ID()
+			)
+		) {
+			$delete_venue_query_args = array(
+				'action' => 'delete_venue',
+				'VNU_ID' => $item->ID(),
+			);
+			$delete_venue_link = EE_Admin_Page::add_query_args_and_nonce($delete_venue_query_args, EE_VENUES_ADMIN_URL);
+		}
+
+		$view_link = get_permalink($item->ID());
+
+		switch ($item->get('status')) {
+			case 'trash':
+				if (
+					EE_Registry::instance()->CAP->current_user_can(
+						'ee_delete_venue',
+						'espresso_venues_restore_venue',
+						$item->ID()
+					)
+				) {
+					$actions['restore_from_trash'] = '<a href="' . $restore_venue_link . '" title="' . esc_attr__(
+						'Restore from Trash',
+						'event_espresso'
+					) . '">' . esc_html__('Restore from Trash', 'event_espresso') . '</a>';
+				}
+				if (
+					$item->count_related('Event') === 0 && EE_Registry::instance()->CAP->current_user_can(
+						'ee_delete_venue',
+						'espresso_venues_delete_venue',
+						$item->ID()
+					)
+				) {
+					$actions['delete permanently'] = '<a href="' . $delete_venue_link . '" title="' . esc_attr__(
+						'Delete Permanently',
+						'event_espresso'
+					) . '">' . esc_html__('Delete Permanently', 'event_espresso') . '</a>';
+				}
+				break;
+			default:
+				$actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__(
+					'View Venue',
+					'event_espresso'
+				) . '">' . esc_html__('View', 'event_espresso') . '</a>';
+				if (
+					EE_Registry::instance()->CAP->current_user_can(
+						'ee_delete_venue',
+						'espresso_venues_trash_venue',
+						$item->ID()
+					)
+				) {
+					$actions['move to trash'] = '<a href="' . $trash_venue_link . '" title="' . esc_attr__(
+						'Trash Event',
+						'event_espresso'
+					) . '">' . esc_html__('Trash', 'event_espresso') . '</a>';
+				}
+		}
+		return $actions;
+	}
+
+
+	public function column_address($item)
+	{
+		return $item->address();
+	}
+
+
+	public function column_city($item)
+	{
+		return $item->city();
+	}
+
+
+	public function column_capacity($item)
+	{
+		return $item->capacity();
+	}
+
+
+	public function column_shortcode($item)
+	{
+		$content = '[ESPRESSO_VENUE id=' . $item->ID() . ']';
+		return $content;
+	}
 }

admin_pages/venues/Venue_Categories_Admin_List_Table.class.php

Spacing +10 added lines, -10 removed lines

@@ -73,9 +73,9 @@ 
     public function column_id($item)
     {
         $content = $item->get('term_id');
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->get_first_related('Term')->get(
+        $content .= '  <span class="show-on-mobile-view-only">'.$item->get_first_related('Term')->get(
             'name'
-        ) . '</span>';
+        ).'</span>';
         return $content;
     }
 
@@ -96,21 +96,21 @@ 
         $delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_VENUES_ADMIN_URL);
 
         $actions = array(
-            'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__(
+            'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__(
                 'Edit Category',
                 'event_espresso'
-            ) . '">' . esc_html__('Edit', 'event_espresso') . '</a>',
+            ).'">'.esc_html__('Edit', 'event_espresso').'</a>',
         );
 
 
-        $actions['delete'] = '<a href="' . $delete_link . '" title="' . esc_attr__(
+        $actions['delete'] = '<a href="'.$delete_link.'" title="'.esc_attr__(
             'Delete Category',
             'event_espresso'
-        ) . '">' . esc_html__('Delete', 'event_espresso') . '</a>';
+        ).'">'.esc_html__('Delete', 'event_espresso').'</a>';
 
-        $content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->get_first_related('Term')->get(
+        $content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->get_first_related('Term')->get(
             'name'
-        ) . '</a></strong>';
+        ).'</a></strong>';
         $content .= $this->row_actions($actions);
         return $content;
     }
@@ -118,7 +118,7 @@ 
 
     public function column_shortcode($item)
     {
-        $content = '[EVENT_ESPRESSO_CATEGORY category_id="' . $item->get_first_related('Term')->get('slug') . '"]';
+        $content = '[EVENT_ESPRESSO_CATEGORY category_id="'.$item->get_first_related('Term')->get('slug').'"]';
         return $content;
     }
 
@@ -130,7 +130,7 @@ 
             'category' => $item->get_first_related('Term')->ID(),
         );
         $e_link = EE_Admin_Page::add_query_args_and_nonce($e_args, EE_VENUES_ADMIN_URL);
-        $content = '<a href="' . $e_link . '">' . $item->get('term_count') . '</a>';
+        $content = '<a href="'.$e_link.'">'.$item->get('term_count').'</a>';
         return $content;
     }
 }

Indentation +116 added lines, -116 removed lines

@@ -15,120 +15,120 @@
  */
 class Venue_Categories_Admin_List_Table extends EE_Admin_List_Table
 {
-    protected function _setup_data()
-    {
-        $this->_data = $this->_admin_page->get_categories($this->_per_page, $this->_current_page);
-        $this->_all_data_count = $this->_admin_page->get_categories($this->_per_page, $this->_current_page, true);
-    }
-
-
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => esc_html__('venue category', 'event_espresso'),
-            'plural'   => esc_html__('venue categories', 'event_espresso'),
-            'ajax'     => true, // for now,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-
-        $this->_columns = array(
-            'cb'    => '<input type="checkbox" />',
-            'id'    => esc_html__('ID', 'event_espresso'),
-            'name'  => esc_html__('Name', 'event_espresso'),
-            // 'shortcode' => esc_html__('Shortcode', 'event_espresso'),
-            'count' => esc_html__('Venues', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'id'    => array('Term.term_id' => true),
-            'name'  => array('Term.slug' => false),
-            'count' => array('term_count' => false),
-        );
-
-        $this->_hidden_columns = array();
-    }
-
-
-    // not needed
-    protected function _get_table_filters()
-    {
-        return array();
-    }
-
-
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count'] = $this->_all_data_count;
-    }
-
-
-    public function column_cb($item)
-    {
-        return sprintf('<input type="checkbox" name="VEN_CAT_ID[]" value="%s" />', $item->get('term_id'));
-    }
-
-
-    public function column_id($item)
-    {
-        $content = $item->get('term_id');
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->get_first_related('Term')->get(
-            'name'
-        ) . '</span>';
-        return $content;
-    }
-
-
-    public function column_name($item)
-    {
-        $edit_query_args = array(
-            'action'     => 'edit_category',
-            'VEN_CAT_ID' => $item->get('term_id'),
-        );
-
-        $delete_query_args = array(
-            'action'     => 'delete_category',
-            'VEN_CAT_ID' => $item->get('term_id'),
-        );
-
-        $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_VENUES_ADMIN_URL);
-        $delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_VENUES_ADMIN_URL);
-
-        $actions = array(
-            'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__(
-                'Edit Category',
-                'event_espresso'
-            ) . '">' . esc_html__('Edit', 'event_espresso') . '</a>',
-        );
-
-
-        $actions['delete'] = '<a href="' . $delete_link . '" title="' . esc_attr__(
-            'Delete Category',
-            'event_espresso'
-        ) . '">' . esc_html__('Delete', 'event_espresso') . '</a>';
-
-        $content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->get_first_related('Term')->get(
-            'name'
-        ) . '</a></strong>';
-        $content .= $this->row_actions($actions);
-        return $content;
-    }
-
-
-    public function column_shortcode($item)
-    {
-        $content = '[EVENT_ESPRESSO_CATEGORY category_id="' . $item->get_first_related('Term')->get('slug') . '"]';
-        return $content;
-    }
-
-
-    public function column_count($item)
-    {
-        $e_args = array(
-            'action'   => 'default',
-            'category' => $item->get_first_related('Term')->ID(),
-        );
-        $e_link = EE_Admin_Page::add_query_args_and_nonce($e_args, EE_VENUES_ADMIN_URL);
-        $content = '<a href="' . $e_link . '">' . $item->get('term_count') . '</a>';
-        return $content;
-    }
+	protected function _setup_data()
+	{
+		$this->_data = $this->_admin_page->get_categories($this->_per_page, $this->_current_page);
+		$this->_all_data_count = $this->_admin_page->get_categories($this->_per_page, $this->_current_page, true);
+	}
+
+
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => esc_html__('venue category', 'event_espresso'),
+			'plural'   => esc_html__('venue categories', 'event_espresso'),
+			'ajax'     => true, // for now,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+
+		$this->_columns = array(
+			'cb'    => '<input type="checkbox" />',
+			'id'    => esc_html__('ID', 'event_espresso'),
+			'name'  => esc_html__('Name', 'event_espresso'),
+			// 'shortcode' => esc_html__('Shortcode', 'event_espresso'),
+			'count' => esc_html__('Venues', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'id'    => array('Term.term_id' => true),
+			'name'  => array('Term.slug' => false),
+			'count' => array('term_count' => false),
+		);
+
+		$this->_hidden_columns = array();
+	}
+
+
+	// not needed
+	protected function _get_table_filters()
+	{
+		return array();
+	}
+
+
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count'] = $this->_all_data_count;
+	}
+
+
+	public function column_cb($item)
+	{
+		return sprintf('<input type="checkbox" name="VEN_CAT_ID[]" value="%s" />', $item->get('term_id'));
+	}
+
+
+	public function column_id($item)
+	{
+		$content = $item->get('term_id');
+		$content .= '  <span class="show-on-mobile-view-only">' . $item->get_first_related('Term')->get(
+			'name'
+		) . '</span>';
+		return $content;
+	}
+
+
+	public function column_name($item)
+	{
+		$edit_query_args = array(
+			'action'     => 'edit_category',
+			'VEN_CAT_ID' => $item->get('term_id'),
+		);
+
+		$delete_query_args = array(
+			'action'     => 'delete_category',
+			'VEN_CAT_ID' => $item->get('term_id'),
+		);
+
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_VENUES_ADMIN_URL);
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_VENUES_ADMIN_URL);
+
+		$actions = array(
+			'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__(
+				'Edit Category',
+				'event_espresso'
+			) . '">' . esc_html__('Edit', 'event_espresso') . '</a>',
+		);
+
+
+		$actions['delete'] = '<a href="' . $delete_link . '" title="' . esc_attr__(
+			'Delete Category',
+			'event_espresso'
+		) . '">' . esc_html__('Delete', 'event_espresso') . '</a>';
+
+		$content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->get_first_related('Term')->get(
+			'name'
+		) . '</a></strong>';
+		$content .= $this->row_actions($actions);
+		return $content;
+	}
+
+
+	public function column_shortcode($item)
+	{
+		$content = '[EVENT_ESPRESSO_CATEGORY category_id="' . $item->get_first_related('Term')->get('slug') . '"]';
+		return $content;
+	}
+
+
+	public function column_count($item)
+	{
+		$e_args = array(
+			'action'   => 'default',
+			'category' => $item->get_first_related('Term')->ID(),
+		);
+		$e_link = EE_Admin_Page::add_query_args_and_nonce($e_args, EE_VENUES_ADMIN_URL);
+		$content = '<a href="' . $e_link . '">' . $item->get('term_count') . '</a>';
+		return $content;
+	}
 }

admin_pages/venues/espresso_events_Venues_Hooks.class.php

Spacing +10 added lines, -10 removed lines

@@ -37,18 +37,18 @@ 
                 'priority'   => 'high',
                 'context'    => 'normal',
             ),
-        );/**/
+        ); /**/
 
         $this->_scripts_styles = array(
             'registers' => array(
                 'ee_event_venues'     => array(
                     'type'    => 'js',
-                    'url'     => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.js',
+                    'url'     => EE_VENUES_ASSETS_URL.'ee-event-venues-admin.js',
                     'depends' => array('jquery'),
                 ),
                 'ee_event_venues_css' => array(
                     'type' => 'css',
-                    'url'  => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.css',
+                    'url'  => EE_VENUES_ASSETS_URL.'ee-event-venues-admin.css',
                 ),
             ),
             'enqueues'  => array(
@@ -74,7 +74,7 @@ 
         // first remove default venue callback
         foreach ($callbacks as $key => $callback) {
             if ($callback[1] == '_default_venue_update') {
-                unset($callbacks[ $key ]);
+                unset($callbacks[$key]);
             }
         }
 
@@ -102,7 +102,7 @@ 
         }
 
         // cap checks
-        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')) {
             $vnu_where['VNU_wp_user'] = get_current_user_id();
         }
 
@@ -113,14 +113,14 @@ 
         $ven_select[0] = esc_html__('Select a Venue', 'event_espresso');
         // setup venues for selector
         foreach ($venues as $venue) {
-            $ven_select[ $venue->ID() ] = $venue->name();
+            $ven_select[$venue->ID()] = $venue->name();
         }
 
         // if $ven_select does not have the existing venue attached to event then let's add that because we'll always
         // show existing attached venues even if it's trashed (or some other restricted status).
 
-        if ($evt_venue_id && ! isset($ven_select[ $evt_venue_id ])) {
-            $ven_select[ $evt_venue_id ] = $evt_venue->name();
+        if ($evt_venue_id && ! isset($ven_select[$evt_venue_id])) {
+            $ven_select[$evt_venue_id] = $evt_venue->name();
             $venues = array_merge($venues, array($evt_venue));
         }
 
@@ -184,7 +184,7 @@ 
         );
 
         $template_path = empty($venues) ? EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content.template.php'
-            : EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content_from_manager.template.php';
+            : EE_VENUES_TEMPLATE_PATH.'event_venues_metabox_content_from_manager.template.php';
 
         // Allow events venue metabox template args filtering.
         $template_args = apply_filters(
@@ -207,7 +207,7 @@ 
         $evt_venue = $evtobj->venues();
         $evt_venue = ! empty($evt_venue) ? array_shift($evt_venue) : null;
 
-        if (! empty($evt_venue) && $evt_venue->ID() != $venue_id) {
+        if ( ! empty($evt_venue) && $evt_venue->ID() != $venue_id) {
             $evtobj->_remove_relation_to($evt_venue->ID(), 'Venue');
         }
 

Indentation +203 added lines, -203 removed lines

@@ -14,207 +14,207 @@
  */
 class espresso_events_Venues_Hooks extends EE_Admin_Hooks
 {
-    protected $_event;
-
-
-    public function __construct(EE_Admin_Page $admin_page)
-    {
-        parent::__construct($admin_page);
-    }
-
-
-    protected function _set_hooks_properties()
-    {
-        $this->_name = 'venues';
-
-        $this->_metaboxes = array(
-            0 => array(
-                'page_route' => array('edit', 'create_new'),
-                'func'       => 'venue_metabox',
-                'label'      => esc_html__('Venue Details', 'event_espresso'),
-                'priority'   => 'high',
-                'context'    => 'normal',
-            ),
-        );/**/
-
-        $this->_scripts_styles = array(
-            'registers' => array(
-                'ee_event_venues'     => array(
-                    'type'    => 'js',
-                    'url'     => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.js',
-                    'depends' => array('jquery'),
-                ),
-                'ee_event_venues_css' => array(
-                    'type' => 'css',
-                    'url'  => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.css',
-                ),
-            ),
-            'enqueues'  => array(
-                'ee_event_venues'     => array('edit', 'create_new'),
-                'ee_event_venues_css' => array('edit', 'create_new'),
-            ),
-        );
-
-        // hook into the handler for saving venue
-        add_filter(
-            'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
-            array($this, 'modify_callbacks'),
-            10
-        );
-
-        // remove default ee_autosave returns for DECAF venues (not needed for CAF venues cause we have a dropdown selector)
-        add_filter('FHEE__Events_Admin_Page__ee_autosave_edit_do_decaf_venue_save', '__return_false');
-    }
-
-
-    public function modify_callbacks($callbacks)
-    {
-        // first remove default venue callback
-        foreach ($callbacks as $key => $callback) {
-            if ($callback[1] == '_default_venue_update') {
-                unset($callbacks[ $key ]);
-            }
-        }
-
-        // now let's add the caf version
-        $callbacks[] = array($this, 'caf_venue_update');
-        return $callbacks;
-    }
-
-
-    public function venue_metabox()
-    {
-        $evt_obj = $this->_adminpage_obj->get_event_object();
-        $evt_id = $evt_obj->ID();
-
-        // first let's see if we have a venue already
-        $evt_venues = ! empty($evt_id) ? $evt_obj->venues() : array();
-        $evt_venue = $evt_venues && is_array($evt_venues) ? reset($evt_venues) : null;
-        $evt_venue_id = $evt_venue instanceof EE_Venue ? $evt_venue->ID() : null;
-
-        // possibly private venues.
-        if (EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
-            $vnu_where['status'] = array('IN', array('publish', 'private'));
-        } else {
-            $vnu_where['status'] = 'publish';
-        }
-
-        // cap checks
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
-            $vnu_where['VNU_wp_user'] = get_current_user_id();
-        }
-
-        $vnumdl = EE_Registry::instance()->load_model('Venue');
-        $venues = $vnumdl->get_all(array($vnu_where, 'order_by' => array('VNU_name' => 'ASC')));
-
-        $ven_select = array();
-        $ven_select[0] = esc_html__('Select a Venue', 'event_espresso');
-        // setup venues for selector
-        foreach ($venues as $venue) {
-            $ven_select[ $venue->ID() ] = $venue->name();
-        }
-
-        // if $ven_select does not have the existing venue attached to event then let's add that because we'll always
-        // show existing attached venues even if it's trashed (or some other restricted status).
-
-        if ($evt_venue_id && ! isset($ven_select[ $evt_venue_id ])) {
-            $ven_select[ $evt_venue_id ] = $evt_venue->name();
-            $venues = array_merge($venues, array($evt_venue));
-        }
-
-        $template_args['venues'] = $venues;
-        $template_args['evt_venue_id'] = $evt_venue_id;
-        $venue_selector = new EE_Select_Input(
-            $ven_select,
-            array(
-                'html_name'  => 'venue_id',
-                'html_id'    => 'venue_id',
-                'html_class' => 'wide',
-                'default'    => $evt_venue_id ? $evt_venue_id : '0'
-            )
-        );
-        $template_args['venue_selector'] = $venue_selector->get_html_for_input();
-        $enable_for_gmap = new EE_Yes_No_Input(
-            array(
-                'html_name'  => 'enable_for_gmap',
-                'html_id'    => 'enable_for_gmap',
-                'default'    => $evt_venue instanceof EE_Venue ? $evt_venue->enable_for_gmap() : false
-            )
-        );
-        $template_args['enable_for_gmap'] = $enable_for_gmap->get_html_for_input();
-        $template_args['new_venue_link'] = EEH_HTML::link(
-            EE_Admin_Page::add_query_args_and_nonce(
-                array('action' => 'create_new'),
-                EE_VENUES_ADMIN_URL
-            ),
-            esc_html_x('Add new Venue', 'a link to add a new venue', 'event_espresso'),
-            esc_html_x('Add new Venue', 'a link to add a new venue', 'event_espresso'),
-            'ev_new_venue_link',
-            'button',
-            'margin-left:10px;',
-            'target="_blank"'
-        );
-
-        // Decide on an info text when there are no venues to display.
-        $no_venues_info_txt = esc_html_x(
-            'You have not created any venues yet.',
-            'Information text displayed in the venues metabox when there are no venues to display',
-            'event_espresso'
-        );
-        if (empty($venues)) {
-            $unpublished_where = $vnu_where;
-            $unpublished_where['status'] = 'draft';
-            $unpublished_venues = $vnumdl->get_all(array($unpublished_where, 'order_by' => array('VNU_name' => 'ASC')));
-            if (count($unpublished_venues) > 0) {
-                $no_venues_info_txt = esc_html_x(
-                // @codingStandardsIgnoreStart
-                    'Use the link below to publish your venue through the venue editor so it appears here for selection.',
-                    // @codingStandardsIgnoreEnd
-                    'Information text displayed in the venues metabox when there are no venues to display',
-                    'event_espresso'
-                );
-            }
-        }
-        $template_args['no_venues_info'] = EEH_HTML::p(
-            EEH_HTML::strong($no_venues_info_txt),
-            'no_venues_info',
-            'info'
-        );
-
-        $template_path = empty($venues) ? EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content.template.php'
-            : EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content_from_manager.template.php';
-
-        // Allow events venue metabox template args filtering.
-        $template_args = apply_filters(
-            'FHEE__espresso_events_Venues_Hooks___venue_metabox__template_args',
-            $template_args,
-            $template_path
-        );
-
-        EEH_Template::display_template($template_path, $template_args);
-    }
-
-
-    public function caf_venue_update($evtobj, $data)
-    {
-        EE_Registry::instance()->load_model('Venue');
-        $venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : null;
-
-
-        // first let's check if the selected venue matches any existing venue attached to the event
-        $evt_venue = $evtobj->venues();
-        $evt_venue = ! empty($evt_venue) ? array_shift($evt_venue) : null;
-
-        if (! empty($evt_venue) && $evt_venue->ID() != $venue_id) {
-            $evtobj->_remove_relation_to($evt_venue->ID(), 'Venue');
-        }
-
-        if (empty($venue_id)) {
-            return true;
-        } //no venue to attach
-
-        // this should take care of adding to revisions as well as main post object
-        $success = $evtobj->_add_relation_to($venue_id, 'Venue');
-        return ! empty($success) ? true : false;
-    }
+	protected $_event;
+
+
+	public function __construct(EE_Admin_Page $admin_page)
+	{
+		parent::__construct($admin_page);
+	}
+
+
+	protected function _set_hooks_properties()
+	{
+		$this->_name = 'venues';
+
+		$this->_metaboxes = array(
+			0 => array(
+				'page_route' => array('edit', 'create_new'),
+				'func'       => 'venue_metabox',
+				'label'      => esc_html__('Venue Details', 'event_espresso'),
+				'priority'   => 'high',
+				'context'    => 'normal',
+			),
+		);/**/
+
+		$this->_scripts_styles = array(
+			'registers' => array(
+				'ee_event_venues'     => array(
+					'type'    => 'js',
+					'url'     => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.js',
+					'depends' => array('jquery'),
+				),
+				'ee_event_venues_css' => array(
+					'type' => 'css',
+					'url'  => EE_VENUES_ASSETS_URL . 'ee-event-venues-admin.css',
+				),
+			),
+			'enqueues'  => array(
+				'ee_event_venues'     => array('edit', 'create_new'),
+				'ee_event_venues_css' => array('edit', 'create_new'),
+			),
+		);
+
+		// hook into the handler for saving venue
+		add_filter(
+			'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
+			array($this, 'modify_callbacks'),
+			10
+		);
+
+		// remove default ee_autosave returns for DECAF venues (not needed for CAF venues cause we have a dropdown selector)
+		add_filter('FHEE__Events_Admin_Page__ee_autosave_edit_do_decaf_venue_save', '__return_false');
+	}
+
+
+	public function modify_callbacks($callbacks)
+	{
+		// first remove default venue callback
+		foreach ($callbacks as $key => $callback) {
+			if ($callback[1] == '_default_venue_update') {
+				unset($callbacks[ $key ]);
+			}
+		}
+
+		// now let's add the caf version
+		$callbacks[] = array($this, 'caf_venue_update');
+		return $callbacks;
+	}
+
+
+	public function venue_metabox()
+	{
+		$evt_obj = $this->_adminpage_obj->get_event_object();
+		$evt_id = $evt_obj->ID();
+
+		// first let's see if we have a venue already
+		$evt_venues = ! empty($evt_id) ? $evt_obj->venues() : array();
+		$evt_venue = $evt_venues && is_array($evt_venues) ? reset($evt_venues) : null;
+		$evt_venue_id = $evt_venue instanceof EE_Venue ? $evt_venue->ID() : null;
+
+		// possibly private venues.
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
+			$vnu_where['status'] = array('IN', array('publish', 'private'));
+		} else {
+			$vnu_where['status'] = 'publish';
+		}
+
+		// cap checks
+		if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
+			$vnu_where['VNU_wp_user'] = get_current_user_id();
+		}
+
+		$vnumdl = EE_Registry::instance()->load_model('Venue');
+		$venues = $vnumdl->get_all(array($vnu_where, 'order_by' => array('VNU_name' => 'ASC')));
+
+		$ven_select = array();
+		$ven_select[0] = esc_html__('Select a Venue', 'event_espresso');
+		// setup venues for selector
+		foreach ($venues as $venue) {
+			$ven_select[ $venue->ID() ] = $venue->name();
+		}
+
+		// if $ven_select does not have the existing venue attached to event then let's add that because we'll always
+		// show existing attached venues even if it's trashed (or some other restricted status).
+
+		if ($evt_venue_id && ! isset($ven_select[ $evt_venue_id ])) {
+			$ven_select[ $evt_venue_id ] = $evt_venue->name();
+			$venues = array_merge($venues, array($evt_venue));
+		}
+
+		$template_args['venues'] = $venues;
+		$template_args['evt_venue_id'] = $evt_venue_id;
+		$venue_selector = new EE_Select_Input(
+			$ven_select,
+			array(
+				'html_name'  => 'venue_id',
+				'html_id'    => 'venue_id',
+				'html_class' => 'wide',
+				'default'    => $evt_venue_id ? $evt_venue_id : '0'
+			)
+		);
+		$template_args['venue_selector'] = $venue_selector->get_html_for_input();
+		$enable_for_gmap = new EE_Yes_No_Input(
+			array(
+				'html_name'  => 'enable_for_gmap',
+				'html_id'    => 'enable_for_gmap',
+				'default'    => $evt_venue instanceof EE_Venue ? $evt_venue->enable_for_gmap() : false
+			)
+		);
+		$template_args['enable_for_gmap'] = $enable_for_gmap->get_html_for_input();
+		$template_args['new_venue_link'] = EEH_HTML::link(
+			EE_Admin_Page::add_query_args_and_nonce(
+				array('action' => 'create_new'),
+				EE_VENUES_ADMIN_URL
+			),
+			esc_html_x('Add new Venue', 'a link to add a new venue', 'event_espresso'),
+			esc_html_x('Add new Venue', 'a link to add a new venue', 'event_espresso'),
+			'ev_new_venue_link',
+			'button',
+			'margin-left:10px;',
+			'target="_blank"'
+		);
+
+		// Decide on an info text when there are no venues to display.
+		$no_venues_info_txt = esc_html_x(
+			'You have not created any venues yet.',
+			'Information text displayed in the venues metabox when there are no venues to display',
+			'event_espresso'
+		);
+		if (empty($venues)) {
+			$unpublished_where = $vnu_where;
+			$unpublished_where['status'] = 'draft';
+			$unpublished_venues = $vnumdl->get_all(array($unpublished_where, 'order_by' => array('VNU_name' => 'ASC')));
+			if (count($unpublished_venues) > 0) {
+				$no_venues_info_txt = esc_html_x(
+				// @codingStandardsIgnoreStart
+					'Use the link below to publish your venue through the venue editor so it appears here for selection.',
+					// @codingStandardsIgnoreEnd
+					'Information text displayed in the venues metabox when there are no venues to display',
+					'event_espresso'
+				);
+			}
+		}
+		$template_args['no_venues_info'] = EEH_HTML::p(
+			EEH_HTML::strong($no_venues_info_txt),
+			'no_venues_info',
+			'info'
+		);
+
+		$template_path = empty($venues) ? EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content.template.php'
+			: EE_VENUES_TEMPLATE_PATH . 'event_venues_metabox_content_from_manager.template.php';
+
+		// Allow events venue metabox template args filtering.
+		$template_args = apply_filters(
+			'FHEE__espresso_events_Venues_Hooks___venue_metabox__template_args',
+			$template_args,
+			$template_path
+		);
+
+		EEH_Template::display_template($template_path, $template_args);
+	}
+
+
+	public function caf_venue_update($evtobj, $data)
+	{
+		EE_Registry::instance()->load_model('Venue');
+		$venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : null;
+
+
+		// first let's check if the selected venue matches any existing venue attached to the event
+		$evt_venue = $evtobj->venues();
+		$evt_venue = ! empty($evt_venue) ? array_shift($evt_venue) : null;
+
+		if (! empty($evt_venue) && $evt_venue->ID() != $venue_id) {
+			$evtobj->_remove_relation_to($evt_venue->ID(), 'Venue');
+		}
+
+		if (empty($venue_id)) {
+			return true;
+		} //no venue to attach
+
+		// this should take care of adding to revisions as well as main post object
+		$success = $evtobj->_add_relation_to($venue_id, 'Venue');
+		return ! empty($success) ? true : false;
+	}
 }

admin_pages/about/About_Admin_Page_Init.core.php

Spacing +4 added lines, -4 removed lines

@@ -20,10 +20,10 @@
         // define some events related constants
         define('EE_ABOUT_PG_SLUG', 'espresso_about');
         define('EE_ABOUT_LABEL', esc_html__('About', 'event_espresso'));
-        define('EE_ABOUT_ADMIN', EE_ADMIN_PAGES . 'about/');
-        define('EE_ABOUT_ADMIN_URL', admin_url('admin.php?page=' . EE_ABOUT_PG_SLUG));
-        define('EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN . 'templates/');
-        define('EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'about/assets/');
+        define('EE_ABOUT_ADMIN', EE_ADMIN_PAGES.'about/');
+        define('EE_ABOUT_ADMIN_URL', admin_url('admin.php?page='.EE_ABOUT_PG_SLUG));
+        define('EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN.'templates/');
+        define('EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL.'about/assets/');
         parent::__construct();
     }
 

Indentation +31 added lines, -31 removed lines

@@ -14,37 +14,37 @@
  */
 class About_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    public function __construct()
-    {
-        // define some events related constants
-        define('EE_ABOUT_PG_SLUG', 'espresso_about');
-        define('EE_ABOUT_LABEL', esc_html__('About', 'event_espresso'));
-        define('EE_ABOUT_ADMIN', EE_ADMIN_PAGES . 'about/');
-        define('EE_ABOUT_ADMIN_URL', admin_url('admin.php?page=' . EE_ABOUT_PG_SLUG));
-        define('EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN . 'templates/');
-        define('EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'about/assets/');
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		// define some events related constants
+		define('EE_ABOUT_PG_SLUG', 'espresso_about');
+		define('EE_ABOUT_LABEL', esc_html__('About', 'event_espresso'));
+		define('EE_ABOUT_ADMIN', EE_ADMIN_PAGES . 'about/');
+		define('EE_ABOUT_ADMIN_URL', admin_url('admin.php?page=' . EE_ABOUT_PG_SLUG));
+		define('EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN . 'templates/');
+		define('EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'about/assets/');
+		parent::__construct();
+	}
 
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('About Event Espresso', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('About Event Espresso', 'event_espresso');
+	}
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'              => 'extras',
-                'menu_order'              => 40,
-                'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
-                'parent_slug'             => 'espresso_events',
-                'menu_slug'               => 'espresso_about',
-                'menu_label'              => EE_ABOUT_LABEL,
-                'capability'              => 'manage_options',
-                'maintenance_mode_parent' => 'espresso_maintenance_settings',
-                'admin_init_page'         => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'              => 'extras',
+				'menu_order'              => 40,
+				'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
+				'parent_slug'             => 'espresso_events',
+				'menu_slug'               => 'espresso_about',
+				'menu_label'              => EE_ABOUT_LABEL,
+				'capability'              => 'manage_options',
+				'maintenance_mode_parent' => 'espresso_maintenance_settings',
+				'admin_init_page'         => $this,
+			)
+		);
+	}
 }

admin_pages/general_settings/General_Settings_Admin_Page_Init.core.php

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', esc_html__('General Settings', 'event_espresso'));
-        define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings/');
-        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
-        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates/');
-        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
+        define('GEN_SET_ADMIN', EE_ADMIN_PAGES.'general_settings/');
+        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page='.GEN_SET_PG_SLUG));
+        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN.'templates/');
+        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL.'general_settings/assets/');
 
         parent::__construct();
     }

Indentation +30 added lines, -30 removed lines

@@ -17,37 +17,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', esc_html__('General Settings', 'event_espresso'));
-        define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings/');
-        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
-        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates/');
-        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', esc_html__('General Settings', 'event_espresso'));
+		define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings/');
+		define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
+		define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates/');
+		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,
+			)
+		);
+	}
 }

admin_pages/registration_form/Registration_Form_Questions_Admin_List_Table.class.php

Spacing +8 added lines, -8 removed lines

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

Indentation +162 added lines, -162 removed lines

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

admin_pages/registration_form/Registration_Form_Admin_Page_Init.core.php

Spacing +7 added lines, -7 removed lines

@@ -24,13 +24,13 @@
         define('REGISTRATION_FORM_PG_SLUG', 'espresso_registration_form');
         define('REGISTRATION_FORM_LABEL', esc_html__('Registration Form', 'event_espresso'));
         define('REGISTRATION_FORM_PG_NAME', REGISTRATION_FORM_LABEL);
-        define('REGISTRATION_FORM_ADMIN', EE_ADMIN_PAGES . 'registration_form/');
-        define('REGISTRATION_FORM_ADMIN_URL', admin_url('admin.php?page=' . REGISTRATION_FORM_PG_SLUG));
-        define('EE_FORMS_ADMIN_URL', admin_url('admin.php?page=' . REGISTRATION_FORM_PG_SLUG));
-        define('REGISTRATION_FORM_ASSETS_PATH', REGISTRATION_FORM_ADMIN . 'assets/');
-        define('REGISTRATION_FORM_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registration_form/assets/');
-        define('REGISTRATION_FORM_TEMPLATE_PATH', REGISTRATION_FORM_ADMIN . 'templates/');
-        define('REGISTRATION_FORM_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registration_form/templates/');
+        define('REGISTRATION_FORM_ADMIN', EE_ADMIN_PAGES.'registration_form/');
+        define('REGISTRATION_FORM_ADMIN_URL', admin_url('admin.php?page='.REGISTRATION_FORM_PG_SLUG));
+        define('EE_FORMS_ADMIN_URL', admin_url('admin.php?page='.REGISTRATION_FORM_PG_SLUG));
+        define('REGISTRATION_FORM_ASSETS_PATH', REGISTRATION_FORM_ADMIN.'assets/');
+        define('REGISTRATION_FORM_ASSETS_URL', EE_ADMIN_PAGES_URL.'registration_form/assets/');
+        define('REGISTRATION_FORM_TEMPLATE_PATH', REGISTRATION_FORM_ADMIN.'templates/');
+        define('REGISTRATION_FORM_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'registration_form/templates/');
         parent::__construct();
     }
 

Indentation +34 added lines, -34 removed lines

@@ -17,41 +17,41 @@
  */
 class Registration_Form_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    public function __construct()
-    {
-        // define some constants
-        define('REGISTRATION_FORM_PG_SLUG', 'espresso_registration_form');
-        define('REGISTRATION_FORM_LABEL', esc_html__('Registration Form', 'event_espresso'));
-        define('REGISTRATION_FORM_PG_NAME', REGISTRATION_FORM_LABEL);
-        define('REGISTRATION_FORM_ADMIN', EE_ADMIN_PAGES . 'registration_form/');
-        define('REGISTRATION_FORM_ADMIN_URL', admin_url('admin.php?page=' . REGISTRATION_FORM_PG_SLUG));
-        define('EE_FORMS_ADMIN_URL', admin_url('admin.php?page=' . REGISTRATION_FORM_PG_SLUG));
-        define('REGISTRATION_FORM_ASSETS_PATH', REGISTRATION_FORM_ADMIN . 'assets/');
-        define('REGISTRATION_FORM_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registration_form/assets/');
-        define('REGISTRATION_FORM_TEMPLATE_PATH', REGISTRATION_FORM_ADMIN . 'templates/');
-        define('REGISTRATION_FORM_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registration_form/templates/');
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		// define some constants
+		define('REGISTRATION_FORM_PG_SLUG', 'espresso_registration_form');
+		define('REGISTRATION_FORM_LABEL', esc_html__('Registration Form', 'event_espresso'));
+		define('REGISTRATION_FORM_PG_NAME', REGISTRATION_FORM_LABEL);
+		define('REGISTRATION_FORM_ADMIN', EE_ADMIN_PAGES . 'registration_form/');
+		define('REGISTRATION_FORM_ADMIN_URL', admin_url('admin.php?page=' . REGISTRATION_FORM_PG_SLUG));
+		define('EE_FORMS_ADMIN_URL', admin_url('admin.php?page=' . REGISTRATION_FORM_PG_SLUG));
+		define('REGISTRATION_FORM_ASSETS_PATH', REGISTRATION_FORM_ADMIN . 'assets/');
+		define('REGISTRATION_FORM_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registration_form/assets/');
+		define('REGISTRATION_FORM_TEMPLATE_PATH', REGISTRATION_FORM_ADMIN . 'templates/');
+		define('REGISTRATION_FORM_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registration_form/templates/');
+		parent::__construct();
+	}
 
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Registration Form Overview', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Registration Form Overview', 'event_espresso');
+	}
 
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'management',
-                'menu_order'      => 30,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => REGISTRATION_FORM_PG_SLUG,
-                'menu_label'      => esc_html__('Registration Form', 'event_espresso'),
-                'capability'      => 'ee_read_questions',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'management',
+				'menu_order'      => 30,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => REGISTRATION_FORM_PG_SLUG,
+				'menu_label'      => esc_html__('Registration Form', 'event_espresso'),
+				'capability'      => 'ee_read_questions',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

caffeinated/admin/extend/registrations/EE_Registration_CheckIn_List_Table.class.php

Spacing +4 added lines, -4 removed lines

@@ -157,9 +157,9 @@ 
             'ee_delete_checkins',
             'espresso_registrations_delete_checkin_row'
         )
-            ? '<a href="' . $delete_url . '" title="'
-              . esc_attr__('Click here to delete this check-in record', 'event_espresso') . '">'
-              . esc_html__('Delete', 'event_espresso') . '</a>'
+            ? '<a href="'.$delete_url.'" title="'
+              . esc_attr__('Click here to delete this check-in record', 'event_espresso').'">'
+              . esc_html__('Delete', 'event_espresso').'</a>'
             : '';
 
         return sprintf(
@@ -221,7 +221,7 @@ 
             ? $this->_req_data['perpage']
             : $per_page;
         $limit = null;
-        if (! $count) {
+        if ( ! $count) {
             $offset = ($current_page - 1) * $per_page;
             $limit = array($offset, $per_page);
         }

Indentation +224 added lines, -224 removed lines

@@ -17,228 +17,228 @@
  */
 class EE_Registration_CheckIn_List_Table extends EE_Admin_List_Table
 {
-    /**
-     * EE_Registration_CheckIn_List_Table constructor.
-     *
-     * @param EE_Admin_Page $admin_page
-     */
-    public function __construct($admin_page)
-    {
-        parent::__construct($admin_page);
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _setup_data()
-    {
-        $this->_data = $this->_get_checkins($this->_per_page);
-        $this->_all_data_count = $this->_get_checkins($this->_per_page, true);
-    }
-
-
-    /**
-     * Sets up the properties for the list table.
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => esc_html__('check-in', 'event_espresso'),
-            'plural'   => esc_html__('check-ins', 'event_espresso'),
-            'ajax'     => true,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-
-        $this->_columns = array(
-            'cb'            => '<input type="checkbox" />', // Render a checkbox instead of text
-            'CHK_in'        => esc_html__('Check-In', 'event_espresso'),
-            'CHK_timestamp' => esc_html__('Timestamp', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'CHK_timestamp' => array('CHK_timestamp' => true),
-        );
-
-        $this->_primary_column = 'CHK_in';
-
-        $this->_hidden_columns = array();
-    }
-
-
-    /**
-     * @return array
-     */
-    protected function _get_table_filters()
-    {
-        return [];
-    }
-
-
-    /**
-     * Returning an empty string to remove the search box for this view.
-     *
-     * @param string $text
-     * @param string $input_id
-     * @return string
-     */
-    public function search_box($text, $input_id)
-    {
-        return '';
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count'] = $this->_get_checkins(null, true);
-    }
-
-
-    /**
-     * @param EE_Checkin $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function column_cb($item)
-    {
-        return sprintf('<input type="checkbox" name="checkbox[%1$s]" />', $item->ID());
-    }
-
-
-    /**
-     * @param EE_Checkin $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_CHK_in(EE_Checkin $item)
-    {
-        $checkin_status_dashicon = CheckinStatusDashicon::fromCheckin($item);
-        return '<span class="'
-               . $checkin_status_dashicon->cssClasses()
-               . '"></span><span class="show-on-mobile-view-only">'
-               . $item->get_datetime('CHK_timestamp')
-               . '</span>';
-    }
-
-
-    /**
-     * @param EE_Checkin $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_CHK_timestamp(EE_Checkin $item)
-    {
-        $actions = array();
-        $delete_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action'  => 'delete_checkin_row',
-                'DTT_ID'  => $this->_req_data['DTT_ID'],
-                '_REG_ID' => $this->_req_data['_REG_ID'],
-                'CHK_ID'  => $item->ID(),
-            )
-        );
-        $actions['delete_checkin'] = EE_Registry::instance()->CAP->current_user_can(
-            'ee_delete_checkins',
-            'espresso_registrations_delete_checkin_row'
-        )
-            ? '<a href="' . $delete_url . '" title="'
-              . esc_attr__('Click here to delete this check-in record', 'event_espresso') . '">'
-              . esc_html__('Delete', 'event_espresso') . '</a>'
-            : '';
-
-        return sprintf(
-            '%1$s %2$s',
-            $item->get_datetime('CHK_timestamp', '', 'H:i:s a'),
-            $this->row_actions($actions)
-        );
-    }
-
-
-    /**
-     * This retrieves all the Check-ins for the given parameters.
-     * experimenting with having the query for the table values within the list table.
-     *
-     * @param int  $per_page How many to retrieve per page
-     * @param bool $count    Whether to return a count or not
-     * @return EE_Checkin[]|int
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _get_checkins($per_page = 10, $count = false)
-    {
-        $REG_ID = isset($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : false;
-        $DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : false;
-
-        // if user does not have the capability for the checkins for this registration then get out!
-        if (
-            ! EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_checkin',
-                'espresso_registrations_registration_checkins',
-                $REG_ID
-            )
-        ) {
-            return $count ? 0 : array();
-        }
-
-        // if no reg id then get out cause need a reg id
-        if (empty($REG_ID) || empty($DTT_ID)) {
-            throw new EE_Error(
-                esc_html__(
-                    'This route cannot be viewed unless registration and datetime IDs are included in the request (via REG_ID and DTT_ID parameters)',
-                    'event_espresso'
-                )
-            );
-        }
-
-        // set orderby
-        // note that with this table we're only providing the option to orderby the timestamp value.
-        $orderby = 'CHK_timestamp';
-
-        $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($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
-            ? $this->_req_data['perpage']
-            : $per_page;
-        $limit = null;
-        if (! $count) {
-            $offset = ($current_page - 1) * $per_page;
-            $limit = array($offset, $per_page);
-        }
-
-        $_where = array(
-            'REG_ID' => $REG_ID,
-            'DTT_ID' => $DTT_ID,
-        );
-
-        $query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
-
-        // if no per_page value then we just want to return a count of all Check-ins
-        if ($count) {
-            return EEM_Checkin::instance()->count(array($_where));
-        }
-
-        return $count
-            ? EEM_Checkin::instance()->count(array($_where))
-            : EEM_Checkin::instance()->get_all($query_params);
-    }
+	/**
+	 * EE_Registration_CheckIn_List_Table constructor.
+	 *
+	 * @param EE_Admin_Page $admin_page
+	 */
+	public function __construct($admin_page)
+	{
+		parent::__construct($admin_page);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _setup_data()
+	{
+		$this->_data = $this->_get_checkins($this->_per_page);
+		$this->_all_data_count = $this->_get_checkins($this->_per_page, true);
+	}
+
+
+	/**
+	 * Sets up the properties for the list table.
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => esc_html__('check-in', 'event_espresso'),
+			'plural'   => esc_html__('check-ins', 'event_espresso'),
+			'ajax'     => true,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+
+		$this->_columns = array(
+			'cb'            => '<input type="checkbox" />', // Render a checkbox instead of text
+			'CHK_in'        => esc_html__('Check-In', 'event_espresso'),
+			'CHK_timestamp' => esc_html__('Timestamp', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'CHK_timestamp' => array('CHK_timestamp' => true),
+		);
+
+		$this->_primary_column = 'CHK_in';
+
+		$this->_hidden_columns = array();
+	}
+
+
+	/**
+	 * @return array
+	 */
+	protected function _get_table_filters()
+	{
+		return [];
+	}
+
+
+	/**
+	 * Returning an empty string to remove the search box for this view.
+	 *
+	 * @param string $text
+	 * @param string $input_id
+	 * @return string
+	 */
+	public function search_box($text, $input_id)
+	{
+		return '';
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count'] = $this->_get_checkins(null, true);
+	}
+
+
+	/**
+	 * @param EE_Checkin $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function column_cb($item)
+	{
+		return sprintf('<input type="checkbox" name="checkbox[%1$s]" />', $item->ID());
+	}
+
+
+	/**
+	 * @param EE_Checkin $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_CHK_in(EE_Checkin $item)
+	{
+		$checkin_status_dashicon = CheckinStatusDashicon::fromCheckin($item);
+		return '<span class="'
+			   . $checkin_status_dashicon->cssClasses()
+			   . '"></span><span class="show-on-mobile-view-only">'
+			   . $item->get_datetime('CHK_timestamp')
+			   . '</span>';
+	}
+
+
+	/**
+	 * @param EE_Checkin $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_CHK_timestamp(EE_Checkin $item)
+	{
+		$actions = array();
+		$delete_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action'  => 'delete_checkin_row',
+				'DTT_ID'  => $this->_req_data['DTT_ID'],
+				'_REG_ID' => $this->_req_data['_REG_ID'],
+				'CHK_ID'  => $item->ID(),
+			)
+		);
+		$actions['delete_checkin'] = EE_Registry::instance()->CAP->current_user_can(
+			'ee_delete_checkins',
+			'espresso_registrations_delete_checkin_row'
+		)
+			? '<a href="' . $delete_url . '" title="'
+			  . esc_attr__('Click here to delete this check-in record', 'event_espresso') . '">'
+			  . esc_html__('Delete', 'event_espresso') . '</a>'
+			: '';
+
+		return sprintf(
+			'%1$s %2$s',
+			$item->get_datetime('CHK_timestamp', '', 'H:i:s a'),
+			$this->row_actions($actions)
+		);
+	}
+
+
+	/**
+	 * This retrieves all the Check-ins for the given parameters.
+	 * experimenting with having the query for the table values within the list table.
+	 *
+	 * @param int  $per_page How many to retrieve per page
+	 * @param bool $count    Whether to return a count or not
+	 * @return EE_Checkin[]|int
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _get_checkins($per_page = 10, $count = false)
+	{
+		$REG_ID = isset($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : false;
+		$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : false;
+
+		// if user does not have the capability for the checkins for this registration then get out!
+		if (
+			! EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_checkin',
+				'espresso_registrations_registration_checkins',
+				$REG_ID
+			)
+		) {
+			return $count ? 0 : array();
+		}
+
+		// if no reg id then get out cause need a reg id
+		if (empty($REG_ID) || empty($DTT_ID)) {
+			throw new EE_Error(
+				esc_html__(
+					'This route cannot be viewed unless registration and datetime IDs are included in the request (via REG_ID and DTT_ID parameters)',
+					'event_espresso'
+				)
+			);
+		}
+
+		// set orderby
+		// note that with this table we're only providing the option to orderby the timestamp value.
+		$orderby = 'CHK_timestamp';
+
+		$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($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
+			? $this->_req_data['perpage']
+			: $per_page;
+		$limit = null;
+		if (! $count) {
+			$offset = ($current_page - 1) * $per_page;
+			$limit = array($offset, $per_page);
+		}
+
+		$_where = array(
+			'REG_ID' => $REG_ID,
+			'DTT_ID' => $DTT_ID,
+		);
+
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
+
+		// if no per_page value then we just want to return a count of all Check-ins
+		if ($count) {
+			return EEM_Checkin::instance()->count(array($_where));
+		}
+
+		return $count
+			? EEM_Checkin::instance()->count(array($_where))
+			: EEM_Checkin::instance()->get_all($query_params);
+	}
 }