eventespresso / event-espresso-core

core/libraries/payment_methods/EE_Onsite_Gateway.lib.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-abstract class EE_Onsite_Gateway extends EE_Gateway{
+abstract class EE_Onsite_Gateway extends EE_Gateway {
 
 	/**
 	 * @return EE_Onsite_Gateway
@@ -53,5 +53,5 @@ 
 	 * } unless a child class specifies these array keys are NOT present
 	 * @return EE_Payment updated
 	 */
-	public abstract function do_direct_payment($payment,$billing_info = null);
+	public abstract function do_direct_payment($payment, $billing_info = null);
 }

core/libraries/payment_methods/templates/payment_details_content.template.php

Indentation +4 added lines, -4 removed lines

@@ -2,10 +2,10 @@
 if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * payment_details_content
- * @var EE_Payment $payment
- * @var EE_Payment_Method $payment_method
- */
+	 * payment_details_content
+	 * @var EE_Payment $payment
+	 * @var EE_Payment_Method $payment_method
+	 */
 $gateway_response = $payment->gateway_response();
 if ( ! empty( $gateway_response )) {
 	echo '<span class="error payment-problem">' . $gateway_response . '</span>';

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * payment_details_content
@@ -7,7 +7,7 @@ 
  * @var EE_Payment_Method $payment_method
  */
 $gateway_response = $payment->gateway_response();
-if ( ! empty( $gateway_response )) {
-	echo '<span class="error payment-problem">' . $gateway_response . '</span>';
+if ( ! empty($gateway_response)) {
+	echo '<span class="error payment-problem">'.$gateway_response.'</span>';
 }
 // End of file payment_details_content.template.php
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

core/libraries/plugin_api/EEI_Plugin_API.lib.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param array  $setup_args  an array of key value pairs of info for registering the component
 	 * @return void
 	 */
-	public static function register( $ID = NULL, $setup_args = array() );
+	public static function register($ID = NULL, $setup_args = array());
 
 
 
@@ -45,5 +45,5 @@ 
 	 * @param string $ID a unique name or ID for the component being registered
 	 * @return void
 	 */
-	public static function deregister( $ID = NULL );
+	public static function deregister($ID = NULL);
 }

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

core/libraries/plugin_api/EE_Register_Admin_Page.lib.php

Indentation +45 added lines, -45 removed lines

@@ -18,30 +18,30 @@ 
 class EE_Register_Admin_Page implements EEI_Plugin_API {
 
 
-    /**
-     * Holds registered EE_Admin_Pages
-     * @var array
-     */
-    protected static $_ee_admin_page_registry = array();
+	/**
+	 * Holds registered EE_Admin_Pages
+	 * @var array
+	 */
+	protected static $_ee_admin_page_registry = array();
 
 
 
 
-    /**
-     * The purpose of this method is to provide an easy way for addons to register their admin pages (using the EE Admin Page loader system).
-     *
-     * @since 4.3.0
-     *
+	/**
+	 * The purpose of this method is to provide an easy way for addons to register their admin pages (using the EE Admin Page loader system).
+	 *
+	 * @since 4.3.0
+	 *
 	 * @param  string $page_basename 	This string represents the basename of the Admin Page init.
 	 *                                                        		The init file must use this basename in its name and class (i.e. {page_basename}_Admin_Page_Init.core.php).
-     * @param  array  $config  {              An array of configuration options that will be used in different circumstances
+	 * @param  array  $config  {              An array of configuration options that will be used in different circumstances
 	 *
 	 *		@type  string $page_path             This is the path where the registered admin pages reside ( used to setup autoloaders).
 	 *
 	 * 	}
-     * @return void
-     */
-    public static function register( $page_basename = NULL, $config = array() ) {
+	 * @return void
+	 */
+	public static function register( $page_basename = NULL, $config = array() ) {
 
 		// check that an admin_page has not already been registered with that name
 		if ( isset(self::$_ee_admin_page_registry[ $page_basename ] )) {
@@ -59,7 +59,7 @@ 
 		}
 
 		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_Admin__loaded' )) {
-            EE_Error::doing_it_wrong(
+			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
 					__('An attempt was made to register "%s" as an EE Admin page has failed because it was not registered at the correct time.  Please use the "AHEE__EE_Admin__loaded" hook to register Admin pages.','event_espresso'),
@@ -67,36 +67,36 @@ 
 				),
 				'4.3'
 			);
-        }
+		}
 
-        //add incoming stuff to our registry property
-        self::$_ee_admin_page_registry[ $page_basename ] = array(
-            'page_path' => $config['page_path'],
-            'config' => $config
-            );
+		//add incoming stuff to our registry property
+		self::$_ee_admin_page_registry[ $page_basename ] = array(
+			'page_path' => $config['page_path'],
+			'config' => $config
+			);
 
-       //add filters
+	   //add filters
 
-       add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array( 'EE_Register_Admin_Page', 'set_page_basename' ), 10 );
-       add_filter('FHEE__EEH_Autoloader__load_admin_core', array( 'EE_Register_Admin_Page', 'set_page_path' ), 10 );
+	   add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array( 'EE_Register_Admin_Page', 'set_page_basename' ), 10 );
+	   add_filter('FHEE__EEH_Autoloader__load_admin_core', array( 'EE_Register_Admin_Page', 'set_page_path' ), 10 );
 
-    }
+	}
 
 
 
-    /**
-     * This deregisters a EE_Admin page that is already registered.  Note, this MUST be loaded after the
-     * page being deregistered is loaded.
-     *
-     * @since    4.3.0
-     *
-     * @param  string $page_basename Use whatever string was used to register the admin page.
-     * @return  void
-     */
-    public static function deregister( $page_basename = NULL ) {
-    	if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) )
-    		unset( self::$_ee_admin_page_registry[$page_basename] );
-    }
+	/**
+	 * This deregisters a EE_Admin page that is already registered.  Note, this MUST be loaded after the
+	 * page being deregistered is loaded.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param  string $page_basename Use whatever string was used to register the admin page.
+	 * @return  void
+	 */
+	public static function deregister( $page_basename = NULL ) {
+		if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) )
+			unset( self::$_ee_admin_page_registry[$page_basename] );
+	}
 
 
 
@@ -112,8 +112,8 @@ 
 				$installed_refs[ $basename ] = $args['page_path'];
 			}
 		}
-        return $installed_refs;
-    }
+		return $installed_refs;
+	}
 
 
 
@@ -124,9 +124,9 @@ 
 	 * @return mixed
 	 */
 	public static function set_page_path( $paths ) {
-        foreach ( self::$_ee_admin_page_registry as $basename => $args ) {
-            $paths[ $basename ] = $args['page_path'];
-        }
-        return $paths;
-    }
+		foreach ( self::$_ee_admin_page_registry as $basename => $args ) {
+			$paths[ $basename ] = $args['page_path'];
+		}
+		return $paths;
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -41,28 +41,28 @@ 
 	 * 	}
      * @return void
      */
