eventespresso / event-espresso-core

admin_pages/maintenance/Maintenance_Admin_Page_Init.core.php

Indentation +88 added lines, -88 removed lines

@@ -17,102 +17,102 @@
  */
 class Maintenance_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    /**
-     * @var int
-     */
-    protected $m_mode_level;
+	/**
+	 * @var int
+	 */
+	protected $m_mode_level;
 
-    /**
-     * @var bool
-     */
-    protected $is_full_m_mode;
+	/**
+	 * @var bool
+	 */
+	protected $is_full_m_mode;
 
 
-    public function __construct()
-    {
-        $this->m_mode_level = EE_Maintenance_Mode::instance()->level();
-        $this->is_full_m_mode = $this->m_mode_level /*=== EE_Maintenance_Mode::level_2_complete_maintenance*/;
-        // define some page related constants
-        if (! defined('EE_MAINTENANCE_PG_SLUG')) {
-            define('EE_MAINTENANCE_LABEL', esc_html__('Maintenance', 'event_espresso'));
-            define('EE_MAINTENANCE_PG_SLUG', 'espresso_maintenance_settings');
-            define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page=' . EE_MAINTENANCE_PG_SLUG));
-            define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES . 'maintenance/');
-            define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN . 'templates/');
-            define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL . 'maintenance/assets/');
-        }
-        // check that if we're in maintenance mode that we tell the admin that
-        add_action('admin_notices', [$this, 'check_maintenance_mode']);
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		$this->m_mode_level = EE_Maintenance_Mode::instance()->level();
+		$this->is_full_m_mode = $this->m_mode_level /*=== EE_Maintenance_Mode::level_2_complete_maintenance*/;
+		// define some page related constants
+		if (! defined('EE_MAINTENANCE_PG_SLUG')) {
+			define('EE_MAINTENANCE_LABEL', esc_html__('Maintenance', 'event_espresso'));
+			define('EE_MAINTENANCE_PG_SLUG', 'espresso_maintenance_settings');
+			define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page=' . EE_MAINTENANCE_PG_SLUG));
+			define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES . 'maintenance/');
+			define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN . 'templates/');
+			define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL . 'maintenance/assets/');
+		}
+		// check that if we're in maintenance mode that we tell the admin that
+		add_action('admin_notices', [$this, 'check_maintenance_mode']);
+		parent::__construct();
+	}
 
 
-    protected function _set_init_properties()
-    {
-        $this->label = EE_MAINTENANCE_LABEL;
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = EE_MAINTENANCE_LABEL;
+	}
 
 
-    public function getMenuProperties(): array
-    {
-        return [
-            'menu_type'               => AdminMenuItem::TYPE_MENU_SUB_ITEM,
-            'menu_group'              => $this->is_full_m_mode ? 'main' : 'extras',
-            'menu_order'              => 30,
-            'show_on_menu'            => AdminMenuItem::DISPLAY_BLOG_ONLY,
-            'parent_slug'             => 'espresso_events',
-            'menu_slug'               => EE_MAINTENANCE_PG_SLUG,
-            'menu_label'              => EE_MAINTENANCE_LABEL,
-            'capability'              => 'manage_options',
-            'maintenance_mode_parent' => EE_MAINTENANCE_PG_SLUG,
-        ];
-    }
+	public function getMenuProperties(): array
+	{
+		return [
+			'menu_type'               => AdminMenuItem::TYPE_MENU_SUB_ITEM,
+			'menu_group'              => $this->is_full_m_mode ? 'main' : 'extras',
+			'menu_order'              => 30,
+			'show_on_menu'            => AdminMenuItem::DISPLAY_BLOG_ONLY,
+			'parent_slug'             => 'espresso_events',
+			'menu_slug'               => EE_MAINTENANCE_PG_SLUG,
+			'menu_label'              => EE_MAINTENANCE_LABEL,
+			'capability'              => 'manage_options',
+			'maintenance_mode_parent' => EE_MAINTENANCE_PG_SLUG,
+		];
+	}
 
 
-    /**
-     * Checks if we're in maintenance mode, and if so we notify the admin adn tell them how to take the site OUT of
-     * maintenance mode
-     */
-    public function check_maintenance_mode()
-    {
-        $notice               = '';
-        $maintenance_page_url = '';
-        if ($this->m_mode_level) {
-            $maintenance_page_url = esc_url_raw(
-                EE_Admin_Page::add_query_args_and_nonce([], EE_MAINTENANCE_ADMIN_URL)
-            );
-            switch ($this->m_mode_level) {
-                case EE_Maintenance_Mode::level_1_frontend_only_maintenance:
-                    $notice = '<div class="update-nag ee-update-nag">';
-                    $notice .= sprintf(
-                        esc_html__(
-                            "Event Espresso is in Frontend-Only MAINTENANCE MODE. This means the front-end (ie, non-wp-admin pages) is disabled for ALL users except site admins. Visit the %s Maintenance Page %s to disable maintenance mode.",
-                            "event_espresso"
-                        ),
-                        "<a href='$maintenance_page_url'>",
-                        "</a>"
-                    );
-                    $notice .= '</div>';
-                    break;
-                case EE_Maintenance_Mode::level_2_complete_maintenance:
-                    $notice = '<div class="error"><p>';
-                    $notice .= sprintf(
-                        esc_html__(
-                            "As part of the process for updating Event Espresso, your database also
+	/**
+	 * Checks if we're in maintenance mode, and if so we notify the admin adn tell them how to take the site OUT of
+	 * maintenance mode
+	 */
+	public function check_maintenance_mode()
+	{
+		$notice               = '';
+		$maintenance_page_url = '';
+		if ($this->m_mode_level) {
+			$maintenance_page_url = esc_url_raw(
+				EE_Admin_Page::add_query_args_and_nonce([], EE_MAINTENANCE_ADMIN_URL)
+			);
+			switch ($this->m_mode_level) {
+				case EE_Maintenance_Mode::level_1_frontend_only_maintenance:
+					$notice = '<div class="update-nag ee-update-nag">';
+					$notice .= sprintf(
+						esc_html__(
+							"Event Espresso is in Frontend-Only MAINTENANCE MODE. This means the front-end (ie, non-wp-admin pages) is disabled for ALL users except site admins. Visit the %s Maintenance Page %s to disable maintenance mode.",
+							"event_espresso"
+						),
+						"<a href='$maintenance_page_url'>",
+						"</a>"
+					);
+					$notice .= '</div>';
+					break;
+				case EE_Maintenance_Mode::level_2_complete_maintenance:
+					$notice = '<div class="error"><p>';
+					$notice .= sprintf(
+						esc_html__(
+							"As part of the process for updating Event Espresso, your database also
 needs to be updated. Event Espresso is in COMPLETE MAINTENANCE MODE (both WordPress admin pages and front-end event registration pages are disabled) until you run the database update script. %s Visit the Maintenance Page to get started,%s it only takes a moment.",
-                            "event_espresso"
-                        ),
-                        "<a href='$maintenance_page_url'>",
-                        "</a>"
-                    );
-                    $notice .= '</p></div>';
-                    break;
-            }
-        }
-        echo apply_filters(
-            'FHEE__Maintenance_Admin_Page_Init__check_maintenance_mode__notice',
-            $notice, // already escaped
-            $maintenance_page_url // already escaped
-        );
-    }
+							"event_espresso"
+						),
+						"<a href='$maintenance_page_url'>",
+						"</a>"
+					);
+					$notice .= '</p></div>';
+					break;
+			}
+		}
+		echo apply_filters(
+			'FHEE__Maintenance_Admin_Page_Init__check_maintenance_mode__notice',
+			$notice, // already escaped
+			$maintenance_page_url // already escaped
+		);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -33,13 +33,13 @@
         $this->m_mode_level = EE_Maintenance_Mode::instance()->level();
         $this->is_full_m_mode = $this->m_mode_level /*=== EE_Maintenance_Mode::level_2_complete_maintenance*/;
         // define some page related constants
-        if (! defined('EE_MAINTENANCE_PG_SLUG')) {
+        if ( ! defined('EE_MAINTENANCE_PG_SLUG')) {
             define('EE_MAINTENANCE_LABEL', esc_html__('Maintenance', 'event_espresso'));
             define('EE_MAINTENANCE_PG_SLUG', 'espresso_maintenance_settings');
-            define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page=' . EE_MAINTENANCE_PG_SLUG));
-            define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES . 'maintenance/');
-            define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN . 'templates/');
-            define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL . 'maintenance/assets/');
+            define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page='.EE_MAINTENANCE_PG_SLUG));
+            define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES.'maintenance/');
+            define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN.'templates/');
+            define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL.'maintenance/assets/');
         }
         // check that if we're in maintenance mode that we tell the admin that
         add_action('admin_notices', [$this, 'check_maintenance_mode']);

