eventespresso / event-espresso-core

core/templates/notifications/persistent_admin_notice.template.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         margin-right: .25em;
     }
 </style>
-<?php endif;?>
+<?php endif; ?>
 <div id="<?php echo $persistent_admin_notice_name; ?>" class="espresso-notices updated ee-nag-notice clearfix">
     <button class="dismiss-ee-nag-notice-btn dismiss-ee-nag-notice hide-if-no-js" data-target="<?php echo $persistent_admin_notice_name; ?>">
         <a><span class="dashicons dashicons-dismiss"></span><?php esc_html_e('Dismiss', 'event_espresso'); ?></a>

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_invoice_settings.dmsstage.php

Indentation +17 added lines, -17 removed lines

@@ -49,29 +49,29 @@
 
 
 
-    /**
-     *    _migration_step
-     *
-     * @access protected
-     * @param int $num_items
-     * @throws EE_Error
-     * @return int number of items ACTUALLY migrated
-     * @throws InvalidDataTypeException
-     */
+	/**
+	 *    _migration_step
+	 *
+	 * @access protected
+	 * @param int $num_items
+	 * @throws EE_Error
+	 * @return int number of items ACTUALLY migrated
+	 * @throws InvalidDataTypeException
+	 */
 	protected function _migration_step( $num_items = 1 ){
 
 		$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
 		$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
 		$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
 		if( $overridden_invoice_body || $overridden_receipt_body ) {
-            new PersistentAdminNotice(
-                'invoice_overriding_templates',
-                esc_html__(
-                    'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
-                    'event_espresso'
-                ),
-                true
-            );
+			new PersistentAdminNotice(
+				'invoice_overriding_templates',
+				esc_html__(
+					'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
+					'event_espresso'
+				),
+				true
+			);
 		}
 
 		//regardless of whether it worked or not, we ought to continue the migration

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
 	 * Just initializes the status of the migration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Update Invoice Settings', 'event_espresso' );
+		$this->_pretty_name = __('Update Invoice Settings', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -58,12 +58,12 @@ 
      * @return int number of items ACTUALLY migrated
      * @throws InvalidDataTypeException
      */
-	protected function _migration_step( $num_items = 1 ){
+	protected function _migration_step($num_items = 1) {
 
 		$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-		$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
-		$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
-		if( $overridden_invoice_body || $overridden_receipt_body ) {
+		$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', NULL, FALSE, FALSE, TRUE);
+		$overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', NULL, FALSE, FALSE, TRUE);
+		if ($overridden_invoice_body || $overridden_receipt_body) {
             new PersistentAdminNotice(
                 'invoice_overriding_templates',
                 esc_html__(

core/services/container/CoffeeMill.php

Indentation +59 added lines, -59 removed lines

@@ -18,65 +18,65 @@
 class CoffeeMill
 {
 
-    /**
-     * @var CoffeeShop $coffee_shop
-     */
-    private static $coffee_shop;
-
-
-
-    /**
-     * @return mixed
-     */
-    public static function getCoffeeShop()
-    {
-        return self::$coffee_shop;
-    }
-
-
-
-    /**
-     * @param CoffeeShop $coffee_shop
-     */
-    public static function setCoffeeShop(CoffeeShop $coffee_shop)
-    {
-        self::$coffee_shop = $coffee_shop;
-    }
-
-
-
-    /**
-     * @param string $identifier
-     * @param array  $arguments
-     * @param string $type
-     * @return mixed
-     * @throws ServiceNotFoundException
-     */
-    public static function createNew($identifier, $arguments = array(), $type = CoffeeMaker::BREW_NEW)
-    {
-        return self::$coffee_shop->brew($identifier, $arguments, $type);
-    }
-
-
-
-    /**
-     * IMPORTANT!!!
-     * Usage of this method is discouraged as it promotes service location.
-     * It's current use is only as a stop gap measure until the CoffeeShop
-     * Dependency Injection Container can be implemented properly for all classes.
-     * If it is at all possible, inject your dependencies via your class constructor.
-     * This method WILL BE DEPRECATED at some point in the near future.
-     *
-     * @param string $identifier
-     * @param array  $arguments
-     * @param string $type
-     * @return mixed
-     * @throws ServiceNotFoundException
-     */
-    public static function getService($identifier, $arguments = array(), $type = CoffeeMaker::BREW_SHARED)
-    {
-        return self::$coffee_shop->brew($identifier, $arguments, $type);
-    }
+	/**
+	 * @var CoffeeShop $coffee_shop
+	 */
+	private static $coffee_shop;
+
+
+
+	/**
+	 * @return mixed
+	 */
+	public static function getCoffeeShop()
+	{
+		return self::$coffee_shop;
+	}
+
+
+
+	/**
+	 * @param CoffeeShop $coffee_shop
+	 */
+	public static function setCoffeeShop(CoffeeShop $coffee_shop)
+	{
+		self::$coffee_shop = $coffee_shop;
+	}
+
+
+
+	/**
+	 * @param string $identifier
+	 * @param array  $arguments
+	 * @param string $type
+	 * @return mixed
+	 * @throws ServiceNotFoundException
+	 */
+	public static function createNew($identifier, $arguments = array(), $type = CoffeeMaker::BREW_NEW)
+	{
+		return self::$coffee_shop->brew($identifier, $arguments, $type);
+	}
+
+
+
+	/**
+	 * IMPORTANT!!!
+	 * Usage of this method is discouraged as it promotes service location.
+	 * It's current use is only as a stop gap measure until the CoffeeShop
+	 * Dependency Injection Container can be implemented properly for all classes.
+	 * If it is at all possible, inject your dependencies via your class constructor.
+	 * This method WILL BE DEPRECATED at some point in the near future.
+	 *
+	 * @param string $identifier
+	 * @param array  $arguments
+	 * @param string $type
+	 * @return mixed
+	 * @throws ServiceNotFoundException
+	 */
+	public static function getService($identifier, $arguments = array(), $type = CoffeeMaker::BREW_SHARED)
+	{
+		return self::$coffee_shop->brew($identifier, $arguments, $type);
+	}
 
 }
 // End of file CoffeeMill.php

core/services/notifications/PersistentAdminNoticeManager.php

Indentation +332 added lines, -332 removed lines

@@ -27,338 +27,338 @@
 class PersistentAdminNoticeManager
 {
 
-    const WP_OPTION_KEY = 'ee_pers_admin_notices';
-
-    /**
-     * @var Collection|PersistentAdminNotice[] $notice_collection
-     */
-    private $notice_collection;
-
-    /**
-     * @type string $return_url
-     */
-    private $return_url;
-
-    /**
-     * @type CapabilitiesChecker $capabilities_checker
-     */
-    private $capabilities_checker;
-
-    /**
-     * @type EE_Request $request
-     */
-    private $request;
-
-
-
-    /**
-     * CapChecker constructor
-     *
-     * @param string $return_url
-     * @param CapabilitiesChecker $capabilities_checker
-     * @param EE_Request          $request
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($return_url = '', CapabilitiesChecker $capabilities_checker, EE_Request $request)
-    {
-        $this->setReturnUrl($return_url);
-        $this->capabilities_checker = $capabilities_checker;
-        $this->request = $request;
-        //ok so we want to enable the entire admin
-        add_action('admin_notices', array($this, 'displayNotices'), 9);
-        add_action('network_admin_notices', array($this, 'displayNotices'), 9);
-        add_action('wp_ajax_dismiss_ee_nag_notice', array($this, 'dismissNotice'));
-        add_action('shutdown', array($this, 'saveNotices'));
-    }
-
-
-
-    /**
-     * @param string $return_url
-     * @throws InvalidDataTypeException
-     */
-    private function setReturnUrl($return_url)
-    {
-        if ( ! is_string($return_url)) {
-            throw new InvalidDataTypeException('$return_url', $return_url, 'string');
-        }
-        $this->return_url = $return_url;
-    }
-
-
-
-    /**
-     * @return Collection
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     */
-    protected function getPersistentAdminNoticeCollection()
-    {
-        if ( ! $this->notice_collection instanceof Collection) {
-            $this->notice_collection = new Collection(
-                '\EventEspresso\core\domain\entities\notifications\PersistentAdminNotice'
-            );
-            $this->retrieveStoredNotices();
-            $this->registerNotices();
-        }
-        return $this->notice_collection;
-    }
-
-
-
-    /**
-     * generates PersistentAdminNotice objects for all non-dismissed notices saved to the db
-     *
-     * @return void
-     * @throws DomainException
-     * @throws InvalidDataTypeException
-     */
-    public function retrieveStoredNotices()
-    {
-        $persistent_admin_notices = get_option(PersistentAdminNoticeManager::WP_OPTION_KEY, array());
-        // \EEH_Debug_Tools::printr($persistent_admin_notices, '$persistent_admin_notices', __FILE__, __LINE__);
-        if ( ! empty($persistent_admin_notices)) {
-            foreach ($persistent_admin_notices as $name => $details) {
-                if (is_array($details)){
-                    if (
-                        ! isset(
-                            $details['message'],
-                            $details['capability'],
-                            $details['cap_context'],
-                            $details['dismissed']
-                        )
-                    ) {
-                        throw new DomainException(
-                            sprintf(
-                                esc_html__(
-                                    'The "%1$s" PersistentAdminNotice could not be retrieved from the database.',
-                                    'event_espresso'
-                                ),
-                                $name
-                            )
-                        );
-                    }
-                    // new format for nag notices
-                    new PersistentAdminNotice(
-                        $name,
-                        $details['message'],
-                        false,
-                        $details['capability'],
-                        $details['cap_context'],
-                        $details['dismissed']
-                    );
-                } else {
-                    try {
-                        // old nag notices, that we want to convert to the new format
-                        new PersistentAdminNotice(
-                            $name,
-                            (string)$details,
-                            false,
-                            '',
-                            '',
-                            empty($details)
-                        );
-                    } catch (\Exception $e) {
-                        EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-                    }
-                }
-                // each notice will self register when the action hook in registerNotices is triggered
-            }
-        }
-    }
-
-
-
-    /**
-     * exposes the Persistent Admin Notice Collection via an action
-     * so that PersistentAdminNotice objects can be added and/or removed
-     * without compromising the actual collection like a filter would
-     */
-    public function registerNotices()
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
-            $this->notice_collection
-        );
-    }
-
-
-
-    /**
-     * @throws DomainException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function displayNotices()
-    {
-        $this->notice_collection = $this->getPersistentAdminNoticeCollection();
-        if ($this->notice_collection->hasObjects()) {
-            // and display notices
-            foreach ($this->notice_collection as $persistent_admin_notice) {
-                /** @var PersistentAdminNotice $persistent_admin_notice */
-                // don't display notices that have already been dismissed
-                if ($persistent_admin_notice->getDismissed()) {
-                    continue;
-                }
-                try {
-                    $this->capabilities_checker->processCapCheck(
-                        $persistent_admin_notice->getCapCheck()
-                    );
-                } catch (InsufficientPermissionsException $e) {
-                    // user does not have required cap, so skip to next notice
-                    // and just eat the exception - nom nom nom nom
-                    continue;
-                }
-                $this->displayPersistentAdminNotice($persistent_admin_notice);
-            }
-        }
-    }
-
-
-
-    /**
-     * does what it's named
-     *
-     * @return bool
-     */
-    public function enqueueAssets()
-    {
-        static $print_scripts = true;
-        if (! $print_scripts) {
-            return $print_scripts;
-        }
-        wp_register_script(
-            'espresso_core',
-            EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
-            array('jquery'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_register_script(
-            'ee_error_js',
-            EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js',
-            array('espresso_core'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_enqueue_script('ee_error_js');
-        $print_scripts = true;
-        return $print_scripts;
-    }
-
-
-
-
-    /**
-     * displayPersistentAdminNoticeHtml
-     *
-     * @param  PersistentAdminNotice $persistent_admin_notice
-     */
-    public function displayPersistentAdminNotice(PersistentAdminNotice $persistent_admin_notice)
-    {
-        // used in template for printing css
-        $print_styles = $this->enqueueAssets();
-        wp_localize_script(
-            'espresso_core',
-            'ee_dismiss',
-            array(
-                'nag_notice'    => $persistent_admin_notice->getName(),
-                'return_url'    => urlencode($this->return_url),
-                'ajax_url'      => WP_AJAX_URL,
-                'unknown_error' => esc_html__(
-                    'An unknown error has occurred on the server while attempting to dismiss this notice.',
-                    'event_espresso'
-                )
-            )
-        );
-        // used in template
-        $persistent_admin_notice_name = $persistent_admin_notice->getName();
-        $persistent_admin_notice_message = $persistent_admin_notice->getMessage();
-        require EE_TEMPLATES . DS . 'notifications' . DS . 'persistent_admin_notice.template.php';
-    }
-
-
-
-    /**
-     * dismissNotice
-     *
-     * @param string $pan_name the name, or key of the Persistent Admin Notice to be dismissed
-     * @param bool   $purge    if true, then delete it from the db
-     * @param bool   $return   forget all of this AJAX or redirect nonsense, and just return
-     * @return void
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     */
-    public function dismissNotice($pan_name = '', $purge = false, $return = false)
-    {
-        $pan_name = $this->request->get('ee_nag_notice', $pan_name);
-        $this->notice_collection = $this->getPersistentAdminNoticeCollection();
-        if ( ! empty($pan_name) && $this->notice_collection->has($pan_name)){
-            /** @var PersistentAdminNotice $persistent_admin_notice */
-            $persistent_admin_notice = $this->notice_collection->get($pan_name);
-            $persistent_admin_notice->setDismissed(true);
-            $persistent_admin_notice->setPurge($purge);
-            $this->saveNotices();
-        }
-        if ($return) {
-            return;
-        } else if ($this->request->ajax) {
-            // grab any notices and concatenate into string
-            echo wp_json_encode(
-                array(
-                    'errors' => implode('<br />', EE_Error::get_notices(false))
-                )
-            );
-            exit();
-        } else {
-            // save errors to a transient to be displayed on next request (after redirect)
-            EE_Error::get_notices(false, true);
-            wp_safe_redirect(
-                urldecode(
-                    $this->request->get('return_url', '')
-                )
-            );
-        }
-    }
-
-
-
-    /**
-     * saveNotices
-     *
-     * @throws DomainException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function saveNotices()
-    {
-        $this->notice_collection = $this->getPersistentAdminNoticeCollection();
-        if ($this->notice_collection->hasObjects()) {
-            $persistent_admin_notices = get_option(PersistentAdminNoticeManager::WP_OPTION_KEY, array());
-            //maybe initialize persistent_admin_notices
-            if (empty($persistent_admin_notices)) {
-                add_option(PersistentAdminNoticeManager::WP_OPTION_KEY, array(), '', 'no');
-            }
-            foreach ($this->notice_collection as $persistent_admin_notice) {
-                // are we deleting this notice ?
-                if ($persistent_admin_notice->getPurge()) {
-                    unset($persistent_admin_notices[$persistent_admin_notice->getName()]);
-                } else {
-                    /** @var PersistentAdminNotice $persistent_admin_notice */
-                    $persistent_admin_notices[$persistent_admin_notice->getName()] = array(
-                        'message'     => $persistent_admin_notice->getMessage(),
-                        'capability'  => $persistent_admin_notice->getCapability(),
-                        'cap_context' => $persistent_admin_notice->getCapContext(),
-                        'dismissed'   => $persistent_admin_notice->getDismissed(),
-                    );
-                }
-            }
-            update_option(PersistentAdminNoticeManager::WP_OPTION_KEY, $persistent_admin_notices);
-        }
-    }
+	const WP_OPTION_KEY = 'ee_pers_admin_notices';
+
+	/**
+	 * @var Collection|PersistentAdminNotice[] $notice_collection
+	 */
+	private $notice_collection;
+
+	/**
+	 * @type string $return_url
+	 */
+	private $return_url;
+
+	/**
+	 * @type CapabilitiesChecker $capabilities_checker
+	 */
+	private $capabilities_checker;
+
+	/**
+	 * @type EE_Request $request
+	 */
+	private $request;
+
+
+
+	/**
+	 * CapChecker constructor
+	 *
+	 * @param string $return_url
+	 * @param CapabilitiesChecker $capabilities_checker
+	 * @param EE_Request          $request
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($return_url = '', CapabilitiesChecker $capabilities_checker, EE_Request $request)
+	{
+		$this->setReturnUrl($return_url);
+		$this->capabilities_checker = $capabilities_checker;
+		$this->request = $request;
+		//ok so we want to enable the entire admin
+		add_action('admin_notices', array($this, 'displayNotices'), 9);
+		add_action('network_admin_notices', array($this, 'displayNotices'), 9);
+		add_action('wp_ajax_dismiss_ee_nag_notice', array($this, 'dismissNotice'));
+		add_action('shutdown', array($this, 'saveNotices'));
+	}
+
+
+
+	/**
+	 * @param string $return_url
+	 * @throws InvalidDataTypeException
+	 */
+	private function setReturnUrl($return_url)
+	{
+		if ( ! is_string($return_url)) {
+			throw new InvalidDataTypeException('$return_url', $return_url, 'string');
+		}
+		$this->return_url = $return_url;
+	}
+
+
+
+	/**
+	 * @return Collection
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 */
+	protected function getPersistentAdminNoticeCollection()
+	{
+		if ( ! $this->notice_collection instanceof Collection) {
+			$this->notice_collection = new Collection(
+				'\EventEspresso\core\domain\entities\notifications\PersistentAdminNotice'
+			);
+			$this->retrieveStoredNotices();
+			$this->registerNotices();
+		}
+		return $this->notice_collection;
+	}
+
+
+
+	/**
+	 * generates PersistentAdminNotice objects for all non-dismissed notices saved to the db
+	 *
+	 * @return void
+	 * @throws DomainException
+	 * @throws InvalidDataTypeException
+	 */
+	public function retrieveStoredNotices()
+	{
+		$persistent_admin_notices = get_option(PersistentAdminNoticeManager::WP_OPTION_KEY, array());
+		// \EEH_Debug_Tools::printr($persistent_admin_notices, '$persistent_admin_notices', __FILE__, __LINE__);
+		if ( ! empty($persistent_admin_notices)) {
+			foreach ($persistent_admin_notices as $name => $details) {
+				if (is_array($details)){
+					if (
+						! isset(
+							$details['message'],
+							$details['capability'],
+							$details['cap_context'],
+							$details['dismissed']
+						)
+					) {
+						throw new DomainException(
+							sprintf(
+								esc_html__(
+									'The "%1$s" PersistentAdminNotice could not be retrieved from the database.',
+									'event_espresso'
+								),
+								$name
+							)
+						);
+					}
+					// new format for nag notices
+					new PersistentAdminNotice(
+						$name,
+						$details['message'],
+						false,
+						$details['capability'],
+						$details['cap_context'],
+						$details['dismissed']
+					);
+				} else {
+					try {
+						// old nag notices, that we want to convert to the new format
+						new PersistentAdminNotice(
+							$name,
+							(string)$details,
+							false,
+							'',
+							'',
+							empty($details)
+						);
+					} catch (\Exception $e) {
+						EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+					}
+				}
+				// each notice will self register when the action hook in registerNotices is triggered
+			}
+		}
+	}
+
+
+
+	/**
+	 * exposes the Persistent Admin Notice Collection via an action
+	 * so that PersistentAdminNotice objects can be added and/or removed
+	 * without compromising the actual collection like a filter would
+	 */
+	public function registerNotices()
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
+			$this->notice_collection
+		);
+	}
+
+
+
+	/**
+	 * @throws DomainException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function displayNotices()
+	{
+		$this->notice_collection = $this->getPersistentAdminNoticeCollection();
+		if ($this->notice_collection->hasObjects()) {
+			// and display notices
+			foreach ($this->notice_collection as $persistent_admin_notice) {
+				/** @var PersistentAdminNotice $persistent_admin_notice */
+				// don't display notices that have already been dismissed
+				if ($persistent_admin_notice->getDismissed()) {
+					continue;
+				}
+				try {
+					$this->capabilities_checker->processCapCheck(
+						$persistent_admin_notice->getCapCheck()
+					);
+				} catch (InsufficientPermissionsException $e) {
+					// user does not have required cap, so skip to next notice
+					// and just eat the exception - nom nom nom nom
+					continue;
+				}
+				$this->displayPersistentAdminNotice($persistent_admin_notice);
+			}
+		}
+	}
+
+
+
+	/**
+	 * does what it's named
+	 *
+	 * @return bool
+	 */
+	public function enqueueAssets()
+	{
+		static $print_scripts = true;
+		if (! $print_scripts) {
+			return $print_scripts;
+		}
+		wp_register_script(
+			'espresso_core',
+			EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
+			array('jquery'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_script(
+			'ee_error_js',
+			EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js',
+			array('espresso_core'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_enqueue_script('ee_error_js');
+		$print_scripts = true;
+		return $print_scripts;
+	}
+
+
+
+
+	/**
+	 * displayPersistentAdminNoticeHtml
+	 *
+	 * @param  PersistentAdminNotice $persistent_admin_notice
+	 */
+	public function displayPersistentAdminNotice(PersistentAdminNotice $persistent_admin_notice)
+	{
+		// used in template for printing css
+		$print_styles = $this->enqueueAssets();
+		wp_localize_script(
+			'espresso_core',
+			'ee_dismiss',
+			array(
+				'nag_notice'    => $persistent_admin_notice->getName(),
+				'return_url'    => urlencode($this->return_url),
+				'ajax_url'      => WP_AJAX_URL,
+				'unknown_error' => esc_html__(
+					'An unknown error has occurred on the server while attempting to dismiss this notice.',
+					'event_espresso'
+				)
+			)
+		);
+		// used in template
+		$persistent_admin_notice_name = $persistent_admin_notice->getName();
+		$persistent_admin_notice_message = $persistent_admin_notice->getMessage();
+		require EE_TEMPLATES . DS . 'notifications' . DS . 'persistent_admin_notice.template.php';
+	}
+
+
+
+	/**
+	 * dismissNotice
+	 *
+	 * @param string $pan_name the name, or key of the Persistent Admin Notice to be dismissed
+	 * @param bool   $purge    if true, then delete it from the db
+	 * @param bool   $return   forget all of this AJAX or redirect nonsense, and just return
+	 * @return void
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 */
+	public function dismissNotice($pan_name = '', $purge = false, $return = false)
+	{
+		$pan_name = $this->request->get('ee_nag_notice', $pan_name);
+		$this->notice_collection = $this->getPersistentAdminNoticeCollection();
+		if ( ! empty($pan_name) && $this->notice_collection->has($pan_name)){
+			/** @var PersistentAdminNotice $persistent_admin_notice */
+			$persistent_admin_notice = $this->notice_collection->get($pan_name);
+			$persistent_admin_notice->setDismissed(true);
+			$persistent_admin_notice->setPurge($purge);
+			$this->saveNotices();
+		}
+		if ($return) {
+			return;
+		} else if ($this->request->ajax) {
+			// grab any notices and concatenate into string
+			echo wp_json_encode(
+				array(
+					'errors' => implode('<br />', EE_Error::get_notices(false))
+				)
+			);
+			exit();
+		} else {
+			// save errors to a transient to be displayed on next request (after redirect)
+			EE_Error::get_notices(false, true);
+			wp_safe_redirect(
+				urldecode(
+					$this->request->get('return_url', '')
+				)
+			);
+		}
+	}
+
+
+
+	/**
+	 * saveNotices
+	 *
+	 * @throws DomainException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function saveNotices()
+	{
+		$this->notice_collection = $this->getPersistentAdminNoticeCollection();
+		if ($this->notice_collection->hasObjects()) {
+			$persistent_admin_notices = get_option(PersistentAdminNoticeManager::WP_OPTION_KEY, array());
+			//maybe initialize persistent_admin_notices
+			if (empty($persistent_admin_notices)) {
+				add_option(PersistentAdminNoticeManager::WP_OPTION_KEY, array(), '', 'no');
+			}
+			foreach ($this->notice_collection as $persistent_admin_notice) {
+				// are we deleting this notice ?
+				if ($persistent_admin_notice->getPurge()) {
+					unset($persistent_admin_notices[$persistent_admin_notice->getName()]);
+				} else {
+					/** @var PersistentAdminNotice $persistent_admin_notice */
+					$persistent_admin_notices[$persistent_admin_notice->getName()] = array(
+						'message'     => $persistent_admin_notice->getMessage(),
+						'capability'  => $persistent_admin_notice->getCapability(),
+						'cap_context' => $persistent_admin_notice->getCapContext(),
+						'dismissed'   => $persistent_admin_notice->getDismissed(),
+					);
+				}
+			}
+			update_option(PersistentAdminNoticeManager::WP_OPTION_KEY, $persistent_admin_notices);
+		}
+	}
 
 
 

