eventespresso / event-espresso-core

admin_pages/messages/help_tours/Messages_Overview_Help_Tour.class.php

Indentation +117 added lines, -117 removed lines

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

Spacing +8 added lines, -8 removed lines

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

admin_pages/support/Support_Admin_Page_Init.core.php

Indentation +30 added lines, -30 removed lines

@@ -16,36 +16,36 @@
 {
 
 
-    public function __construct()
-    {
-        // define some help/support page related constants
-        define('EE_SUPPORT_PG_SLUG', 'espresso_support');
-        define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG));
-        define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
-        define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/');
-        define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/');
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		// define some help/support page related constants
+		define('EE_SUPPORT_PG_SLUG', 'espresso_support');
+		define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG));
+		define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
+		define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/');
+		define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/');
+		parent::__construct();
+	}
 
-    protected function _set_init_properties()
-    {
-        $this->label = __('Help & Support', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = __('Help & Support', 'event_espresso');
+	}
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'              => 'extras',
-                'menu_order'              => 30,
-                'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
-                'parent_slug'             => 'espresso_events',
-                'menu_slug'               => EE_SUPPORT_PG_SLUG,
-                'menu_label'              => __('Help & Support', 'event_espresso'),
-                'capability'              => 'ee_read_ee',
-                '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'              => 30,
+				'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
+				'parent_slug'             => 'espresso_events',
+				'menu_slug'               => EE_SUPPORT_PG_SLUG,
+				'menu_label'              => __('Help & Support', 'event_espresso'),
+				'capability'              => 'ee_read_ee',
+				'maintenance_mode_parent' => 'espresso_maintenance_settings',
+				'admin_init_page'         => $this,
+			)
+		);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -20,10 +20,10 @@
     {
         // define some help/support page related constants
         define('EE_SUPPORT_PG_SLUG', 'espresso_support');
-        define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG));
-        define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
-        define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/');
-        define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/');
+        define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page='.EE_SUPPORT_PG_SLUG));
+        define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES.'support/templates/');
+        define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES.'support/');
+        define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL.'support/assets/');
         parent::__construct();
     }
 

admin_pages/support/Support_Admin_Page.core.php

Indentation +238 added lines, -238 removed lines