admin_pages/about/About_Admin_Page_Init.core.php

Indentation +31 added lines, -31 removed lines

@@ -14,39 +14,39 @@
  */
 class About_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    public function __construct()
-    {
-        // define some events related constants
-        if (! defined('EE_ABOUT_PG_SLUG')) {
-            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
+		if (! defined('EE_ABOUT_PG_SLUG')) {
+			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');
+	}
 
 
-    public function getMenuProperties(): array
-    {
-        return [
-            'menu_type'               => AdminMenuItem::TYPE_MENU_SUB_ITEM,
-            'menu_group'              => 'extras',
-            'menu_order'              => 40,
-            'show_on_menu'            => AdminMenuItem::DISPLAY_BLOG_AND_NETWORK,
-            'parent_slug'             => 'espresso_events',
-            'menu_slug'               => 'espresso_about',
-            'menu_label'              => EE_ABOUT_LABEL,
-            'capability'              => 'manage_options',
-            'maintenance_mode_parent' => 'espresso_maintenance_settings',
-        ];
-    }
+	public function getMenuProperties(): array
+	{
+		return [
+			'menu_type'               => AdminMenuItem::TYPE_MENU_SUB_ITEM,
+			'menu_group'              => 'extras',
+			'menu_order'              => 40,
+			'show_on_menu'            => AdminMenuItem::DISPLAY_BLOG_AND_NETWORK,
+			'parent_slug'             => 'espresso_events',
+			'menu_slug'               => 'espresso_about',
+			'menu_label'              => EE_ABOUT_LABEL,
+			'capability'              => 'manage_options',
+			'maintenance_mode_parent' => 'espresso_maintenance_settings',
+		];
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -17,13 +17,13 @@
     public function __construct()
     {
         // define some events related constants
-        if (! defined('EE_ABOUT_PG_SLUG')) {
+        if ( ! defined('EE_ABOUT_PG_SLUG')) {
             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();
     }

admin_pages/events/Events_Admin_Page_Init.core.php

Indentation +33 added lines, -33 removed lines

@@ -14,41 +14,41 @@
  */
 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');
+	}
 
 
-    public function getMenuProperties(): array
-    {
-        return [
-            'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
-            'menu_group'      => 'main',
-            'menu_order'      => 10,
-            'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
-            'parent_slug'     => 'espresso_events',
-            'menu_slug'       => 'espresso_events',
-            'menu_label'      => esc_html__('Events', 'event_espresso'),
-            'capability'      => 'ee_read_events',
-        ];
-    }
+	public function getMenuProperties(): array
+	{
+		return [
+			'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
+			'menu_group'      => 'main',
+			'menu_order'      => 10,
+			'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
+			'parent_slug'     => 'espresso_events',
+			'menu_slug'       => 'espresso_events',
+			'menu_label'      => esc_html__('Events', 'event_espresso'),
+			'capability'      => 'ee_read_events',
+		];
+	}
 }

admin_pages/registrations/Registrations_Admin_Page_Init.core.php

Indentation +39 added lines, -39 removed lines

@@ -11,48 +11,48 @@
  */
 class Registrations_Admin_Page_Init extends EE_Admin_Page_CPT_Init
 {
-    /**
-     *        constructor
-     *
-     * @Constructor
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if (! defined('REG_PG_SLUG')) {
-            define('REG_PG_SLUG', 'espresso_registrations');
-            define('REG_PG_NAME', ucwords(str_replace('_', '', REG_PG_SLUG)));
-            define('REG_ADMIN', EE_ADMIN_PAGES . 'registrations/');
-            define('REG_ADMIN_URL', admin_url('admin.php?page=' . REG_PG_SLUG));
-            define('REG_ASSETS_PATH', REG_ADMIN . 'assets/');
-            define('REG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registrations/assets/');
-            define('REG_TEMPLATE_PATH', REG_ADMIN . 'templates/');
-            define('REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registrations/templates/');
-        }
+	/**
+	 *        constructor
+	 *
+	 * @Constructor
+	 * @access public
+	 * @return void
+	 */
+	public function __construct()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if (! defined('REG_PG_SLUG')) {
+			define('REG_PG_SLUG', 'espresso_registrations');
+			define('REG_PG_NAME', ucwords(str_replace('_', '', REG_PG_SLUG)));
+			define('REG_ADMIN', EE_ADMIN_PAGES . 'registrations/');
+			define('REG_ADMIN_URL', admin_url('admin.php?page=' . REG_PG_SLUG));
+			define('REG_ASSETS_PATH', REG_ADMIN . 'assets/');
+			define('REG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registrations/assets/');
+			define('REG_TEMPLATE_PATH', REG_ADMIN . 'templates/');
+			define('REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registrations/templates/');
+		}
 
-        parent::__construct();
-    }
+		parent::__construct();
+	}
 
 
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Registrations Overview', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Registrations Overview', 'event_espresso');
+	}
 
 
-    public function getMenuProperties(): array
-    {
-        return [
-            'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
-            'menu_group'      => 'main',
-            'menu_order'      => 40,
-            'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
-            'parent_slug'     => 'espresso_events',
-            'menu_slug'       => REG_PG_SLUG,
-            'menu_label'      => esc_html__('Registrations', 'event_espresso'),
-            'capability'      => 'ee_read_registrations',
-        ];
-    }
+	public function getMenuProperties(): array
+	{
+		return [
+			'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
+			'menu_group'      => 'main',
+			'menu_order'      => 40,
+			'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
+			'parent_slug'     => 'espresso_events',
+			'menu_slug'       => REG_PG_SLUG,
+			'menu_label'      => esc_html__('Registrations', 'event_espresso'),
+			'capability'      => 'ee_read_registrations',
+		];
+	}
 }

