eventespresso / event-espresso-core

payment_methods/Check/EE_PMT_Check.pm.php

Spacing +9 added lines, -9 removed lines

@@ -22,7 +22,7 @@ 
         $this->_pretty_name = esc_html__("Check", 'event_espresso');
         $this->_default_description = esc_html__('After clicking "Finalize Registration", you will be given instructions on how to complete your payment.', 'event_espresso');
         parent::__construct($pm_instance);
-        $this->_default_button_url = $this->file_url() . 'lib/check-logo.png';
+        $this->_default_button_url = $this->file_url().'lib/check-logo.png';
     }
 
 
@@ -48,14 +48,14 @@ 
         if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
             $organization = EE_Registry::instance()->CFG->organization;
             $organization_name = $organization->get_pretty('name');
-            $default_address = $organization->address_1 != '' ? $organization->get_pretty('address_1') . '<br />' : '';
-            $default_address .= $organization->address_2 != '' ? $organization->get_pretty('address_2') . '<br />' : '';
+            $default_address = $organization->address_1 != '' ? $organization->get_pretty('address_1').'<br />' : '';
+            $default_address .= $organization->address_2 != '' ? $organization->get_pretty('address_2').'<br />' : '';
             $default_address .= $organization->city != '' ? $organization->get_pretty('city') : '';
