eventespresso / event-espresso-core

core/EE_Network_Config.core.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
     public static function instance()
     {
         // check if class object is instantiated, and instantiated properly
-        if (! self::$_instance instanceof EE_Network_Config) {
+        if ( ! self::$_instance instanceof EE_Network_Config) {
             self::$_instance = new self();
         }
         return self::$_instance;
@@ -136,7 +136,7 @@ 
         // need to bust cache for comparing original if this is a multisite install
         if (is_multisite()) {
             global $current_site;
-            $cache_key = $current_site->id . ':ee_network_config';
+            $cache_key = $current_site->id.':ee_network_config';
             wp_cache_delete($cache_key, 'site-options');
         }
 

Indentation +197 added lines, -197 removed lines

@@ -14,180 +14,180 @@ 
 final class EE_Network_Config
 {
 
-    /**
-     * @var EE_Network_Config $_instance
-     */
-    private static $_instance;
-
-    /**
-     * addons can add their specific network_config objects to this property
-     *
-     * @var EE_Config_Base[] $addons
-     */
-    public $addons;
-
-    /**
-     * @var EE_Network_Core_Config $core
-     */
-    public $core;
-
-
-    /**
-     * @singleton method used to instantiate class object
-     * @return EE_Network_Config instance
-     */
-    public static function instance()
-    {
-        // check if class object is instantiated, and instantiated properly
-        if (! self::$_instance instanceof EE_Network_Config) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-
-    /**
-     * class constructor
-     */
-    private function __construct()
-    {
-        do_action('AHEE__EE_Network_Config__construct__begin', $this);
-        // set defaults
-        $this->core = apply_filters('FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config());
-        $this->addons = array();
-
-        $this->_load_config();
-
-        // construct__end hook
-        do_action('AHEE__EE_Network_Config__construct__end', $this);
-    }
-
-
-    /**
-     * load EE Network Config options
-     *
-     * @return void
-     */
-    private function _load_config()
-    {
-        // load network config start hook
-        do_action('AHEE__EE_Network_Config___load_config__start', $this);
-        $config = $this->get_config();
-        foreach ($config as $config_prop => $settings) {
-            if ($config_prop === 'core' && ! $settings instanceof EE_Network_Core_Config) {
-                $core = new EE_Network_Core_Config();
-                foreach ($settings as $prop => $setting) {
-                    if (property_exists($core, $prop)) {
-                        $core->{$prop} = $setting;
-                    }
-                }
-                $settings = $core;
-                add_filter('FHEE__EE_Network_Config___load_config__update_network_config', '__return_true');
-            }
-            if (is_object($settings) && property_exists($this, $config_prop)) {
-                $this->{$config_prop} = apply_filters(
-                    'FHEE__EE_Network_Config___load_config__config_settings',
-                    $settings,
-                    $config_prop,
-                    $this
-                );
-                if (method_exists($settings, 'populate')) {
-                    $this->{$config_prop}->populate();
-                }
-                if (method_exists($settings, 'do_hooks')) {
-                    $this->{$config_prop}->do_hooks();
-                }
-            }
-        }
-        if (apply_filters('FHEE__EE_Network_Config___load_config__update_network_config', false)) {
-            $this->update_config();
-        }
-
-        // load network config end hook
-        do_action('AHEE__EE_Network_Config___load_config__end', $this);
-    }
-
-
-    /**
-     * get_config
-     *
-     * @return array of network config stuff
-     */
-    public function get_config()
-    {
-        // grab network configuration
-        $CFG = get_site_option('ee_network_config', array());
-        $CFG = apply_filters('FHEE__EE_Network_Config__get_config__CFG', $CFG);
-        return $CFG;
-    }
-
-
-    /**
-     * update_config
-     *
-     * @param bool $add_success
-     * @param bool $add_error
-     * @return bool success
-     */
-    public function update_config($add_success = false, $add_error = true)
-    {
-        do_action('AHEE__EE_Network_Config__update_config__begin', $this);
-
-        // need to bust cache for comparing original if this is a multisite install
-        if (is_multisite()) {
-            global $current_site;
-            $cache_key = $current_site->id . ':ee_network_config';
-            wp_cache_delete($cache_key, 'site-options');
-        }
-
-        // we have to compare existing saved config with config in memory because if there is no difference that means
-        // that the method executed fine but there just was no update.  WordPress doesn't distinguish between false because
-        // there were 0 records updated because of no change vs false because some error produced problems with the update.
-        $original = get_site_option('ee_network_config');
-
-        if ($original == $this) {
-            return true;
-        }
-        // update
-        $saved = update_site_option('ee_network_config', $this);
-
-        do_action('AHEE__EE_Network_Config__update_config__end', $this, $saved);
-        // if config remains the same or was updated successfully
-        if ($saved) {
-            if ($add_success) {
-                $msg = is_multisite() ? esc_html__(
-                    'The Event Espresso Network Configuration Settings have been successfully updated.',
-                    'event_espresso'
-                ) : esc_html__('Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso');
-                EE_Error::add_success($msg);
-            }
-            return true;
-        }
-        if ($add_error) {
-            $msg = is_multisite() ? esc_html__(
-                'The Event Espresso Network Configuration Settings were not updated.',
-                'event_espresso'
-            ) : esc_html__('Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-        return false;
-    }
-
-
-    /**
-     * __sleep
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        return apply_filters(
-            'FHEE__EE_Network_Config__sleep',
-            array(
-                'core',
-            )
-        );
-    }
+	/**
+	 * @var EE_Network_Config $_instance
+	 */
+	private static $_instance;
+
+	/**
+	 * addons can add their specific network_config objects to this property
+	 *
+	 * @var EE_Config_Base[] $addons
+	 */
+	public $addons;
+
+	/**
+	 * @var EE_Network_Core_Config $core
+	 */
+	public $core;
+
+
+	/**
+	 * @singleton method used to instantiate class object
+	 * @return EE_Network_Config instance
+	 */
+	public static function instance()
+	{
+		// check if class object is instantiated, and instantiated properly
+		if (! self::$_instance instanceof EE_Network_Config) {
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
+	/**
+	 * class constructor
+	 */
+	private function __construct()
+	{
+		do_action('AHEE__EE_Network_Config__construct__begin', $this);
+		// set defaults
+		$this->core = apply_filters('FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config());
+		$this->addons = array();
+
+		$this->_load_config();
+
+		// construct__end hook
+		do_action('AHEE__EE_Network_Config__construct__end', $this);
+	}
+
+
+	/**
+	 * load EE Network Config options
+	 *
+	 * @return void
+	 */
+	private function _load_config()
+	{
+		// load network config start hook
+		do_action('AHEE__EE_Network_Config___load_config__start', $this);
+		$config = $this->get_config();
+		foreach ($config as $config_prop => $settings) {
+			if ($config_prop === 'core' && ! $settings instanceof EE_Network_Core_Config) {
+				$core = new EE_Network_Core_Config();
+				foreach ($settings as $prop => $setting) {
+					if (property_exists($core, $prop)) {
+						$core->{$prop} = $setting;
+					}
+				}
+				$settings = $core;
+				add_filter('FHEE__EE_Network_Config___load_config__update_network_config', '__return_true');
+			}
+			if (is_object($settings) && property_exists($this, $config_prop)) {
+				$this->{$config_prop} = apply_filters(
+					'FHEE__EE_Network_Config___load_config__config_settings',
+					$settings,
+					$config_prop,
+					$this
+				);
+				if (method_exists($settings, 'populate')) {
+					$this->{$config_prop}->populate();
+				}
+				if (method_exists($settings, 'do_hooks')) {
+					$this->{$config_prop}->do_hooks();
+				}
+			}
+		}
+		if (apply_filters('FHEE__EE_Network_Config___load_config__update_network_config', false)) {
+			$this->update_config();
+		}
+
+		// load network config end hook
+		do_action('AHEE__EE_Network_Config___load_config__end', $this);
+	}
+
+
+	/**
+	 * get_config
+	 *
+	 * @return array of network config stuff
+	 */
+	public function get_config()
+	{
+		// grab network configuration
+		$CFG = get_site_option('ee_network_config', array());
+		$CFG = apply_filters('FHEE__EE_Network_Config__get_config__CFG', $CFG);
+		return $CFG;
+	}
+
+
+	/**
+	 * update_config
+	 *
+	 * @param bool $add_success
+	 * @param bool $add_error
+	 * @return bool success
+	 */
+	public function update_config($add_success = false, $add_error = true)
+	{
+		do_action('AHEE__EE_Network_Config__update_config__begin', $this);
+
+		// need to bust cache for comparing original if this is a multisite install
+		if (is_multisite()) {
+			global $current_site;
+			$cache_key = $current_site->id . ':ee_network_config';
+			wp_cache_delete($cache_key, 'site-options');
+		}
+
+		// we have to compare existing saved config with config in memory because if there is no difference that means
+		// that the method executed fine but there just was no update.  WordPress doesn't distinguish between false because
+		// there were 0 records updated because of no change vs false because some error produced problems with the update.
+		$original = get_site_option('ee_network_config');
+
+		if ($original == $this) {
+			return true;
+		}
+		// update
+		$saved = update_site_option('ee_network_config', $this);
+
+		do_action('AHEE__EE_Network_Config__update_config__end', $this, $saved);
+		// if config remains the same or was updated successfully
+		if ($saved) {
+			if ($add_success) {
+				$msg = is_multisite() ? esc_html__(
+					'The Event Espresso Network Configuration Settings have been successfully updated.',
+					'event_espresso'
+				) : esc_html__('Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso');
+				EE_Error::add_success($msg);
+			}
+			return true;
+		}
+		if ($add_error) {
+			$msg = is_multisite() ? esc_html__(
+				'The Event Espresso Network Configuration Settings were not updated.',
+				'event_espresso'
+			) : esc_html__('Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+		return false;
+	}
+
+
+	/**
+	 * __sleep
+	 *
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		return apply_filters(
+			'FHEE__EE_Network_Config__sleep',
+			array(
+				'core',
+			)
+		);
+	}
 }
 
 
@@ -197,27 +197,27 @@ 
 class EE_Network_Core_Config extends EE_Config_Base
 {
 
-    /**
-     * PUE site license key
-     *
-     * @var string $site_license_key
-     */
-    public $site_license_key;
-
-    /**
-     * This indicates whether messages system processing should be done on the same request or not.
-     *
-     * @var boolean $do_messages_on_same_request
-     */
-    public $do_messages_on_same_request;
-
-
-    /**
-     * EE_Network_Core_Config constructor.
-     */
-    public function __construct()
-    {
-        $this->site_license_key = '';
-        $this->do_messages_on_same_request = false;
-    }
+	/**
+	 * PUE site license key
+	 *
+	 * @var string $site_license_key
+	 */
+	public $site_license_key;
+
+	/**
+	 * This indicates whether messages system processing should be done on the same request or not.
+	 *
+	 * @var boolean $do_messages_on_same_request
+	 */
+	public $do_messages_on_same_request;
+
+
+	/**
+	 * EE_Network_Core_Config constructor.
+	 */
+	public function __construct()
+	{
+		$this->site_license_key = '';
+		$this->do_messages_on_same_request = false;
+	}
 }

core/domain/entities/route_match/MatchAnyRouteSpecification.php

Indentation +15 added lines, -15 removed lines

@@ -14,19 +14,19 @@
 class MatchAnyRouteSpecification extends MultiRouteSpecification
 {
 
-    /**
-     * returns true if current request matches specification
-     *
-     * @since 4.9.71.p
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        foreach ($this->specifications as $specification) {
-            if ($specification->isMatchingRoute()) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since 4.9.71.p
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		foreach ($this->specifications as $specification) {
+			if ($specification->isMatchingRoute()) {
+				return true;
+			}
+		}
+		return false;
+	}
 }

core/domain/entities/route_match/specifications/admin/WordPressPageEditorAddNew.php

Indentation +11 added lines, -11 removed lines

@@ -14,15 +14,15 @@
  */
 class WordPressPageEditorAddNew extends RouteMatchSpecification
 {
-    /**
-     * returns true if current request matches specification
-     *
-     * @since 4.9.71.p
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        return strpos($this->request->requestUri(), 'wp-admin/post-new.php') !== false
-            && $this->request->getRequestParam('post_type', 'post') === 'page';
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since 4.9.71.p
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		return strpos($this->request->requestUri(), 'wp-admin/post-new.php') !== false
+			&& $this->request->getRequestParam('post_type', 'post') === 'page';
+	}
 }

core/domain/entities/route_match/specifications/admin/WordPressPostsEditorAddNew.php

Indentation +11 added lines, -11 removed lines

@@ -14,15 +14,15 @@
  */
 class WordPressPostsEditorAddNew extends RouteMatchSpecification
 {
-    /**
-     * returns true if current request matches specification
-     *
-     * @since 4.9.71.p
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        return strpos($this->request->requestUri(), 'wp-admin/post-new.php') !== false
-            && $this->request->getRequestParam('post_type', 'post') === 'post';
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since 4.9.71.p
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		return strpos($this->request->requestUri(), 'wp-admin/post-new.php') !== false
+			&& $this->request->getRequestParam('post_type', 'post') === 'post';
+	}
 }

core/domain/entities/route_match/specifications/admin/WordPressPostsListTable.php

Indentation +11 added lines, -11 removed lines

@@ -14,15 +14,15 @@
  */
 class WordPressPostsListTable extends RouteMatchSpecification
 {
-    /**
-     * returns true if current request matches specification
-     *
-     * @since 4.9.71.p
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        return strpos($this->request->requestUri(), 'wp-admin/edit.php') !== false
-            && $this->request->getRequestParam('post_type', 'post') === 'post';
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since 4.9.71.p
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		return strpos($this->request->requestUri(), 'wp-admin/edit.php') !== false
+			&& $this->request->getRequestParam('post_type', 'post') === 'post';
+	}
 }

core/domain/entities/route_match/specifications/admin/WordPressPageEditorEdit.php

Indentation +19 added lines, -19 removed lines

@@ -15,23 +15,23 @@
  */
 class WordPressPageEditorEdit extends RouteMatchSpecification
 {
-    /**
-     * returns true if current request matches specification
-     *
-     * @since 4.9.71.p
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        global $post;
-        return strpos($this->request->requestUri(), 'wp-admin/post.php') !== false
-            && (
-                $this->request->getRequestParam('post_type', 'post') === 'page'
-                || (
-                    $post instanceof WP_Post
-                    && $post->post_type === 'page'
-                )
-            )
-            && $this->request->getRequestParam('action') === 'edit';
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since 4.9.71.p
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		global $post;
+		return strpos($this->request->requestUri(), 'wp-admin/post.php') !== false
+			&& (
+				$this->request->getRequestParam('post_type', 'post') === 'page'
+				|| (
+					$post instanceof WP_Post
+					&& $post->post_type === 'page'
+				)
+			)
+			&& $this->request->getRequestParam('action') === 'edit';
+	}
 }

core/domain/entities/route_match/specifications/admin/EspressoEventEditorEdit.php

Indentation +11 added lines, -11 removed lines

@@ -14,15 +14,15 @@
  */
 class EspressoEventEditorEdit extends RouteMatchSpecification
 {
-    /**
-     * returns true if current request matches specification
-     *
-     * @since 4.9.71.p
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        return $this->request->getRequestParam('page') === 'espresso_events'
-            && $this->request->getRequestParam('action') === 'edit';
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since 4.9.71.p
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		return $this->request->getRequestParam('page') === 'espresso_events'
+			&& $this->request->getRequestParam('action') === 'edit';
+	}
 }

core/domain/entities/route_match/specifications/admin/EspressoEventEditorAddNew.php

Indentation +11 added lines, -11 removed lines

@@ -14,15 +14,15 @@
  */
 class EspressoEventEditorAddNew extends RouteMatchSpecification
 {
-    /**
-     * returns true if current request matches specification
-     *
-     * @since 4.9.71.p
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        return $this->request->getRequestParam('page') === 'espresso_events'
-            && $this->request->getRequestParam('action') === 'create_new';
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since 4.9.71.p
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		return $this->request->getRequestParam('page') === 'espresso_events'
+			&& $this->request->getRequestParam('action') === 'create_new';
+	}
 }

core/domain/entities/route_match/specifications/admin/EspressoVenueEditorEdit.php

Indentation +11 added lines, -11 removed lines

@@ -14,15 +14,15 @@
  */
 class EspressoVenueEditorEdit extends RouteMatchSpecification
 {
-    /**
-     * returns true if current request matches specification
-     *
-     * @since 4.9.71.p
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        return $this->request->getRequestParam('page') === 'espresso_venues'
-            && $this->request->getRequestParam('action') === 'edit';
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since 4.9.71.p
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		return $this->request->getRequestParam('page') === 'espresso_venues'
+			&& $this->request->getRequestParam('action') === 'edit';
+	}
 }