@@ -13,242 +13,242 @@
 {
 
 
-    protected function _init_page_props()
-    {
-        $this->page_slug = EE_SUPPORT_PG_SLUG;
-        $this->page_label = esc_html__('Help & Support', 'event_espresso');
-        $this->_admin_base_url = EE_SUPPORT_ADMIN_URL;
-        $this->_admin_base_path = EE_SUPPORT_ADMIN;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_labels = array();
-        $this->_admin_page_title = $this->page_label;
-    }
-
-
-    protected function _set_page_routes()
-    {
-        $this->_page_routes = array(
-            'default'    => array(
-                'func'       => '_contact_support',
-                'capability' => 'ee_read_ee',
-            ),
-            'developers' => array(
-                'func'       => '_developers',
-                'capability' => 'ee_read_ee',
-            ),
-            'shortcodes' => array(
-                'func'       => '_shortcodes',
-                'capability' => 'ee_read_ee',
-            ),
-        );
-    }
-
-
-    protected function _set_page_config()
-    {
-        $this->_page_config = array(
-            'default'    => array(
-                'nav'           => array(
-                    'label' => esc_html__('Support', 'event_espresso'),
-                    'order' => 30,
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_support_boxes')),
-                'require_nonce' => false,
-            ),
-            'developers' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Developers', 'event_espresso'),
-                    'order' => 50,
-                ),
-                'metaboxes'     => $this->_default_espresso_metaboxes,
-                'require_nonce' => false,
-            ),
-            'shortcodes' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Shortcodes', 'event_espresso'),
-                    'order' => 60,
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_shortcodes_boxes')),
-                'require_nonce' => false,
-            ),
-        );
-    }
-
-
-    // none of the below group are currently used for Support pages
-    protected function _add_screen_options()
-    {
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    public function admin_init()
-    {
-    }
-
-
-    public function admin_notices()
-    {
-    }
-
-
-    public function admin_footer_scripts()
-    {
-    }
-
-
-    public function load_scripts_styles()
-    {
-    }
-
-
-    protected function _installation()
-    {
-        $template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            $template_path,
-            '',
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _resources()
-    {
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _add_settings_metabox($box, $label, array $args)
-    {
-        add_meta_box(
-            "espresso_{$box}_settings",
-            $label,
-            function ($post, $metabox) {
-                echo EEH_Template::display_template(
-                    $metabox['args']['template_path'],
-                    $metabox['args']['template_args'],
-                    true
-                );
-            },
-            $this->_current_screen->id,
-            'normal',
-            'high',
-            apply_filters(
-                "FHEE__Support_Admin_Page___add_settings_metabox__{$box}_args_array",
-                $args
-            )
-        );
-    }
-
-
-    protected function _resources_boxes()
-    {
-        $boxes = apply_filters(
-            'FHEE__Support_Admin_Page___resources_boxes__boxes_array',
-            array(
-                'favorite_theme_developers' => esc_html__('Favorite Theme Developers', 'event_espresso'),
-                'highly_recommended_themes' => esc_html__('Highly Recommended Themes', 'event_espresso'),
-                'hire_developer'            => esc_html__('Hire a Developer', 'event_espresso'),
-                'partners'                  => esc_html__('Partners', 'event_espresso'),
-                'recommended_plugins'       => esc_html__('Recommended Plugins', 'event_espresso'),
-                'other_resources'           => esc_html__('Other Resources', 'event_espresso'),
-            )
-        );
-        foreach ($boxes as $box => $label) {
-            $this->_add_settings_metabox(
-                $box,
-                $label,
-                array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
-                    'template_args' => $this->_template_args,
-                )
-            );
-        }
-    }
-
-
-    protected function _shortcodes()
-    {
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _shortcodes_boxes()
-    {
-        $boxes = apply_filters(
-            'FHEE__Support_Admin_Page___shortcodes_boxes__boxes_array',
-            array(
-                'shortcodes_event_listings'  => esc_html__('Event Listings', 'event_espresso'),
-                'shortcodes_ticket_selector' => esc_html__('Event Ticket Selector', 'event_espresso'),
-                'shortcodes_category'        => esc_html__('Event Categories', 'event_espresso'),
-                'shortcodes_attendee'        => esc_html__('Event Attendees', 'event_espresso')
-                /*'shortcodes_single_events' => esc_html__('Single Events', 'event_espresso'),*/
-                /*'shortcodes_attendee_listings' => esc_html__('Attendee Listings', 'event_espresso'),*/
-            )
-        );
-        foreach ($boxes as $box => $label) {
-            $this->_add_settings_metabox(
-                $box,
-                $label,
-                array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
-                    'template_args' => $this->_template_args,
-                )
-            );
-        }
-    }
-
-
-    protected function _contact_support()
-    {
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _support_boxes()
-    {
-        $boxes = apply_filters(
-            'FHEE__Support_Admin_Page___support_boxes__boxes_array',
-            array(
-                'contact_support'       => esc_html__('Contact Support', 'event_espresso'),
-                'important_information' => esc_html__('Important Information', 'event_espresso'),
-            )
-        );
-        foreach ($boxes as $box => $label) {
-            $this->_add_settings_metabox(
-                $box,
-                $label,
-                array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
-                    'template_args' => $this->_template_args,
-                )
-            );
-        }
-    }
-
-
-    protected function _developers()
-    {
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php',
-            array(),
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
+	protected function _init_page_props()
+	{
+		$this->page_slug = EE_SUPPORT_PG_SLUG;
+		$this->page_label = esc_html__('Help & Support', 'event_espresso');
+		$this->_admin_base_url = EE_SUPPORT_ADMIN_URL;
+		$this->_admin_base_path = EE_SUPPORT_ADMIN;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_labels = array();
+		$this->_admin_page_title = $this->page_label;
+	}
+
+
+	protected function _set_page_routes()
+	{
+		$this->_page_routes = array(
+			'default'    => array(
+				'func'       => '_contact_support',
+				'capability' => 'ee_read_ee',
+			),
+			'developers' => array(
+				'func'       => '_developers',
+				'capability' => 'ee_read_ee',
+			),
+			'shortcodes' => array(
+				'func'       => '_shortcodes',
+				'capability' => 'ee_read_ee',
+			),
+		);
+	}
+
+
+	protected function _set_page_config()
+	{
+		$this->_page_config = array(
+			'default'    => array(
+				'nav'           => array(
+					'label' => esc_html__('Support', 'event_espresso'),
+					'order' => 30,
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_support_boxes')),
+				'require_nonce' => false,
+			),
+			'developers' => array(
+				'nav'           => array(
+					'label' => esc_html__('Developers', 'event_espresso'),
+					'order' => 50,
+				),
+				'metaboxes'     => $this->_default_espresso_metaboxes,
+				'require_nonce' => false,
+			),
+			'shortcodes' => array(
+				'nav'           => array(
+					'label' => esc_html__('Shortcodes', 'event_espresso'),
+					'order' => 60,
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_shortcodes_boxes')),
+				'require_nonce' => false,
+			),
+		);
+	}
+
+
+	// none of the below group are currently used for Support pages
+	protected function _add_screen_options()
+	{
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	public function admin_init()
+	{
+	}
+
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	public function load_scripts_styles()
+	{
+	}
+
+
+	protected function _installation()
+	{
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			$template_path,
+			'',
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _resources()
+	{
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _add_settings_metabox($box, $label, array $args)
+	{
+		add_meta_box(
+			"espresso_{$box}_settings",
+			$label,
+			function ($post, $metabox) {
+				echo EEH_Template::display_template(
+					$metabox['args']['template_path'],
+					$metabox['args']['template_args'],
+					true
+				);
+			},
+			$this->_current_screen->id,
+			'normal',
+			'high',
+			apply_filters(
+				"FHEE__Support_Admin_Page___add_settings_metabox__{$box}_args_array",
+				$args
+			)
+		);
+	}
+
+
+	protected function _resources_boxes()
+	{
+		$boxes = apply_filters(
+			'FHEE__Support_Admin_Page___resources_boxes__boxes_array',
+			array(
+				'favorite_theme_developers' => esc_html__('Favorite Theme Developers', 'event_espresso'),
+				'highly_recommended_themes' => esc_html__('Highly Recommended Themes', 'event_espresso'),
+				'hire_developer'            => esc_html__('Hire a Developer', 'event_espresso'),
+				'partners'                  => esc_html__('Partners', 'event_espresso'),
+				'recommended_plugins'       => esc_html__('Recommended Plugins', 'event_espresso'),
+				'other_resources'           => esc_html__('Other Resources', 'event_espresso'),
+			)
+		);
+		foreach ($boxes as $box => $label) {
+			$this->_add_settings_metabox(
+				$box,
+				$label,
+				array(
+					'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+					'template_args' => $this->_template_args,
+				)
+			);
+		}
+	}
+
+
+	protected function _shortcodes()
+	{
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _shortcodes_boxes()
+	{
+		$boxes = apply_filters(
+			'FHEE__Support_Admin_Page___shortcodes_boxes__boxes_array',
+			array(
+				'shortcodes_event_listings'  => esc_html__('Event Listings', 'event_espresso'),
+				'shortcodes_ticket_selector' => esc_html__('Event Ticket Selector', 'event_espresso'),
+				'shortcodes_category'        => esc_html__('Event Categories', 'event_espresso'),
+				'shortcodes_attendee'        => esc_html__('Event Attendees', 'event_espresso')
+				/*'shortcodes_single_events' => esc_html__('Single Events', 'event_espresso'),*/
+				/*'shortcodes_attendee_listings' => esc_html__('Attendee Listings', 'event_espresso'),*/
+			)
+		);
+		foreach ($boxes as $box => $label) {
+			$this->_add_settings_metabox(
+				$box,
+				$label,
+				array(
+					'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+					'template_args' => $this->_template_args,
+				)
+			);
+		}
+	}
+
+
+	protected function _contact_support()
+	{
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _support_boxes()
+	{
+		$boxes = apply_filters(
+			'FHEE__Support_Admin_Page___support_boxes__boxes_array',
+			array(
+				'contact_support'       => esc_html__('Contact Support', 'event_espresso'),
+				'important_information' => esc_html__('Important Information', 'event_espresso'),
+			)
+		);
+		foreach ($boxes as $box => $label) {
+			$this->_add_settings_metabox(
+				$box,
+				$label,
+				array(
+					'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+					'template_args' => $this->_template_args,
+				)
+			);
+		}
+	}
+
+
+	protected function _developers()
+	{
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php',
+			array(),
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -117,7 +117,7 @@ 
 
     protected function _installation()
     {
-        $template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
+        $template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_installation.template.php';
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
             $template_path,
             '',
@@ -138,7 +138,7 @@ 
         add_meta_box(
             "espresso_{$box}_settings",
             $label,
-            function ($post, $metabox) {
+            function($post, $metabox) {
                 echo EEH_Template::display_template(
                     $metabox['args']['template_path'],
                     $metabox['args']['template_args'],
@@ -174,7 +174,7 @@ 
                 $box,
                 $label,
                 array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH."support_admin_details_{$box}.template.php",
                     'template_args' => $this->_template_args,
                 )
             );
@@ -206,7 +206,7 @@ 
                 $box,
                 $label,
                 array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH."support_admin_details_{$box}.template.php",
                     'template_args' => $this->_template_args,
                 )
             );
@@ -234,7 +234,7 @@ 
                 $box,
                 $label,
                 array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH."support_admin_details_{$box}.template.php",
                     'template_args' => $this->_template_args,
                 )
             );
@@ -245,7 +245,7 @@ 
     protected function _developers()
     {
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php',
+            EE_SUPPORT_ADMIN_TEMPLATE_PATH.'developers_admin_details.template.php',
             array(),
             true
         );

admin_pages/support/templates/support_admin_details_shortcodes_attendee.template.php

Indentation +13 added lines, -13 removed lines

@@ -9,9 +9,9 @@ 
             <strong>[ESPRESSO_EVENT_ATTENDEES]</strong><br>
             <p class="description">
                 <?php _e(
-                    'With no parameters, this shows the attendees for the earliest active event, or if no active event, the earliest upcoming event.  If it is used in Event Description, then it will show the attendees for that event.',
-                    'event_espresso'
-                ); ?>
+					'With no parameters, this shows the attendees for the earliest active event, or if no active event, the earliest upcoming event.  If it is used in Event Description, then it will show the attendees for that event.',
+					'event_espresso'
+				); ?>
             </p>
             <br>
         </li>
@@ -40,18 +40,18 @@ 
             <strong>[ESPRESSO_EVENT_ATTENDEES status=RAP]</strong><br>
             <p class="description">
                 <?php _e(
-                    'You can list attendees that have a specific registration status (use status code) or use "all" to return all attendees regardless of status.  Default when you don\'t have this parameter set is to only return attendees attached to approved contacts.',
-                    'event_espresso'
-                ); ?>
+					'You can list attendees that have a specific registration status (use status code) or use "all" to return all attendees regardless of status.  Default when you don\'t have this parameter set is to only return attendees attached to approved contacts.',
+					'event_espresso'
+				); ?>
             </p>
             <p>
                 <?php _e('The statuses you can use are:', 'event_espresso'); ?>
                 <br>
                 <?php
-                foreach (EEM_Registration::reg_status_array(array(), true) as $status_code => $status_label) {
-                    echo '<strong>' . $status_code . ':</strong>' . ' ' . $status_label . '<br>';
-                }
-                ?>
+				foreach (EEM_Registration::reg_status_array(array(), true) as $status_code => $status_label) {
+					echo '<strong>' . $status_code . ':</strong>' . ' ' . $status_label . '<br>';
+				}
+				?>
 
             </p>
             <br>
@@ -60,9 +60,9 @@ 
             <strong>[ESPRESSO_EVENT_ATTENDEES display_on_archives=true]</strong><br>
             <p class="description">
                 <?php _e(
-                    'Will display the attendees list when events are viewed on archive pages.',
-                    'event_espresso'
-                ); ?>
+					'Will display the attendees list when events are viewed on archive pages.',
+					'event_espresso'
+				); ?>
             </p>
             <br>
         </li>

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
                 <br>
                 <?php
                 foreach (EEM_Registration::reg_status_array(array(), true) as $status_code => $status_label) {
-                    echo '<strong>' . $status_code . ':</strong>' . ' ' . $status_label . '<br>';
+                    echo '<strong>'.$status_code.':</strong>'.' '.$status_label.'<br>';
                 }
                 ?>
 

admin_pages/support/templates/support_admin_details_installation.template.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <div class="padding">
     <!-- <p><?php _e(
-        'Download the <a href="https://eventespresso.com/wp-content/plugins/download-monitor/download.php?id=2">Installation Guide</a> as a PDF',
-        'event_espresso'
-    ); ?></p> -->
+		'Download the <a href="https://eventespresso.com/wp-content/plugins/download-monitor/download.php?id=2">Installation Guide</a> as a PDF',
+		'event_espresso'
+	); ?></p> -->
     <p>
         <?php _e('For the latest installation instructions please visit:', 'event_espresso'); ?>
         <a href="https://eventespresso.com/wiki/installing-event-espresso/" target="_blank">https://eventespresso.com/wiki/installing-event-espresso/</a>

admin_pages/support/templates/support_admin_details_important_information.template.php

Indentation +43 added lines, -43 removed lines

@@ -1,50 +1,50 @@ 
 <div class="padding">
     <?php
-    global $wpdb, $wp_version;
-    $wp_req_version = '3.1';
-    $php_req_version = '5.2';
-    $mysql_req_version = '5.0';
-    $is_php_valid = version_compare(phpversion(), $php_req_version, '>');
-    $is_mysql_valid = version_compare($wpdb->db_version(), $mysql_req_version, '>');
+	global $wpdb, $wp_version;
+	$wp_req_version = '3.1';
+	$php_req_version = '5.2';
+	$mysql_req_version = '5.0';
+	$is_php_valid = version_compare(phpversion(), $php_req_version, '>');
+	$is_mysql_valid = version_compare($wpdb->db_version(), $mysql_req_version, '>');
 
-    if (! version_compare($wp_version, $wp_req_version, '>=')) {
-        echo '<p class="red_alert">'
-             . __(
-                 'This version of Event Espresso requires WordPress version',
-                 'event_espresso'
-             ) . ' ' . $wp_req_version . '+. '
-             . __(
-                 'Please upgrade to the latest version of WordPress.',
-                 'event_espresso'
-             ) . '</p>';
-    }
-    if (! $is_php_valid) {
-        echo '<p class="red_alert">'
-             . __(
-                 'Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:',
-                 'event_espresso'
-             ) . ' ' . $php_req_version . '</p>';
-    }
-    if (! $is_mysql_valid) {
-        echo '<p class="red_alert">'
-             . __(
-                 'Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:',
-                 'event_espresso'
-             ) . ' ' . $mysql_req_version . '</p>';
-    }
+	if (! version_compare($wp_version, $wp_req_version, '>=')) {
+		echo '<p class="red_alert">'
+			 . __(
+				 'This version of Event Espresso requires WordPress version',
+				 'event_espresso'
+			 ) . ' ' . $wp_req_version . '+. '
+			 . __(
+				 'Please upgrade to the latest version of WordPress.',
+				 'event_espresso'
+			 ) . '</p>';
+	}
+	if (! $is_php_valid) {
+		echo '<p class="red_alert">'
+			 . __(
+				 'Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:',
+				 'event_espresso'
+			 ) . ' ' . $php_req_version . '</p>';
+	}
+	if (! $is_mysql_valid) {
+		echo '<p class="red_alert">'
+			 . __(
+				 'Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:',
+				 'event_espresso'
+			 ) . ' ' . $mysql_req_version . '</p>';
+	}
 
-    $query_args = array(
-        'page'   => 'espresso_maintenance_settings',
-        'action' => 'system_status',
-    );
-    $system_status_link = EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php'));
+	$query_args = array(
+		'page'   => 'espresso_maintenance_settings',
+		'action' => 'system_status',
+	);
+	$system_status_link = EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php'));
 
-    ?>
+	?>
     <a href="<?php echo $system_status_link; ?>" class="button-secondary right">
         <?php _e(
-            'System Information',
-            'event_espresso'
-        ); ?></a>
+			'System Information',
+			'event_espresso'
+		); ?></a>
     <div class="localhost-information">
         <p><strong><?php esc_html_e('WordPress Version:', 'event_espresso'); ?></strong>&nbsp;<?php echo $wp_version; ?>
         </p>
@@ -52,9 +52,9 @@ 
         <p><strong><?php esc_html_e('MySQL Version:', 'event_espresso'); ?></strong>&nbsp;<?php echo $wpdb->db_version(); ?></p>
         <p><strong>
                 <?php esc_html_e(
-                    'Event Espresso Version:',
-                    'event_espresso'
-                ); ?></strong>&nbsp;<?php echo EVENT_ESPRESSO_VERSION ?></p>
+					'Event Espresso Version:',
+					'event_espresso'
+				); ?></strong>&nbsp;<?php echo EVENT_ESPRESSO_VERSION ?></p>
         <p><strong><?php esc_html_e('WordPress Address (URL):', 'event_espresso'); ?></strong>&nbsp;<?php echo site_url(); ?></p>
         <p><strong><?php esc_html_e('Site address (URL):', 'event_espresso'); ?></strong>&nbsp;<?php echo home_url(); ?>
     </div>

Spacing +7 added lines, -7 removed lines

@@ -7,30 +7,30 @@
     $is_php_valid = version_compare(phpversion(), $php_req_version, '>');
     $is_mysql_valid = version_compare($wpdb->db_version(), $mysql_req_version, '>');
 
-    if (! version_compare($wp_version, $wp_req_version, '>=')) {
+    if ( ! version_compare($wp_version, $wp_req_version, '>=')) {
         echo '<p class="red_alert">'
              . __(
                  'This version of Event Espresso requires WordPress version',
                  'event_espresso'
-             ) . ' ' . $wp_req_version . '+. '
+             ).' '.$wp_req_version.'+. '
              . __(
                  'Please upgrade to the latest version of WordPress.',
                  'event_espresso'
-             ) . '</p>';
+             ).'</p>';
     }
-    if (! $is_php_valid) {
+    if ( ! $is_php_valid) {
         echo '<p class="red_alert">'
              . __(
                  'Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:',
                  'event_espresso'
-             ) . ' ' . $php_req_version . '</p>';
+             ).' '.$php_req_version.'</p>';
     }
-    if (! $is_mysql_valid) {
+    if ( ! $is_mysql_valid) {
         echo '<p class="red_alert">'
              . __(
                  'Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:',
                  'event_espresso'
-             ) . ' ' . $mysql_req_version . '</p>';
+             ).' '.$mysql_req_version.'</p>';
     }
 
     $query_args = array(

admin_pages/about/About_Admin_Page.core.php

Indentation +274 added lines, -274 removed lines

@@ -17,128 +17,128 @@ 
 {
 
 
-    protected function _init_page_props()
-    {
-        $this->page_slug = EE_ABOUT_PG_SLUG;
-        $this->page_label = esc_html__('About Event Espresso', 'event_espresso');
-        $this->_admin_base_url = EE_ABOUT_ADMIN_URL;
-        $this->_admin_base_path = EE_ABOUT_ADMIN;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-        // todo: all hooks for ajax goes here.
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_labels = array();
-        $this->_admin_page_title = $this->page_label;
-    }
-
-
-    protected function _set_page_routes()
-    {
-        $this->_page_routes = array(
-            'default' => array(
-                'func'       => '_overview',
-                'capability' => 'manage_options',
-            ),
-            // 'overview' => '_overview',
-            // 'func' => '_overview',
-            // 'capability' => 'ee_read_ee'
-            // ),
-            'credits' => array(
-                'func'       => '_credits',
-                'capability' => 'manage_options',
-            ),
-
-            'decafvpro' => array(
-                'func'       => '_decafvpro',
-                'capability' => 'manage_options',
-            ),
-            'reviews'   => array(
-                'func'       => '_reviews',
-                'capability' => 'manage_options',
-            ),
-        );
-    }
-
-
-    protected function _set_page_config()
-    {
-        $this->_page_config = array(
-            /*'default' => array(
+	protected function _init_page_props()
+	{
+		$this->page_slug = EE_ABOUT_PG_SLUG;
+		$this->page_label = esc_html__('About Event Espresso', 'event_espresso');
+		$this->_admin_base_url = EE_ABOUT_ADMIN_URL;
+		$this->_admin_base_path = EE_ABOUT_ADMIN;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+		// todo: all hooks for ajax goes here.
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_labels = array();
+		$this->_admin_page_title = $this->page_label;
+	}
+
+
+	protected function _set_page_routes()
+	{
+		$this->_page_routes = array(
+			'default' => array(
+				'func'       => '_overview',
+				'capability' => 'manage_options',
+			),
+			// 'overview' => '_overview',
+			// 'func' => '_overview',
+			// 'capability' => 'ee_read_ee'
+			// ),
+			'credits' => array(
+				'func'       => '_credits',
+				'capability' => 'manage_options',
+			),
+
+			'decafvpro' => array(
+				'func'       => '_decafvpro',
+				'capability' => 'manage_options',
+			),
+			'reviews'   => array(
+				'func'       => '_reviews',
+				'capability' => 'manage_options',
+			),
+		);
+	}
+
+
+	protected function _set_page_config()
+	{
+		$this->_page_config = array(
+			/*'default' => array(
                 'nav' => array(
                     'label' => __('What\'s New', 'event_espresso'),
                     'order' => 10),
                 'require_nonce' => FALSE
                 ),*/
-            // 'overview' => array(
-            'default' => array(
-                'nav'           => array(
-                    'label' => esc_html__('About', 'event_espresso'),
-                    'order' => 20,
-                ),
-                'require_nonce' => false,
-            ),
-            'credits' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Credits', 'event_espresso'),
-                    'order' => 30,
-                ),
-                'require_nonce' => false,
-            ),
-
-            'decafvpro' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Decaf vs Regular', 'event_espresso'),
-                    'order' => 40,
-                ),
-                'require_nonce' => false,
-            ),
-            'reviews'   => array(
-                'nav'           => array(
-                    'label' => esc_html__('Reviews', 'event_espresso'),
-                    'order' => 50,
-                ),
-                'require_nonce' => false,
-            ),
-        );
-    }
-
-
-    // none of the below group are currently used for Support pages
-    protected function _add_screen_options()
-    {
-    }
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-    public function admin_init()
-    {
-    }
-
-    public function admin_notices()
-    {
-    }
-
-    public function admin_footer_scripts()
-    {
-    }
-
-    public function load_scripts_styles()
-    {
-    }
-
-
-    protected function _whats_new()
-    {
-        /*$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
+			// 'overview' => array(
+			'default' => array(
+				'nav'           => array(
+					'label' => esc_html__('About', 'event_espresso'),
+					'order' => 20,
+				),
+				'require_nonce' => false,
+			),
+			'credits' => array(
+				'nav'           => array(
+					'label' => esc_html__('Credits', 'event_espresso'),
+					'order' => 30,
+				),
+				'require_nonce' => false,
+			),
+
+			'decafvpro' => array(
+				'nav'           => array(
+					'label' => esc_html__('Decaf vs Regular', 'event_espresso'),
+					'order' => 40,
+				),
+				'require_nonce' => false,
+			),
+			'reviews'   => array(
+				'nav'           => array(
+					'label' => esc_html__('Reviews', 'event_espresso'),
+					'order' => 50,
+				),
+				'require_nonce' => false,
+			),
+		);
+	}
+
+
+	// none of the below group are currently used for Support pages
+	protected function _add_screen_options()
+	{
+	}
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+	public function admin_init()
+	{
+	}
+
+	public function admin_notices()
+	{
+	}
+
+	public function admin_footer_scripts()
+	{
+	}
+
+	public function load_scripts_styles()
+	{
+	}
+
+
+	protected function _whats_new()
+	{
+		/*$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
         $steps = $steps !== FALSE ? $steps : '';
         $this->_admin_page_title = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
         $settings_message = $steps;
@@ -146,168 +146,168 @@ 
         $template = EE_ABOUT_TEMPLATE_PATH . 'whats_new.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
         $this->display_about_admin_page();*/
-    }
+	}
 
 
-    protected function _overview()
-    {
-        /*$this->_template_args['admin_page_title'] = __('About Event Espresso', 'event_espresso');
+	protected function _overview()
+	{
+		/*$this->_template_args['admin_page_title'] = __('About Event Espresso', 'event_espresso');
         $this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso');
         $template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
         $this->display_about_admin_page();*/
 
-        // Copied from _whats_new()
-        $steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance
-            ? $this->_get_started_steps() : false;
-        $steps = $steps !== false ? $steps : '';
-        $this->_admin_page_title = sprintf(
-            esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
-            EVENT_ESPRESSO_VERSION
-        );
-        $settings_message = $steps;
-        $this->_template_args['admin_page_subtitle'] = esc_html__(
-            'Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.',
-            'event_espresso'
-        ) . $settings_message;
-        $template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
-
-
-    protected function _get_started_steps()
-    {
-        $steps = '<h2>' . esc_html__('Getting Started', 'event_espresso') . '</h2>';
-        $step_one = '<p>'
-                    . sprintf(
-                        esc_html__(
-                            '%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.',
-                            'event_espresso'
-                        ),
-                        '<strong>',
-                        '</strong>',
-                        '<a href="admin.php?page=espresso_general_settings">',
-                        '</a>'
-                    ) . '</strong></p>';
-        $step_two = '<p>'
-                    . sprintf(
-                        esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'),
-                        '<strong>',
-                        '</strong>',
-                        '<a href="admin.php?page=espresso_payment_settings">',
-                        '</a>'
-                    ) . '</strong></p>';
-        $step_three = '<p>'
-                      . sprintf(
-                          esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'),
-                          '<strong>',
-                          '</strong>',
-                          '<a href="admin.php?page=espresso_events&action=create_new">',
-                          '</a>'
-                      ) . '</strong></p>';
-
-        // done?
-        $done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? false : true;
-        $active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(
-            EEM_Payment_Method::scope_cart,
-            array(array('PMD_type' => 'Invoice'))
-        );
-        $active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
-        // done step two if a non-invoice paymetn method is active; or there is more than one PM active, or
-        // if only the invoice is active but it's clearly been updated
-        $done_step_two = $active_pms_count > 1 ||
-                         ($active_pms_count === 1 && ! $active_invoice_pm) ||
-                         ($active_invoice_pm instanceof EE_Payment_Method && (
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_name', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_email', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_address', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('page_extra_info', true, '')
-                             )
-                         );
-        $done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? true : false;
-
-        // if ALL steps are done, let's just return FALSE so we don't display anything
-        if ($done_step_one && $done_step_two && $done_step_three) {
-            return false;
-        }
-
-        // now let's put it together
-        $steps .= sprintf('%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
-        $steps .= sprintf('%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
-        $steps .= sprintf(
-            '%s' . $step_three . '%s',
-            $done_step_three ? '<strike>' : '',
-            $done_step_three ? '</strike>' : ''
-        );
-
-        return $steps;
-    }
-
-
-    protected function _credits()
-    {
-        $this->_template_args['admin_page_title'] = sprintf(
-            __('Welcome to Event Espresso %s', 'event_espresso'),
-            EVENT_ESPRESSO_VERSION
-        );
-        $this->_template_args['admin_page_subtitle'] = __(
-            'Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.',
-            'event_espresso'
-        );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
-
-
-    protected function _decafvpro()
-    {
-        $this->_template_args['admin_page_title'] = sprintf(
-            __('Welcome to Event Espresso %s', 'event_espresso'),
-            EVENT_ESPRESSO_VERSION
-        );
-        $this->_template_args['admin_page_subtitle'] = sprintf(
-            __(
-                'Event Espresso lets you focus on doing %swhat you love%s — %sorganizing your events%s',
-                'event_espresso'
-            ),
-            '<em>',
-            '</em>',
-            '<strong>',
-            '</strong>'
-        );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
-
-    protected function _reviews()
-    {
-        $this->_template_args['admin_page_title'] = __('Rave Reviews About Event Espresso 4', 'event_espresso');
-        $this->_template_args['admin_page_subtitle'] = __(
-            'At Event Espresso, customer satisfaction is our ultimate goal.',
-            'event_espresso'
-        );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
+		// Copied from _whats_new()
+		$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance
+			? $this->_get_started_steps() : false;
+		$steps = $steps !== false ? $steps : '';
+		$this->_admin_page_title = sprintf(
+			esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
+			EVENT_ESPRESSO_VERSION
+		);
+		$settings_message = $steps;
+		$this->_template_args['admin_page_subtitle'] = esc_html__(
+			'Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.',
+			'event_espresso'
+		) . $settings_message;
+		$template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
+
+
+	protected function _get_started_steps()
+	{
+		$steps = '<h2>' . esc_html__('Getting Started', 'event_espresso') . '</h2>';
+		$step_one = '<p>'
+					. sprintf(
+						esc_html__(
+							'%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.',
+							'event_espresso'
+						),
+						'<strong>',
+						'</strong>',
+						'<a href="admin.php?page=espresso_general_settings">',
+						'</a>'
+					) . '</strong></p>';
+		$step_two = '<p>'
+					. sprintf(
+						esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'),
+						'<strong>',
+						'</strong>',
+						'<a href="admin.php?page=espresso_payment_settings">',
+						'</a>'
+					) . '</strong></p>';
+		$step_three = '<p>'
+					  . sprintf(
+						  esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'),
+						  '<strong>',
+						  '</strong>',
+						  '<a href="admin.php?page=espresso_events&action=create_new">',
+						  '</a>'
+					  ) . '</strong></p>';
+
+		// done?
+		$done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? false : true;
+		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(
+			EEM_Payment_Method::scope_cart,
+			array(array('PMD_type' => 'Invoice'))
+		);
+		$active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
+		// done step two if a non-invoice paymetn method is active; or there is more than one PM active, or
+		// if only the invoice is active but it's clearly been updated
+		$done_step_two = $active_pms_count > 1 ||
+						 ($active_pms_count === 1 && ! $active_invoice_pm) ||
+						 ($active_invoice_pm instanceof EE_Payment_Method && (
+								 $active_invoice_pm->get_extra_meta('pdf_payee_name', true, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_email', true, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', true, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_address', true, '') ||
+								 $active_invoice_pm->get_extra_meta('page_extra_info', true, '')
+							 )
+						 );
+		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? true : false;
+
+		// if ALL steps are done, let's just return FALSE so we don't display anything
+		if ($done_step_one && $done_step_two && $done_step_three) {
+			return false;
+		}
+
+		// now let's put it together
+		$steps .= sprintf('%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
+		$steps .= sprintf('%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
+		$steps .= sprintf(
+			'%s' . $step_three . '%s',
+			$done_step_three ? '<strike>' : '',
+			$done_step_three ? '</strike>' : ''
+		);
+
+		return $steps;
+	}
+
+
+	protected function _credits()
+	{
+		$this->_template_args['admin_page_title'] = sprintf(
+			__('Welcome to Event Espresso %s', 'event_espresso'),
+			EVENT_ESPRESSO_VERSION
+		);
+		$this->_template_args['admin_page_subtitle'] = __(
+			'Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.',
+			'event_espresso'
+		);
+		$template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
+
+
+	protected function _decafvpro()
+	{
+		$this->_template_args['admin_page_title'] = sprintf(
+			__('Welcome to Event Espresso %s', 'event_espresso'),
+			EVENT_ESPRESSO_VERSION
+		);
+		$this->_template_args['admin_page_subtitle'] = sprintf(
+			__(
+				'Event Espresso lets you focus on doing %swhat you love%s — %sorganizing your events%s',
+				'event_espresso'
+			),
+			'<em>',
+			'</em>',
+			'<strong>',
+			'</strong>'
+		);
+		$template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
+
+	protected function _reviews()
+	{
+		$this->_template_args['admin_page_title'] = __('Rave Reviews About Event Espresso 4', 'event_espresso');
+		$this->_template_args['admin_page_subtitle'] = __(
+			'At Event Espresso, customer satisfaction is our ultimate goal.',
+			'event_espresso'
+		);
+		$template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -169,8 +169,8 @@ 
         $this->_template_args['admin_page_subtitle'] = esc_html__(
             'Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.',
             'event_espresso'
-        ) . $settings_message;
-        $template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
+        ).$settings_message;
+        $template = EE_ABOUT_TEMPLATE_PATH.'ee4-overview.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
             $template,
             $this->_template_args,
@@ -182,7 +182,7 @@ 
 
     protected function _get_started_steps()
     {
-        $steps = '<h2>' . esc_html__('Getting Started', 'event_espresso') . '</h2>';
+        $steps = '<h2>'.esc_html__('Getting Started', 'event_espresso').'</h2>';
         $step_one = '<p>'
                     . sprintf(
                         esc_html__(
@@ -193,7 +193,7 @@ 
                         '</strong>',
                         '<a href="admin.php?page=espresso_general_settings">',
                         '</a>'
-                    ) . '</strong></p>';
+                    ).'</strong></p>';
         $step_two = '<p>'
                     . sprintf(
                         esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'),
@@ -201,7 +201,7 @@ 
                         '</strong>',
                         '<a href="admin.php?page=espresso_payment_settings">',
                         '</a>'
-                    ) . '</strong></p>';
+                    ).'</strong></p>';
         $step_three = '<p>'
                       . sprintf(
                           esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'),
@@ -209,7 +209,7 @@ 
                           '</strong>',
                           '<a href="admin.php?page=espresso_events&action=create_new">',
                           '</a>'
-                      ) . '</strong></p>';
+                      ).'</strong></p>';
 
         // done?
         $done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? false : true;
@@ -238,10 +238,10 @@ 
         }
 
         // now let's put it together
-        $steps .= sprintf('%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
-        $steps .= sprintf('%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
+        $steps .= sprintf('%s'.$step_one.'%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
+        $steps .= sprintf('%s'.$step_two.'%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
         $steps .= sprintf(
-            '%s' . $step_three . '%s',
+            '%s'.$step_three.'%s',
             $done_step_three ? '<strike>' : '',
             $done_step_three ? '</strike>' : ''
         );
@@ -260,7 +260,7 @@ 
             'Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.',
             'event_espresso'
         );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
+        $template = EE_ABOUT_TEMPLATE_PATH.'credits.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
             $template,
             $this->_template_args,
@@ -286,7 +286,7 @@ 
             '<strong>',
             '</strong>'
         );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php';
+        $template = EE_ABOUT_TEMPLATE_PATH.'decafvpro.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
             $template,
             $this->_template_args,
@@ -302,7 +302,7 @@ 
             'At Event Espresso, customer satisfaction is our ultimate goal.',
             'event_espresso'
         );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php';
+        $template = EE_ABOUT_TEMPLATE_PATH.'reviews.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
             $template,
             $this->_template_args,

admin_pages/about/templates/reviews.template.php

Spacing +3 added lines, -3 removed lines

@@ -136,7 +136,7 @@ 
 
     </div>
     <?php
-    if (! defined('EE_CAF_URL')) {
+    if ( ! defined('EE_CAF_URL')) {
         ?>
         <div align="right"><a
                 href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab"
@@ -256,7 +256,7 @@ 
 
     </div>
     <?php
-    if (! defined('EE_CAF_URL')) {
+    if ( ! defined('EE_CAF_URL')) {
         ?>
         <div align="right"><a
                 href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab"
@@ -367,7 +367,7 @@ 
         </div>
     </div>
     <?php
-    if (! defined('EE_CAF_URL')) {
+    if ( ! defined('EE_CAF_URL')) {
         ?>
         <div align="right"><a
                 href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab"

Indentation +26 added lines, -26 removed lines

@@ -1,19 +1,19 @@ 
 <h2 style="text-align: left;"><?php esc_html_e('Who uses Event Espresso?', 'event_espresso'); ?></h2>
 <p><?php
-    echo sprintf(
-        esc_html__(
-            'Event Espresso is used by over 40,000 event organizers across the world. They host %sconferences%s, %sart classes%s, training courses, concerts, fundraisers, workshops, %sfilm festivals%s, %spaint and wine%s, and more.',
-            'event_espresso'
-        ),
-        '<a href="https://eventespresso.com/use-cases/conferences/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">',
-        '</a>',
-        '<a href="https://eventespresso.com/use-cases/art-classes/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">',
-        '</a>',
-        '<a href="https://eventespresso.com/use-cases/film-festival-ticketing-software/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">',
-        '</a>',
-        '<a href="https://eventespresso.com/use-cases/paint-wine-party-ticketing-software/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">',
-        '</a>'
-    ); ?></p>
+	echo sprintf(
+		esc_html__(
+			'Event Espresso is used by over 40,000 event organizers across the world. They host %sconferences%s, %sart classes%s, training courses, concerts, fundraisers, workshops, %sfilm festivals%s, %spaint and wine%s, and more.',
+			'event_espresso'
+		),
+		'<a href="https://eventespresso.com/use-cases/conferences/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">',
+		'</a>',
+		'<a href="https://eventespresso.com/use-cases/art-classes/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">',
+		'</a>',
+		'<a href="https://eventespresso.com/use-cases/film-festival-ticketing-software/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">',
+		'</a>',
+		'<a href="https://eventespresso.com/use-cases/paint-wine-party-ticketing-software/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">',
+		'</a>'
+	); ?></p>
 
     <h2 class="about-headline-callout"><?php esc_html_e('Rave Reviews About Event Espresso 4', 'event_espresso'); ?></h2>
     <p>See what people have to say about the Event Espresso software and support services on <a
@@ -135,16 +135,16 @@ 
 
     </div>
     <?php
-    if (! defined('EE_CAF_URL')) {
-        ?>
+	if (! defined('EE_CAF_URL')) {
+		?>
         <div align="right"><a
                 href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab"
                 target="_blank" class="button button-primary button-hero"><span
                     class="dashicons dashicons-cart"></span><?php esc_html_e('Upgrade Now!', 'event_espresso') ?></a>
         </div>
         <?php
-    }
-    ?>
+	}
+	?>
     &nbsp;
     <hr/>
     <div class="feature-section has-3-columns is-fullwidth three-col">
@@ -255,16 +255,16 @@ 
 
     </div>
     <?php
-    if (! defined('EE_CAF_URL')) {
-        ?>
+	if (! defined('EE_CAF_URL')) {
+		?>
         <div align="right"><a
                 href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab"
                 target="_blank" class="button button-primary button-hero"><span
                     class="dashicons dashicons-cart"></span><?php esc_html_e('Upgrade Now!', 'event_espresso') ?></a>
         </div>
         <?php
-    }
-    ?>
+	}
+	?>
     &nbsp;
     <hr/>
     <div class="feature-section has-3-columns is-fullwidth three-col">
@@ -366,13 +366,13 @@ 
         </div>
     </div>
     <?php
-    if (! defined('EE_CAF_URL')) {
-        ?>
+	if (! defined('EE_CAF_URL')) {
+		?>
         <div align="right"><a
                 href="https://eventespresso.com/pricing/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=reviews+tab"
                 target="_blank" class="button button-primary button-hero"><span
                     class="dashicons dashicons-cart"></span><?php esc_html_e('Upgrade Now!', 'event_espresso') ?></a>
         </div>
         <?php
-    }
-    ?>
\ No newline at end of file
+	}
+	?>
\ No newline at end of file

admin_pages/about/templates/whats_new.template.php

Indentation +31 added lines, -31 removed lines

@@ -4,52 +4,52 @@
     <?php $type = 'minor'; ?>
     <?php // $type = 'major'; ?>
     <p><?php
-        printf(
-            __('<strong>Version %1$s</strong> is a %2$s bug fix/enhancement release.', 'event_espresso'),
-            EVENT_ESPRESSO_VERSION,
-            $type
-        ); ?>
+		printf(
+			__('<strong>Version %1$s</strong> is a %2$s bug fix/enhancement release.', 'event_espresso'),
+			EVENT_ESPRESSO_VERSION,
+			$type
+		); ?>
         <?php
-        $ver = explode('.', EVENT_ESPRESSO_VERSION);
-        array_pop($ver);
-        $ver = implode('.', $ver);
-        ?>
+		$ver = explode('.', EVENT_ESPRESSO_VERSION);
+		array_pop($ver);
+		$ver = implode('.', $ver);
+		?>
         <?php
-        printf(
-            __('For more information, see <a href="%s">the release notes</a>.', 'event_espresso'),
-            'http://eventespresso.com/wiki/ee4-changelog/#' . $ver
-        ); ?>
+		printf(
+			__('For more information, see <a href="%s">the release notes</a>.', 'event_espresso'),
+			'http://eventespresso.com/wiki/ee4-changelog/#' . $ver
+		); ?>
     </p>
 </div>
 
 <div class="changelog">
     <?php
-    // maintenance mode on?
-    if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
-        ?>
+	// maintenance mode on?
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
+		?>
         <div class="ee-attention">
             <h2 class="ee-maintenance-mode-callout">
                 <?php
-                _e(
-                    'Event Espresso is in full maintenance mode.',
-                    'event_espresso'
-                ); ?></h2>
+				_e(
+					'Event Espresso is in full maintenance mode.',
+					'event_espresso'
+				); ?></h2>
             <p>
                 <?php
-                printf(
-                    __(
-                        'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %sEvent Espresso Maintenance%s page.',
-                        'event_espresso'
-                    ),
-                    '<a href="admin.php?page=espresso_maintenance_settings">',
-                    '</a>'
-                );
-                ?>
+				printf(
+					__(
+						'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %sEvent Espresso Maintenance%s page.',
+						'event_espresso'
+					),
+					'<a href="admin.php?page=espresso_maintenance_settings">',
+					'</a>'
+				);
+				?>
             </p>
         </div>
         <?php
-    }
-    ?>
+	}
+	?>
 
 
     <h2 class="about-headline-callout">Initial EE4 Decaf (free) Release</h2>

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         <?php
         printf(
             __('For more information, see <a href="%s">the release notes</a>.', 'event_espresso'),
-            'http://eventespresso.com/wiki/ee4-changelog/#' . $ver
+            'http://eventespresso.com/wiki/ee4-changelog/#'.$ver
         ); ?>
     </p>
 </div>