-            $default_address .= ( $organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
+            $default_address .= ($organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
             $state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
-            $country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($organization->CNT_ISO) ;
-            $default_address .=  $state ? $state->name() . '<br />' : '';
-            $default_address .= $country ? $country->name() . '<br />' : '';
+            $country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($organization->CNT_ISO);
+            $default_address .= $state ? $state->name().'<br />' : '';
+            $default_address .= $country ? $country->name().'<br />' : '';
             $default_address .= $organization->zip != '' ? $organization->get_pretty('zip') : '';
         } else {
             $default_address = 'unknown';
@@ -70,7 +70,7 @@ 
                 'payment_instructions' => new EE_Text_Area_Input(array(
                     'html_label_text' =>  sprintf(esc_html__("Instructions %s", "event_espresso"), $this->get_help_tab_link()),
                     'default' => esc_html__("Please send Check/Money Order to the address below. Payment must be received within 48 hours of event date.", 'event_espresso'),
-                    'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+                    'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
                 )),
                 'payable_to' => new EE_Text_Input(array(
                     'html_label_text' =>  sprintf(esc_html__("Payable To %s", "event_espresso"), $this->get_help_tab_link()),
@@ -79,7 +79,7 @@ 
                 'address_to_send_payment' => new EE_Text_Area_Input(array(
                     'html_label_text' =>  sprintf(esc_html__("Address Payable %s", "event_espresso"), $this->get_help_tab_link()),
                     'default' => $default_address,
-                    'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+                    'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
                 )),
             ),
             'exclude' => array('PMD_debug_mode')

Indentation +105 added lines, -105 removed lines

@@ -11,121 +11,121 @@
  */
 class EE_PMT_Check extends EE_PMT_Base
 {
-    /**
-     * @param null $pm_instance
-     * @return EE_PMT_Check
-     */
-    public function __construct($pm_instance = null)
-    {
-        $this->_pretty_name = esc_html__("Check", 'event_espresso');
-        $this->_default_description = esc_html__('After clicking "Finalize Registration", you will be given instructions on how to complete your payment.', 'event_espresso');
-        parent::__construct($pm_instance);
-        $this->_default_button_url = $this->file_url() . 'lib/check-logo.png';
-    }
+	/**
+	 * @param null $pm_instance
+	 * @return EE_PMT_Check
+	 */
+	public function __construct($pm_instance = null)
+	{
+		$this->_pretty_name = esc_html__("Check", 'event_espresso');
+		$this->_default_description = esc_html__('After clicking "Finalize Registration", you will be given instructions on how to complete your payment.', 'event_espresso');
+		parent::__construct($pm_instance);
+		$this->_default_button_url = $this->file_url() . 'lib/check-logo.png';
+	}
 
 
 
-    /**
-     * Creates the billing form for this payment method type
-     * @param \EE_Transaction $transaction
-     * @return NULL
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        return null;
-    }
+	/**
+	 * Creates the billing form for this payment method type
+	 * @param \EE_Transaction $transaction
+	 * @return NULL
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		return null;
+	}
 
 
 
-    /**
-     * Overrides parent to dynamically set some defaults, but only when the form is requested
-     * @return EE_Form_Section_Proper
-     */
-    public function generate_new_settings_form()
-    {
-        if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
-            $organization = EE_Registry::instance()->CFG->organization;
-            $organization_name = $organization->get_pretty('name');
-            $default_address = $organization->address_1 != '' ? $organization->get_pretty('address_1') . '<br />' : '';
-            $default_address .= $organization->address_2 != '' ? $organization->get_pretty('address_2') . '<br />' : '';
-            $default_address .= $organization->city != '' ? $organization->get_pretty('city') : '';
-            $default_address .= ( $organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
-            $state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
-            $country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($organization->CNT_ISO) ;
-            $default_address .=  $state ? $state->name() . '<br />' : '';
-            $default_address .= $country ? $country->name() . '<br />' : '';
-            $default_address .= $organization->zip != '' ? $organization->get_pretty('zip') : '';
-        } else {
-            $default_address = 'unknown';
-            $organization_name = 'unknown';
-        }
-            return new EE_Payment_Method_Form(array(
-            'extra_meta_inputs' => array(
-                'check_title' => new EE_Text_Input(array(
-                    'html_label_text' =>  sprintf(esc_html__("Title %s", "event_espresso"), $this->get_help_tab_link()),
-                    'default' =>  esc_html__("Check/Money Order Payments", 'event_espresso'),
-                )),
-                'payment_instructions' => new EE_Text_Area_Input(array(
-                    'html_label_text' =>  sprintf(esc_html__("Instructions %s", "event_espresso"), $this->get_help_tab_link()),
-                    'default' => esc_html__("Please send Check/Money Order to the address below. Payment must be received within 48 hours of event date.", 'event_espresso'),
-                    'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
-                )),
-                'payable_to' => new EE_Text_Input(array(
-                    'html_label_text' =>  sprintf(esc_html__("Payable To %s", "event_espresso"), $this->get_help_tab_link()),
-                    'default' => $organization_name
-                )),
-                'address_to_send_payment' => new EE_Text_Area_Input(array(
-                    'html_label_text' =>  sprintf(esc_html__("Address Payable %s", "event_espresso"), $this->get_help_tab_link()),
-                    'default' => $default_address,
-                    'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
-                )),
-            ),
-            'exclude' => array('PMD_debug_mode')
-            ));
-    }
+	/**
+	 * Overrides parent to dynamically set some defaults, but only when the form is requested
+	 * @return EE_Form_Section_Proper
+	 */
+	public function generate_new_settings_form()
+	{
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			$organization = EE_Registry::instance()->CFG->organization;
+			$organization_name = $organization->get_pretty('name');
+			$default_address = $organization->address_1 != '' ? $organization->get_pretty('address_1') . '<br />' : '';
+			$default_address .= $organization->address_2 != '' ? $organization->get_pretty('address_2') . '<br />' : '';
+			$default_address .= $organization->city != '' ? $organization->get_pretty('city') : '';
+			$default_address .= ( $organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
+			$state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
+			$country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($organization->CNT_ISO) ;
+			$default_address .=  $state ? $state->name() . '<br />' : '';
+			$default_address .= $country ? $country->name() . '<br />' : '';
+			$default_address .= $organization->zip != '' ? $organization->get_pretty('zip') : '';
+		} else {
+			$default_address = 'unknown';
+			$organization_name = 'unknown';
+		}
+			return new EE_Payment_Method_Form(array(
+			'extra_meta_inputs' => array(
+				'check_title' => new EE_Text_Input(array(
+					'html_label_text' =>  sprintf(esc_html__("Title %s", "event_espresso"), $this->get_help_tab_link()),
+					'default' =>  esc_html__("Check/Money Order Payments", 'event_espresso'),
+				)),
+				'payment_instructions' => new EE_Text_Area_Input(array(
+					'html_label_text' =>  sprintf(esc_html__("Instructions %s", "event_espresso"), $this->get_help_tab_link()),
+					'default' => esc_html__("Please send Check/Money Order to the address below. Payment must be received within 48 hours of event date.", 'event_espresso'),
+					'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+				)),
+				'payable_to' => new EE_Text_Input(array(
+					'html_label_text' =>  sprintf(esc_html__("Payable To %s", "event_espresso"), $this->get_help_tab_link()),
+					'default' => $organization_name
+				)),
+				'address_to_send_payment' => new EE_Text_Area_Input(array(
+					'html_label_text' =>  sprintf(esc_html__("Address Payable %s", "event_espresso"), $this->get_help_tab_link()),
+					'default' => $default_address,
+					'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+				)),
+			),
+			'exclude' => array('PMD_debug_mode')
+			));
+	}
 
 
 
-    /**
-     * Adds the help tab
-     * @see EE_PMT_Base::help_tabs_config()
-     * @return array
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                        'title' => esc_html__('Check Settings', 'event_espresso'),
-                        'filename' => 'payment_methods_overview_check'
-                        ),
-        );
-    }
+	/**
+	 * Adds the help tab
+	 * @see EE_PMT_Base::help_tabs_config()
+	 * @return array
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+						'title' => esc_html__('Check Settings', 'event_espresso'),
+						'filename' => 'payment_methods_overview_check'
+						),
+		);
+	}
 
 
 
-    /**
-     * For adding any html output ab ove the payment overview.
-     * Many gateways won't want ot display anything, so this function just returns an empty string.
-     * Other gateways may want to override this, such as offline gateways.
-     * @return string
-     */
-    public function payment_overview_content(EE_Payment $payment)
-    {
-        $extra_meta_for_payment_method = $this->_pm_instance->all_extra_meta_array();
-        $template_vars = array_merge(
-            array(
-                            'payment_method' => $this->_pm_instance,
-                            'payment' => $payment,
-                            'check_title' => '',
-                            'payment_instructions' => '',
-                            'payable_to' => '',
-                            'address_to_send_payment' => '',
-                            ),
-            $extra_meta_for_payment_method
-        );
-        return EEH_Template::locate_template(
-            'payment_methods/Check/templates/check_payment_details_content.template.php',
-            $template_vars
-        );
-    }
+	/**
+	 * For adding any html output ab ove the payment overview.
+	 * Many gateways won't want ot display anything, so this function just returns an empty string.
+	 * Other gateways may want to override this, such as offline gateways.
+	 * @return string
+	 */
+	public function payment_overview_content(EE_Payment $payment)
+	{
+		$extra_meta_for_payment_method = $this->_pm_instance->all_extra_meta_array();
+		$template_vars = array_merge(
+			array(
+							'payment_method' => $this->_pm_instance,
+							'payment' => $payment,
+							'check_title' => '',
+							'payment_instructions' => '',
+							'payable_to' => '',
+							'address_to_send_payment' => '',
+							),
+			$extra_meta_for_payment_method
+		);
+		return EEH_Template::locate_template(
+			'payment_methods/Check/templates/check_payment_details_content.template.php',
+			$template_vars
+		);
+	}
 }

admin_pages/messages/EE_Message_List_Table.class.php

Spacing +18 added lines, -18 removed lines

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

Indentation +433 added lines, -433 removed lines

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

admin_pages/registrations/qtips/Registration_List_Table_Tips.lib.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
                . esc_html__(
                    'This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
 

Indentation +37 added lines, -37 removed lines

@@ -13,16 +13,16 @@ 
  */
 class Registration_List_Table_Tips extends EE_Qtip_Config
 {
-    protected function _set_tips_array()
-    {
-        $this->_qtipsa = array(
-            0 => array(
-                'content_id' => 'registration-trash-lock',
-                'target'     => '.ee-lock-icon',
-                'content'    => $this->_registration_trash_message(),
-            ),
-            /** removing status strips for now because they are triggered anywhere on the row. */
-            /**1 => array(
+	protected function _set_tips_array()
+	{
+		$this->_qtipsa = array(
+			0 => array(
+				'content_id' => 'registration-trash-lock',
+				'target'     => '.ee-lock-icon',
+				'content'    => $this->_registration_trash_message(),
+			),
+			/** removing status strips for now because they are triggered anywhere on the row. */
+			/**1 => array(
              * 'content_id' => 'registration-status-' . EEM_Registration::status_id_approved,
              * 'target' => '.reg-status-' . EEM_Registration::status_id_approved,
              * 'content' => $this->_registration_status_legend(EEM_Registration::status_id_approved),
@@ -72,37 +72,37 @@ 
              * )
              * )
              * )/**/
-        );
-    }
+		);
+	}
 
 
-    private function _registration_trash_message()
-    {
-        return '<p>'
-               . esc_html__(
-                   'This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	private function _registration_trash_message()
+	{
+		return '<p>'
+			   . esc_html__(
+				   'This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
 
-    /**
-     * output the relevant ee-status-legend with the designated status highlighted.
-     *
-     * @param  EEM_Registration constant $status What status is set (by class)
-     * @return string         The status legend with the related status highlighted
-     */
-    private function _registration_status_legend($status)
-    {
+	/**
+	 * output the relevant ee-status-legend with the designated status highlighted.
+	 *
+	 * @param  EEM_Registration constant $status What status is set (by class)
+	 * @return string         The status legend with the related status highlighted
+	 */
+	private function _registration_status_legend($status)
+	{
 
-        $status_array = array(
-            'approved_status' => EEM_Registration::status_id_approved,
-            'pending_status' => EEM_Registration::status_id_pending_payment,
-            'not_approved' => EEM_Registration::status_id_not_approved,
-            'declined_status' => EEM_Registration::status_id_declined,
-            'cancelled_status' => EEM_Registration::status_id_cancelled,
-        );
+		$status_array = array(
+			'approved_status' => EEM_Registration::status_id_approved,
+			'pending_status' => EEM_Registration::status_id_pending_payment,
+			'not_approved' => EEM_Registration::status_id_not_approved,
+			'declined_status' => EEM_Registration::status_id_declined,
+			'cancelled_status' => EEM_Registration::status_id_cancelled,
+		);
 
-        return EEH_Template::status_legend($status_array, $status);
-    }
+		return EEH_Template::status_legend($status_array, $status);
+	}
 }

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/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_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/transactions/Extend_Transactions_Admin_Page.core.php

Spacing +10 added lines, -10 removed lines

@@ -34,9 +34,9 @@ 
     public function __construct($routing = true)
     {
         parent::__construct($routing);
-        define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/');
-        define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/');
-        define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/');
+        define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'transactions/templates/');
+        define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'transactions/assets/');
+        define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'transactions/assets/');
     }
 
 
@@ -48,7 +48,7 @@ 
      */
     protected function _extend_page_config()
     {
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions';
+        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'transactions';
 
         $new_page_routes = array(
             'reports' => array(
@@ -89,7 +89,7 @@ 
     {
         wp_register_script(
             'ee-txn-reports-js',
-            TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js',
+            TXN_CAF_ASSETS_URL.'ee-transaction-admin-reports.js',
             array('google-charts'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -119,7 +119,7 @@ 
      */
     protected function _transaction_reports()
     {
-        $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
+        $template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php';
         $this->_admin_page_title = esc_html__('Transactions', 'event_espresso');
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
             $template_path,
@@ -162,7 +162,7 @@ 
             }
 
             // setup the date range.
-            $beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+            $beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
             $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
             $subtitle = sprintf(
                 wp_strip_all_tags(
@@ -185,7 +185,7 @@ 
                 wp_strip_all_tags(
                     __('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
                 ),
-                '<h2>' . $report_title . '</h2><p>',
+                '<h2>'.$report_title.'</h2><p>',
                 '</p>'
             ),
         );
@@ -228,7 +228,7 @@ 
             }
 
             // setup the date range.
-            $beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+            $beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
             $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
             $subtitle = sprintf(
                 wp_strip_all_tags(
@@ -251,7 +251,7 @@ 
                 wp_strip_all_tags(
                     __('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
                 ),
-                '<h2>' . $report_title . '</h2><p>',
+                '<h2>'.$report_title.'</h2><p>',
                 '</p>'
             ),
         );

Indentation +242 added lines, -242 removed lines

@@ -14,246 +14,246 @@
  */
 class Extend_Transactions_Admin_Page extends Transactions_Admin_Page
 {
-    /**
-     * This is used to hold the reports template data which is setup early in the request.
-     *
-     * @type array
-     */
-    protected $_reports_template_data = array();
-
-    /**
-     * @Constructor
-     * @access public
-     *
-     * @param bool $routing
-     *
-     * @return \Extend_Transactions_Admin_Page
-     */
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-        define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/');
-        define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/');
-        define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/');
-    }
-
-
-    /**
-     *    _extend_page_config
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _extend_page_config()
-    {
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions';
-
-        $new_page_routes = array(
-            'reports' => array(
-                'func'       => '_transaction_reports',
-                'capability' => 'ee_read_transactions',
-            ),
-        );
-
-        $this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
-
-        $new_page_config = array(
-            'reports' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Reports', 'event_espresso'),
-                    'order' => 20,
-                ),
-                'help_tabs'     => array(
-                    'transactions_reports_help_tab' => array(
-                        'title'    => esc_html__('Transaction Reports', 'event_espresso'),
-                        'filename' => 'transactions_reports',
-                    ),
-                ),
-                'require_nonce' => false,
-            ),
-        );
-        $this->_page_config = array_merge($this->_page_config, $new_page_config);
-    }
-
-
-    /**
-     *    load_scripts_styles_reports
-     *
-     * @access public
-     * @return void
-     */
-    public function load_scripts_styles_reports()
-    {
-        wp_register_script(
-            'ee-txn-reports-js',
-            TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js',
-            array('google-charts'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_enqueue_script('ee-txn-reports-js');
-        $this->_transaction_reports_js_setup();
-        EE_Registry::$i18n_js_strings['currency_format'] = EEH_Money::get_format_for_google_charts();
-    }
-
-
-    /**
-     * This is called when javascript is being enqueued to setup the various data needed for the reports js.
-     * Also $this->{$_reports_template_data} property is set for later usage by the _transaction_reports method.
-     */
-    protected function _transaction_reports_js_setup()
-    {
-        $this->_reports_template_data['admin_reports'][] = $this->_revenue_per_day_report();
-        $this->_reports_template_data['admin_reports'][] = $this->_revenue_per_event_report();
-    }
-
-
-    /**
-     * _transaction_reports
-     *    generates Business Reports regarding Transactions
-     *
-     * @return void
-     */
-    protected function _transaction_reports()
-    {
-        $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
-        $this->_admin_page_title = esc_html__('Transactions', 'event_espresso');
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            $template_path,
-            $this->_reports_template_data,
-            true
-        );
-
-        // the final template wrapper
-        $this->display_admin_page_with_no_sidebar();
-    }
-
-
-    /**
-     * _revenue_per_day_report
-     * generates Business Report showing Total Revenue per Day.
-     *
-     * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
-     *
-     * @return string
-     */
-    private function _revenue_per_day_report($period = '-1 month')
-    {
-
-        $report_ID = 'txn-admin-revenue-per-day-report-dv';
-
-        $TXN = EEM_Transaction::instance();
-
-        $results = $TXN->get_revenue_per_day_report($period);
-        $results = (array) $results;
-        $revenue = array();
-        $subtitle = '';
-
-        if ($results) {
-            $revenue[] = array(
-                esc_html__('Date (only shows dates that have a revenue greater than 1)', 'event_espresso'),
-                esc_html__('Total Revenue', 'event_espresso'),
-            );
-            foreach ($results as $result) {
-                $revenue[] = array($result->txnDate, (float) $result->revenue);
-            }
-
-            // setup the date range.
-            $beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
-            $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
-            $subtitle = sprintf(
-                wp_strip_all_tags(
-                    _x('For the period: %s to %s', 'Used to give date range', 'event_espresso')
-                ),
-                $beginning_date->format('Y-m-d'),
-                $ending_date->format('Y-m-d')
-            );
-        }
-
-        $report_title = wp_strip_all_tags(__('Total Revenue per Day', 'event_espresso'));
-
-        $report_params = array(
-            'title'     => $report_title,
-            'subtitle'  => $subtitle,
-            'id'        => $report_ID,
-            'revenue'   => $revenue,
-            'noResults' => empty($revenue) || count($revenue) === 1,
-            'noTxnMsg'  => sprintf(
-                wp_strip_all_tags(
-                    __('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
-                ),
-                '<h2>' . $report_title . '</h2><p>',
-                '</p>'
-            ),
-        );
-        wp_localize_script('ee-txn-reports-js', 'txnRevPerDay', $report_params);
-
-        return $report_ID;
-    }
-
-
-    /**
-     * _revenue_per_event_report
-     * generates Business Report showing total revenue per event.
-     *
-     * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
-     *
-     * @return int
-     */
-    private function _revenue_per_event_report($period = '-1 month')
-    {
-
-        $report_ID = 'txn-admin-revenue-per-event-report-dv';
-
-        $TXN = EEM_Transaction::instance();
-        $results = $TXN->get_revenue_per_event_report($period);
-        $results = (array) $results;
-        $revenue = array();
-        $subtitle = '';
-
-        if ($results) {
-            $revenue[] = array(
-                esc_html__('Event (only events that have a revenue greater than 1 are shown)', 'event_espresso'),
-                esc_html__('Total Revenue', 'event_espresso'),
-            );
-            foreach ($results as $result) {
-                if ($result->revenue > 1) {
-                    $event_name = stripslashes(html_entity_decode($result->event_name, ENT_QUOTES, 'UTF-8'));
-                    $event_name = wp_trim_words($event_name, 5, '...');
-                    $revenue[] = array($event_name, (float) $result->revenue);
-                }
-            }
-
-            // setup the date range.
-            $beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
-            $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
-            $subtitle = sprintf(
-                wp_strip_all_tags(
-                    _x('For the period: %s to %s', 'Used to give date range', 'event_espresso')
-                ),
-                $beginning_date->format('Y-m-d'),
-                $ending_date->format('Y-m-d')
-            );
-        }
-
-        $report_title = wp_strip_all_tags(__('Total Revenue per Event', 'event_espresso'));
-
-        $report_params = array(
-            'title'     => $report_title,
-            'subtitle'  => $subtitle,
-            'id'        => $report_ID,
-            'revenue'   => $revenue,
-            'noResults' => empty($revenue),
-            'noTxnMsg'  => sprintf(
-                wp_strip_all_tags(
-                    __('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
-                ),
-                '<h2>' . $report_title . '</h2><p>',
-                '</p>'
-            ),
-        );
-        wp_localize_script('ee-txn-reports-js', 'txnRevPerEvent', $report_params);
-
-        return $report_ID;
-    }
+	/**
+	 * This is used to hold the reports template data which is setup early in the request.
+	 *
+	 * @type array
+	 */
+	protected $_reports_template_data = array();
+
+	/**
+	 * @Constructor
+	 * @access public
+	 *
+	 * @param bool $routing
+	 *
+	 * @return \Extend_Transactions_Admin_Page
+	 */
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+		define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/');
+		define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/');
+		define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/');
+	}
+
+
+	/**
+	 *    _extend_page_config
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _extend_page_config()
+	{
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions';
+
+		$new_page_routes = array(
+			'reports' => array(
+				'func'       => '_transaction_reports',
+				'capability' => 'ee_read_transactions',
+			),
+		);
+
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
+
+		$new_page_config = array(
+			'reports' => array(
+				'nav'           => array(
+					'label' => esc_html__('Reports', 'event_espresso'),
+					'order' => 20,
+				),
+				'help_tabs'     => array(
+					'transactions_reports_help_tab' => array(
+						'title'    => esc_html__('Transaction Reports', 'event_espresso'),
+						'filename' => 'transactions_reports',
+					),
+				),
+				'require_nonce' => false,
+			),
+		);
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
+	}
+
+
+	/**
+	 *    load_scripts_styles_reports
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function load_scripts_styles_reports()
+	{
+		wp_register_script(
+			'ee-txn-reports-js',
+			TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js',
+			array('google-charts'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_enqueue_script('ee-txn-reports-js');
+		$this->_transaction_reports_js_setup();
+		EE_Registry::$i18n_js_strings['currency_format'] = EEH_Money::get_format_for_google_charts();
+	}
+
+
+	/**
+	 * This is called when javascript is being enqueued to setup the various data needed for the reports js.
+	 * Also $this->{$_reports_template_data} property is set for later usage by the _transaction_reports method.
+	 */
+	protected function _transaction_reports_js_setup()
+	{
+		$this->_reports_template_data['admin_reports'][] = $this->_revenue_per_day_report();
+		$this->_reports_template_data['admin_reports'][] = $this->_revenue_per_event_report();
+	}
+
+
+	/**
+	 * _transaction_reports
+	 *    generates Business Reports regarding Transactions
+	 *
+	 * @return void
+	 */
+	protected function _transaction_reports()
+	{
+		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
+		$this->_admin_page_title = esc_html__('Transactions', 'event_espresso');
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			$template_path,
+			$this->_reports_template_data,
+			true
+		);
+
+		// the final template wrapper
+		$this->display_admin_page_with_no_sidebar();
+	}
+
+
+	/**
+	 * _revenue_per_day_report
+	 * generates Business Report showing Total Revenue per Day.
+	 *
+	 * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
+	 *
+	 * @return string
+	 */
+	private function _revenue_per_day_report($period = '-1 month')
+	{
+
+		$report_ID = 'txn-admin-revenue-per-day-report-dv';
+
+		$TXN = EEM_Transaction::instance();
+
+		$results = $TXN->get_revenue_per_day_report($period);
+		$results = (array) $results;
+		$revenue = array();
+		$subtitle = '';
+
+		if ($results) {
+			$revenue[] = array(
+				esc_html__('Date (only shows dates that have a revenue greater than 1)', 'event_espresso'),
+				esc_html__('Total Revenue', 'event_espresso'),
+			);
+			foreach ($results as $result) {
+				$revenue[] = array($result->txnDate, (float) $result->revenue);
+			}
+
+			// setup the date range.
+			$beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(
+				wp_strip_all_tags(
+					_x('For the period: %s to %s', 'Used to give date range', 'event_espresso')
+				),
+				$beginning_date->format('Y-m-d'),
+				$ending_date->format('Y-m-d')
+			);
+		}
+
+		$report_title = wp_strip_all_tags(__('Total Revenue per Day', 'event_espresso'));
+
+		$report_params = array(
+			'title'     => $report_title,
+			'subtitle'  => $subtitle,
+			'id'        => $report_ID,
+			'revenue'   => $revenue,
+			'noResults' => empty($revenue) || count($revenue) === 1,
+			'noTxnMsg'  => sprintf(
+				wp_strip_all_tags(
+					__('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
+				),
+				'<h2>' . $report_title . '</h2><p>',
+				'</p>'
+			),
+		);
+		wp_localize_script('ee-txn-reports-js', 'txnRevPerDay', $report_params);
+
+		return $report_ID;
+	}
+
+
+	/**
+	 * _revenue_per_event_report
+	 * generates Business Report showing total revenue per event.
+	 *
+	 * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
+	 *
+	 * @return int
+	 */
+	private function _revenue_per_event_report($period = '-1 month')
+	{
+
+		$report_ID = 'txn-admin-revenue-per-event-report-dv';
+
+		$TXN = EEM_Transaction::instance();
+		$results = $TXN->get_revenue_per_event_report($period);
+		$results = (array) $results;
+		$revenue = array();
+		$subtitle = '';
+
+		if ($results) {
+			$revenue[] = array(
+				esc_html__('Event (only events that have a revenue greater than 1 are shown)', 'event_espresso'),
+				esc_html__('Total Revenue', 'event_espresso'),
+			);
+			foreach ($results as $result) {
+				if ($result->revenue > 1) {
+					$event_name = stripslashes(html_entity_decode($result->event_name, ENT_QUOTES, 'UTF-8'));
+					$event_name = wp_trim_words($event_name, 5, '...');
+					$revenue[] = array($event_name, (float) $result->revenue);
+				}
+			}
+
+			// setup the date range.
+			$beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(
+				wp_strip_all_tags(
+					_x('For the period: %s to %s', 'Used to give date range', 'event_espresso')
+				),
+				$beginning_date->format('Y-m-d'),
+				$ending_date->format('Y-m-d')
+			);
+		}
+
+		$report_title = wp_strip_all_tags(__('Total Revenue per Event', 'event_espresso'));
+
+		$report_params = array(
+			'title'     => $report_title,
+			'subtitle'  => $subtitle,
+			'id'        => $report_ID,
+			'revenue'   => $revenue,
+			'noResults' => empty($revenue),
+			'noTxnMsg'  => sprintf(
+				wp_strip_all_tags(
+					__('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
+				),
+				'<h2>' . $report_title . '</h2><p>',
+				'</p>'
+			),
+		);
+		wp_localize_script('ee-txn-reports-js', 'txnRevPerEvent', $report_params);
+
+		return $report_ID;
+	}
 }