-    public static function register( $page_basename = NULL, $config = array() ) {
+    public static function register($page_basename = NULL, $config = array()) {
 
 		// check that an admin_page has not already been registered with that name
-		if ( isset(self::$_ee_admin_page_registry[ $page_basename ] )) {
-			throw new EE_Error( sprintf( __( 'An Admin Page with the name "%s" has already been registered and each Admin Page requires a unique name.', 'event_espresso' ), $page_basename ));
+		if (isset(self::$_ee_admin_page_registry[$page_basename])) {
+			throw new EE_Error(sprintf(__('An Admin Page with the name "%s" has already been registered and each Admin Page requires a unique name.', 'event_espresso'), $page_basename));
 		}
 
 		// required fields MUST be present, so let's make sure they are.
-		if ( empty( $page_basename ) || ! is_array( $config ) || empty( $config['page_path'] )) {
-			throw new EE_Error( __( 'In order to register an Admin Page with EE_Register_Admin_Page::register(), you must include the "page_basename" (the class name of the page), and an array containing the following keys: "page_path" (the path where the registered admin pages reside)', 'event_espresso' ));
+		if (empty($page_basename) || ! is_array($config) || empty($config['page_path'])) {
+			throw new EE_Error(__('In order to register an Admin Page with EE_Register_Admin_Page::register(), you must include the "page_basename" (the class name of the page), and an array containing the following keys: "page_path" (the path where the registered admin pages reside)', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_admin_page_registry[ $page_basename ] ) ){
+		if (isset(self::$_ee_admin_page_registry[$page_basename])) {
 			return;
 		}
 
-		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_Admin__loaded' )) {
+		if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_Admin__loaded')) {
             EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
-					__('An attempt was made to register "%s" as an EE Admin page has failed because it was not registered at the correct time.  Please use the "AHEE__EE_Admin__loaded" hook to register Admin pages.','event_espresso'),
+					__('An attempt was made to register "%s" as an EE Admin page has failed because it was not registered at the correct time.  Please use the "AHEE__EE_Admin__loaded" hook to register Admin pages.', 'event_espresso'),
 					$page_basename
 				),
 				'4.3'
@@ -70,15 +70,15 @@ 
         }
 
         //add incoming stuff to our registry property
-        self::$_ee_admin_page_registry[ $page_basename ] = array(
+        self::$_ee_admin_page_registry[$page_basename] = array(
             'page_path' => $config['page_path'],
             'config' => $config
             );
 
        //add filters
 
-       add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array( 'EE_Register_Admin_Page', 'set_page_basename' ), 10 );
-       add_filter('FHEE__EEH_Autoloader__load_admin_core', array( 'EE_Register_Admin_Page', 'set_page_path' ), 10 );
+       add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array('EE_Register_Admin_Page', 'set_page_basename'), 10);
+       add_filter('FHEE__EEH_Autoloader__load_admin_core', array('EE_Register_Admin_Page', 'set_page_path'), 10);
 
     }
 
@@ -93,9 +93,9 @@ 
      * @param  string $page_basename Use whatever string was used to register the admin page.
      * @return  void
      */
-    public static function deregister( $page_basename = NULL ) {
-    	if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) )
-    		unset( self::$_ee_admin_page_registry[$page_basename] );
+    public static function deregister($page_basename = NULL) {
+    	if ( ! empty(self::$_ee_admin_page_registry[$page_basename]))
+    		unset(self::$_ee_admin_page_registry[$page_basename]);
     }
 
 
@@ -106,10 +106,10 @@ 
 	 * @param $installed_refs
 	 * @return mixed
 	 */
-	public static function set_page_basename( $installed_refs ) {
-		if ( ! empty( self::$_ee_admin_page_registry )) {
-			foreach ( self::$_ee_admin_page_registry as $basename => $args ) {
-				$installed_refs[ $basename ] = $args['page_path'];
+	public static function set_page_basename($installed_refs) {
+		if ( ! empty(self::$_ee_admin_page_registry)) {
+			foreach (self::$_ee_admin_page_registry as $basename => $args) {
+				$installed_refs[$basename] = $args['page_path'];
 			}
 		}
         return $installed_refs;
@@ -123,9 +123,9 @@ 
 	 * @param $paths
 	 * @return mixed
 	 */
-	public static function set_page_path( $paths ) {
-        foreach ( self::$_ee_admin_page_registry as $basename => $args ) {
-            $paths[ $basename ] = $args['page_path'];
+	public static function set_page_path($paths) {
+        foreach (self::$_ee_admin_page_registry as $basename => $args) {
+            $paths[$basename] = $args['page_path'];
         }
         return $paths;
     }

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister an EE Admin Page.
@@ -94,8 +96,9 @@ 
      * @return  void
      */
     public static function deregister( $page_basename = NULL ) {
-    	if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) )
-    		unset( self::$_ee_admin_page_registry[$page_basename] );
+    	if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) ) {
+    	    		unset( self::$_ee_admin_page_registry[$page_basename] );
+    	}
     }
 
 

core/libraries/plugin_api/EE_Register_CPT.lib.php

Spacing +29 added lines, -29 removed lines

@@ -66,33 +66,33 @@ 
 	 * @throws  EE_Error
 	 * @return void
 	 */
-	public static function register( $cpt_ref = NULL, $setup_args = array() ) {
+	public static function register($cpt_ref = NULL, $setup_args = array()) {
 
 		//check for requred params
-		if ( empty( $cpt_ref ) ) {
+		if (empty($cpt_ref)) {
 			throw new EE_Error(
-				__('In order to register custom post types and custom taxonomies, you must include a value to reference what had been registered', 'event_espresso' )
+				__('In order to register custom post types and custom taxonomies, you must include a value to reference what had been registered', 'event_espresso')
 				);
 		}
 
-		if ( ! is_array( $setup_args ) || ( empty( $setup_args['cpts'] ) && empty( $setup_args['cts'] ) ) ) {
+		if ( ! is_array($setup_args) || (empty($setup_args['cpts']) && empty($setup_args['cts']))) {
 			throw new EE_Error(
-				__( 'In order to register custom post types or custom taxonomies, you must include an array containing either an array of custom post types to register (key "cpts"), an array of custom taxonomies ("cts") or both.', 'event_espresso' )
+				__('In order to register custom post types or custom taxonomies, you must include an array containing either an array of custom post types to register (key "cpts"), an array of custom taxonomies ("cts") or both.', 'event_espresso')
 				);
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_registry[ $cpt_ref ] ) ){
+		if (isset(self::$_registry[$cpt_ref])) {
 			return;
 		}
 
 		//make sure cpt ref is unique.
-		if ( isset( self::$_registry[$cpt_ref] ) ) {
-			$cpt_ref = uniqid() . '_' . $cpt_ref;
+		if (isset(self::$_registry[$cpt_ref])) {
+			$cpt_ref = uniqid().'_'.$cpt_ref;
 		}
 
 		//make sure this was called in the right place!
-		if ( did_action( 'AHEE__EE_System__load_CPTs_and_session__complete' ) ) {
+		if (did_action('AHEE__EE_System__load_CPTs_and_session__complete')) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
@@ -105,17 +105,17 @@ 
 
 		//validate incoming args
 		$validated = array(
-			'cpts' => isset( $setup_args['cpts'] ) ? (array) $setup_args['cpts'] : array(),
-			'cts' => isset( $setup_args['cts'] ) ? (array) $setup_args['cts'] : array(),
-			'default_terms' => isset( $setup_args['default_terms'] ) ? (array) $setup_args['default_terms'] : array()
+			'cpts' => isset($setup_args['cpts']) ? (array) $setup_args['cpts'] : array(),
+			'cts' => isset($setup_args['cts']) ? (array) $setup_args['cts'] : array(),
+			'default_terms' => isset($setup_args['default_terms']) ? (array) $setup_args['default_terms'] : array()
 			);
 
 		self::$_registry[$cpt_ref] = $validated;
 
 		//hook into to cpt system
-		add_filter( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', array( __CLASS__, 'filter_cpts' ), 5 );
-		add_filter( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array( __CLASS__, 'filter_cts' ), 5 );
-		add_action( 'AHEE__EE_Register_CPTs__construct_end', array( __CLASS__, 'default_terms'), 5 );
+		add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', array(__CLASS__, 'filter_cpts'), 5);
+		add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array(__CLASS__, 'filter_cts'), 5);
+		add_action('AHEE__EE_Register_CPTs__construct_end', array(__CLASS__, 'default_terms'), 5);
 	}
 
 
@@ -129,9 +129,9 @@ 
 	 *
 	 * @return array new array of cpts and their registration information
 	 */
-	public static function filter_cpts( $cpts ) {
-		foreach( self::$_registry as  $registries ) {
-			foreach ( $registries['cpts'] as $cpt_name => $cpt_settings ) {
+	public static function filter_cpts($cpts) {
+		foreach (self::$_registry as  $registries) {
+			foreach ($registries['cpts'] as $cpt_name => $cpt_settings) {
 				$cpts[$cpt_name] = $cpt_settings;
 			}
 		}
@@ -148,9 +148,9 @@ 
 	 *
 	 * @return array new array of cts and their registration information.
 	 */
-	public static function filter_cts( $cts ) {
-		foreach( self::$_registry as $registries ) {
-			foreach( $registries['cts'] as $ct_name => $ct_settings ) {
+	public static function filter_cts($cts) {
+		foreach (self::$_registry as $registries) {
+			foreach ($registries['cts'] as $ct_name => $ct_settings) {
 				$cts[$ct_name] = $ct_settings;
 			}
 		}
@@ -167,11 +167,11 @@ 
 	 *
 	 * @return void
 	 */
-	public static function default_terms( EE_Register_CPTs $cpt_class ) {
-		foreach( self::$_registry as $registries ) {
-			foreach( $registries['default_terms'] as $taxonomy => $terms ) {
-				foreach ( $terms as $term => $cpts ) {
-					$cpt_class->set_default_term( $taxonomy, $term, $cpts );
+	public static function default_terms(EE_Register_CPTs $cpt_class) {
+		foreach (self::$_registry as $registries) {
+			foreach ($registries['default_terms'] as $taxonomy => $terms) {
+				foreach ($terms as $term => $cpts) {
+					$cpt_class->set_default_term($taxonomy, $term, $cpts);
 				}
 			}
 		}
@@ -188,9 +188,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function deregister( $cpt_ref = null ) {
-		if ( !empty( self::$_registry[$cpt_ref] ) ) {
-			unset( self::$_registry[$cpt_ref] );
+	public static function deregister($cpt_ref = null) {
+		if ( ! empty(self::$_registry[$cpt_ref])) {
+			unset(self::$_registry[$cpt_ref]);
 		}
 	}
 } //end class EE_Register_CPT

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

core/libraries/plugin_api/EE_Register_Capabilities.lib.php

Spacing +29 added lines, -29 removed lines

@@ -47,33 +47,33 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $cap_reference = NULL, $setup_args = array() ) {
+	public static function register($cap_reference = NULL, $setup_args = array()) {
 		//required fields MUST be present, so let's make sure they are.
-		if ( ! isset( $cap_reference ) || ! is_array( $setup_args ) || empty( $setup_args['capabilities'] ) ) {
+		if ( ! isset($cap_reference) || ! is_array($setup_args) || empty($setup_args['capabilities'])) {
 			throw new EE_Error(
-				__( 'In order to register capabilities with EE_Register_Capabilities::register, you must include a unique name to reference the capabilities being registered, plus an array containing the following keys: "capabilities".', 'event_espresso' )
+				__('In order to register capabilities with EE_Register_Capabilities::register, you must include a unique name to reference the capabilities being registered, plus an array containing the following keys: "capabilities".', 'event_espresso')
 			);
 		}
 		//make sure we don't register twice
-		if( isset( self::$_registry[ $cap_reference ] ) ){
+		if (isset(self::$_registry[$cap_reference])) {
 			return;
 		}
 		//make sure this is not registered too late or too early.
-		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_System___detect_if_activation_or_upgrade__begin' ) ) {
-			EE_Error::doing_it_wrong( __METHOD__, sprintf( __('%s has been registered too late.  Please ensure that EE_Register_Capabilities::register has been called at some point before the "AHEE__EE_System___detect_if_activation_or_upgrade__begin" action hook has been called.', 'event_espresso'), $cap_reference ), '4.5.0' );
+		if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin')) {
+			EE_Error::doing_it_wrong(__METHOD__, sprintf(__('%s has been registered too late.  Please ensure that EE_Register_Capabilities::register has been called at some point before the "AHEE__EE_System___detect_if_activation_or_upgrade__begin" action hook has been called.', 'event_espresso'), $cap_reference), '4.5.0');
 		}
 		//some preliminary sanitization and setting to the $_registry property
 		self::$_registry[$cap_reference] = array(
-			'caps' => isset( $setup_args['capabilities'] ) && is_array( $setup_args['capabilities'] ) ? $setup_args['capabilities'] : array(),
-			'cap_maps' => isset( $setup_args['capability_maps'] ) ? $setup_args['capability_maps'] : array()
+			'caps' => isset($setup_args['capabilities']) && is_array($setup_args['capabilities']) ? $setup_args['capabilities'] : array(),
+			'cap_maps' => isset($setup_args['capability_maps']) ? $setup_args['capability_maps'] : array()
 		);
 		//set initial caps (note that EE_Capabilities takes care of making sure that the caps get added only once)
-		add_filter( 'FHEE__EE_Capabilities__init_caps_map__caps', array( 'EE_Register_Capabilities', 'register_capabilities' ), 10 );
+		add_filter('FHEE__EE_Capabilities__init_caps_map__caps', array('EE_Register_Capabilities', 'register_capabilities'), 10);
 		//add filter for cap maps
-		add_filter( 'FHEE__EE_Capabilities___set_meta_caps__meta_caps', array( 'EE_Register_Capabilities', 'register_cap_maps' ), 10 );
+		add_filter('FHEE__EE_Capabilities___set_meta_caps__meta_caps', array('EE_Register_Capabilities', 'register_cap_maps'), 10);
 		//init_role_caps to register new capabilities
-		if ( is_admin() ) {
-			EE_Registry::instance()->load_core( 'Capabilities' );
+		if (is_admin()) {
+			EE_Registry::instance()->load_core('Capabilities');
 			EE_Capabilities::instance()->init_caps();
 		}
 	}
@@ -88,9 +88,9 @@ 
 	 *
 	 * @return array merged in new caps.
 	 */
-	public static function register_capabilities( $incoming_caps ) {
-		foreach ( self::$_registry as $ref => $caps_and_cap_map ) {
-			$incoming_caps = array_merge_recursive( $incoming_caps, $caps_and_cap_map[ 'caps' ] );
+	public static function register_capabilities($incoming_caps) {
+		foreach (self::$_registry as $ref => $caps_and_cap_map) {
+			$incoming_caps = array_merge_recursive($incoming_caps, $caps_and_cap_map['caps']);
 		}
 		return $incoming_caps;
 	}
@@ -105,13 +105,13 @@ 
 	 * @return EE_Meta_Capability_Map[]
 	 * @throws EE_Error
 	 */
-	public static function register_cap_maps( $cap_maps ) {
+	public static function register_cap_maps($cap_maps) {
 		//loop through and instantiate cap maps.
-		foreach ( self::$_registry as $cap_reference => $setup ) {
-			if ( ! isset( $setup['cap_maps'] ) ) {
+		foreach (self::$_registry as $cap_reference => $setup) {
+			if ( ! isset($setup['cap_maps'])) {
 				continue;
 			}
-			foreach ( $setup['cap_maps'] as $cap_class => $args ) {
+			foreach ($setup['cap_maps'] as $cap_class => $args) {
 
 				/**
 				 * account for cases where capability maps may be indexed
@@ -138,19 +138,19 @@ 
 				 * 	...
 				 * )
 				 */
-				if ( is_numeric( $cap_class ) ) {
-					$cap_class = key( $args );
+				if (is_numeric($cap_class)) {
+					$cap_class = key($args);
 					$args = $args[$cap_class];
 				}
 
-				if ( ! class_exists( $cap_class ) ) {
-					throw new EE_Error( sprintf( __( 'An addon (%s) has tried to register a capability map improperly.  Capability map arrays must be indexed by capability map classname, and an array for the class arguments', 'event_espresso' ), $cap_reference ) );
+				if ( ! class_exists($cap_class)) {
+					throw new EE_Error(sprintf(__('An addon (%s) has tried to register a capability map improperly.  Capability map arrays must be indexed by capability map classname, and an array for the class arguments', 'event_espresso'), $cap_reference));
 				}
 
-				if ( count( $args ) !== 2 ) {
-					throw new EE_Error( sprintf( __('An addon (%s) has tried to register a capability map improperly.  Capability map arrays must be indexed by capability map classname, and an array for the class arguments.  The array should have two values the first being a string and the second an array.', 'event_espresso' ), $cap_reference ) );
+				if (count($args) !== 2) {
+					throw new EE_Error(sprintf(__('An addon (%s) has tried to register a capability map improperly.  Capability map arrays must be indexed by capability map classname, and an array for the class arguments.  The array should have two values the first being a string and the second an array.', 'event_espresso'), $cap_reference));
 				}
-				$cap_maps[] = new $cap_class( $args[0], $args[1] );
+				$cap_maps[] = new $cap_class($args[0], $args[1]);
 			}
 		}
 		return $cap_maps;
@@ -159,9 +159,9 @@ 
 
 
 
-	public static function deregister( $cap_reference = NULL ) {
-		if ( !empty( self::$_registry[$cap_reference] ) ) {
-			unset( self::$_registry[ $cap_reference ] );
+	public static function deregister($cap_reference = NULL) {
+		if ( ! empty(self::$_registry[$cap_reference])) {
+			unset(self::$_registry[$cap_reference]);
 		}
 
 		//re init caps to grab the changes due to removed caps.

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

core/libraries/plugin_api/EE_Register_Config.lib.php

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new config with the EE_Registry::instance->CFG property.
@@ -111,7 +113,8 @@ 
 	 * @param mixed $config_class_name
 	 */
 	public static function deregister( $config_class_name = NULL ) {
-		if ( ! empty( self::$_ee_config_registry[ $config_class_name ] ))
-    			unset( self::$_ee_config_registry[ $config_class_name ] );
+		if ( ! empty( self::$_ee_config_registry[ $config_class_name ] )) {
+		    			unset( self::$_ee_config_registry[ $config_class_name ] );
+		}
 	}
 }

Spacing +18 added lines, -18 removed lines

@@ -42,24 +42,24 @@ 
 	 *                       		}
 	 * @return void
 	 */
-	public static function register( $config_class = NULL, $setup_args = array() ) {
+	public static function register($config_class = NULL, $setup_args = array()) {
 
-		$setup_args['config_name'] = isset( $setup_args['config_name'] ) && ! empty( $setup_args['config_name'] ) ? $setup_args['config_name'] : $config_class;
-		$setup_args['config_section'] = isset( $setup_args['config_section'] ) && ! empty( $setup_args['config_section'] ) ? $setup_args['config_section'] : 'addons';
+		$setup_args['config_name'] = isset($setup_args['config_name']) && ! empty($setup_args['config_name']) ? $setup_args['config_name'] : $config_class;
+		$setup_args['config_section'] = isset($setup_args['config_section']) && ! empty($setup_args['config_section']) ? $setup_args['config_section'] : 'addons';
 
 		//required fields MUST be present, so let's make sure they are.
-		if ( empty( $config_class ) || ! is_array( $setup_args ) || empty( $setup_args['config_name'] )) {
-			throw new EE_Error( __( 'In order to register a Config Class with EE_Register_Config::register(), you must include a "config_class" (the actual class name for this config class). As well, you can supply an array containing the following keys: "config_section" the main section of the config object the settings will be saved under (by default the new config will be registered under EE_Config::instance()->modules or EE_Config::instance()->addons depending on what type of class is calling this), "config_name" (by default the new config will be registered to EE_Config::instance()->{config_section}->{config_class}, but supplying a "config_name" will set the property name that this variable is accessible by. ie: EE_Config::instance()->{config_section}->{config_name})', 'event_espresso' ));
+		if (empty($config_class) || ! is_array($setup_args) || empty($setup_args['config_name'])) {
+			throw new EE_Error(__('In order to register a Config Class with EE_Register_Config::register(), you must include a "config_class" (the actual class name for this config class). As well, you can supply an array containing the following keys: "config_section" the main section of the config object the settings will be saved under (by default the new config will be registered under EE_Config::instance()->modules or EE_Config::instance()->addons depending on what type of class is calling this), "config_name" (by default the new config will be registered to EE_Config::instance()->{config_section}->{config_class}, but supplying a "config_name" will set the property name that this variable is accessible by. ie: EE_Config::instance()->{config_section}->{config_name})', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_config_registry[ $config_class ] ) ){
+		if (isset(self::$_ee_config_registry[$config_class])) {
 			return;
 		}
 
 
 		//first find out if this happened too late.
-		if ( did_action( 'AHEE__EE_System__load_core_configuration__begin' ) ) {
+		if (did_action('AHEE__EE_System__load_core_configuration__begin')) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
@@ -70,13 +70,13 @@ 
 				);
 		}
 		//add incoming stuff to our registry property
-		self::$_ee_config_registry[ $config_class ] = array(
+		self::$_ee_config_registry[$config_class] = array(
 			'section' => $setup_args['config_section'],
 			'name' => $setup_args['config_name']
 		);
 
-		add_action( 'AHEE__EE_Config___load_core_config__end', array( 'EE_Register_Config', 'set_config' ), 15, 1 );
-		add_action( 'AHEE__EE_Config__update_espresso_config__end', array( 'EE_Register_Config', 'set_config' ), 15, 1 );
+		add_action('AHEE__EE_Config___load_core_config__end', array('EE_Register_Config', 'set_config'), 15, 1);
+		add_action('AHEE__EE_Config__update_espresso_config__end', array('EE_Register_Config', 'set_config'), 15, 1);
 	}
 
 
@@ -90,18 +90,18 @@ 
 	 * @param \EE_Config $EE_Config
 	 * @return \StdClass
 	 */
-	public static function set_config( EE_Config $EE_Config ) {
-		foreach ( self::$_ee_config_registry as $config_class => $settings ) {
+	public static function set_config(EE_Config $EE_Config) {
+		foreach (self::$_ee_config_registry as $config_class => $settings) {
 			//first some validation of our incoming class_name.  We'll throw an error early if its' not registered correctly
-			if ( ! class_exists( $config_class )) {
+			if ( ! class_exists($config_class)) {
 				throw new EE_Error(
 					sprintf(
-						__( 'The "%s" config class can not be registered with EE_Config because it does not exist.  Verify that an autoloader has been set for this class', 'event_espresso' ),
+						__('The "%s" config class can not be registered with EE_Config because it does not exist.  Verify that an autoloader has been set for this class', 'event_espresso'),
 						$config_class
 					)
 				 );
 			}
-			$EE_Config->get_config( $settings['section'], $settings['name'], $config_class );
+			$EE_Config->get_config($settings['section'], $settings['name'], $config_class);
 		}
 	}
 
@@ -111,8 +111,8 @@ 
 	/**
 	 * @param mixed $config_class_name
 	 */
-	public static function deregister( $config_class_name = NULL ) {
-		if ( ! empty( self::$_ee_config_registry[ $config_class_name ] ))
-    			unset( self::$_ee_config_registry[ $config_class_name ] );
+	public static function deregister($config_class_name = NULL) {
+		if ( ! empty(self::$_ee_config_registry[$config_class_name]))
+    			unset(self::$_ee_config_registry[$config_class_name]);
 	}
 }

Indentation +1 added lines, -1 removed lines

@@ -113,6 +113,6 @@
 	 */
 	public static function deregister( $config_class_name = NULL ) {
 		if ( ! empty( self::$_ee_config_registry[ $config_class_name ] ))
-    			unset( self::$_ee_config_registry[ $config_class_name ] );
+				unset( self::$_ee_config_registry[ $config_class_name ] );
 	}
 }

core/libraries/plugin_api/EE_Register_Data_Migration_Scripts.lib.php

Spacing +15 added lines, -15 removed lines

@@ -45,32 +45,32 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $dms_id = NULL, $setup_args = array()  ) {
+	public static function register($dms_id = NULL, $setup_args = array()) {
 
 		//required fields MUST be present, so let's make sure they are.
-		if ( empty( $dms_id ) || ! is_array( $setup_args ) || empty( $setup_args['dms_paths'] )) {
-			throw new EE_Error( __( 'In order to register Data Migration Scripts with EE_Register_Data_Migration_Scripts::register(), you must include a "dms_id" (a unique identifier for this set of data migration scripts), and  an array containing the following keys: "dms_paths" (an array of full server paths to folders that contain data migration scripts)', 'event_espresso' ));
+		if (empty($dms_id) || ! is_array($setup_args) || empty($setup_args['dms_paths'])) {
+			throw new EE_Error(__('In order to register Data Migration Scripts with EE_Register_Data_Migration_Scripts::register(), you must include a "dms_id" (a unique identifier for this set of data migration scripts), and  an array containing the following keys: "dms_paths" (an array of full server paths to folders that contain data migration scripts)', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_settings[ $dms_id ] ) ){
+		if (isset(self::$_settings[$dms_id])) {
 			return;
 		}
 
 		//make sure this was called in the right place!
-		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_System___detect_if_activation_or_upgrade__begin' )) {
+		if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin')) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
-					__( 'An attempt to register Data Migration Scripts has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register Data Migration Scripts.','event_espresso'),
+					__('An attempt to register Data Migration Scripts has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register Data Migration Scripts.', 'event_espresso'),
 				'4.3.0'
 			);
 		}
 		//setup $_settings array from incoming values.
-		self::$_settings[ $dms_id ] = array(
-			'dms_paths' =>isset( $setup_args['dms_paths'] ) ? (array)$setup_args['dms_paths'] : array()
+		self::$_settings[$dms_id] = array(
+			'dms_paths' =>isset($setup_args['dms_paths']) ? (array) $setup_args['dms_paths'] : array()
 		);
 		// setup DMS
-		add_filter( 'FHEE__EE_Data_Migration_Manager__get_data_migration_script_folders', array( 'EE_Register_Data_Migration_Scripts', 'add_data_migration_script_folders' ));
+		add_filter('FHEE__EE_Data_Migration_Manager__get_data_migration_script_folders', array('EE_Register_Data_Migration_Scripts', 'add_data_migration_script_folders'));
 	}
 
 
@@ -80,9 +80,9 @@ 
 	 * @param array $dms_paths
 	 * @return array
 	 */
-	public static function add_data_migration_script_folders( $dms_paths = array() ){
-		foreach( self::$_settings as $settings ) {
-			$dms_paths = array_merge( $dms_paths, $settings['dms_paths'] );
+	public static function add_data_migration_script_folders($dms_paths = array()) {
+		foreach (self::$_settings as $settings) {
+			$dms_paths = array_merge($dms_paths, $settings['dms_paths']);
 		}
 		return $dms_paths;
 	}
@@ -97,9 +97,9 @@ 
 	 * @param mixed $dms_id  unique identifier for the set of Data Migration Scripts that were previously registered
 	 * @return void
 	 */
-	public static function deregister( $dms_id = NULL ) {
-		if ( isset( self::$_settings[ $dms_id ] )) {
-			unset( self::$_settings[ $dms_id ] );
+	public static function deregister($dms_id = NULL) {
+		if (isset(self::$_settings[$dms_id])) {
+			unset(self::$_settings[$dms_id]);
 		}
 	}
 

core/libraries/plugin_api/EE_Register_Message_Type.lib.php

Indentation +217 added lines, -217 removed lines

@@ -18,58 +18,58 @@ 
 class EE_Register_Message_Type implements EEI_Plugin_API {
 
 
-    /**
-     * Holds values for registered message types
-     * @var array
-     */
-    protected static $_ee_message_type_registry = array();
-
-
-    /**
-     * Method for registering new message types in the EE_messages system.
-     *
-     * Note:  All message types must have the following files in order to work:
-     *
-     * - Template files for default templates getting setup.  See /core/libraries/messages/defaults/default/ for examples (note that template files match a specific naming schema).  These templates will need to be registered with the default template pack.
-     * - EE_Messages_Validator extended class(es).  See /core/libraries/messages/validators/email/
-     *      for examples.  Note for any new message types, there will need to be a validator for each
-     *      messenger combo this message type can activate with.
-     * - And of course the main EE_{Message_Type_Name}_message_type class that defines the new
-     *      message type and its properties.
-     *
-     * @since   4.3.0
-     *
+	/**
+	 * Holds values for registered message types
+	 * @var array
+	 */
+	protected static $_ee_message_type_registry = array();
+
+
+	/**
+	 * Method for registering new message types in the EE_messages system.
+	 *
+	 * Note:  All message types must have the following files in order to work:
+	 *
+	 * - Template files for default templates getting setup.  See /core/libraries/messages/defaults/default/ for examples (note that template files match a specific naming schema).  These templates will need to be registered with the default template pack.
+	 * - EE_Messages_Validator extended class(es).  See /core/libraries/messages/validators/email/
+	 *      for examples.  Note for any new message types, there will need to be a validator for each
+	 *      messenger combo this message type can activate with.
+	 * - And of course the main EE_{Message_Type_Name}_message_type class that defines the new
+	 *      message type and its properties.
+	 *
+	 * @since   4.3.0
+	 *
 	 * 	@param string $mt_name                               Whatever is defined for the $name property of
 	 *                                                                          the message type you are registering (eg.
 	 *                                                                          declined_registration). Required.
-     * @param  array  $setup_args  {
-     *        An array of arguments provided for registering the message type.
-     *
-     *        @type string $mtfilename                          The filename of the message type being
-     *                                                                          registered.  This will be the main
-     *                                                                          EE_{Messagetype_Name}_message_type class. (
-     *                                                                          eg. EE_Declined_Registration_message_type.
-     *                                                                          class.php). Required.
-     *        @type array $autoloadpaths                       An array of paths to add to the messages
-     *                                                                          autoloader for the new message type. Required.
-     *        @type array $messengers_to_activate_with An array of messengers that this message
-     *                                                                          type should activate with. Each value in the
-     *                                                                          array should match the name property of a
-     *                                                                          EE_messenger. Optional.
-     *        @type array $messengers_to_validate_with An array of messengers that this message type is valid for.  Each
-     *                                                                          value in the array should match the name property of an
-     *                                                                          EE_messenger. Optional.
-     *        @type bool $force_activation                   This simply is a way of indicating that this message type MUST be *
-     *                                                                          activated when the plugin is activated/reactivated (default false)
-     *
-     * }
-     * @return void
-     */
-    public static function register( $mt_name = NULL, $setup_args = array() ) {
-
-        //required fields MUST be present, so let's make sure they are.
-        if ( ! isset( $mt_name ) || ! is_array( $setup_args ) || empty( $setup_args['mtfilename'] ) || empty( $setup_args['autoloadpaths'] ) )
-            throw new EE_Error(
+	 * @param  array  $setup_args  {
+	 *        An array of arguments provided for registering the message type.
+	 *
+	 *        @type string $mtfilename                          The filename of the message type being
+	 *                                                                          registered.  This will be the main
+	 *                                                                          EE_{Messagetype_Name}_message_type class. (
+	 *                                                                          eg. EE_Declined_Registration_message_type.
+	 *                                                                          class.php). Required.
+	 *        @type array $autoloadpaths                       An array of paths to add to the messages
+	 *                                                                          autoloader for the new message type. Required.
+	 *        @type array $messengers_to_activate_with An array of messengers that this message
+	 *                                                                          type should activate with. Each value in the
+	 *                                                                          array should match the name property of a
+	 *                                                                          EE_messenger. Optional.
+	 *        @type array $messengers_to_validate_with An array of messengers that this message type is valid for.  Each
+	 *                                                                          value in the array should match the name property of an
+	 *                                                                          EE_messenger. Optional.
+	 *        @type bool $force_activation                   This simply is a way of indicating that this message type MUST be *
+	 *                                                                          activated when the plugin is activated/reactivated (default false)
+	 *
+	 * }
+	 * @return void
+	 */
+	public static function register( $mt_name = NULL, $setup_args = array() ) {
+
+		//required fields MUST be present, so let's make sure they are.
+		if ( ! isset( $mt_name ) || ! is_array( $setup_args ) || empty( $setup_args['mtfilename'] ) || empty( $setup_args['autoloadpaths'] ) )
+			throw new EE_Error(
 				__( 'In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso' )
 			);
 
@@ -78,9 +78,9 @@ 
 			return;
 		}
 
-        //make sure this was called in the right place!
-        if ( ! did_action( 'EE_Brewing_Regular___messages_caf' ) || did_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' )) {
-            EE_Error::doing_it_wrong(
+		//make sure this was called in the right place!
+		if ( ! did_action( 'EE_Brewing_Regular___messages_caf' ) || did_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' )) {
+			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
 					__('A message type named "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.','event_espresso'),
@@ -88,15 +88,15 @@ 
 				),
 				'4.3.0'
 			);
-        }
+		}
 
 	//setup $__ee_message_type_registry array from incoming values.
 	self::$_ee_message_type_registry[ $mt_name ] = array(
 		'mtfilename' => (string) $setup_args['mtfilename'],
 		'autoloadpaths' => (array) $setup_args['autoloadpaths'],
 		'messengers_to_activate_with' => ! empty( $setup_args['messengers_to_activate_with'] ) ? (array) $setup_args['messengers_to_activate_with'] : array(),
-                        'messengers_to_validate_with' => ! empty( $setup_args['messengers_to_validate_with'] ) ? (array) $setup_args['messengers_to_validate_with'] : array(),
-                        'force_activation' => ! empty( $setup_args['force_activation'] ) ? (bool) $setup_args['force_activation'] : array()
+						'messengers_to_validate_with' => ! empty( $setup_args['messengers_to_validate_with'] ) ? (array) $setup_args['messengers_to_validate_with'] : array(),
+						'force_activation' => ! empty( $setup_args['force_activation'] ) ? (bool) $setup_args['force_activation'] : array()
 	);
 
 	//add filters
@@ -107,166 +107,166 @@ 
 
 	//actions
 	add_action( 'AHEE__EE_Addon__initialize_default_data__begin', array( 'EE_Register_Message_Type', 'set_defaults' ) );
-    }
-
-
-
-    /**
-     * This just ensures that when an addon registers a message type that on initial activation/reactivation the defaults the addon sets are taken care of.
-     */
-    public static function set_defaults() {
-    	//only set defaults if we're not in EE_Maintenance mode
-    	EE_Registry::instance()->load_helper('Activation');
-    	EEH_Activation::generate_default_message_templates();
-
-            //for any message types with force activation, let's ensure they are activated
-            foreach ( self::$_ee_message_type_registry as $mtname => $settings ) {
-                if ( $settings['force_activation'] ) {
-                    $MSG = new EE_Messages();
-                    foreach ( $settings['messengers_to_activate_with'] as $messenger ) {
-                        $MSG->ensure_message_type_is_active( $mtname, $messenger );
-                    }
-                }
-            }
-    }
-
-
-
-    /**
-     * This deregisters a message type that was previously registered with a specific mtname.
-     *
-     * @since    4.3.0
-     *
-     * @param string  $mt_name the name for the message type that was previously registered
-     * @return void
-     */
-    public static function deregister( $mt_name = NULL ) {
-    	if ( !empty( self::$_ee_message_type_registry[$mt_name] ) ) {
-                        //let's make sure that we remove any place this message type was made active
-                        EE_Registry::instance()->load_helper( 'MSG_Template' );
-                        $active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
-                        foreach( $active_messengers as $messenger => $settings ) {
-                            if ( !empty( $settings['settings'][$messenger . '-message_types'][$mt_name] ) ) {
-                                unset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt_name] );
-                            }
-                        }
-                        EEH_MSG_Template::update_to_inactive( '', $mt_name );
-                        EEH_MSG_Template::update_active_messengers_in_db( $active_messengers );
-    		unset( self::$_ee_message_type_registry[$mt_name] );
-        }
-    }
-
-
-
-    /**
-     * callback for FHEE__EE_messages__get_installed__messagetype_files filter.
-     *
-     * @since   4.3.0
-     *
-     * @param  array  $messagetype_files The current array of message type file names
-     * @return  array                                 Array of message type file names
-     */
-    public static function register_messagetype_files( $messagetype_files ) {
-        if ( empty( self::$_ee_message_type_registry ) )
-            return $messagetype_files;
-
-        foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-            if ( empty( $mt_reg['mtfilename' ] ) )
-                continue;
-            $messagetype_files[] = $mt_reg['mtfilename'];
-        }
-
-        return $messagetype_files;
-    }
-
-
-
-
-
-    /**
-     * callback for FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.
-     *
-     * @since    4.3.0
-     *
-     * @param array $paths array of paths to be checked by EE_messages autoloader.
-     * @return array
-     */
-    public static function register_msgs_autoload_paths( $paths  ) {
-
-        if ( ! empty( self::$_ee_message_type_registry ) ) {
-            foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-                if ( empty( $mt_reg['autoloadpaths'] ) )
-                    continue;
-                $paths = array_merge( $paths, $mt_reg['autoloadpaths'] );
-            }
-        }
-
-        return $paths;
-    }
-
-
-
-
-
-    /**
-     * callback for FHEE__EE_messenger__get_default_message_types__default_types filter.
-     *
-     * @since   4.3.0
-     *
-     *
-     * @param  array                $default_types array of message types activated with messenger (
-     *                                                               corresponds to the $name property of message type)
-     * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
-     * @return  array
-     */
-    public static function register_messengers_to_activate_mt_with( $default_types, EE_messenger $messenger ) {
-        if ( empty( self::$_ee_message_type_registry ) )
-            return $default_types;
-
-        foreach ( self::$_ee_message_type_registry as $mt_name => $mt_reg ) {
-            if ( empty( $mt_reg['messengers_to_activate_with'] ) || empty( $mt_reg['mtfilename'] ) )
-                continue;
-
-            //loop through each of the messengers and if it matches the loaded class then we add this message type to the
-            foreach ( $mt_reg['messengers_to_activate_with'] as $msgr ) {
-                if ( $messenger->name == $msgr ) {
-                    $default_types[] = $mt_name;
-                }
-            }
-        }
-
-        return $default_types;
-    }
-
-
-
-     /**
-     * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter.
-     *
-     * @since   4.3.0
-     *
-     *
-     * @param  array                $valid_types     array of message types valid with messenger (
-     *                                                               corresponds to the $name property of message type)
-     * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
-     * @return  array
-     */
-    public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) {
-        if ( empty( self::$_ee_message_type_registry ) )
-            return $valid_types;
-
-        foreach ( self::$_ee_message_type_registry as $mt_name => $mt_reg ) {
-            if ( empty( $mt_reg['messengers_to_validate_with'] ) || empty( $mt_reg['mtfilename'] ) )
-                continue;
-
-            //loop through each of the messengers and if it matches the loaded class then we add this message type to the
-            foreach ( $mt_reg['messengers_to_validate_with'] as $msgr ) {
-                if ( $messenger->name == $msgr ) {
-                    $valid_types[] = $mt_name;
-                }
-            }
-        }
-
-        return $valid_types;
-    }
+	}
+
+
+
+	/**
+	 * This just ensures that when an addon registers a message type that on initial activation/reactivation the defaults the addon sets are taken care of.
+	 */
+	public static function set_defaults() {
+		//only set defaults if we're not in EE_Maintenance mode
+		EE_Registry::instance()->load_helper('Activation');
+		EEH_Activation::generate_default_message_templates();
+
+			//for any message types with force activation, let's ensure they are activated
+			foreach ( self::$_ee_message_type_registry as $mtname => $settings ) {
+				if ( $settings['force_activation'] ) {
+					$MSG = new EE_Messages();
+					foreach ( $settings['messengers_to_activate_with'] as $messenger ) {
+						$MSG->ensure_message_type_is_active( $mtname, $messenger );
+					}
+				}
+			}
+	}
+
+
+
+	/**
+	 * This deregisters a message type that was previously registered with a specific mtname.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param string  $mt_name the name for the message type that was previously registered
+	 * @return void
+	 */
+	public static function deregister( $mt_name = NULL ) {
+		if ( !empty( self::$_ee_message_type_registry[$mt_name] ) ) {
+						//let's make sure that we remove any place this message type was made active
+						EE_Registry::instance()->load_helper( 'MSG_Template' );
+						$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
+						foreach( $active_messengers as $messenger => $settings ) {
+							if ( !empty( $settings['settings'][$messenger . '-message_types'][$mt_name] ) ) {
+								unset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt_name] );
+							}
+						}
+						EEH_MSG_Template::update_to_inactive( '', $mt_name );
+						EEH_MSG_Template::update_active_messengers_in_db( $active_messengers );
+			unset( self::$_ee_message_type_registry[$mt_name] );
+		}
+	}
+
+
+
+	/**
+	 * callback for FHEE__EE_messages__get_installed__messagetype_files filter.
+	 *
+	 * @since   4.3.0
+	 *
+	 * @param  array  $messagetype_files The current array of message type file names
+	 * @return  array                                 Array of message type file names
+	 */
+	public static function register_messagetype_files( $messagetype_files ) {
+		if ( empty( self::$_ee_message_type_registry ) )
+			return $messagetype_files;
+
+		foreach ( self::$_ee_message_type_registry as $mt_reg ) {
+			if ( empty( $mt_reg['mtfilename' ] ) )
+				continue;
+			$messagetype_files[] = $mt_reg['mtfilename'];
+		}
+
+		return $messagetype_files;
+	}
+
+
+
+
+
+	/**
+	 * callback for FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param array $paths array of paths to be checked by EE_messages autoloader.
+	 * @return array
+	 */
+	public static function register_msgs_autoload_paths( $paths  ) {
+
+		if ( ! empty( self::$_ee_message_type_registry ) ) {
+			foreach ( self::$_ee_message_type_registry as $mt_reg ) {
+				if ( empty( $mt_reg['autoloadpaths'] ) )
+					continue;
+				$paths = array_merge( $paths, $mt_reg['autoloadpaths'] );
+			}
+		}
+
+		return $paths;
+	}
+
+
+
+
+
+	/**
+	 * callback for FHEE__EE_messenger__get_default_message_types__default_types filter.
+	 *
+	 * @since   4.3.0
+	 *
+	 *
+	 * @param  array                $default_types array of message types activated with messenger (
+	 *                                                               corresponds to the $name property of message type)
+	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
+	 * @return  array
+	 */
+	public static function register_messengers_to_activate_mt_with( $default_types, EE_messenger $messenger ) {
+		if ( empty( self::$_ee_message_type_registry ) )
+			return $default_types;
+
+		foreach ( self::$_ee_message_type_registry as $mt_name => $mt_reg ) {
+			if ( empty( $mt_reg['messengers_to_activate_with'] ) || empty( $mt_reg['mtfilename'] ) )
+				continue;
+
+			//loop through each of the messengers and if it matches the loaded class then we add this message type to the
+			foreach ( $mt_reg['messengers_to_activate_with'] as $msgr ) {
+				if ( $messenger->name == $msgr ) {
+					$default_types[] = $mt_name;
+				}
+			}
+		}
+
+		return $default_types;
+	}
+
+
+
+	 /**
+	  * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter.
+	  *
+	  * @since   4.3.0
+	  *
+	  *
+	  * @param  array                $valid_types     array of message types valid with messenger (
+	  *                                                               corresponds to the $name property of message type)
+	  * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
+	  * @return  array
+	  */
+	public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) {
+		if ( empty( self::$_ee_message_type_registry ) )
+			return $valid_types;
+
+		foreach ( self::$_ee_message_type_registry as $mt_name => $mt_reg ) {
+			if ( empty( $mt_reg['messengers_to_validate_with'] ) || empty( $mt_reg['mtfilename'] ) )
+				continue;
+
+			//loop through each of the messengers and if it matches the loaded class then we add this message type to the
+			foreach ( $mt_reg['messengers_to_validate_with'] as $msgr ) {
+				if ( $messenger->name == $msgr ) {
+					$valid_types[] = $mt_name;
+				}
+			}
+		}
+
+		return $valid_types;
+	}
 }

Spacing +49 added lines, -49 removed lines

@@ -65,25 +65,25 @@ 
      * }
      * @return void
      */
-    public static function register( $mt_name = NULL, $setup_args = array() ) {
+    public static function register($mt_name = NULL, $setup_args = array()) {
 
         //required fields MUST be present, so let's make sure they are.
-        if ( ! isset( $mt_name ) || ! is_array( $setup_args ) || empty( $setup_args['mtfilename'] ) || empty( $setup_args['autoloadpaths'] ) )
+        if ( ! isset($mt_name) || ! is_array($setup_args) || empty($setup_args['mtfilename']) || empty($setup_args['autoloadpaths']))
             throw new EE_Error(
-				__( 'In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso' )
+				__('In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso')
 			);
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_message_type_registry[ $mt_name ] ) ){
+		if (isset(self::$_ee_message_type_registry[$mt_name])) {
 			return;
 		}
 
         //make sure this was called in the right place!
-        if ( ! did_action( 'EE_Brewing_Regular___messages_caf' ) || did_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' )) {
+        if ( ! did_action('EE_Brewing_Regular___messages_caf') || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')) {
             EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
-					__('A message type named "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.','event_espresso'),
+					__('A message type named "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.', 'event_espresso'),
 					$mt_name
 				),
 				'4.3.0'
@@ -91,22 +91,22 @@ 
         }
 
 	//setup $__ee_message_type_registry array from incoming values.
-	self::$_ee_message_type_registry[ $mt_name ] = array(
+	self::$_ee_message_type_registry[$mt_name] = array(
 		'mtfilename' => (string) $setup_args['mtfilename'],
 		'autoloadpaths' => (array) $setup_args['autoloadpaths'],
-		'messengers_to_activate_with' => ! empty( $setup_args['messengers_to_activate_with'] ) ? (array) $setup_args['messengers_to_activate_with'] : array(),
-                        'messengers_to_validate_with' => ! empty( $setup_args['messengers_to_validate_with'] ) ? (array) $setup_args['messengers_to_validate_with'] : array(),
-                        'force_activation' => ! empty( $setup_args['force_activation'] ) ? (bool) $setup_args['force_activation'] : array()
+		'messengers_to_activate_with' => ! empty($setup_args['messengers_to_activate_with']) ? (array) $setup_args['messengers_to_activate_with'] : array(),
+                        'messengers_to_validate_with' => ! empty($setup_args['messengers_to_validate_with']) ? (array) $setup_args['messengers_to_validate_with'] : array(),
+                        'force_activation' => ! empty($setup_args['force_activation']) ? (bool) $setup_args['force_activation'] : array()
 	);
 
 	//add filters
-	add_filter( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( 'EE_Register_Message_Type', 'register_msgs_autoload_paths'), 10 );
-	add_filter('FHEE__EE_messages__get_installed__messagetype_files', array( 'EE_Register_Message_Type', 'register_messagetype_files'), 10, 1 );
-	add_filter( 'FHEE__EE_messenger__get_default_message_types__default_types', array( 'EE_Register_Message_Type', 'register_messengers_to_activate_mt_with'), 10, 2 );
-	add_filter( 'FHEE__EE_messenger__get_valid_message_types__valid_types', array( 'EE_Register_Message_Type', 'register_messengers_to_validate_mt_with'), 10, 2 );
+	add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array('EE_Register_Message_Type', 'register_msgs_autoload_paths'), 10);
+	add_filter('FHEE__EE_messages__get_installed__messagetype_files', array('EE_Register_Message_Type', 'register_messagetype_files'), 10, 1);
+	add_filter('FHEE__EE_messenger__get_default_message_types__default_types', array('EE_Register_Message_Type', 'register_messengers_to_activate_mt_with'), 10, 2);
+	add_filter('FHEE__EE_messenger__get_valid_message_types__valid_types', array('EE_Register_Message_Type', 'register_messengers_to_validate_mt_with'), 10, 2);
 
 	//actions
-	add_action( 'AHEE__EE_Addon__initialize_default_data__begin', array( 'EE_Register_Message_Type', 'set_defaults' ) );
+	add_action('AHEE__EE_Addon__initialize_default_data__begin', array('EE_Register_Message_Type', 'set_defaults'));
     }
 
 
@@ -120,11 +120,11 @@ 
     	EEH_Activation::generate_default_message_templates();
 
             //for any message types with force activation, let's ensure they are activated
-            foreach ( self::$_ee_message_type_registry as $mtname => $settings ) {
-                if ( $settings['force_activation'] ) {
+            foreach (self::$_ee_message_type_registry as $mtname => $settings) {
+                if ($settings['force_activation']) {
                     $MSG = new EE_Messages();
-                    foreach ( $settings['messengers_to_activate_with'] as $messenger ) {
-                        $MSG->ensure_message_type_is_active( $mtname, $messenger );
+                    foreach ($settings['messengers_to_activate_with'] as $messenger) {
+                        $MSG->ensure_message_type_is_active($mtname, $messenger);
                     }
                 }
             }
@@ -140,19 +140,19 @@ 
      * @param string  $mt_name the name for the message type that was previously registered
      * @return void
      */
-    public static function deregister( $mt_name = NULL ) {
-    	if ( !empty( self::$_ee_message_type_registry[$mt_name] ) ) {
+    public static function deregister($mt_name = NULL) {
+    	if ( ! empty(self::$_ee_message_type_registry[$mt_name])) {
                         //let's make sure that we remove any place this message type was made active
-                        EE_Registry::instance()->load_helper( 'MSG_Template' );
+                        EE_Registry::instance()->load_helper('MSG_Template');
                         $active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
-                        foreach( $active_messengers as $messenger => $settings ) {
-                            if ( !empty( $settings['settings'][$messenger . '-message_types'][$mt_name] ) ) {
-                                unset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt_name] );
+                        foreach ($active_messengers as $messenger => $settings) {
+                            if ( ! empty($settings['settings'][$messenger.'-message_types'][$mt_name])) {
+                                unset($active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt_name]);
                             }
                         }
-                        EEH_MSG_Template::update_to_inactive( '', $mt_name );
-                        EEH_MSG_Template::update_active_messengers_in_db( $active_messengers );
-    		unset( self::$_ee_message_type_registry[$mt_name] );
+                        EEH_MSG_Template::update_to_inactive('', $mt_name);
+                        EEH_MSG_Template::update_active_messengers_in_db($active_messengers);
+    		unset(self::$_ee_message_type_registry[$mt_name]);
         }
     }
 
@@ -166,12 +166,12 @@ 
      * @param  array  $messagetype_files The current array of message type file names
      * @return  array                                 Array of message type file names
      */
-    public static function register_messagetype_files( $messagetype_files ) {
-        if ( empty( self::$_ee_message_type_registry ) )
+    public static function register_messagetype_files($messagetype_files) {
+        if (empty(self::$_ee_message_type_registry))
             return $messagetype_files;
 
-        foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-            if ( empty( $mt_reg['mtfilename' ] ) )
+        foreach (self::$_ee_message_type_registry as $mt_reg) {
+            if (empty($mt_reg['mtfilename']))
                 continue;
             $messagetype_files[] = $mt_reg['mtfilename'];
         }
@@ -191,13 +191,13 @@ 
      * @param array $paths array of paths to be checked by EE_messages autoloader.
      * @return array
      */
-    public static function register_msgs_autoload_paths( $paths  ) {
+    public static function register_msgs_autoload_paths($paths) {
 
-        if ( ! empty( self::$_ee_message_type_registry ) ) {
-            foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-                if ( empty( $mt_reg['autoloadpaths'] ) )
+        if ( ! empty(self::$_ee_message_type_registry)) {
+            foreach (self::$_ee_message_type_registry as $mt_reg) {
+                if (empty($mt_reg['autoloadpaths']))
                     continue;
-                $paths = array_merge( $paths, $mt_reg['autoloadpaths'] );
+                $paths = array_merge($paths, $mt_reg['autoloadpaths']);
             }
         }
 
@@ -219,17 +219,17 @@ 
      * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
      * @return  array
      */
-    public static function register_messengers_to_activate_mt_with( $default_types, EE_messenger $messenger ) {
-        if ( empty( self::$_ee_message_type_registry ) )
+    public static function register_messengers_to_activate_mt_with($default_types, EE_messenger $messenger) {
+        if (empty(self::$_ee_message_type_registry))
             return $default_types;
 
-        foreach ( self::$_ee_message_type_registry as $mt_name => $mt_reg ) {
-            if ( empty( $mt_reg['messengers_to_activate_with'] ) || empty( $mt_reg['mtfilename'] ) )
+        foreach (self::$_ee_message_type_registry as $mt_name => $mt_reg) {
+            if (empty($mt_reg['messengers_to_activate_with']) || empty($mt_reg['mtfilename']))
                 continue;
 
             //loop through each of the messengers and if it matches the loaded class then we add this message type to the
-            foreach ( $mt_reg['messengers_to_activate_with'] as $msgr ) {
-                if ( $messenger->name == $msgr ) {
+            foreach ($mt_reg['messengers_to_activate_with'] as $msgr) {
+                if ($messenger->name == $msgr) {
                     $default_types[] = $mt_name;
                 }
             }
@@ -251,17 +251,17 @@ 
      * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
      * @return  array
      */
-    public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) {
-        if ( empty( self::$_ee_message_type_registry ) )
+    public static function register_messengers_to_validate_mt_with($valid_types, EE_messenger $messenger) {
+        if (empty(self::$_ee_message_type_registry))
             return $valid_types;
 
-        foreach ( self::$_ee_message_type_registry as $mt_name => $mt_reg ) {
-            if ( empty( $mt_reg['messengers_to_validate_with'] ) || empty( $mt_reg['mtfilename'] ) )
+        foreach (self::$_ee_message_type_registry as $mt_name => $mt_reg) {
+            if (empty($mt_reg['messengers_to_validate_with']) || empty($mt_reg['mtfilename']))
                 continue;
 
             //loop through each of the messengers and if it matches the loaded class then we add this message type to the
-            foreach ( $mt_reg['messengers_to_validate_with'] as $msgr ) {
-                if ( $messenger->name == $msgr ) {
+            foreach ($mt_reg['messengers_to_validate_with'] as $msgr) {
+                if ($messenger->name == $msgr) {
                     $valid_types[] = $mt_name;
                 }
             }

Braces +27 added lines, -17 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage plugin api, messages
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message type for the EE messages system.
@@ -68,10 +70,11 @@ 
     public static function register( $mt_name = NULL, $setup_args = array() ) {
 
         //required fields MUST be present, so let's make sure they are.
-        if ( ! isset( $mt_name ) || ! is_array( $setup_args ) || empty( $setup_args['mtfilename'] ) || empty( $setup_args['autoloadpaths'] ) )
-            throw new EE_Error(
+        if ( ! isset( $mt_name ) || ! is_array( $setup_args ) || empty( $setup_args['mtfilename'] ) || empty( $setup_args['autoloadpaths'] ) ) {
+                    throw new EE_Error(
 				__( 'In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso' )
 			);
+        }
 
 		//make sure we don't register twice
 		if( isset( self::$_ee_message_type_registry[ $mt_name ] ) ){
@@ -167,12 +170,14 @@ 
      * @return  array                                 Array of message type file names
      */
     public static function register_messagetype_files( $messagetype_files ) {
-        if ( empty( self::$_ee_message_type_registry ) )
-            return $messagetype_files;
+        if ( empty( self::$_ee_message_type_registry ) ) {
+                    return $messagetype_files;
+        }
 
         foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-            if ( empty( $mt_reg['mtfilename' ] ) )
-                continue;
+            if ( empty( $mt_reg['mtfilename' ] ) ) {
+                            continue;
+            }
             $messagetype_files[] = $mt_reg['mtfilename'];
         }
 
@@ -195,8 +200,9 @@ 
 
         if ( ! empty( self::$_ee_message_type_registry ) ) {
             foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-                if ( empty( $mt_reg['autoloadpaths'] ) )
-                    continue;
+                if ( empty( $mt_reg['autoloadpaths'] ) ) {
+                                    continue;
+                }
                 $paths = array_merge( $paths, $mt_reg['autoloadpaths'] );
             }
         }
@@ -220,12 +226,14 @@ 
      * @return  array
      */
     public static function register_messengers_to_activate_mt_with( $default_types, EE_messenger $messenger ) {
-        if ( empty( self::$_ee_message_type_registry ) )
-            return $default_types;
+        if ( empty( self::$_ee_message_type_registry ) ) {
+                    return $default_types;
+        }
 
         foreach ( self::$_ee_message_type_registry as $mt_name => $mt_reg ) {
-            if ( empty( $mt_reg['messengers_to_activate_with'] ) || empty( $mt_reg['mtfilename'] ) )
-                continue;
+            if ( empty( $mt_reg['messengers_to_activate_with'] ) || empty( $mt_reg['mtfilename'] ) ) {
+                            continue;
+            }
 
             //loop through each of the messengers and if it matches the loaded class then we add this message type to the
             foreach ( $mt_reg['messengers_to_activate_with'] as $msgr ) {
@@ -252,12 +260,14 @@ 
      * @return  array
      */
     public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) {
-        if ( empty( self::$_ee_message_type_registry ) )
-            return $valid_types;
+        if ( empty( self::$_ee_message_type_registry ) ) {
+                    return $valid_types;
+        }
 
         foreach ( self::$_ee_message_type_registry as $mt_name => $mt_reg ) {
-            if ( empty( $mt_reg['messengers_to_validate_with'] ) || empty( $mt_reg['mtfilename'] ) )
-                continue;
+            if ( empty( $mt_reg['messengers_to_validate_with'] ) || empty( $mt_reg['mtfilename'] ) ) {
+                            continue;
+            }
 
             //loop through each of the messengers and if it matches the loaded class then we add this message type to the
             foreach ( $mt_reg['messengers_to_validate_with'] as $msgr ) {