admin_pages/payments/Payments_Admin_Page_Init.core.php

Indentation +141 added lines, -141 removed lines

@@ -15,147 +15,147 @@
  */
 class Payments_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    /**
-     * @var TableAnalysis $table_analysis
-     */
-    protected $_table_analysis;
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct()
-    {
-        // define some page related constants
-        if (! defined('EE_PAYMENTS_PG_SLUG')) {
-            define('EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings');
-            define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page=' . EE_PAYMENTS_PG_SLUG));
-            define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES . 'payments/');
-            define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN . 'templates/');
-            define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'payments/assets/');
-        }
-        $this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', [], true);
-        // check that there are active gateways on all admin page loads. but don't do it just yet
-        add_action('admin_notices', [$this, 'check_payment_gateway_setup']);
-
-        // Show/hide PP Standard alongside PP Express.
-        add_filter(
-            'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods',
-            [$this, 'unset_pp_standard']
-        );
-
-        parent::__construct();
-    }
-
-
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Payment Methods', 'event_espresso');
-    }
-
-
-    public function getMenuProperties(): array
-    {
-        return [
-            'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
-            'menu_group'      => 'settings',
-            'menu_order'      => 30,
-            'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
-            'parent_slug'     => 'espresso_events',
-            'menu_slug'       => EE_PAYMENTS_PG_SLUG,
-            'menu_label'      => esc_html__('Payment Methods', 'event_espresso'),
-            'capability'      => 'ee_manage_gateways',
-        ];
-    }
-
-
-    /**
-     * Checks that there is at least one active gateway. If not, add a notice
-     *
-     * @throws EE_Error
-     */
-    public function check_payment_gateway_setup()
-    {
-        // ONLY do this check if models can query
-        // and avoid a bug where when we nuke EE4's data that this causes a fatal error
-        // because the tables are deleted just before this request runs.
-        // see https://events.codebasehq.com/projects/event-espresso/tickets/7539
-        if (
-            ! EE_Maintenance_Mode::instance()->models_can_query()
-            || ! $this->_get_table_analysis()->tableExists(EEM_Payment_Method::instance()->table())
-        ) {
-            return;
-        }
-
-        $actives = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
-        if ($actives < 1) {
-            $url = EE_Admin_Page::add_query_args_and_nonce([], EE_PAYMENTS_ADMIN_URL);
-            echo '<div class="error">
+	/**
+	 * @var TableAnalysis $table_analysis
+	 */
+	protected $_table_analysis;
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct()
+	{
+		// define some page related constants
+		if (! defined('EE_PAYMENTS_PG_SLUG')) {
+			define('EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings');
+			define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page=' . EE_PAYMENTS_PG_SLUG));
+			define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES . 'payments/');
+			define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN . 'templates/');
+			define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'payments/assets/');
+		}
+		$this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', [], true);
+		// check that there are active gateways on all admin page loads. but don't do it just yet
+		add_action('admin_notices', [$this, 'check_payment_gateway_setup']);
+
+		// Show/hide PP Standard alongside PP Express.
+		add_filter(
+			'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods',
+			[$this, 'unset_pp_standard']
+		);
+
+		parent::__construct();
+	}
+
+
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Payment Methods', 'event_espresso');
+	}
+
+
+	public function getMenuProperties(): array
+	{
+		return [
+			'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
+			'menu_group'      => 'settings',
+			'menu_order'      => 30,
+			'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
+			'parent_slug'     => 'espresso_events',
+			'menu_slug'       => EE_PAYMENTS_PG_SLUG,
+			'menu_label'      => esc_html__('Payment Methods', 'event_espresso'),
+			'capability'      => 'ee_manage_gateways',
+		];
+	}
+
+
+	/**
+	 * Checks that there is at least one active gateway. If not, add a notice
+	 *
+	 * @throws EE_Error
+	 */
+	public function check_payment_gateway_setup()
+	{
+		// ONLY do this check if models can query
+		// and avoid a bug where when we nuke EE4's data that this causes a fatal error
+		// because the tables are deleted just before this request runs.
+		// see https://events.codebasehq.com/projects/event-espresso/tickets/7539
+		if (
+			! EE_Maintenance_Mode::instance()->models_can_query()
+			|| ! $this->_get_table_analysis()->tableExists(EEM_Payment_Method::instance()->table())
+		) {
+			return;
+		}
+
+		$actives = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
+		if ($actives < 1) {
+			$url = EE_Admin_Page::add_query_args_and_nonce([], EE_PAYMENTS_ADMIN_URL);
+			echo '<div class="error">
 				 <p>'
-                 . sprintf(
-                     esc_html__(
-                         "There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s",
-                         "event_espresso"
-                     ),
-                     "<a href='$url'>",
-                     "</a>"
-                 )
-                 . '</p>
+				 . sprintf(
+					 esc_html__(
+						 "There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s",
+						 "event_espresso"
+					 ),
+					 "<a href='$url'>",
+					 "</a>"
+				 )
+				 . '</p>
 			 </div>';
-        }
-    }
-
-
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     * @throws EE_Error
-     */
-    protected function _get_table_analysis()
-    {
-        if ($this->_table_analysis instanceof TableAnalysis) {
-            return $this->_table_analysis;
-        } else {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
-
-
-    /**
-     * Hide PayPal Standard for "new" users.
-     *
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function unset_pp_standard($payment_method_types)
-    {
-        $pps                           = EEM_Payment_Method::instance()->get_one_of_type('Paypal_Standard');
-        $paypal_standard_active        = ! empty($pps) && $pps->active();
-        $paypal_standard_active_before = false;
-        if ($pps) {
-            // PP Standard used before ?
-            $paypal_id = $pps->get_extra_meta('paypal_id', true);
-            if ($paypal_id && ! empty($paypal_id)) {
-                $paypal_standard_active_before = true;
-            }
-        }
-
-        // Not using PP Standard? Then display only PayPal Express, do not show PayPal Standard.
-        if (
-            apply_filters(
-                'FHEE__EE_PMT_Paypal_Express__register_payment_methods__hide_paypal_standard',
-                ! $paypal_standard_active && ! $paypal_standard_active_before
-            )
-        ) {
-            unset($payment_method_types['paypal_standard']);
-        }
-        return $payment_method_types;
-    }
+		}
+	}
+
+
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 * @throws EE_Error
+	 */
+	protected function _get_table_analysis()
+	{
+		if ($this->_table_analysis instanceof TableAnalysis) {
+			return $this->_table_analysis;
+		} else {
+			throw new EE_Error(
+				sprintf(
+					esc_html__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * Hide PayPal Standard for "new" users.
+	 *
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function unset_pp_standard($payment_method_types)
+	{
+		$pps                           = EEM_Payment_Method::instance()->get_one_of_type('Paypal_Standard');
+		$paypal_standard_active        = ! empty($pps) && $pps->active();
+		$paypal_standard_active_before = false;
+		if ($pps) {
+			// PP Standard used before ?
+			$paypal_id = $pps->get_extra_meta('paypal_id', true);
+			if ($paypal_id && ! empty($paypal_id)) {
+				$paypal_standard_active_before = true;
+			}
+		}
+
+		// Not using PP Standard? Then display only PayPal Express, do not show PayPal Standard.
+		if (
+			apply_filters(
+				'FHEE__EE_PMT_Paypal_Express__register_payment_methods__hide_paypal_standard',
+				! $paypal_standard_active && ! $paypal_standard_active_before
+			)
+		) {
+			unset($payment_method_types['paypal_standard']);
+		}
+		return $payment_method_types;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -28,12 +28,12 @@
     public function __construct()
     {
         // define some page related constants
-        if (! defined('EE_PAYMENTS_PG_SLUG')) {
+        if ( ! defined('EE_PAYMENTS_PG_SLUG')) {
             define('EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings');
-            define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page=' . EE_PAYMENTS_PG_SLUG));
-            define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES . 'payments/');
-            define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN . 'templates/');
-            define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'payments/assets/');
+            define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page='.EE_PAYMENTS_PG_SLUG));
+            define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES.'payments/');
+            define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN.'templates/');
+            define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'payments/assets/');
         }
         $this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', [], true);
         // check that there are active gateways on all admin page loads. but don't do it just yet

admin_pages/registration_form/Registration_Form_Admin_Page_Init.core.php

Indentation +34 added lines, -34 removed lines

@@ -17,42 +17,42 @@
  */
 class Registration_Form_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    public function __construct()
-    {
-        // define some constants
-        if (! defined('REGISTRATION_FORM_PG_SLUG')) {
-            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
+		if (! defined('REGISTRATION_FORM_PG_SLUG')) {
+			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');
+	}
 
 
-    public function getMenuProperties(): array
-    {
-        return [
-            'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
-            'menu_group'      => 'management',
-            'menu_order'      => 30,
-            'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
-            'parent_slug'     => 'espresso_events',
-            'menu_slug'       => REGISTRATION_FORM_PG_SLUG,
-            'menu_label'      => esc_html__('Registration Form', 'event_espresso'),
-            'capability'      => 'ee_read_questions',
-        ];
-    }
+	public function getMenuProperties(): array
+	{
+		return [
+			'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
+			'menu_group'      => 'management',
+			'menu_order'      => 30,
+			'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
+			'parent_slug'     => 'espresso_events',
+			'menu_slug'       => REGISTRATION_FORM_PG_SLUG,
+			'menu_label'      => esc_html__('Registration Form', 'event_espresso'),
+			'capability'      => 'ee_read_questions',
+		];
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -20,17 +20,17 @@
     public function __construct()
     {
         // define some constants
-        if (! defined('REGISTRATION_FORM_PG_SLUG')) {
+        if ( ! defined('REGISTRATION_FORM_PG_SLUG')) {
             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();
     }

admin_pages/other_services/Other_Services_Admin_Page_Init.core.php

Indentation +30 added lines, -30 removed lines

@@ -14,38 +14,38 @@
  */
 class Other_Services_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    public function __construct()
-    {
-        // define some help/support page related constants
-        if (! defined('EE_OTHER_SERVICES_PG_SLUG')) {
-            define('EE_OTHER_SERVICES_PG_SLUG', 'espresso_packages');
-            define('EE_OTHER_SERVICES_ADMIN_URL', admin_url('admin.php?page=' . EE_OTHER_SERVICES_PG_SLUG));
-            define('EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'other_services/templates/');
-            define('EE_OTHER_SERVICES_ADMIN', EE_ADMIN_PAGES . 'other_services/');
-            define('EE_OTHER_SERVICES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'other_services/assets/');
-        }
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		// define some help/support page related constants
+		if (! defined('EE_OTHER_SERVICES_PG_SLUG')) {
+			define('EE_OTHER_SERVICES_PG_SLUG', 'espresso_packages');
+			define('EE_OTHER_SERVICES_ADMIN_URL', admin_url('admin.php?page=' . EE_OTHER_SERVICES_PG_SLUG));
+			define('EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'other_services/templates/');
+			define('EE_OTHER_SERVICES_ADMIN', EE_ADMIN_PAGES . 'other_services/');
+			define('EE_OTHER_SERVICES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'other_services/assets/');
+		}
+		parent::__construct();
+	}
 
 
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Extensions & Services', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Extensions & Services', 'event_espresso');
+	}
 
 
-    public function getMenuProperties(): array
-    {
-        return [
-            'menu_type'               => AdminMenuItem::TYPE_MENU_SUB_ITEM,
-            'menu_group'              => 'extras',
-            'menu_order'              => 30,
-            'show_on_menu'            => AdminMenuItem::DISPLAY_BLOG_AND_NETWORK,
-            'parent_slug'             => 'espresso_events',
-            'menu_slug'               => EE_OTHER_SERVICES_PG_SLUG,
-            'menu_label'              => esc_html__('Extensions & Services', 'event_espresso'),
-            'capability'              => 'ee_read_ee',
-            'maintenance_mode_parent' => 'espresso_maintenance_settings',
-        ];
-    }
+	public function getMenuProperties(): array
+	{
+		return [
+			'menu_type'               => AdminMenuItem::TYPE_MENU_SUB_ITEM,
+			'menu_group'              => 'extras',
+			'menu_order'              => 30,
+			'show_on_menu'            => AdminMenuItem::DISPLAY_BLOG_AND_NETWORK,
+			'parent_slug'             => 'espresso_events',
+			'menu_slug'               => EE_OTHER_SERVICES_PG_SLUG,
+			'menu_label'              => esc_html__('Extensions & Services', 'event_espresso'),
+			'capability'              => 'ee_read_ee',
+			'maintenance_mode_parent' => 'espresso_maintenance_settings',
+		];
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -17,12 +17,12 @@
     public function __construct()
     {
         // define some help/support page related constants
-        if (! defined('EE_OTHER_SERVICES_PG_SLUG')) {
+        if ( ! defined('EE_OTHER_SERVICES_PG_SLUG')) {
             define('EE_OTHER_SERVICES_PG_SLUG', 'espresso_packages');
-            define('EE_OTHER_SERVICES_ADMIN_URL', admin_url('admin.php?page=' . EE_OTHER_SERVICES_PG_SLUG));
-            define('EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'other_services/templates/');
-            define('EE_OTHER_SERVICES_ADMIN', EE_ADMIN_PAGES . 'other_services/');
-            define('EE_OTHER_SERVICES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'other_services/assets/');
+            define('EE_OTHER_SERVICES_ADMIN_URL', admin_url('admin.php?page='.EE_OTHER_SERVICES_PG_SLUG));
+            define('EE_OTHER_SERVICES_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES.'other_services/templates/');
+            define('EE_OTHER_SERVICES_ADMIN', EE_ADMIN_PAGES.'other_services/');
+            define('EE_OTHER_SERVICES_ASSETS_URL', EE_ADMIN_PAGES_URL.'other_services/assets/');
         }
         parent::__construct();
     }

admin_pages/messages/Messages_Admin_Page_Init.core.php

Indentation +45 added lines, -45 removed lines

@@ -13,49 +13,49 @@
  */
 class Messages_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    /**
-     *constructor
-     *
-     * @Constructor
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-
-        if (! defined('EE_MSG_PG_SLUG')) {
-            define('EE_MSG_PG_SLUG', 'espresso_messages');
-            define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
-            define('EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages/');
-            define('EE_MSG_ADMIN_URL', admin_url('admin.php?page=' . EE_MSG_PG_SLUG));
-            define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets/');
-            define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/');
-            define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates/');
-            define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/');
-        }
-
-        parent::__construct();
-    }
-
-
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Messages System', 'event_espresso');
-    }
-
-
-    public function getMenuProperties(): array
-    {
-        return [
-            'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
-            'menu_group'      => 'management',
-            'menu_order'      => 10,
-            'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
-            'parent_slug'     => 'espresso_events',
-            'menu_slug'       => EE_MSG_PG_SLUG,
-            'menu_label'      => esc_html__('Messages', 'event_espresso'),
-            'capability'      => 'ee_read_global_messages',
-        ];
-    }
+	/**
+	 *constructor
+	 *
+	 * @Constructor
+	 * @access public
+	 * @return void
+	 */
+	public function __construct()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+
+		if (! defined('EE_MSG_PG_SLUG')) {
+			define('EE_MSG_PG_SLUG', 'espresso_messages');
+			define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
+			define('EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages/');
+			define('EE_MSG_ADMIN_URL', admin_url('admin.php?page=' . EE_MSG_PG_SLUG));
+			define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets/');
+			define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/');
+			define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates/');
+			define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/');
+		}
+
+		parent::__construct();
+	}
+
+
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Messages System', 'event_espresso');
+	}
+
+
+	public function getMenuProperties(): array
+	{
+		return [
+			'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
+			'menu_group'      => 'management',
+			'menu_order'      => 10,
+			'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
+			'parent_slug'     => 'espresso_events',
+			'menu_slug'       => EE_MSG_PG_SLUG,
+			'menu_label'      => esc_html__('Messages', 'event_espresso'),
+			'capability'      => 'ee_read_global_messages',
+		];
+	}
 }

Spacing +7 added lines, -7 removed lines

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

admin_pages/general_settings/General_Settings_Admin_Page_Init.core.php

Indentation +30 added lines, -30 removed lines

@@ -17,38 +17,38 @@
  */
 class General_Settings_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    public function __construct()
-    {
-        // define some constants
-        if (! defined('GEN_SET_PG_SLUG')) {
-            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();
-    }
+	public function __construct()
+	{
+		// define some constants
+		if (! defined('GEN_SET_PG_SLUG')) {
+			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();
+	}
 
 
-    protected function _set_init_properties()
-    {
-        $this->label = GEN_SET_LABEL;
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = GEN_SET_LABEL;
+	}
 
 
-    public function getMenuProperties(): array
-    {
-        return [
-            'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
-            'menu_group'      => 'settings',
-            'menu_order'      => 20,
-            'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
-            'parent_slug'     => 'espresso_events',
-            'menu_slug'       => GEN_SET_PG_SLUG,
-            'menu_label'      => GEN_SET_LABEL,
-            'capability'      => 'manage_options',
-        ];
-    }
+	public function getMenuProperties(): array
+	{
+		return [
+			'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
+			'menu_group'      => 'settings',
+			'menu_order'      => 20,
+			'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
+			'parent_slug'     => 'espresso_events',
+			'menu_slug'       => GEN_SET_PG_SLUG,
+			'menu_label'      => GEN_SET_LABEL,
+			'capability'      => 'manage_options',
+		];
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -20,13 +20,13 @@
     public function __construct()
     {
         // define some constants
-        if (! defined('GEN_SET_PG_SLUG')) {
+        if ( ! defined('GEN_SET_PG_SLUG')) {
             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();
     }