Spacing +7 added lines, -7 removed lines

@@ -120,7 +120,7 @@ 
         // \EEH_Debug_Tools::printr($persistent_admin_notices, '$persistent_admin_notices', __FILE__, __LINE__);
         if ( ! empty($persistent_admin_notices)) {
             foreach ($persistent_admin_notices as $name => $details) {
-                if (is_array($details)){
+                if (is_array($details)) {
                     if (
                         ! isset(
                             $details['message'],
@@ -153,7 +153,7 @@ 
                         // old nag notices, that we want to convert to the new format
                         new PersistentAdminNotice(
                             $name,
-                            (string)$details,
+                            (string) $details,
                             false,
                             '',
                             '',
@@ -226,19 +226,19 @@ 
     public function enqueueAssets()
     {
         static $print_scripts = true;
-        if (! $print_scripts) {
+        if ( ! $print_scripts) {
             return $print_scripts;
         }
         wp_register_script(
             'espresso_core',
-            EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js',
             array('jquery'),
             EVENT_ESPRESSO_VERSION,
             true
         );
         wp_register_script(
             'ee_error_js',
-            EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js',
             array('espresso_core'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -276,7 +276,7 @@ 
         // used in template
         $persistent_admin_notice_name = $persistent_admin_notice->getName();
         $persistent_admin_notice_message = $persistent_admin_notice->getMessage();
-        require EE_TEMPLATES . DS . 'notifications' . DS . 'persistent_admin_notice.template.php';
+        require EE_TEMPLATES.DS.'notifications'.DS.'persistent_admin_notice.template.php';
     }
 
 
@@ -296,7 +296,7 @@ 
     {
         $pan_name = $this->request->get('ee_nag_notice', $pan_name);
         $this->notice_collection = $this->getPersistentAdminNoticeCollection();
-        if ( ! empty($pan_name) && $this->notice_collection->has($pan_name)){
+        if ( ! empty($pan_name) && $this->notice_collection->has($pan_name)) {
             /** @var PersistentAdminNotice $persistent_admin_notice */
             $persistent_admin_notice = $this->notice_collection->get($pan_name);
             $persistent_admin_notice->setDismissed(true);

core/middleware/EE_Recommended_Versions.core.php

Indentation +142 added lines, -142 removed lines

@@ -1,7 +1,7 @@ 
 <?php use EventEspresso\core\exceptions\InvalidDataTypeException;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -20,153 +20,153 @@ 
 {
 
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param    EE_Request  $request
-     * @param    EE_Response $response
-     * @return    EE_Response
-     */
-    public function handle_request(EE_Request $request, EE_Response $response)
-    {
-        $this->_request = $request;
-        $this->_response = $response;
-        //$this->_response->add_output( "\n\t IN >>  " . __CLASS__ );
-        //$this->_response->set_notice( 1, 'hey look at this' );
-        // check required WP version
-        if ( ! $this->_minimum_wp_version_required()) {
-            $this->_request->un_set('activate', true);
-            add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1);
-            //$this->_response->add_output( "\n<br />" . 'minimum_wp_version_error' );
-            $this->_response->terminate_request();
-            $this->_response->deactivate_plugin();
-        }
-        // check recommended PHP version
-        if ( ! $this->_minimum_php_version_recommended()) {
-            $this->_display_minimum_recommended_php_version_notice();
-        }
-        $this->_response = $this->process_request_stack($this->_request, $this->_response);
-        //$this->_response->add_output( "\n\t OUT << " . __CLASS__ );
-        return $this->_response;
-    }
-
-
-    /**
-     * Helper method to assess installed wp version against given values.
-     * By default this compares the required minimum version of WP for EE against the installed version of WP
-     *
-     * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked against)
-     * so consider that when sending in your values.
-     *
-     * @param string $version_to_check
-     * @param string $operator
-     * @return bool
-     */
-    public static function check_wp_version($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
-    {
-        global $wp_version;
-        return version_compare(
-            //first account for wp_version being pre-release (like RC, beta etc which are usually in the format like
-            //4.7-RC3-39519
-            strpos($wp_version, '-') > 0 ? substr($wp_version, 0, strpos($wp_version, '-')) : $wp_version,
-            $version_to_check,
-            $operator
-        );
-    }
-
-
-
-    /**
-     *    _minimum_wp_version_required
-     *
-     * @access private
-     * @return boolean
-     */
-    private function _minimum_wp_version_required()
-    {
-        return self::check_wp_version();
-    }
-
-
-
-    /**
-     *    _check_php_version
-     *
-     * @access private
-     * @param string $min_version
-     * @return boolean
-     */
-    private function _check_php_version($min_version = EE_MIN_PHP_VER_RECOMMENDED)
-    {
-        return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
-    }
-
-
-
-    /**
-     *    _minimum_php_version_recommended
-     *
-     * @access private
-     * @return boolean
-     */
-    private function _minimum_php_version_recommended()
-    {
-        return $this->_check_php_version(EE_MIN_PHP_VER_RECOMMENDED);
-    }
-
-
-
-    /**
-     *    minimum_wp_version_error
-     *
-     * @return void
-     */
-    public function minimum_wp_version_error()
-    {
-        global $wp_version;
-        ?>
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param    EE_Request  $request
+	 * @param    EE_Response $response
+	 * @return    EE_Response
+	 */
+	public function handle_request(EE_Request $request, EE_Response $response)
+	{
+		$this->_request = $request;
+		$this->_response = $response;
+		//$this->_response->add_output( "\n\t IN >>  " . __CLASS__ );
+		//$this->_response->set_notice( 1, 'hey look at this' );
+		// check required WP version
+		if ( ! $this->_minimum_wp_version_required()) {
+			$this->_request->un_set('activate', true);
+			add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1);
+			//$this->_response->add_output( "\n<br />" . 'minimum_wp_version_error' );
+			$this->_response->terminate_request();
+			$this->_response->deactivate_plugin();
+		}
+		// check recommended PHP version
+		if ( ! $this->_minimum_php_version_recommended()) {
+			$this->_display_minimum_recommended_php_version_notice();
+		}
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
+		//$this->_response->add_output( "\n\t OUT << " . __CLASS__ );
+		return $this->_response;
+	}
+
+
+	/**
+	 * Helper method to assess installed wp version against given values.
+	 * By default this compares the required minimum version of WP for EE against the installed version of WP
+	 *
+	 * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked against)
+	 * so consider that when sending in your values.
+	 *
+	 * @param string $version_to_check
+	 * @param string $operator
+	 * @return bool
+	 */
+	public static function check_wp_version($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
+	{
+		global $wp_version;
+		return version_compare(
+			//first account for wp_version being pre-release (like RC, beta etc which are usually in the format like
+			//4.7-RC3-39519
+			strpos($wp_version, '-') > 0 ? substr($wp_version, 0, strpos($wp_version, '-')) : $wp_version,
+			$version_to_check,
+			$operator
+		);
+	}
+
+
+
+	/**
+	 *    _minimum_wp_version_required
+	 *
+	 * @access private
+	 * @return boolean
+	 */
+	private function _minimum_wp_version_required()
+	{
+		return self::check_wp_version();
+	}
+
+
+
+	/**
+	 *    _check_php_version
+	 *
+	 * @access private
+	 * @param string $min_version
+	 * @return boolean
+	 */
+	private function _check_php_version($min_version = EE_MIN_PHP_VER_RECOMMENDED)
+	{
+		return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
+	}
+
+
+
+	/**
+	 *    _minimum_php_version_recommended
+	 *
+	 * @access private
+	 * @return boolean
+	 */
+	private function _minimum_php_version_recommended()
+	{
+		return $this->_check_php_version(EE_MIN_PHP_VER_RECOMMENDED);
+	}
+
+
+
+	/**
+	 *    minimum_wp_version_error
+	 *
+	 * @return void
+	 */
+	public function minimum_wp_version_error()
+	{
+		global $wp_version;
+		?>
         <div class="error">
             <p>
                 <?php
-                printf(
-                        __('We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
-                                'event_espresso'),
-                        EE_MIN_WP_VER_REQUIRED,
-                        $wp_version,
-                        '<br/>',
-                        '<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
-                );
-                ?>
+				printf(
+						__('We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
+								'event_espresso'),
+						EE_MIN_WP_VER_REQUIRED,
+						$wp_version,
+						'<br/>',
+						'<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
+				);
+				?>
             </p>
         </div>
         <?php
-    }
-
-
-
-    /**
-     *    _display_minimum_recommended_php_version_notice
-     *
-     * @access private
-     * @return void
-     * @throws InvalidDataTypeException
-     */
-    private function _display_minimum_recommended_php_version_notice()
-    {
-        new \EventEspresso\core\domain\entities\notifications\PersistentAdminNotice(
-            'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
-            sprintf(
-                __(
-                    'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                    'event_espresso'
-                ),
-                EE_MIN_PHP_VER_RECOMMENDED,
-                PHP_VERSION,
-                '<br/>',
-                '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-            )
-        );
-    }
+	}
+
+
+
+	/**
+	 *    _display_minimum_recommended_php_version_notice
+	 *
+	 * @access private
+	 * @return void
+	 * @throws InvalidDataTypeException
+	 */
+	private function _display_minimum_recommended_php_version_notice()
+	{
+		new \EventEspresso\core\domain\entities\notifications\PersistentAdminNotice(
+			'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+			sprintf(
+				__(
+					'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+					'event_espresso'
+				),
+				EE_MIN_PHP_VER_RECOMMENDED,
+				PHP_VERSION,
+				'<br/>',
+				'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+			)
+		);
+	}
 
 
 }

Spacing +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
     private function _display_minimum_recommended_php_version_notice()
     {
         new \EventEspresso\core\domain\entities\notifications\PersistentAdminNotice(
-            'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+            'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
             sprintf(
                 __(
                     'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',

core/db_models/EEM_Payment_Method.model.php

Indentation +23 added lines, -23 removed lines

@@ -294,15 +294,15 @@ 
 
 
 
-    /**
-     * Overrides parent to not only turn wpdb results into EE_Payment_Method objects,
-     * but also verifies the payment method type of each is a usable object. If not,
-     * deactivate it, sets a notification, and deactivates it
-     *
-     * @param array $rows
-     * @return EE_Payment_Method[]
-     * @throws InvalidDataTypeException
-     */
+	/**
+	 * Overrides parent to not only turn wpdb results into EE_Payment_Method objects,
+	 * but also verifies the payment method type of each is a usable object. If not,
+	 * deactivate it, sets a notification, and deactivates it
+	 *
+	 * @param array $rows
+	 * @return EE_Payment_Method[]
+	 * @throws InvalidDataTypeException
+	 */
 	protected function _create_objects( $rows = array() ) {
 		EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
 		$payment_methods = parent::_create_objects( $rows );
@@ -319,20 +319,20 @@ 
 				//only deactivate and notify the admin if the payment is active somewhere
 				$payment_method->deactivate();
 				$payment_method->save();
-                new PersistentAdminNotice(
-                    'auto-deactivated-' . $payment_method->type(),
-                    sprintf(
-                        __('The payment method %1$s was automatically deactivated because it appears its associated Event Espresso Addon was recently deactivated.%2$sIt can be reactivated on the %3$sPlugins admin page%4$s, then you can reactivate the payment method.',
-                            'event_espresso'),
-                        $payment_method->admin_name(),
-                        '<br />',
-                        '<a href="' . admin_url('plugins.php') . '">',
-                        '</a>'
-                    ),
-                    true,
-                    '',
-                    ''
-                );
+				new PersistentAdminNotice(
+					'auto-deactivated-' . $payment_method->type(),
+					sprintf(
+						__('The payment method %1$s was automatically deactivated because it appears its associated Event Espresso Addon was recently deactivated.%2$sIt can be reactivated on the %3$sPlugins admin page%4$s, then you can reactivate the payment method.',
+							'event_espresso'),
+						$payment_method->admin_name(),
+						'<br />',
+						'<a href="' . admin_url('plugins.php') . '">',
+						'</a>'
+					),
+					true,
+					'',
+					''
+				);
 			}
 		}
 		return $usable_payment_methods;

Spacing +92 added lines, -92 removed lines

@@ -1,8 +1,8 @@ 
 <?php use EventEspresso\core\domain\entities\notifications\PersistentAdminNotice;
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -40,33 +40,33 @@ 
 	 * @access   protected
 	 * @return EEM_Payment_Method
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singlular_item = __( 'Payment Method', 'event_espresso' );
-		$this->plural_item = __( 'Payment Methods', 'event_espresso' );
-		$this->_tables = array( 'Payment_Method' => new EE_Primary_Table( 'esp_payment_method', 'PMD_ID' ) );
+	protected function __construct($timezone = NULL) {
+		$this->singlular_item = __('Payment Method', 'event_espresso');
+		$this->plural_item = __('Payment Methods', 'event_espresso');
+		$this->_tables = array('Payment_Method' => new EE_Primary_Table('esp_payment_method', 'PMD_ID'));
 		$this->_fields = array(
 			'Payment_Method' => array(
-				'PMD_ID' => new EE_Primary_Key_Int_Field( 'PMD_ID', __( "ID", 'event_espresso' ) ),
-				'PMD_type' => new EE_Plain_Text_Field( 'PMD_type', __( "Payment Method Type", 'event_espresso' ), FALSE, 'Admin_Only' ),
-				'PMD_name' => new EE_Plain_Text_Field( 'PMD_name', __( "Name", 'event_espresso' ), FALSE ),
-				'PMD_desc' => new EE_Post_Content_Field( 'PMD_desc', __( "Description", 'event_espresso' ), FALSE, '' ),
-				'PMD_admin_name' => new EE_Plain_Text_Field( 'PMD_admin_name', __( "Admin-Only Name", 'event_espresso' ), TRUE ),
-				'PMD_admin_desc' => new EE_Post_Content_Field( 'PMD_admin_desc', __( "Admin-Only Description", 'event_espresso' ), TRUE ),
-				'PMD_slug' => new EE_Slug_Field( 'PMD_slug', __( "Slug", 'event_espresso' ), FALSE ),
-				'PMD_order' => new EE_Integer_Field( 'PMD_order', __( "Order", 'event_espresso' ), FALSE, 0 ),
-				'PMD_debug_mode' => new EE_Boolean_Field( 'PMD_debug_mode', __( "Debug Mode On?", 'event_espresso' ), FALSE, FALSE ),
-				'PMD_wp_user' => new EE_WP_User_Field( 'PMD_wp_user', __( "Payment Method Creator ID", 'event_espresso' ), FALSE ),
-				'PMD_open_by_default' => new EE_Boolean_Field( 'PMD_open_by_default', __( "Open by Default?", 'event_espresso' ), FALSE, FALSE ), 'PMD_button_url' => new EE_Plain_Text_Field( 'PMD_button_url', __( "Button URL", 'event_espresso' ), TRUE, '' ),
-				'PMD_scope' => new EE_Serialized_Text_Field( 'PMD_scope', __( "Usable From?", 'event_espresso' ), FALSE, array() ), //possible values currently are 'CART','ADMIN','API'
+				'PMD_ID' => new EE_Primary_Key_Int_Field('PMD_ID', __("ID", 'event_espresso')),
+				'PMD_type' => new EE_Plain_Text_Field('PMD_type', __("Payment Method Type", 'event_espresso'), FALSE, 'Admin_Only'),
+				'PMD_name' => new EE_Plain_Text_Field('PMD_name', __("Name", 'event_espresso'), FALSE),
+				'PMD_desc' => new EE_Post_Content_Field('PMD_desc', __("Description", 'event_espresso'), FALSE, ''),
+				'PMD_admin_name' => new EE_Plain_Text_Field('PMD_admin_name', __("Admin-Only Name", 'event_espresso'), TRUE),
+				'PMD_admin_desc' => new EE_Post_Content_Field('PMD_admin_desc', __("Admin-Only Description", 'event_espresso'), TRUE),
+				'PMD_slug' => new EE_Slug_Field('PMD_slug', __("Slug", 'event_espresso'), FALSE),
+				'PMD_order' => new EE_Integer_Field('PMD_order', __("Order", 'event_espresso'), FALSE, 0),
+				'PMD_debug_mode' => new EE_Boolean_Field('PMD_debug_mode', __("Debug Mode On?", 'event_espresso'), FALSE, FALSE),
+				'PMD_wp_user' => new EE_WP_User_Field('PMD_wp_user', __("Payment Method Creator ID", 'event_espresso'), FALSE),
+				'PMD_open_by_default' => new EE_Boolean_Field('PMD_open_by_default', __("Open by Default?", 'event_espresso'), FALSE, FALSE), 'PMD_button_url' => new EE_Plain_Text_Field('PMD_button_url', __("Button URL", 'event_espresso'), TRUE, ''),
+				'PMD_scope' => new EE_Serialized_Text_Field('PMD_scope', __("Usable From?", 'event_espresso'), FALSE, array()), //possible values currently are 'CART','ADMIN','API'
 		) );
 		$this->_model_relations = array(
  //			'Event'=>new EE_HABTM_Relation('Event_Payment_Method'),
 			'Payment' => new EE_Has_Many_Relation(),
-			'Currency' => new EE_HABTM_Relation( 'Currency_Payment_Method' ),
+			'Currency' => new EE_HABTM_Relation('Currency_Payment_Method'),
 			'Transaction' => new EE_Has_Many_Relation(),
 			'WP_User' => new EE_Belongs_To_Relation(),
 		);
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -76,8 +76,8 @@ 
 	 * @param string $slug
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_by_slug( $slug ) {
-		return $this->get_one( array( array( 'PMD_slug' => $slug ) ) );
+	public function get_one_by_slug($slug) {
+		return $this->get_one(array(array('PMD_slug' => $slug)));
 	}
 
 
@@ -91,8 +91,8 @@ 
 		return apply_filters(
 			'FHEE__EEM_Payment_Method__scopes',
 			array(
-				self::scope_cart 		=> __( "Front-end Registration Page", 'event_espresso' ),
-				self::scope_admin 	=> __( "Admin Registration Page (no online processing)", 'event_espresso' )
+				self::scope_cart 		=> __("Front-end Registration Page", 'event_espresso'),
+				self::scope_admin 	=> __("Admin Registration Page (no online processing)", 'event_espresso')
 			)
 		);
 	}
@@ -104,9 +104,9 @@ 
 	 * @param string $scope like one of EEM_Payment_Method::instance()->scopes()
 	 * @return boolean
 	 */
-	public function is_valid_scope( $scope ) {
+	public function is_valid_scope($scope) {
 		$scopes = $this->scopes();
-		if ( isset( $scopes[ $scope ] ) ) {
+		if (isset($scopes[$scope])) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -122,11 +122,11 @@ 
 	 * @throws EE_Error
 	 * @return EE_Payment_Method[]
 	 */
-	public function get_all_active( $scope = NULL, $query_params = array() ) {
-		if( ! isset( $query_params[ 'order_by' ] ) && ! isset( $query_params[ 'order' ] ) ) {
-			$query_params = array( 'order_by' => array( 'PMD_order' => 'ASC', 'PMD_ID' => 'ASC' ) );
+	public function get_all_active($scope = NULL, $query_params = array()) {
+		if ( ! isset($query_params['order_by']) && ! isset($query_params['order'])) {
+			$query_params = array('order_by' => array('PMD_order' => 'ASC', 'PMD_ID' => 'ASC'));
 		}
-		return $this->get_all( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+		return $this->get_all($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 	/**
@@ -135,8 +135,8 @@ 
 	 * @param array $query_params
 	 * @return int
 	 */
-	public function count_active( $scope = NULL, $query_params = array() ){
-		return $this->count( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+	public function count_active($scope = NULL, $query_params = array()) {
+		return $this->count($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 	/**
@@ -147,21 +147,21 @@ 
 	 * @return array like param of EEM_Base::get_all()
 	 * @throws EE_Error
 	 */
-	protected function _get_query_params_for_all_active( $scope = NULL, $query_params = array() ){
-		if ( $scope ) {
-			if ( $this->is_valid_scope( $scope ) ) {
-				return array_replace_recursive( array( array( 'PMD_scope' => array( 'LIKE', "%$scope%" ) ) ), $query_params );
+	protected function _get_query_params_for_all_active($scope = NULL, $query_params = array()) {
+		if ($scope) {
+			if ($this->is_valid_scope($scope)) {
+				return array_replace_recursive(array(array('PMD_scope' => array('LIKE', "%$scope%"))), $query_params);
 			} else {
-				throw new EE_Error( sprintf( __( "'%s' is not a valid scope for a payment method", "event_espresso" ), $scope ) );
+				throw new EE_Error(sprintf(__("'%s' is not a valid scope for a payment method", "event_espresso"), $scope));
 			}
 		} else {
 			$acceptable_scopes = array();
 			$count = 0;
-			foreach ( $this->scopes() as $scope_name => $desc ) {
+			foreach ($this->scopes() as $scope_name => $desc) {
 				$count++;
-				$acceptable_scopes[ 'PMD_scope*' . $count ] = array( 'LIKE', '%' . $scope_name . '%' );
+				$acceptable_scopes['PMD_scope*'.$count] = array('LIKE', '%'.$scope_name.'%');
 			}
-			return array_replace_recursive( array( array( 'OR*active_scope' => $acceptable_scopes ) ), $query_params );
+			return array_replace_recursive(array(array('OR*active_scope' => $acceptable_scopes)), $query_params);
 		}
 	}
 
@@ -173,8 +173,8 @@ 
 	 * @return array like param of EEM_Base::get_all()
 	 * @throws EE_Error
 	 */
-	public function get_query_params_for_all_active( $scope = NULL, $query_params = array() ) {
-		return $this->_get_query_params_for_all_active( $scope, $query_params );
+	public function get_query_params_for_all_active($scope = NULL, $query_params = array()) {
+		return $this->_get_query_params_for_all_active($scope, $query_params);
 	}
 
 
@@ -184,8 +184,8 @@ 
 	 * @param array  $query_params
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_active( $scope = NULL, $query_params = array() ) {
-		return $this->get_one( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+	public function get_one_active($scope = NULL, $query_params = array()) {
+		return $this->get_one($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 
@@ -195,8 +195,8 @@ 
 	 * @param string $type
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_of_type( $type ) {
-		return $this->get_one( array( array( 'PMD_type' => $type ) ) );
+	public function get_one_of_type($type) {
+		return $this->get_one(array(array('PMD_type' => $type)));
 	}
 
 
@@ -209,22 +209,22 @@ 
 	 * @return EE_Payment_Method
 	 * @throws EE_Error
 	 */
-	public function ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db = FALSE ) {
+	public function ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db = FALSE) {
 		//first: check if it's a slug
-		if( is_string( $base_class_obj_or_id ) ) {
-			$obj = $this->get_one_by_slug( $base_class_obj_or_id );
-			if( $obj ) {
+		if (is_string($base_class_obj_or_id)) {
+			$obj = $this->get_one_by_slug($base_class_obj_or_id);
+			if ($obj) {
 				return $obj;
 			}
 		}
 		//ok so it wasn't a slug we were passed. try the usual then (ie, it's an object or an ID)
 		try {
-			return parent::ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db );
+			return parent::ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db);
 		}
-		catch ( EE_Error $e ) {
+		catch (EE_Error $e) {
 			//handle it outside the catch
 		}
-		throw new EE_Error( sprintf( __( "'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso" ), $base_class_obj_or_id ) );
+		throw new EE_Error(sprintf(__("'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso"), $base_class_obj_or_id));
 	}
 
 
@@ -235,12 +235,12 @@ 
 	 * @param mixed $base_obj_or_id_or_slug
 	 * @return int
 	 */
-	function ensure_is_ID( $base_obj_or_id_or_slug ) {
-		if ( is_string( $base_obj_or_id_or_slug ) ) {
+	function ensure_is_ID($base_obj_or_id_or_slug) {
+		if (is_string($base_obj_or_id_or_slug)) {
 			//assume it's a slug
-			$base_obj_or_id_or_slug = $this->get_one_by_slug( $base_obj_or_id_or_slug );
+			$base_obj_or_id_or_slug = $this->get_one_by_slug($base_obj_or_id_or_slug);
 		}
-		return parent::ensure_is_ID( $base_obj_or_id_or_slug );
+		return parent::ensure_is_ID($base_obj_or_id_or_slug);
 	}
 
 
@@ -249,36 +249,36 @@ 
 	 * Verifies the button urls on all the passed payment methods have a valid button url. If not, resets them to their default.
 	 * @param EE_Payment_Method[] $payment_methods. If NULL is provided defaults to all payment methods active in the cart
 	 */
-	function verify_button_urls( $payment_methods = NULL ) {
-		$payment_methods = is_array( $payment_methods ) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart);
-		foreach ( $payment_methods as $payment_method ) {
+	function verify_button_urls($payment_methods = NULL) {
+		$payment_methods = is_array($payment_methods) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart);
+		foreach ($payment_methods as $payment_method) {
 			try {
 				$current_button_url = $payment_method->button_url();
-				$buttons_urls_to_try = apply_filters( 'FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array(
-					'current_ssl' => str_replace( "http://", "https://", $current_button_url ),
-					'current' => str_replace( "https://", "http://", $current_button_url ),
-					'default_ssl' => str_replace( "http://", "https://", $payment_method->type_obj()->default_button_url() ),
-					'default' => str_replace( "https://", "http://", $payment_method->type_obj()->default_button_url() ),
-				) );
-				foreach( $buttons_urls_to_try as $button_url_to_try ) {
-					if(
+				$buttons_urls_to_try = apply_filters('FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array(
+					'current_ssl' => str_replace("http://", "https://", $current_button_url),
+					'current' => str_replace("https://", "http://", $current_button_url),
+					'default_ssl' => str_replace("http://", "https://", $payment_method->type_obj()->default_button_url()),
+					'default' => str_replace("https://", "http://", $payment_method->type_obj()->default_button_url()),
+				));
+				foreach ($buttons_urls_to_try as $button_url_to_try) {
+					if (
 							(//this is the current url and it exists, regardless of SSL issues
 								$button_url_to_try == $current_button_url &&
 								EEH_URL::remote_file_exists(
 										$button_url_to_try,
 										array(
 											'sslverify' => false,
-											'limit_response_size' => 4095,//we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
+											'limit_response_size' => 4095, //we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
 											) )
 							)
 							||
 							(//this is NOT the current url and it exists with a working SSL cert
 								$button_url_to_try != $current_button_url &&
-								EEH_URL::remote_file_exists( $button_url_to_try )
+								EEH_URL::remote_file_exists($button_url_to_try)
 							) ) {
-						if( $current_button_url != $button_url_to_try ){
-							$payment_method->save( array( 'PMD_button_url' => $button_url_to_try ) );
-							EE_Error::add_attention( sprintf( __( "Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso" ), $payment_method->name(), $button_url_to_try ) );
+						if ($current_button_url != $button_url_to_try) {
+							$payment_method->save(array('PMD_button_url' => $button_url_to_try));
+							EE_Error::add_attention(sprintf(__("Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso"), $payment_method->name(), $button_url_to_try));
 						}
 						//this image exists. So if wasn't set before, now it is;
 						//or if it was already set, we have nothing to do
@@ -286,8 +286,8 @@ 
 					}
 				}
 			}
-			catch ( EE_Error $e ) {
-				$payment_method->set_active( FALSE );
+			catch (EE_Error $e) {
+				$payment_method->set_active(FALSE);
 			}
 		}
 	}
@@ -303,30 +303,30 @@ 
      * @return EE_Payment_Method[]
      * @throws InvalidDataTypeException
      */
-	protected function _create_objects( $rows = array() ) {
-		EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-		$payment_methods = parent::_create_objects( $rows );
+	protected function _create_objects($rows = array()) {
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
+		$payment_methods = parent::_create_objects($rows);
 		/* @var $payment_methods EE_Payment_Method[] */
 		$usable_payment_methods = array();
-		foreach ( $payment_methods as $key => $payment_method ) {
-			if ( EE_Payment_Method_Manager::instance()->payment_method_type_exists( $payment_method->type() ) ) {
-				$usable_payment_methods[ $key ] = $payment_method;
+		foreach ($payment_methods as $key => $payment_method) {
+			if (EE_Payment_Method_Manager::instance()->payment_method_type_exists($payment_method->type())) {
+				$usable_payment_methods[$key] = $payment_method;
 				//some payment methods enqueue their scripts in EE_PMT_*::__construct
 				//which is kinda a no-no (just because it's being constructed doesn't mean we need to enqueue
 				//its scripts). but for backwards-compat we should continue to do that
 				$payment_method->type_obj();
-			} elseif( $payment_method->active() ) {
+			} elseif ($payment_method->active()) {
 				//only deactivate and notify the admin if the payment is active somewhere
 				$payment_method->deactivate();
 				$payment_method->save();
                 new PersistentAdminNotice(
-                    'auto-deactivated-' . $payment_method->type(),
+                    'auto-deactivated-'.$payment_method->type(),
                     sprintf(
                         __('The payment method %1$s was automatically deactivated because it appears its associated Event Espresso Addon was recently deactivated.%2$sIt can be reactivated on the %3$sPlugins admin page%4$s, then you can reactivate the payment method.',
                             'event_espresso'),
                         $payment_method->admin_name(),
                         '<br />',
-                        '<a href="' . admin_url('plugins.php') . '">',
+                        '<a href="'.admin_url('plugins.php').'">',
                         '</a>'
                     ),
                     true,
@@ -348,16 +348,16 @@ 
 	 * @param string 	$scope @see EEM_Payment_Method::get_all_for_events
 	 * @return EE_Payment_Method[]
 	 */
-	public function get_all_for_transaction( $transaction, $scope ) {
+	public function get_all_for_transaction($transaction, $scope) {
 		//@todo take relations between events and payment methods into account, once that relation exists
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			//@todo take the relation between transaction and currencies into account
 		}
-		$currencies_for_events = array( EE_Config::instance()->currency->code );
+		$currencies_for_events = array(EE_Config::instance()->currency->code);
 		//give addons a chance to override what payment methods are chosen based on the transaction
 		return apply_filters(
 			'FHEE__EEM_Payment_Method__get_all_for_transaction__payment_methods',
-			$this->get_all_active( $scope, array( array( 'Currency.CUR_code' => array( 'IN', $currencies_for_events ) ) ) ),
+			$this->get_all_active($scope, array(array('Currency.CUR_code' => array('IN', $currencies_for_events)))),
 			$transaction,
 			$scope
 		);
@@ -373,16 +373,16 @@ 
 	 * @param EE_Registration|int $registration_or_reg_id  Either the EE_Registration object or the id for the registration.
 	 * @return EE_Payment|null
 	 */
-	public function get_last_used_for_registration( $registration_or_reg_id ) {
-		$registration_id = EEM_Registration::instance()->ensure_is_ID( $registration_or_reg_id );
+	public function get_last_used_for_registration($registration_or_reg_id) {
+		$registration_id = EEM_Registration::instance()->ensure_is_ID($registration_or_reg_id);
 
 		$query_params = array(
 			0 => array(
 				'Payment.Registration.REG_ID' => $registration_id,
 			),
-			'order_by' => array( 'Payment.PAY_ID' => 'DESC' )
+			'order_by' => array('Payment.PAY_ID' => 'DESC')
 		);
-		return $this->get_one( $query_params );
+		return $this->get_one($query_params);
 	}
 
 }

core/EE_Load_Espresso_Core.core.php

Indentation +3 added lines, -3 removed lines

@@ -83,9 +83,9 @@
 		// build DI container
 		$OpenCoffeeShop = new OpenCoffeeShop();
 		$OpenCoffeeShop->addRecipes();
-        $OpenCoffeeShop->CoffeeShop()->addService('EE_Request', $request);
-        $OpenCoffeeShop->CoffeeShop()->addService('EE_Response', $response);
-        CoffeeMill::setCoffeeShop($OpenCoffeeShop->CoffeeShop());
+		$OpenCoffeeShop->CoffeeShop()->addService('EE_Request', $request);
+		$OpenCoffeeShop->CoffeeShop()->addService('EE_Response', $response);
+		CoffeeMill::setCoffeeShop($OpenCoffeeShop->CoffeeShop());
 		// $CoffeeShop = $OpenCoffeeShop->CoffeeShop();
 		// create and cache the CommandBus, and also add the CapChecker middleware
 		$this->registry->create(

Spacing +34 added lines, -34 removed lines

@@ -2,8 +2,8 @@ 
 use EventEspresso\core\services\container\CoffeeMill;
 use EventEspresso\core\services\container\OpenCoffeeShop;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -54,7 +54,7 @@ 
 	 */
 	public function __construct() {
 		// deprecated functions
-		espresso_load_required( 'EventEspresso\core\Factory', EE_CORE . 'Factory.php' );
+		espresso_load_required('EventEspresso\core\Factory', EE_CORE.'Factory.php');
 	}
 
 
@@ -70,16 +70,16 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->request = $request;
 		$this->response = $response;
 		// info about how to load classes required by other classes
 		$this->dependency_map = $this->_load_dependency_map();
 		// central repository for classes
 		$this->registry = $this->_load_registry();
-		do_action( 'EE_Load_Espresso_Core__handle_request__initialize_core_loading' );
+		do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
 		// PSR4 Autoloaders
-		$this->registry->load_core( 'EE_Psr4AutoloaderInit' );
+		$this->registry->load_core('EE_Psr4AutoloaderInit');
 		// build DI container
 		$OpenCoffeeShop = new OpenCoffeeShop();
 		$OpenCoffeeShop->addRecipes();
@@ -92,20 +92,20 @@ 
 			'CommandBusInterface',
 			array(
 				null,
-				$this->registry->create( 'CapChecker' )
+				$this->registry->create('CapChecker')
 			),
 			true
 		);
 		// workarounds for PHP < 5.3
 		$this->_load_class_tools();
 		// load interfaces
-		espresso_load_required( 'EEI_Payment_Method_Interfaces', EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php' );
+		espresso_load_required('EEI_Payment_Method_Interfaces', EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php');
 		// deprecated functions
-		espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' );
+		espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
 		// WP cron jobs
-		$this->registry->load_core( 'Cron_Tasks' );
-		$this->registry->load_core( 'EE_Request_Handler' );
-		$this->registry->load_core( 'EE_System' );
+		$this->registry->load_core('Cron_Tasks');
+		$this->registry->load_core('EE_Request_Handler');
+		$this->registry->load_core('EE_System');
 
 		return $this->response;
 	}
@@ -135,11 +135,11 @@ 
 	 * @throws \EE_Error
 	 */
 	public function dependency_map() {
-		if ( ! $this->dependency_map instanceof EE_Dependency_Map ) {
+		if ( ! $this->dependency_map instanceof EE_Dependency_Map) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Invalid EE_Dependency_Map: "%1$s"', 'event_espresso' ),
-					print_r( $this->dependency_map, true )
+					__('Invalid EE_Dependency_Map: "%1$s"', 'event_espresso'),
+					print_r($this->dependency_map, true)
 				)
 			);
 		}
@@ -153,11 +153,11 @@ 
 	 * @throws \EE_Error
 	 */
 	public function registry() {
-		if ( ! $this->registry instanceof EE_Registry ) {
+		if ( ! $this->registry instanceof EE_Registry) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Invalid EE_Registry: "%1$s"', 'event_espresso' ),
-					print_r( $this->registry, true )
+					__('Invalid EE_Registry: "%1$s"', 'event_espresso'),
+					print_r($this->registry, true)
 				)
 			);
 		}
@@ -173,15 +173,15 @@ 
 	 * 	@return EE_Dependency_Map
 	 */
 	private function _load_dependency_map() {
-		if ( ! is_readable( EE_CORE . 'EE_Dependency_Map.core.php' ) ) {
+		if ( ! is_readable(EE_CORE.'EE_Dependency_Map.core.php')) {
 			EE_Error::add_error(
-				__( 'The EE_Dependency_Map core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Dependency_Map core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
-		require_once( EE_CORE . 'EE_Dependency_Map.core.php' );
-		return EE_Dependency_Map::instance( $this->request, $this->response );
+		require_once(EE_CORE.'EE_Dependency_Map.core.php');
+		return EE_Dependency_Map::instance($this->request, $this->response);
 	}
 
 
@@ -193,15 +193,15 @@ 
 	 * 	@return EE_Registry
 	 */
 	private function _load_registry() {
-		if ( ! is_readable( EE_CORE . 'EE_Registry.core.php' )) {
+		if ( ! is_readable(EE_CORE.'EE_Registry.core.php')) {
 			EE_Error::add_error(
-				__( 'The EE_Registry core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Registry core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
-		require_once( EE_CORE . 'EE_Registry.core.php' );
-		return EE_Registry::instance( $this->dependency_map );
+		require_once(EE_CORE.'EE_Registry.core.php');
+		return EE_Registry::instance($this->dependency_map);
 	}
 
 
@@ -212,13 +212,13 @@ 
 	 * 	@return void
 	 */
 	private function _load_class_tools() {
-		if ( ! is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) {
+		if ( ! is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) {
 			EE_Error::add_error(
-				__( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' ),
+				__('The EEH_Class_Tools helper could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
-		require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' );
+		require_once(EE_HELPERS.'EEH_Class_Tools.helper.php');
 	}
 
 
@@ -232,13 +232,13 @@ 
 	 * @param \EE_Request $request
 	 * @param \EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response ) {
+	public function handle_response(EE_Request $request, EE_Response $response) {
 		//\EEH_Debug_Tools::printr( __FUNCTION__, __CLASS__, __FILE__, __LINE__, 2 );
 		//EEH_Debug_Tools::printr( $request, '$request', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $response, '$response', __FILE__, __LINE__ );
 		//die();
-		if ( $response->plugin_deactivated() ) {
-			espresso_deactivate_plugin( EE_PLUGIN_BASENAME );
+		if ($response->plugin_deactivated()) {
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
 		}
 	}
 

core/domain/entities/notifications/PersistentAdminNotice.php

Indentation +320 added lines, -321 removed lines

@@ -25,330 +25,329 @@
 class PersistentAdminNotice implements RequiresCapCheckInterface
 {
 
-    /**
-     * @var string $name
-     */
-    protected $name = '';
-
-    /**
-     * @var string $message
-     */
-    protected $message = '';
-
-    /**
-     * @var boolean $force_update
-     */
-    protected $force_update = false;
-
-    /**
-     * @var string $capability
-     */
-    protected $capability = 'manage_options';
-
-    /**
-     * @var string $cap_context
-     */
-    protected $cap_context = 'view persistent admin notice';
-
-    /**
-     * @var boolean $dismissed
-     */
-    protected $dismissed = false;
-
-    /**
-     * @var CapCheckInterface $cap_check
-     */
-    protected $cap_check;
-
-    /**
-     * if true, then this notice will be deleted from the database
-     *
-     * @var boolean $purge
-     */
-    protected $purge = false;
-
-    /**
-     * gets set to true if notice is successfully registered with the PersistentAdminNoticeManager
-     * if false, and WP_DEBUG is on, then an exception will be thrown in the admin footer
-     *
-     * @var boolean $registered
-     */
-    private $registered = false;
-
-
-
-    /**
-     * PersistentAdminNotice constructor
-
-     *
-     * @param string $name         [required] the name, or key of the Persistent Admin Notice to be stored
-     * @param string $message      [required] the message to be stored persistently until dismissed
-     * @param bool   $force_update enforce the reappearance of a persistent message
-     * @param string $capability   user capability required to view this notice
-     * @param string $cap_context  description for why the cap check is being performed
-     * @param bool   $dismissed    whether or not the user has already dismissed/viewed this notice
-     * @throws InvalidDataTypeException
-     */
-    public function __construct(
-        $name,
-        $message,
-        $force_update = false,
-        $capability = 'manage_options',
-        $cap_context = 'view persistent admin notice',
-        $dismissed = false
-    ) {
-        $this->setName($name);
-        $this->setMessage($message);
-        $this->setForceUpdate($force_update);
-        $this->setCapability($capability);
-        $this->setCapContext($cap_context);
-        $this->setDismissed($dismissed);
-        add_action(
-            'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
-            array($this, 'registerPersistentAdminNotice')
-        );
-        add_action('admin_footer', array($this, 'confirmRegistered'));
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-
-
-    /**
-     * @param string $name
-     * @throws InvalidDataTypeException
-     */
-    private function setName($name)
-    {
-        if ( ! is_string($name)) {
-            throw new InvalidDataTypeException('$name', $name, 'string');
-        }
-        $this->name = sanitize_key($name);
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-
-
-    /**
-     * @param string $message
-     * @throws InvalidDataTypeException
-     */
-    private function setMessage($message)
-    {
-        // \EEH_Debug_Tools::printr($this->name, '$this->name', __FILE__, __LINE__);
-        // \EEH_Debug_Tools::printr($message, '$message', __FILE__, __LINE__);
-        if ( ! is_string($message)) {
-            throw new InvalidDataTypeException('$message', $message, 'string');
-        }
-        global $allowedtags;
-        $allowedtags['br'] = array();
-        $this->message = wp_kses($message, $allowedtags);
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function getForceUpdate()
-    {
-        return $this->force_update;
-    }
-
-
-
-    /**
-     * @param bool $force_update
-     */
-    private function setForceUpdate($force_update)
-    {
-        $this->force_update = filter_var($force_update, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function getCapability()
-    {
-        return $this->capability;
-    }
-
-
-
-    /**
-     * @param string $capability
-     * @throws InvalidDataTypeException
-     */
-    private function setCapability($capability)
-    {
-        if ( ! is_string($capability)) {
-            throw new InvalidDataTypeException('$capability', $capability, 'string');
-        }
-        $this->capability = $capability;
-    }
+	/**
+	 * @var string $name
+	 */
+	protected $name = '';
+
+	/**
+	 * @var string $message
+	 */
+	protected $message = '';
+
+	/**
+	 * @var boolean $force_update
+	 */
+	protected $force_update = false;
+
+	/**
+	 * @var string $capability
+	 */
+	protected $capability = 'manage_options';
+
+	/**
+	 * @var string $cap_context
+	 */
+	protected $cap_context = 'view persistent admin notice';
+
+	/**
+	 * @var boolean $dismissed
+	 */
+	protected $dismissed = false;
+
+	/**
+	 * @var CapCheckInterface $cap_check
+	 */
+	protected $cap_check;
+
+	/**
+	 * if true, then this notice will be deleted from the database
+	 *
+	 * @var boolean $purge
+	 */
+	protected $purge = false;
+
+	/**
+	 * gets set to true if notice is successfully registered with the PersistentAdminNoticeManager
+	 * if false, and WP_DEBUG is on, then an exception will be thrown in the admin footer
+	 *
+	 * @var boolean $registered
+	 */
+	private $registered = false;
+
+
+
+	/**
+	 * PersistentAdminNotice constructor
+	 *
+	 * @param string $name         [required] the name, or key of the Persistent Admin Notice to be stored
+	 * @param string $message      [required] the message to be stored persistently until dismissed
+	 * @param bool   $force_update enforce the reappearance of a persistent message
+	 * @param string $capability   user capability required to view this notice
+	 * @param string $cap_context  description for why the cap check is being performed
+	 * @param bool   $dismissed    whether or not the user has already dismissed/viewed this notice
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct(
+		$name,
+		$message,
+		$force_update = false,
+		$capability = 'manage_options',
+		$cap_context = 'view persistent admin notice',
+		$dismissed = false
+	) {
+		$this->setName($name);
+		$this->setMessage($message);
+		$this->setForceUpdate($force_update);
+		$this->setCapability($capability);
+		$this->setCapContext($cap_context);
+		$this->setDismissed($dismissed);
+		add_action(
+			'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
+			array($this, 'registerPersistentAdminNotice')
+		);
+		add_action('admin_footer', array($this, 'confirmRegistered'));
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+
+
+	/**
+	 * @param string $name
+	 * @throws InvalidDataTypeException
+	 */
+	private function setName($name)
+	{
+		if ( ! is_string($name)) {
+			throw new InvalidDataTypeException('$name', $name, 'string');
+		}
+		$this->name = sanitize_key($name);
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function getMessage()
+	{
+		return $this->message;
+	}
+
+
+
+	/**
+	 * @param string $message
+	 * @throws InvalidDataTypeException
+	 */
+	private function setMessage($message)
+	{
+		// \EEH_Debug_Tools::printr($this->name, '$this->name', __FILE__, __LINE__);
+		// \EEH_Debug_Tools::printr($message, '$message', __FILE__, __LINE__);
+		if ( ! is_string($message)) {
+			throw new InvalidDataTypeException('$message', $message, 'string');
+		}
+		global $allowedtags;
+		$allowedtags['br'] = array();
+		$this->message = wp_kses($message, $allowedtags);
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function getForceUpdate()
+	{
+		return $this->force_update;
+	}
+
+
+
+	/**
+	 * @param bool $force_update
+	 */
+	private function setForceUpdate($force_update)
+	{
+		$this->force_update = filter_var($force_update, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function getCapability()
+	{
+		return $this->capability;
+	}
+
+
+
+	/**
+	 * @param string $capability
+	 * @throws InvalidDataTypeException
+	 */
+	private function setCapability($capability)
+	{
+		if ( ! is_string($capability)) {
+			throw new InvalidDataTypeException('$capability', $capability, 'string');
+		}
+		$this->capability = $capability;
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function getCapContext()
-    {
-        return $this->cap_context;
-    }
-
-
-
-    /**
-     * @param string $cap_context
-     * @throws InvalidDataTypeException
-     */
-    private function setCapContext($cap_context)
-    {
-        if ( ! is_string($cap_context)) {
-            throw new InvalidDataTypeException('$cap_context', $cap_context, 'string');
-        }
-        $this->cap_context = $cap_context;
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function getDismissed()
-    {
-        return $this->dismissed;
-    }
-
-
-
-    /**
-     * @param bool $dismissed
-     */
-    public function setDismissed($dismissed)
-    {
-        $this->dismissed = filter_var($dismissed, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-
-    /**
-     * @return CapCheckInterface
-     * @throws InvalidDataTypeException
-     */
-    public function getCapCheck()
-    {
-        if ( ! $this->cap_check instanceof CapCheckInterface) {
-            $this->setCapCheck(
-                new CapCheck(
-                    $this->capability,
-                    $this->cap_context
-                )
-            );
-        }
-        return $this->cap_check;
-    }
-
-
-
-    /**
-     * @param CapCheckInterface $cap_check
-     */
-    private function setCapCheck(CapCheckInterface $cap_check)
-    {
-        $this->cap_check = $cap_check;
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function getPurge()
-    {
-        return $this->purge;
-    }
-
-
-
-    /**
-     * @param bool $purge
-     */
-    public function setPurge($purge)
-    {
-        $this->purge = filter_var($purge, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-
-    /**
-     * given a valid PersistentAdminNotice Collection,
-     * this notice will be added if it is not already found in the collection (using its name as the identifier)
-     * if an existing notice is found that has already been dismissed,
-     * but we are overriding with a forced update, then we will toggle its dismissed state,
-     * so that the notice is displayed again
-     *
-     * @param Collection $persistent_admin_notice_collection
-     * @throws InvalidEntityException
-     */
-    public function registerPersistentAdminNotice(Collection $persistent_admin_notice_collection)
-    {
-        // first check if this notice has already been added to the collection
-        if ($persistent_admin_notice_collection->has($this->name)) {
-            /** @var PersistentAdminNotice $existing */
-            $existing = $persistent_admin_notice_collection->get($this->name);
-            // we don't need to add it again (we can't actually)
-            // but if it has already been dismissed, and we are overriding with a forced update
-            if ($existing->getDismissed() && $this->getForceUpdate()) {
-                // then toggle the notice's dismissed state to true
-                // so that it gets displayed again
-                $existing->setDismissed(false);
-            }
-        } else {
-            $persistent_admin_notice_collection->add($this, $this->name);
-        }
-        $this->registered = true;
-    }
-
-
-
-    /**
-     * @throws DomainException
-     */
-    public function confirmRegistered()
-    {
-        if( ! $this->registered && WP_DEBUG) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'The "%1$s" PersistentAdminNotice was not successfully registered. Please ensure that it is being created prior to either the "admin_notices" or "network_admin_notices" hooks being triggered.',
-                        'event_espresso'
-                    ),
-                    $this->name
-                )
-            );
-        }
-    }
+	/**
+	 * @return string
+	 */
+	public function getCapContext()
+	{
+		return $this->cap_context;
+	}
+
+
+
+	/**
+	 * @param string $cap_context
+	 * @throws InvalidDataTypeException
+	 */
+	private function setCapContext($cap_context)
+	{
+		if ( ! is_string($cap_context)) {
+			throw new InvalidDataTypeException('$cap_context', $cap_context, 'string');
+		}
+		$this->cap_context = $cap_context;
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function getDismissed()
+	{
+		return $this->dismissed;
+	}
+
+
+
+	/**
+	 * @param bool $dismissed
+	 */
+	public function setDismissed($dismissed)
+	{
+		$this->dismissed = filter_var($dismissed, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+
+	/**
+	 * @return CapCheckInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function getCapCheck()
+	{
+		if ( ! $this->cap_check instanceof CapCheckInterface) {
+			$this->setCapCheck(
+				new CapCheck(
+					$this->capability,
+					$this->cap_context
+				)
+			);
+		}
+		return $this->cap_check;
+	}
+
+
+
+	/**
+	 * @param CapCheckInterface $cap_check
+	 */
+	private function setCapCheck(CapCheckInterface $cap_check)
+	{
+		$this->cap_check = $cap_check;
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function getPurge()
+	{
+		return $this->purge;
+	}
+
+
+
+	/**
+	 * @param bool $purge
+	 */
+	public function setPurge($purge)
+	{
+		$this->purge = filter_var($purge, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+
+	/**
+	 * given a valid PersistentAdminNotice Collection,
+	 * this notice will be added if it is not already found in the collection (using its name as the identifier)
+	 * if an existing notice is found that has already been dismissed,
+	 * but we are overriding with a forced update, then we will toggle its dismissed state,
+	 * so that the notice is displayed again
+	 *
+	 * @param Collection $persistent_admin_notice_collection
+	 * @throws InvalidEntityException
+	 */
+	public function registerPersistentAdminNotice(Collection $persistent_admin_notice_collection)
+	{
+		// first check if this notice has already been added to the collection
+		if ($persistent_admin_notice_collection->has($this->name)) {
+			/** @var PersistentAdminNotice $existing */
+			$existing = $persistent_admin_notice_collection->get($this->name);
+			// we don't need to add it again (we can't actually)
+			// but if it has already been dismissed, and we are overriding with a forced update
+			if ($existing->getDismissed() && $this->getForceUpdate()) {
+				// then toggle the notice's dismissed state to true
+				// so that it gets displayed again
+				$existing->setDismissed(false);
+			}
+		} else {
+			$persistent_admin_notice_collection->add($this, $this->name);
+		}
+		$this->registered = true;
+	}
+
+
+
+	/**
+	 * @throws DomainException
+	 */
+	public function confirmRegistered()
+	{
+		if( ! $this->registered && WP_DEBUG) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'The "%1$s" PersistentAdminNotice was not successfully registered. Please ensure that it is being created prior to either the "admin_notices" or "network_admin_notices" hooks being triggered.',
+						'event_espresso'
+					),
+					$this->name
+				)
+			);
+		}
+	}
 
 
 }

Spacing +1 added lines, -1 removed lines

@@ -337,7 +337,7 @@
      */
     public function confirmRegistered()
     {
-        if( ! $this->registered && WP_DEBUG) {
+        if ( ! $this->registered && WP_DEBUG) {
             throw new DomainException(
                 sprintf(
                     esc_html__(

core/admin/EE_Admin_Page_Loader.core.php

Indentation +32 added lines, -32 removed lines

@@ -405,21 +405,21 @@ 
 		$class_name = $this->_get_classname_for_admin_init_page( $page );
  		EE_Registry::instance()->load_file( $path, $class_name, 'core' );
 		if ( ! class_exists( $class_name )) {
-            $inner_error_msg = '<br />' . sprintf(
-                esc_html__(
-                    'Make sure you have %1$s defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class',
-                    'event_espresso'
-                ),
-                '<strong>' . $class_name . '</strong>'
-            );
+			$inner_error_msg = '<br />' . sprintf(
+				esc_html__(
+					'Make sure you have %1$s defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class',
+					'event_espresso'
+				),
+				'<strong>' . $class_name . '</strong>'
+			);
 			$error_msg[] = sprintf( __('Something went wrong with loading the %s admin page.', 'event_espresso' ), $page);
 			$error_msg[] = $error_msg[0]
-                           . "\r\n"
-                           . sprintf(
-                               esc_html__( 'There is no Init class in place for the %s admin page.', 'event_espresso'),
-                               $page
-                           )
-                           . $inner_error_msg;
+						   . "\r\n"
+						   . sprintf(
+							   esc_html__( 'There is no Init class in place for the %s admin page.', 'event_espresso'),
+							   $page
+						   )
+						   . $inner_error_msg;
 			throw new EE_Error( implode( '||', $error_msg ));
 		}
 		$a = new ReflectionClass($class_name);
@@ -465,15 +465,15 @@ 
 
 
 
-    /**
-     * _prep_pages
-     * sets the _prepped_menu_maps property
-     *
-     * @access private
-     * @throws EE_Error
-     * @return void
-     * @throws InvalidDataTypeException
-     */
+	/**
+	 * _prep_pages
+	 * sets the _prepped_menu_maps property
+	 *
+	 * @access private
+	 * @throws EE_Error
+	 * @return void
+	 * @throws InvalidDataTypeException
+	 */
 	private function _prep_pages() {
 		$pages_array = array();
 
@@ -485,16 +485,16 @@ 
 				$page_map = $page->get_menu_map();
 				//if we've got an array then the menu map is in the old format so let's throw a persistent notice that the admin system isn't setup correctly for this item.
 				if ( is_array( $page_map ) || empty( $page_map ) ) {
-                    new PersistentAdminNotice(
-                        'menu_map_warning_' . str_replace(' ', '_', $page->label) . '_' . EVENT_ESPRESSO_VERSION,
-                        sprintf(
-                            __(
-                                'The admin page for %s was not correctly setup because it is using an older method for integrating with Event Espresso Core.  This means that full functionality for this component is not available.  This error message usually appears with an Add-on that is out of date.  Make sure you update all your Event Espresso 4 add-ons to the latest version to ensure they have necessary compatibility updates in place.',
-                                'event_espresso'
-                            ),
-                            $page->label
-                        )
-                    );
+					new PersistentAdminNotice(
+						'menu_map_warning_' . str_replace(' ', '_', $page->label) . '_' . EVENT_ESPRESSO_VERSION,
+						sprintf(
+							__(
+								'The admin page for %s was not correctly setup because it is using an older method for integrating with Event Espresso Core.  This means that full functionality for this component is not available.  This error message usually appears with an Add-on that is out of date.  Make sure you update all your Event Espresso 4 add-ons to the latest version to ensure they have necessary compatibility updates in place.',
+								'event_espresso'
+							),
+							$page->label
+						)
+					);
 					continue;
 				}
 

Spacing +124 added lines, -124 removed lines

@@ -2,7 +2,7 @@ 
 use EventEspresso\core\domain\entities\notifications\PersistentAdminNotice;
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -122,8 +122,8 @@ 
 		//let's do a scan and see what installed pages we have
 		$this->_get_installed_pages();
 		//set menus (has to be done on every load - we're not actually loading the page just setting the menus and where they point to).
-		add_action('admin_menu', array( $this, 'set_menus' ));
-		add_action( 'network_admin_menu', array( $this, 'set_network_menus' ) );
+		add_action('admin_menu', array($this, 'set_menus'));
+		add_action('network_admin_menu', array($this, 'set_network_menus'));
 	}
 
 
@@ -136,13 +136,13 @@ 
 	 * @return void
 	 */
 	private function _define_caffeinated_constants() {
-		if ( ! defined( 'EE_CORE_CAF_ADMIN'  ) ) {
-			define( 'EE_CORE_CAF_ADMIN', EE_PLUGIN_DIR_PATH . 'caffeinated/admin/');
-			define( 'EE_CORE_CAF_ADMIN_URL', EE_PLUGIN_DIR_URL . 'caffeinated/admin/');
-			define( 'EE_CORE_CAF_ADMIN_NEW', EE_CORE_CAF_ADMIN . 'new/');
-			define( 'EE_CORE_CAF_ADMIN_EXTEND', EE_CORE_CAF_ADMIN . 'extend/');
-			define( 'EE_CORE_CAF_ADMIN_EXTEND_URL', EE_CORE_CAF_ADMIN_URL . 'extend/');
-			define( 'EE_CORE_CAF_ADMIN_HOOKS', EE_CORE_CAF_ADMIN . 'hooks/');
+		if ( ! defined('EE_CORE_CAF_ADMIN')) {
+			define('EE_CORE_CAF_ADMIN', EE_PLUGIN_DIR_PATH.'caffeinated/admin/');
+			define('EE_CORE_CAF_ADMIN_URL', EE_PLUGIN_DIR_URL.'caffeinated/admin/');
+			define('EE_CORE_CAF_ADMIN_NEW', EE_CORE_CAF_ADMIN.'new/');
+			define('EE_CORE_CAF_ADMIN_EXTEND', EE_CORE_CAF_ADMIN.'extend/');
+			define('EE_CORE_CAF_ADMIN_EXTEND_URL', EE_CORE_CAF_ADMIN_URL.'extend/');
+			define('EE_CORE_CAF_ADMIN_HOOKS', EE_CORE_CAF_ADMIN.'hooks/');
 		}
 	}
 
@@ -161,7 +161,7 @@ 
 
 		//set array of EE_Admin_Page_Menu_Group objects
 		$groups = array(
-			'main' => new EE_Admin_Page_Menu_Group( array(
+			'main' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __('Main', 'event_espresso'),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::NONE,
 				'menu_slug' => 'main',
@@ -169,7 +169,7 @@ 
 				'menu_order' => 0,
 				'parent_slug' => 'espresso_events',
 				)),
-			'management' => new EE_Admin_Page_Menu_Group( array(
+			'management' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __('Management', 'event_espresso'),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
 				'menu_slug' => 'management',
@@ -177,7 +177,7 @@ 
 				'menu_order' => 10,
 				'parent_slug' => 'espresso_events'
 				)),
-			'settings' => new EE_Admin_Page_Menu_Group( array(
+			'settings' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __('Settings', 'event_espresso'),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
 				'menu_slug' => 'settings',
@@ -185,7 +185,7 @@ 
 				'menu_order' => 30,
 				'parent_slug' => 'espresso_events'
 				)),
-			'templates' => new EE_Admin_Page_Menu_Group( array(
+			'templates' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __('Templates', 'event_espresso'),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
 				'menu_slug' => 'templates',
@@ -193,7 +193,7 @@ 
 				'menu_order' => 40,
 				'parent_slug' => 'espresso_events'
 				)),
-			'extras' => new EE_Admin_Page_Menu_Group( array(
+			'extras' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __('Extras', 'event_espresso'),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
 				'menu_slug' => 'extras',
@@ -202,7 +202,7 @@ 
 				'parent_slug' => 'espresso_events',
 				'maintenance_mode_parent' => 'espresso_maintenance_settings'
 				)),
-			'tools' => new EE_Admin_Page_Menu_Group( array(
+			'tools' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __("Tools", "event_espresso"),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
 				'menu_slug' => 'tools',
@@ -210,7 +210,7 @@ 
 				'menu_order' => 60,
 				'parent_slug' => 'espresso_events'
 				)),
-			'addons' => new EE_Admin_Page_Menu_Group( array(
+			'addons' => new EE_Admin_Page_Menu_Group(array(
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
 				'menu_label' => __('Add-ons', 'event_espresso'),
 				'menu_slug' => 'addons',
@@ -220,7 +220,7 @@ 
 				))
 			);
 
-		$this->_admin_menu_groups = apply_filters( 'FHEE__EE_Admin_Page_Loader___set_menu_groups__admin_menu_groups', $groups );
+		$this->_admin_menu_groups = apply_filters('FHEE__EE_Admin_Page_Loader___set_menu_groups__admin_menu_groups', $groups);
 	}
 
 
@@ -238,10 +238,10 @@ 
 	private function _rearrange_menu_groups() {
 		$groups = array();
 		//first let's order the menu groups by their internal menu order (note usort type hinting to ensure the incoming array is EE_Admin_Page_Menu_Map objects )
-		usort( $this->_admin_menu_groups, array( $this, '_sort_menu_maps' ) );
-		foreach ( $this->_admin_menu_groups as $group ) {
-			if ( ! $group instanceof EE_Admin_Page_Menu_Group )
-				throw new EE_Error( sprintf( __('Unable to continue sorting the menu groups array because there is an invalid value for the menu groups.  All values in this array are required to be a EE_Admin_Page_Menu_Group object.  Instead there was: %s', 'event_espresso'), print_r($group, TRUE) ) );
+		usort($this->_admin_menu_groups, array($this, '_sort_menu_maps'));
+		foreach ($this->_admin_menu_groups as $group) {
+			if ( ! $group instanceof EE_Admin_Page_Menu_Group)
+				throw new EE_Error(sprintf(__('Unable to continue sorting the menu groups array because there is an invalid value for the menu groups.  All values in this array are required to be a EE_Admin_Page_Menu_Group object.  Instead there was: %s', 'event_espresso'), print_r($group, TRUE)));
 			$groups[$group->menu_slug] = $group;
 		}
 		return $groups;
@@ -259,48 +259,48 @@ 
 	 */
 	private function _get_installed_pages() {
 		$installed_refs = array();
-		$exclude = array( 'assets', 'templates' );
+		$exclude = array('assets', 'templates');
 		// grab everything in the  admin core directory
-		$admin_screens = glob( EE_ADMIN_PAGES . '*', GLOB_ONLYDIR );
-		if ( $admin_screens ) {
-			foreach( $admin_screens as $admin_screen ) {
+		$admin_screens = glob(EE_ADMIN_PAGES.'*', GLOB_ONLYDIR);
+		if ($admin_screens) {
+			foreach ($admin_screens as $admin_screen) {
 				// files and anything in the exclude array need not apply
-				if ( is_dir( $admin_screen ) && ! in_array( basename( $admin_screen ), $exclude )) {
+				if (is_dir($admin_screen) && ! in_array(basename($admin_screen), $exclude)) {
 					// these folders represent the different EE admin pages
-					$installed_refs[ basename( $admin_screen ) ] = $admin_screen;
+					$installed_refs[basename($admin_screen)] = $admin_screen;
 				}
 			}
 		}
 
-		if ( empty( $installed_refs ) ) {
+		if (empty($installed_refs)) {
 			$error_msg[] = __('There are no EE_Admin pages detected, it looks like EE did not install properly', 'event_espresso');
-			$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __('Check that the %s folder exists and is writable. Maybe try deactivating, then reactivating Event Espresso again.', 'event_espresso'), EE_ADMIN_PAGES );
-			throw new EE_Error( implode( '||', $error_msg ));
+			$error_msg[] = $error_msg[0]."\r\n".sprintf(__('Check that the %s folder exists and is writable. Maybe try deactivating, then reactivating Event Espresso again.', 'event_espresso'), EE_ADMIN_PAGES);
+			throw new EE_Error(implode('||', $error_msg));
 		}
 
 		//this just checks the caffeinated folder and takes care of setting up any caffeinated stuff.
 		$installed_refs = $this->_set_caffeinated($installed_refs);
 		//allow plugins to add in their own pages (note at this point they will need to have an autoloader defined for their class) OR hook into EEH_Autoloader::load_admin_page() to add their path.;
-		$installed_refs = apply_filters( 'FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', $installed_refs );
-		$this->_caffeinated_extends = apply_filters( 'FHEE__EE_Admin_Page_Loader___get_installed_pages__caffeinated_extends', $this->_caffeinated_extends );
+		$installed_refs = apply_filters('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', $installed_refs);
+		$this->_caffeinated_extends = apply_filters('FHEE__EE_Admin_Page_Loader___get_installed_pages__caffeinated_extends', $this->_caffeinated_extends);
 
 		//loop through admin pages and setup the $_installed_pages array.
 		$hooks_ref = array();
-		foreach ( $installed_refs as $page => $path ) {
+		foreach ($installed_refs as $page => $path) {
 			// set autoloaders for our admin page classes based on included path information
-			EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( $path );
+			EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder($path);
 			// build list of installed pages
-			$this->_installed_pages[$page] = $this->_load_admin_page( $page, $path );
+			$this->_installed_pages[$page] = $this->_load_admin_page($page, $path);
 			// verify returned object
-			if ( $this->_installed_pages[$page] instanceof EE_Admin_Page_Init ) {
-				if ( ! $this->_installed_pages[$page]->get_menu_map() instanceof EE_Admin_Page_Menu_Map ) {
+			if ($this->_installed_pages[$page] instanceof EE_Admin_Page_Init) {
+				if ( ! $this->_installed_pages[$page]->get_menu_map() instanceof EE_Admin_Page_Menu_Map) {
 					continue;
 				}
 
 				//skip if in full maintenance mode and maintenance_mode_parent is set
 				$maintenance_mode_parent = $this->_installed_pages[$page]->get_menu_map()->maintenance_mode_parent;
-				if ( empty( $maintenance_mode_parent ) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
-					unset( $installed_refs[$page] );
+				if (empty($maintenance_mode_parent) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
+					unset($installed_refs[$page]);
 					continue;
 				}
 
@@ -308,45 +308,45 @@ 
 				//flag for register hooks on extended pages b/c extended pages use the default INIT.
 				$extend = FALSE;
 				//now that we've got the admin_init objects... lets see if there are any caffeinated pages extending the originals.  If there are then let's hook into the init admin filter and load our extend instead.
-				if ( isset( $this->_caffeinated_extends[$page] ) ) {
+				if (isset($this->_caffeinated_extends[$page])) {
 					$this->_current_caf_extend_slug = $page;
-					$path_hook = 'FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__' . $this->_installed_pages[$page]->get_menu_map()->menu_slug . '_' . $this->_installed_pages[$page]->get_admin_page_name();
-					$path_runtime = 'return "' . $this->_caffeinated_extends[$this->_current_caf_extend_slug]["path"] . '";';
-					$page_hook = 'FHEE__EE_Admin_Page_Init___initialize_admin_page__admin_page__' . $this->_installed_pages[$page]->get_menu_map()->menu_slug . '_' . $this->_installed_pages[$page]->get_admin_page_name();
-					$page_runtime = 'return "' . $this->_caffeinated_extends[$this->_current_caf_extend_slug]["admin_page"] . '";';
+					$path_hook = 'FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__'.$this->_installed_pages[$page]->get_menu_map()->menu_slug.'_'.$this->_installed_pages[$page]->get_admin_page_name();
+					$path_runtime = 'return "'.$this->_caffeinated_extends[$this->_current_caf_extend_slug]["path"].'";';
+					$page_hook = 'FHEE__EE_Admin_Page_Init___initialize_admin_page__admin_page__'.$this->_installed_pages[$page]->get_menu_map()->menu_slug.'_'.$this->_installed_pages[$page]->get_admin_page_name();
+					$page_runtime = 'return "'.$this->_caffeinated_extends[$this->_current_caf_extend_slug]["admin_page"].'";';
 
-					$hook_function_path = create_function( '$path_to_file', $path_runtime);
-					$hook_function_page = create_function( '$admin_page', $page_runtime );
+					$hook_function_path = create_function('$path_to_file', $path_runtime);
+					$hook_function_page = create_function('$admin_page', $page_runtime);
 
-					add_filter( $path_hook, $hook_function_path );
-					add_filter( $page_hook, $hook_function_page );
+					add_filter($path_hook, $hook_function_path);
+					add_filter($page_hook, $hook_function_page);
 					$extend = TRUE;
 				}
 				//let's do the registered hooks
-				$extended_hooks = $this->_installed_pages[$page]->register_hooks( $extend );
+				$extended_hooks = $this->_installed_pages[$page]->register_hooks($extend);
 				$hooks_ref = array_merge($hooks_ref, $extended_hooks);
 			}
 		}
 
 		//the hooks_ref is all the pages where we have $extended _Hooks files that will extend a class in a different folder.  So we want to make sure we load the file for the parent.
 		//first make sure we've got unique values
-		$hooks_ref = array_unique( $hooks_ref );
+		$hooks_ref = array_unique($hooks_ref);
 		//now let's loop and require!
-		foreach ( $hooks_ref as $path ) {
-			require_once( $path );
+		foreach ($hooks_ref as $path) {
+			require_once($path);
 		}
 		//make sure we have menu slugs global setup. Used in EE_Admin_Page->page_setup() to ensure we don't do a full class load for an admin page that isn't requested.
 		global $ee_menu_slugs;
 		$ee_menu_slugs = $this->_menu_slugs;
 
 		//we need to loop again to run any early code
-		foreach ( $installed_refs as $page => $path ) {
-			if ( $this->_installed_pages[$page] instanceof EE_Admin_Page_Init ) {
+		foreach ($installed_refs as $page => $path) {
+			if ($this->_installed_pages[$page] instanceof EE_Admin_Page_Init) {
 				$this->_installed_pages[$page]->do_initial_loads();
 			}
 		}
 
-		do_action( 'AHEE__EE_Admin_Page_Loader___get_installed_pages_loaded', $this->_installed_pages );
+		do_action('AHEE__EE_Admin_Page_Loader___get_installed_pages_loaded', $this->_installed_pages);
 
 	}
 
@@ -358,9 +358,9 @@ 
 	 * @param string $page_slug
 	 * @return EE_Admin_Page
 	 */
-	public function get_admin_page_object( $page_slug = '' ) {
-		if ( isset( $this->_installed_pages[ $page_slug ] )) {
-			return $this->_installed_pages[ $page_slug ]->loaded_page_object();
+	public function get_admin_page_object($page_slug = '') {
+		if (isset($this->_installed_pages[$page_slug])) {
+			return $this->_installed_pages[$page_slug]->loaded_page_object();
 		}
 		return NULL;
 	}
@@ -373,9 +373,9 @@ 
 	 * @param $dir_name
 	 * @return string
 	 */
-	private function _get_classname_for_admin_page( $dir_name = '' ) {
-		$class_name = str_replace( '_', ' ', strtolower( $dir_name ));
-		return str_replace( ' ', '_', ucwords( $class_name )) . '_Admin_Page';
+	private function _get_classname_for_admin_page($dir_name = '') {
+		$class_name = str_replace('_', ' ', strtolower($dir_name));
+		return str_replace(' ', '_', ucwords($class_name)).'_Admin_Page';
 	}
 
 
@@ -386,9 +386,9 @@ 
 	 * @param $dir_name
 	 * @return string
 	 */
-	private function _get_classname_for_admin_init_page( $dir_name = '' ) {
-		$class_name = str_replace( '_', ' ', strtolower( $dir_name ));
-		return str_replace( ' ', '_', ucwords( $class_name )) . '_Admin_Page_Init';
+	private function _get_classname_for_admin_init_page($dir_name = '') {
+		$class_name = str_replace('_', ' ', strtolower($dir_name));
+		return str_replace(' ', '_', ucwords($class_name)).'_Admin_Page_Init';
 	}
 
 
@@ -401,26 +401,26 @@ 
 	 * @throws EE_Error
 	 * @return object|bool  return page object if valid, bool false if not.
 	 */
-	private function _load_admin_page( $page = '', $path = '' ) {
-		$class_name = $this->_get_classname_for_admin_init_page( $page );
- 		EE_Registry::instance()->load_file( $path, $class_name, 'core' );
-		if ( ! class_exists( $class_name )) {
-            $inner_error_msg = '<br />' . sprintf(
+	private function _load_admin_page($page = '', $path = '') {
+		$class_name = $this->_get_classname_for_admin_init_page($page);
+ 		EE_Registry::instance()->load_file($path, $class_name, 'core');
+		if ( ! class_exists($class_name)) {
+            $inner_error_msg = '<br />'.sprintf(
                 esc_html__(
                     'Make sure you have %1$s defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class',
                     'event_espresso'
                 ),
-                '<strong>' . $class_name . '</strong>'
+                '<strong>'.$class_name.'</strong>'
             );
-			$error_msg[] = sprintf( __('Something went wrong with loading the %s admin page.', 'event_espresso' ), $page);
+			$error_msg[] = sprintf(__('Something went wrong with loading the %s admin page.', 'event_espresso'), $page);
 			$error_msg[] = $error_msg[0]
                            . "\r\n"
                            . sprintf(
-                               esc_html__( 'There is no Init class in place for the %s admin page.', 'event_espresso'),
+                               esc_html__('There is no Init class in place for the %s admin page.', 'event_espresso'),
                                $page
                            )
                            . $inner_error_msg;
-			throw new EE_Error( implode( '||', $error_msg ));
+			throw new EE_Error(implode('||', $error_msg));
 		}
 		$a = new ReflectionClass($class_name);
 		return  $a->newInstance();
@@ -439,9 +439,9 @@ 
 	public function set_menus() {
 		//prep the menu pages (sort, group.)
 		$this->_prep_pages();
-		foreach( $this->_prepped_menu_maps as $menu_map ) {
-			if ( EE_Registry::instance()->CAP->current_user_can( $menu_map->capability, $menu_map->menu_slug ) ) {
-				$menu_map->add_menu_page( FALSE );
+		foreach ($this->_prepped_menu_maps as $menu_map) {
+			if (EE_Registry::instance()->CAP->current_user_can($menu_map->capability, $menu_map->menu_slug)) {
+				$menu_map->add_menu_page(FALSE);
 			}
 		}
 	}
@@ -454,11 +454,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_network_menus(){
+	public function set_network_menus() {
 		$this->_prep_pages();
-		foreach( $this->_prepped_menu_maps as $menu_map ) {
-			if ( EE_Registry::instance()->CAP->current_user_can( $menu_map->capability, $menu_map->menu_slug ) ) {
-				$menu_map->add_menu_page( TRUE );
+		foreach ($this->_prepped_menu_maps as $menu_map) {
+			if (EE_Registry::instance()->CAP->current_user_can($menu_map->capability, $menu_map->menu_slug)) {
+				$menu_map->add_menu_page(TRUE);
 			}
 		}
 	}
@@ -480,13 +480,13 @@ 
 		//rearrange _admin_menu_groups to be indexed by group slug.
 		$menu_groups = $this->_rearrange_menu_groups();
 
-		foreach( $this->_installed_pages as $page ) {
-			if ( $page instanceof EE_Admin_page_Init ) {
+		foreach ($this->_installed_pages as $page) {
+			if ($page instanceof EE_Admin_page_Init) {
 				$page_map = $page->get_menu_map();
 				//if we've got an array then the menu map is in the old format so let's throw a persistent notice that the admin system isn't setup correctly for this item.
-				if ( is_array( $page_map ) || empty( $page_map ) ) {
+				if (is_array($page_map) || empty($page_map)) {
                     new PersistentAdminNotice(
-                        'menu_map_warning_' . str_replace(' ', '_', $page->label) . '_' . EVENT_ESPRESSO_VERSION,
+                        'menu_map_warning_'.str_replace(' ', '_', $page->label).'_'.EVENT_ESPRESSO_VERSION,
                         sprintf(
                             __(
                                 'The admin page for %s was not correctly setup because it is using an older method for integrating with Event Espresso Core.  This means that full functionality for this component is not available.  This error message usually appears with an Add-on that is out of date.  Make sure you update all your Event Espresso 4 add-ons to the latest version to ensure they have necessary compatibility updates in place.',
@@ -499,12 +499,12 @@ 
 				}
 
 				//if page map is NOT a EE_Admin_Page_Menu_Map object then throw error.
-				if ( ! $page_map instanceof EE_Admin_Page_Menu_Map ) {
-					throw new EE_Error( sprintf( __('The menu map for %s must be an EE_Admin_Page_Menu_Map object.  Instead it is %s.  Please double check that the menu map has been configured correctly.', 'event_espresso'), $page->label, $page_map ) );
+				if ( ! $page_map instanceof EE_Admin_Page_Menu_Map) {
+					throw new EE_Error(sprintf(__('The menu map for %s must be an EE_Admin_Page_Menu_Map object.  Instead it is %s.  Please double check that the menu map has been configured correctly.', 'event_espresso'), $page->label, $page_map));
 				}
 
 				//use the maintenance_mode_parent property and maintenance mode status to determine if this page even gets added to array.
-				if ( empty( $page_map->maintenance_mode_parent ) &&  EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
+				if (empty($page_map->maintenance_mode_parent) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
 					continue;
 				}
 
@@ -513,21 +513,21 @@ 
 			}
 		}
 
-		if ( empty( $pages_array )) {
-			throw new EE_Error(__('Something went wrong when prepping the admin pages', 'event_espresso') );
+		if (empty($pages_array)) {
+			throw new EE_Error(__('Something went wrong when prepping the admin pages', 'event_espresso'));
 		}
 
 		//let's sort the groups, make sure it's a valid group, add header (if to show).
-		foreach ( $pages_array as $group => $menu_maps ) {
+		foreach ($pages_array as $group => $menu_maps) {
 			//valid_group?
-			if ( ! array_key_exists( $group, $menu_groups ) )
+			if ( ! array_key_exists($group, $menu_groups))
 				continue;
 
 			//sort pages.
-			usort( $menu_maps, array( $this, '_sort_menu_maps' ) );
+			usort($menu_maps, array($this, '_sort_menu_maps'));
 
 			//prepend header
-			array_unshift( $menu_maps, $menu_groups[$group] );
+			array_unshift($menu_maps, $menu_groups[$group]);
 
 			//reset $pages_array with prepped data
 			$pages_array[$group] = $menu_maps;
@@ -535,9 +535,9 @@ 
 
 
 		//now let's setup the _prepped_menu_maps property
-		foreach ( $menu_groups as $group => $group_objs ) {
-			if ( isset( $pages_array[$group] ) )
-				$this->_prepped_menu_maps = array_merge( $this->_prepped_menu_maps, $pages_array[$group] );
+		foreach ($menu_groups as $group => $group_objs) {
+			if (isset($pages_array[$group]))
+				$this->_prepped_menu_maps = array_merge($this->_prepped_menu_maps, $pages_array[$group]);
 		}/**/
 
 	}
@@ -557,10 +557,10 @@ 
 	 * @param array $installed_refs the original installed_refs array that may contain our NEW EE_Admin_Pages to be loaded.
 	 * @return array
 	 */
-	private function _set_caffeinated( $installed_refs ) {
+	private function _set_caffeinated($installed_refs) {
 
 		//first let's check if there IS a caffeinated folder. If there is not then lets get out.
-		if ( ! is_dir( EE_PLUGIN_DIR_PATH . 'caffeinated' . DS . 'admin' ) || ( defined( 'EE_DECAF' ) && EE_DECAF )) {
+		if ( ! is_dir(EE_PLUGIN_DIR_PATH.'caffeinated'.DS.'admin') || (defined('EE_DECAF') && EE_DECAF)) {
 			return $installed_refs;
 		}
 
@@ -569,15 +569,15 @@ 
 		$exclude = array('tickets');
 
 		//okay let's setup an "New" pages first (we'll return installed refs later)
-		$new_admin_screens = glob( EE_CORE_CAF_ADMIN . 'new/*', GLOB_ONLYDIR );
-		if ( $new_admin_screens ) {
-			foreach( $new_admin_screens as $admin_screen ) {
+		$new_admin_screens = glob(EE_CORE_CAF_ADMIN.'new/*', GLOB_ONLYDIR);
+		if ($new_admin_screens) {
+			foreach ($new_admin_screens as $admin_screen) {
 				// files and anything in the exclude array need not apply
-				if ( is_dir( $admin_screen ) && ! in_array( basename( $admin_screen ), $exclude )) {
+				if (is_dir($admin_screen) && ! in_array(basename($admin_screen), $exclude)) {
 					// these folders represent the different NEW EE admin pages
-					$installed_refs[ basename( $admin_screen ) ] = $admin_screen;
+					$installed_refs[basename($admin_screen)] = $admin_screen;
 					// set autoloaders for our admin page classes based on included path information
-					EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( $admin_screen );
+					EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder($admin_screen);
 //					$this->_caf_autoloader[] = array(
 //						'dir' => 'new',
 //						'folder' => basename( $admin_screen )
@@ -587,18 +587,18 @@ 
 		}
 
 		//let's see if there are any EXTENDS to setup in the $_caffeinated_extends array (that will be used later for hooking into the _initialize_admin_age in the related core_init admin page)
-		$extends = glob( EE_CORE_CAF_ADMIN . 'extend/*', GLOB_ONLYDIR );
-		if ( $extends ) {
-			foreach( $extends as $extend ) {
-				if ( is_dir( $extend ) ) {
-					$extend_ref = basename( $extend );
+		$extends = glob(EE_CORE_CAF_ADMIN.'extend/*', GLOB_ONLYDIR);
+		if ($extends) {
+			foreach ($extends as $extend) {
+				if (is_dir($extend)) {
+					$extend_ref = basename($extend);
 					//now let's make sure there is a file that matches the expected format
-					$filename = str_replace(' ', '_', ucwords( str_replace('_', ' ', $extend_ref ) ) );
-					$filename = 'Extend_' . $filename . '_Admin_Page';
-					$this->_caffeinated_extends[$extend_ref]['path'] = str_replace( array( '\\', '/' ), DS, EE_CORE_CAF_ADMIN . 'extend' . DS . $extend_ref . DS . $filename . '.core.php' );
+					$filename = str_replace(' ', '_', ucwords(str_replace('_', ' ', $extend_ref)));
+					$filename = 'Extend_'.$filename.'_Admin_Page';
+					$this->_caffeinated_extends[$extend_ref]['path'] = str_replace(array('\\', '/'), DS, EE_CORE_CAF_ADMIN.'extend'.DS.$extend_ref.DS.$filename.'.core.php');
 					$this->_caffeinated_extends[$extend_ref]['admin_page'] = $filename;
 					// set autoloaders for our admin page classes based on included path information
-					EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( $extend );
+					EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder($extend);
 //					$this->_caf_autoloader[] = array(
 //						'dir' => 'extend',
 //						'folder' => $extend_ref
@@ -609,22 +609,22 @@ 
 
 		//let's see if there are any HOOK files and instantiate them if there are (so that hooks are loaded early!).
 		$ee_admin_hooks = array();
-		$hooks = glob( EE_CORE_CAF_ADMIN . 'hooks/*.class.php' );
-		if ( $hooks ) {
-			foreach ( $hooks as $hook ) {
-				if ( is_readable( $hook ) ) {
+		$hooks = glob(EE_CORE_CAF_ADMIN.'hooks/*.class.php');
+		if ($hooks) {
+			foreach ($hooks as $hook) {
+				if (is_readable($hook)) {
 					require_once $hook;
-					$classname = str_replace( EE_CORE_CAF_ADMIN . 'hooks/', '', $hook );
+					$classname = str_replace(EE_CORE_CAF_ADMIN.'hooks/', '', $hook);
 					$classname = str_replace('.class.php', '', $classname);
-					if ( class_exists( $classname ) ) {
-						$a = new ReflectionClass( $classname );
+					if (class_exists($classname)) {
+						$a = new ReflectionClass($classname);
 						$ee_admin_hooks[] = $a->newInstance();
 					}
 				}
 			}
 		}/**/
 
-		$ee_admin_hooks = apply_filters( 'FHEE__EE_Admin_Page_Loader__set_caffeinated__ee_admin_hooks', $ee_admin_hooks );
+		$ee_admin_hooks = apply_filters('FHEE__EE_Admin_Page_Loader__set_caffeinated__ee_admin_hooks', $ee_admin_hooks);
 
 		return $installed_refs;
 
@@ -679,8 +679,8 @@ 
 	 * @param  EE_Admin_Page_Menu_Map $b being compared to
 	 * @return int    sort order
 	 */
-	private function _sort_menu_maps( EE_Admin_Page_Menu_Map $a, EE_Admin_Page_Menu_Map $b ) {
-		if ( $a->menu_order == $b->menu_order )
+	private function _sort_menu_maps(EE_Admin_Page_Menu_Map $a, EE_Admin_Page_Menu_Map $b) {
+		if ($a->menu_order == $b->menu_order)
 			return 0;
 		return ($a->menu_order < $b->menu_order) ? -1 : 1;
 	}

Braces +14 added lines, -9 removed lines

@@ -2,8 +2,9 @@ 
 use EventEspresso\core\domain\entities\notifications\PersistentAdminNotice;
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -240,8 +241,9 @@ 
 		//first let's order the menu groups by their internal menu order (note usort type hinting to ensure the incoming array is EE_Admin_Page_Menu_Map objects )
 		usort( $this->_admin_menu_groups, array( $this, '_sort_menu_maps' ) );
 		foreach ( $this->_admin_menu_groups as $group ) {
-			if ( ! $group instanceof EE_Admin_Page_Menu_Group )
-				throw new EE_Error( sprintf( __('Unable to continue sorting the menu groups array because there is an invalid value for the menu groups.  All values in this array are required to be a EE_Admin_Page_Menu_Group object.  Instead there was: %s', 'event_espresso'), print_r($group, TRUE) ) );
+			if ( ! $group instanceof EE_Admin_Page_Menu_Group ) {
+							throw new EE_Error( sprintf( __('Unable to continue sorting the menu groups array because there is an invalid value for the menu groups.  All values in this array are required to be a EE_Admin_Page_Menu_Group object.  Instead there was: %s', 'event_espresso'), print_r($group, TRUE) ) );
+			}
 			$groups[$group->menu_slug] = $group;
 		}
 		return $groups;
@@ -520,8 +522,9 @@ 
 		//let's sort the groups, make sure it's a valid group, add header (if to show).
 		foreach ( $pages_array as $group => $menu_maps ) {
 			//valid_group?
-			if ( ! array_key_exists( $group, $menu_groups ) )
-				continue;
+			if ( ! array_key_exists( $group, $menu_groups ) ) {
+							continue;
+			}
 
 			//sort pages.
 			usort( $menu_maps, array( $this, '_sort_menu_maps' ) );
@@ -536,8 +539,9 @@ 
 
 		//now let's setup the _prepped_menu_maps property
 		foreach ( $menu_groups as $group => $group_objs ) {
-			if ( isset( $pages_array[$group] ) )
-				$this->_prepped_menu_maps = array_merge( $this->_prepped_menu_maps, $pages_array[$group] );
+			if ( isset( $pages_array[$group] ) ) {
+							$this->_prepped_menu_maps = array_merge( $this->_prepped_menu_maps, $pages_array[$group] );
+			}
 		}/**/
 
 	}
@@ -680,8 +684,9 @@ 
 	 * @return int    sort order
 	 */
 	private function _sort_menu_maps( EE_Admin_Page_Menu_Map $a, EE_Admin_Page_Menu_Map $b ) {
-		if ( $a->menu_order == $b->menu_order )
-			return 0;
+		if ( $a->menu_order == $b->menu_order ) {
+					return 0;
+		}
 		return ($a->menu_order < $b->menu_order) ? -1 : 1;
 	}