eventespresso / event-espresso-core

core/libraries/plugin_api/EE_Register_Addon.lib.php

Braces +1 added lines, -1 removed lines

@@ -275,7 +275,7 @@
 				//we know it was just activated and the request will end soon
 			}
 			return;
-		}else{
+		} else{
 			// 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' )) {
 				EE_Error::doing_it_wrong(

Indentation +4 added lines, -4 removed lines

@@ -138,10 +138,10 @@
 	 *       		 An array of message types with the key as the message type name and the values as below:
 	 *        		@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 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 should validate with. Each value in the array should match the name property of an EE_messenger. Optional.
 	 *       	}
 	 *			@type array $custom_post_types

Spacing +170 added lines, -170 removed lines

@@ -66,23 +66,23 @@ 
 	 * @param string $min_core_version
 	 * @return string always like '4.3.0.rc.000'
 	 */
-	protected static function _effective_version( $min_core_version ) {
+	protected static function _effective_version($min_core_version) {
 		// versions: 4 . 3 . 1 . p . 123
 		// offsets:    0 . 1 . 2 . 3 . 4
-		$version_parts = explode( '.', $min_core_version );
+		$version_parts = explode('.', $min_core_version);
 		//check they specified the micro version (after 2nd period)
-		if( ! isset( $version_parts[ 2 ] ) ) {
-			$version_parts[ 2] = '0';
+		if ( ! isset($version_parts[2])) {
+			$version_parts[2] = '0';
 		}
 		//if they didn't specify the 'p', or 'rc' part. Just assume the lowest possible
 		//soon we can assume that's 'rc', but this current version is 'alpha'
-		if( ! isset( $version_parts[ 3 ] ) ) {
-			$version_parts[ 3 ] = 'dev';
+		if ( ! isset($version_parts[3])) {
+			$version_parts[3] = 'dev';
 		}
-		if( ! isset( $version_parts[ 4 ] ) ) {
-			$version_parts[ 4 ] = '000';
+		if ( ! isset($version_parts[4])) {
+			$version_parts[4] = '000';
 		}
-		return implode( '.', $version_parts );
+		return implode('.', $version_parts);
 
 	}
 
@@ -92,8 +92,8 @@ 
 	 * @param string $actual_core_version the actual core version, optional
 	 * @return boolean
 	 */
-	public static  function _meets_min_core_version_requirement( $min_core_version, $actual_core_version = EVENT_ESPRESSO_VERSION ) {
-		return version_compare( self::_effective_version( $actual_core_version ), self::_effective_version( $min_core_version ), '>=' );
+	public static  function _meets_min_core_version_requirement($min_core_version, $actual_core_version = EVENT_ESPRESSO_VERSION) {
+		return version_compare(self::_effective_version($actual_core_version), self::_effective_version($min_core_version), '>=');
 	}
 
 
@@ -155,235 +155,235 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $addon_name = '', $setup_args = array()  ) {
+	public static function register($addon_name = '', $setup_args = array()) {
 		// required fields MUST be present, so let's make sure they are.
-		if ( empty( $addon_name ) || ! is_array( $setup_args )) {
-			throw new EE_Error( __( 'In order to register an EE_Addon with EE_Register_Addon::register(), you must include the "addon_name" (the name of the addon), and an array of arguments.', 'event_espresso' ));
+		if (empty($addon_name) || ! is_array($setup_args)) {
+			throw new EE_Error(__('In order to register an EE_Addon with EE_Register_Addon::register(), you must include the "addon_name" (the name of the addon), and an array of arguments.', 'event_espresso'));
 		}
-		if ( ! isset($setup_args[ 'main_file_path' ]) || empty( $setup_args[ 'main_file_path' ] ) ){
-			throw new EE_Error( sprintf( __( 'When registering an addon, you didn\'t provide the "main_file_path", which is the full path to the main file loaded directly by Wordpress. You only provided %s', 'event_espresso' ), implode(",", array_keys( $setup_args ) ) ) );
+		if ( ! isset($setup_args['main_file_path']) || empty($setup_args['main_file_path'])) {
+			throw new EE_Error(sprintf(__('When registering an addon, you didn\'t provide the "main_file_path", which is the full path to the main file loaded directly by Wordpress. You only provided %s', 'event_espresso'), implode(",", array_keys($setup_args))));
 		}
 		// check that addon has not already been registered with that name
-		if ( isset( self::$_settings[ $addon_name ] ) && ! did_action( 'activate_plugin' ) ) {
-			throw new EE_Error( sprintf( __( 'An EE_Addon with the name "%s" has already been registered and each EE_Addon requires a unique name.', 'event_espresso' ), $addon_name ));
+		if (isset(self::$_settings[$addon_name]) && ! did_action('activate_plugin')) {
+			throw new EE_Error(sprintf(__('An EE_Addon with the name "%s" has already been registered and each EE_Addon requires a unique name.', 'event_espresso'), $addon_name));
 		}
 
 
 		// no class name for addon?
-		if ( empty( $setup_args['class_name'] )) {
+		if (empty($setup_args['class_name'])) {
 			// generate one by first separating name with spaces
-			$class_name = str_replace( array( '-', '_' ), ' ', trim( $addon_name ));
+			$class_name = str_replace(array('-', '_'), ' ', trim($addon_name));
 			//capitalize, then replace spaces with underscores
-			$class_name = str_replace( ' ', '_', ucwords( $class_name ));
+			$class_name = str_replace(' ', '_', ucwords($class_name));
 		} else {
 			$class_name = $setup_args['class_name'];
 		}
-		$class_name = strpos( $class_name, 'EE_' ) === 0 ? $class_name : 'EE_' . $class_name;
+		$class_name = strpos($class_name, 'EE_') === 0 ? $class_name : 'EE_'.$class_name;
 		//setup $_settings array from incoming values.
 		$addon_settings = array(
 			// generated from the addon name, changes something like "calendar" to "EE_Calendar"
 			'class_name' 						=> $class_name,
 			// the addon slug for use in URLs, etc
-			'plugin_slug' 						=> isset( $setup_args['plugin_slug'] ) ? (string)$setup_args['plugin_slug'] : '',
+			'plugin_slug' 						=> isset($setup_args['plugin_slug']) ? (string) $setup_args['plugin_slug'] : '',
 			// page slug to be used when generating the "Settings" link on the WP plugin page
-			'plugin_action_slug' 			=> isset( $setup_args[ 'plugin_action_slug' ] ) ? (string)$setup_args[ 'plugin_action_slug' ] : '',
+			'plugin_action_slug' 			=> isset($setup_args['plugin_action_slug']) ? (string) $setup_args['plugin_action_slug'] : '',
 			// the "software" version for the addon
-			'version' 								=> isset( $setup_args['version'] ) ? (string)$setup_args['version'] : '',
+			'version' 								=> isset($setup_args['version']) ? (string) $setup_args['version'] : '',
 			// the minimum version of EE Core that the addon will work with
-			'min_core_version' 			=> isset( $setup_args['min_core_version'] ) ? (string)$setup_args['min_core_version'] : '',
+			'min_core_version' 			=> isset($setup_args['min_core_version']) ? (string) $setup_args['min_core_version'] : '',
 			// full server path to main file (file loaded directly by WP)
-			'main_file_path' 					=> isset( $setup_args['main_file_path'] ) ? (string)$setup_args['main_file_path'] : '',
+			'main_file_path' 					=> isset($setup_args['main_file_path']) ? (string) $setup_args['main_file_path'] : '',
 			// path to folder containing files for integrating with the EE core admin and/or setting up EE admin pages
-			'admin_path' 						=> isset( $setup_args['admin_path'] ) ? (string)$setup_args['admin_path'] : '',
+			'admin_path' 						=> isset($setup_args['admin_path']) ? (string) $setup_args['admin_path'] : '',
 			// a method to be called when the EE Admin is first invoked, can be used for hooking into any admin page
-			'admin_callback' 				=> isset( $setup_args['admin_callback'] ) ? (string)$setup_args['admin_callback'] : '',
+			'admin_callback' 				=> isset($setup_args['admin_callback']) ? (string) $setup_args['admin_callback'] : '',
 			// the section name for this addon's configuration settings section (defaults to "addons")
-			'config_section' 					=> isset( $setup_args['config_section'] ) ? (string)$setup_args['config_section'] : 'addons',
+			'config_section' 					=> isset($setup_args['config_section']) ? (string) $setup_args['config_section'] : 'addons',
 			// the class name for this addon's configuration settings object
-			'config_class' 						=> isset( $setup_args['config_class'] ) ? (string)$setup_args['config_class'] : '',
+			'config_class' 						=> isset($setup_args['config_class']) ? (string) $setup_args['config_class'] : '',
 			//the name given to the config for this addons' configuration settings object (optional)
-			'config_name' 					=> isset( $setup_args['config_name'] ) ? (string) $setup_args['config_name']: '',
+			'config_name' 					=> isset($setup_args['config_name']) ? (string) $setup_args['config_name'] : '',
 			// an array of "class names" => "full server paths" for any classes that might be invoked by the addon
-			'autoloader_paths' 			=> isset( $setup_args['autoloader_paths'] ) ? (array)$setup_args['autoloader_paths'] : array(),
+			'autoloader_paths' 			=> isset($setup_args['autoloader_paths']) ? (array) $setup_args['autoloader_paths'] : array(),
 			// an array of  "full server paths" for any folders containing classes that might be invoked by the addon
-			'autoloader_folders' 			=> isset( $setup_args['autoloader_folders'] ) ? (array)$setup_args['autoloader_folders'] : array(),
+			'autoloader_folders' 			=> isset($setup_args['autoloader_folders']) ? (array) $setup_args['autoloader_folders'] : array(),
 			// array of full server paths to any EE_DMS data migration scripts used by the addon
-			'dms_paths' 						=> isset( $setup_args['dms_paths'] ) ? (array)$setup_args['dms_paths'] : array(),
+			'dms_paths' 						=> isset($setup_args['dms_paths']) ? (array) $setup_args['dms_paths'] : array(),
 			// array of full server paths to any EED_Modules used by the addon
-			'module_paths' 					=> isset( $setup_args['module_paths'] ) ? (array)$setup_args['module_paths'] : array(),
+			'module_paths' 					=> isset($setup_args['module_paths']) ? (array) $setup_args['module_paths'] : array(),
 			// array of full server paths to any EES_Shortcodes used by the addon
-			'shortcode_paths'			 	=> isset( $setup_args['shortcode_paths'] ) ? (array)$setup_args['shortcode_paths'] : array(),
+			'shortcode_paths'			 	=> isset($setup_args['shortcode_paths']) ? (array) $setup_args['shortcode_paths'] : array(),
 			// array of full server paths to any WP_Widgets used by the addon
-			'widget_paths' 					=> isset( $setup_args['widget_paths'] ) ? (array)$setup_args['widget_paths'] : array(),
+			'widget_paths' 					=> isset($setup_args['widget_paths']) ? (array) $setup_args['widget_paths'] : array(),
 			// array of PUE options used by the addon
-			'pue_options' 						=> isset( $setup_args['pue_options'] ) ? (array)$setup_args['pue_options'] : array(),
-			'message_types' 				=> isset( $setup_args['message_types'] ) ? (array) $setup_args['message_types'] : array(),
-			'capabilities' 						=> isset( $setup_args['capabilities'] ) ? (array) $setup_args['capabilities'] : array(),
-			'capability_maps' 				=> isset( $setup_args['capability_maps'] ) ? (array) $setup_args['capability_maps'] : array(),
-			'model_paths' 					=> isset( $setup_args['model_paths'] ) ? (array) $setup_args['model_paths'] : array(),
-			'class_paths' 						=> isset( $setup_args['class_paths'] ) ? (array) $setup_args['class_paths'] : array(),
-			'model_extension_paths' 	=> isset( $setup_args['model_extension_paths'] ) ? (array) $setup_args['model_extension_paths'] : array(),
-			'class_extension_paths' 		=> isset( $setup_args['class_extension_paths'] ) ? (array) $setup_args['class_extension_paths'] : array(),
-			'custom_post_types' 			=> isset( $setup_args['custom_post_types'] ) ? (array) $setup_args['custom_post_types'] : array(),
-			'custom_taxonomies' 		=> isset( $setup_args['custom_taxonomies'] ) ? (array) $setup_args['custom_taxonomies'] : array(),
-			'payment_method_paths'	=> isset( $setup_args[ 'payment_method_paths' ] ) ? (array) $setup_args[ 'payment_method_paths' ] : array(),
-			'default_terms' 					=> isset( $setup_args['default_terms'] ) ? (array) $setup_args['default_terms'] : array(),
+			'pue_options' 						=> isset($setup_args['pue_options']) ? (array) $setup_args['pue_options'] : array(),
+			'message_types' 				=> isset($setup_args['message_types']) ? (array) $setup_args['message_types'] : array(),
+			'capabilities' 						=> isset($setup_args['capabilities']) ? (array) $setup_args['capabilities'] : array(),
+			'capability_maps' 				=> isset($setup_args['capability_maps']) ? (array) $setup_args['capability_maps'] : array(),
+			'model_paths' 					=> isset($setup_args['model_paths']) ? (array) $setup_args['model_paths'] : array(),
+			'class_paths' 						=> isset($setup_args['class_paths']) ? (array) $setup_args['class_paths'] : array(),
+			'model_extension_paths' 	=> isset($setup_args['model_extension_paths']) ? (array) $setup_args['model_extension_paths'] : array(),
+			'class_extension_paths' 		=> isset($setup_args['class_extension_paths']) ? (array) $setup_args['class_extension_paths'] : array(),
+			'custom_post_types' 			=> isset($setup_args['custom_post_types']) ? (array) $setup_args['custom_post_types'] : array(),
+			'custom_taxonomies' 		=> isset($setup_args['custom_taxonomies']) ? (array) $setup_args['custom_taxonomies'] : array(),
+			'payment_method_paths'	=> isset($setup_args['payment_method_paths']) ? (array) $setup_args['payment_method_paths'] : array(),
+			'default_terms' 					=> isset($setup_args['default_terms']) ? (array) $setup_args['default_terms'] : array(),
 			// if not empty, inserts a new table row after this plugin's row on the WP Plugins page that can be used for adding upgrading/marketing info
-			'plugins_page_row' 			=> isset( $setup_args['plugins_page_row'] ) ? $setup_args['plugins_page_row'] : '',
+			'plugins_page_row' 			=> isset($setup_args['plugins_page_row']) ? $setup_args['plugins_page_row'] : '',
 		);
 
 		// if plugin_action_slug is NOT set, but an admin page path IS set, then let's just use the plugin_slug since that will be used for linking to the admin page
-		$addon_settings[ 'plugin_action_slug' ] = empty( $addon_settings[ 'plugin_action_slug' ] ) && ! empty( $addon_settings[ 'admin_path' ] ) ? $addon_settings[ 'plugin_slug' ] : $addon_settings[ 'plugin_action_slug' ];
+		$addon_settings['plugin_action_slug'] = empty($addon_settings['plugin_action_slug']) && ! empty($addon_settings['admin_path']) ? $addon_settings['plugin_slug'] : $addon_settings['plugin_action_slug'];
 		// full server path to main file (file loaded directly by WP)
-		$addon_settings['plugin_basename'] = plugin_basename( $addon_settings[ 'main_file_path' ] );
+		$addon_settings['plugin_basename'] = plugin_basename($addon_settings['main_file_path']);
 
 		//check whether this addon version is compatible with EE core
-		if ( isset( EE_Register_Addon::$_incompatible_addons[ $addon_name ] ) &&
-				! self::_meets_min_core_version_requirement( EE_Register_Addon::$_incompatible_addons[ $addon_name ], $addon_settings[ 'version' ] ) ) {
+		if (isset(EE_Register_Addon::$_incompatible_addons[$addon_name]) &&
+				! self::_meets_min_core_version_requirement(EE_Register_Addon::$_incompatible_addons[$addon_name], $addon_settings['version'])) {
 			$incompatibility_message = sprintf(
-				__( 'The Event Espresso "%1$s" addon was deactivated because it is incompatible with this version of core.%2$s Only version %3$s or higher of "%1$s" can run with this version of core. This can happen when attempting to run beta versions or release candidates with older versions of core, or running old versions of addons with a newer version of core.%2$sPlease upgrade Event Espresso Core and the "%1$s" addon, then re-attempt activating it.', 'event_espresso' ),
+				__('The Event Espresso "%1$s" addon was deactivated because it is incompatible with this version of core.%2$s Only version %3$s or higher of "%1$s" can run with this version of core. This can happen when attempting to run beta versions or release candidates with older versions of core, or running old versions of addons with a newer version of core.%2$sPlease upgrade Event Espresso Core and the "%1$s" addon, then re-attempt activating it.', 'event_espresso'),
 				$addon_name,
 				'<br />',
-				EE_Register_Addon::$_incompatible_addons[ $addon_name ]
+				EE_Register_Addon::$_incompatible_addons[$addon_name]
 			);
-		} else if ( ! self::_meets_min_core_version_requirement( $setup_args[ 'min_core_version' ], espresso_version() ) ) {
+		} else if ( ! self::_meets_min_core_version_requirement($setup_args['min_core_version'], espresso_version())) {
 			$incompatibility_message = sprintf(
-				__( 'The Event Espresso "%1$s" addon could not be activated because it requires Event Espresso Core version "%2$s" or higher in order to run.%4$sYour version of Event Espresso Core is currently at "%3$s". Please upgrade Event Espresso Core first and then re-attempt activating "%1$s".', 'event_espresso' ),
+				__('The Event Espresso "%1$s" addon could not be activated because it requires Event Espresso Core version "%2$s" or higher in order to run.%4$sYour version of Event Espresso Core is currently at "%3$s". Please upgrade Event Espresso Core first and then re-attempt activating "%1$s".', 'event_espresso'),
 				$addon_name,
-				self::_effective_version( $setup_args[ 'min_core_version' ] ),
-				self::_effective_version( espresso_version() ),
+				self::_effective_version($setup_args['min_core_version']),
+				self::_effective_version(espresso_version()),
 				'<br />'
 			);
 		} else {
 			$incompatibility_message = '';
 		}
-		if ( ! empty( $incompatibility_message ) ) {
+		if ( ! empty($incompatibility_message)) {
 			//remove 'activate' from the REQUEST so WP doesn't erroneously tell the user the
 			//plugin activated fine when it didn't
-			if( isset( $_GET[ 'activate' ]) ) {
-				unset( $_GET[ 'activate' ] );
+			if (isset($_GET['activate'])) {
+				unset($_GET['activate']);
 			}
-			if( isset( $_REQUEST[ 'activate' ] ) ){
-				unset( $_REQUEST[ 'activate' ] );
+			if (isset($_REQUEST['activate'])) {
+				unset($_REQUEST['activate']);
 			}
 			//and show an error message indicating the plugin didn't activate properly
-			EE_Error::add_error( $incompatibility_message, __FILE__, __FUNCTION__, __LINE__ );
-			if ( current_user_can( 'activate_plugins' )) {
-				require_once( ABSPATH.'wp-admin/includes/plugin.php' );
-				deactivate_plugins( plugin_basename( $addon_settings[ 'main_file_path' ] ), TRUE );
+			EE_Error::add_error($incompatibility_message, __FILE__, __FUNCTION__, __LINE__);
+			if (current_user_can('activate_plugins')) {
+				require_once(ABSPATH.'wp-admin/includes/plugin.php');
+				deactivate_plugins(plugin_basename($addon_settings['main_file_path']), TRUE);
 			}
 			return;
 		}
 		//this is an activation request
-		if( did_action( 'activate_plugin' ) ){
+		if (did_action('activate_plugin')) {
 			//to find if THIS is the addon that was activated,
 			//just check if we have already registered it or not
 			//(as the newly-activated addon wasn't around the first time addons were registered)
-			if( ! isset( self::$_settings[ $addon_name ] ) ){
-				self::$_settings[ $addon_name ] = $addon_settings;
+			if ( ! isset(self::$_settings[$addon_name])) {
+				self::$_settings[$addon_name] = $addon_settings;
 				$addon = self::_load_and_init_addon_class($addon_name);
 				$addon->set_activation_indicator_option();
 				//dont bother setting up the rest of the addon.
 				//we know it was just activated and the request will end soon
 			}
 			return;
-		}else{
+		} else {
 			// 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__,
 					sprintf(
-						__( 'An attempt to register an EE_Addon named "%s" has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register addons.','event_espresso'),
+						__('An attempt to register an EE_Addon named "%s" has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register addons.', 'event_espresso'),
 						$addon_name
 					),
 					'4.3.0'
 				);
 			}
-			self::$_settings[ $addon_name ] = $addon_settings;
+			self::$_settings[$addon_name] = $addon_settings;
 		}
 		// we need cars
-		if ( ! empty( self::$_settings[ $addon_name ]['autoloader_paths'] )) {
+		if ( ! empty(self::$_settings[$addon_name]['autoloader_paths'])) {
 			// setup autoloader for single file
-			EEH_Autoloader::instance()->register_autoloader( self::$_settings[ $addon_name ]['autoloader_paths'] );
+			EEH_Autoloader::instance()->register_autoloader(self::$_settings[$addon_name]['autoloader_paths']);
 		}
 		// setup autoloaders for folders
-		if ( ! empty( self::$_settings[ $addon_name ]['autoloader_folders'] )) {
-			foreach ( self::$_settings[ $addon_name ]['autoloader_folders'] as $autoloader_folder ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $autoloader_folder );
+		if ( ! empty(self::$_settings[$addon_name]['autoloader_folders'])) {
+			foreach (self::$_settings[$addon_name]['autoloader_folders'] as $autoloader_folder) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($autoloader_folder);
 			}
 		}
 		// register new models
-		if ( ! empty( self::$_settings[ $addon_name ]['model_paths'] ) || ! empty( self::$_settings[ $addon_name ]['class_paths'] )) {
-			EE_Register_Model::register( $addon_name, array( 'model_paths' => self::$_settings[ $addon_name ]['model_paths'] , 'class_paths' => self::$_settings[ $addon_name ]['class_paths']));
+		if ( ! empty(self::$_settings[$addon_name]['model_paths']) || ! empty(self::$_settings[$addon_name]['class_paths'])) {
+			EE_Register_Model::register($addon_name, array('model_paths' => self::$_settings[$addon_name]['model_paths'], 'class_paths' => self::$_settings[$addon_name]['class_paths']));
 		}
 		// register model extensions
-		if ( ! empty( self::$_settings[ $addon_name ]['model_extension_paths'] ) || ! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )) {
-			EE_Register_Model_Extensions::register( $addon_name, array( 'model_extension_paths' => self::$_settings[ $addon_name ]['model_extension_paths'] , 'class_extension_paths' => self::$_settings[ $addon_name ]['class_extension_paths']));
+		if ( ! empty(self::$_settings[$addon_name]['model_extension_paths']) || ! empty(self::$_settings[$addon_name]['class_extension_paths'])) {
+			EE_Register_Model_Extensions::register($addon_name, array('model_extension_paths' => self::$_settings[$addon_name]['model_extension_paths'], 'class_extension_paths' => self::$_settings[$addon_name]['class_extension_paths']));
 		}
 		// setup DMS
-		if ( ! empty( self::$_settings[ $addon_name ]['dms_paths'] )) {
-			EE_Register_Data_Migration_Scripts::register( $addon_name, array( 'dms_paths' => self::$_settings[ $addon_name ]['dms_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['dms_paths'])) {
+			EE_Register_Data_Migration_Scripts::register($addon_name, array('dms_paths' => self::$_settings[$addon_name]['dms_paths']));
 		}
 		// if config_class is present let's register config.
-		if ( ! empty( self::$_settings[ $addon_name ]['config_class'] )) {
+		if ( ! empty(self::$_settings[$addon_name]['config_class'])) {
 			EE_Register_Config::register(
-				self::$_settings[ $addon_name ]['config_class'],
+				self::$_settings[$addon_name]['config_class'],
 				array(
-					'config_section' => self::$_settings[ $addon_name ]['config_section'],
-					'config_name' => self::$_settings[ $addon_name ]['config_name']
+					'config_section' => self::$_settings[$addon_name]['config_section'],
+					'config_name' => self::$_settings[$addon_name]['config_name']
 				)
 			);
 		}
 		// register admin page
-		if ( ! empty( self::$_settings[ $addon_name ]['admin_path'] )) {
-			EE_Register_Admin_Page::register( $addon_name, array( 'page_path' => self::$_settings[ $addon_name ]['admin_path'] ));
+		if ( ! empty(self::$_settings[$addon_name]['admin_path'])) {
+			EE_Register_Admin_Page::register($addon_name, array('page_path' => self::$_settings[$addon_name]['admin_path']));
 
 		}
 		// add to list of modules to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['module_paths'] )) {
-			EE_Register_Module::register( $addon_name, array( 'module_paths' => self::$_settings[ $addon_name ]['module_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['module_paths'])) {
+			EE_Register_Module::register($addon_name, array('module_paths' => self::$_settings[$addon_name]['module_paths']));
 		}
 		// add to list of shortcodes to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['shortcode_paths'] )) {
-			EE_Register_Shortcode::register( $addon_name, array( 'shortcode_paths' => self::$_settings[ $addon_name ]['shortcode_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['shortcode_paths'])) {
+			EE_Register_Shortcode::register($addon_name, array('shortcode_paths' => self::$_settings[$addon_name]['shortcode_paths']));
 		}
 		// add to list of widgets to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['widget_paths'] )) {
-			EE_Register_Widget::register( $addon_name, array( 'widget_paths' => self::$_settings[ $addon_name ]['widget_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['widget_paths'])) {
+			EE_Register_Widget::register($addon_name, array('widget_paths' => self::$_settings[$addon_name]['widget_paths']));
 		}
 
 		//register capability related stuff.
-		if ( ! empty( self::$_settings[ $addon_name ]['capabilities'] ) ) {
-			EE_Register_Capabilities::register( $addon_name , array( 'capabilities' => self::$_settings[$addon_name]['capabilities'], 'capability_maps' => self::$_settings[$addon_name]['capability_maps'] ) );
+		if ( ! empty(self::$_settings[$addon_name]['capabilities'])) {
+			EE_Register_Capabilities::register($addon_name, array('capabilities' => self::$_settings[$addon_name]['capabilities'], 'capability_maps' => self::$_settings[$addon_name]['capability_maps']));
 		}
 		//any message type to register?
-		if (  !empty( self::$_settings[$addon_name]['message_types'] ) ) {
-				add_action( 'EE_Brewing_Regular___messages_caf', array( 'EE_Register_Addon', 'register_message_types' ) );
+		if ( ! empty(self::$_settings[$addon_name]['message_types'])) {
+				add_action('EE_Brewing_Regular___messages_caf', array('EE_Register_Addon', 'register_message_types'));
 		}
 
 		// if plugin update engine is being used for auto-updates (not needed if PUE is not being used)
-		if ( ! empty( $setup_args['pue_options'] )) {
-			self::$_settings[ $addon_name ]['pue_options'] = array(
-				'pue_plugin_slug' 	=> isset( $setup_args['pue_options']['pue_plugin_slug'] ) ? (string)$setup_args['pue_options']['pue_plugin_slug'] : 'espresso_' . strtolower( $class_name ),
-				'plugin_basename' => isset( $setup_args['pue_options']['plugin_basename'] ) ? (string)$setup_args['pue_options']['plugin_basename'] : plugin_basename( self::$_settings[ $addon_name ]['main_file_path'] ),
-				'checkPeriod' 			=> isset( $setup_args['pue_options']['checkPeriod'] ) ? (string)$setup_args['pue_options']['checkPeriod'] : '24',
-				'use_wp_update'		=> isset( $setup_args['pue_options']['use_wp_update'] ) ? (string)$setup_args['pue_options']['use_wp_update'] : FALSE
+		if ( ! empty($setup_args['pue_options'])) {
+			self::$_settings[$addon_name]['pue_options'] = array(
+				'pue_plugin_slug' 	=> isset($setup_args['pue_options']['pue_plugin_slug']) ? (string) $setup_args['pue_options']['pue_plugin_slug'] : 'espresso_'.strtolower($class_name),
+				'plugin_basename' => isset($setup_args['pue_options']['plugin_basename']) ? (string) $setup_args['pue_options']['plugin_basename'] : plugin_basename(self::$_settings[$addon_name]['main_file_path']),
+				'checkPeriod' 			=> isset($setup_args['pue_options']['checkPeriod']) ? (string) $setup_args['pue_options']['checkPeriod'] : '24',
+				'use_wp_update'		=> isset($setup_args['pue_options']['use_wp_update']) ? (string) $setup_args['pue_options']['use_wp_update'] : FALSE
 			);
-			add_action( 'AHEE__EE_System__brew_espresso__after_pue_init', array( 'EE_Register_Addon', 'load_pue_update' ));
+			add_action('AHEE__EE_System__brew_espresso__after_pue_init', array('EE_Register_Addon', 'load_pue_update'));
 		}
 
 		//any custom post type/ custom capabilities or default terms to register
-		if ( !empty( self::$_settings[$addon_name]['custom_post_types'] ) || !empty( self::$_settings[$addon_name]['custom_taxonomies'] ) ) {
-			EE_Register_CPT::register( $addon_name, array( 'cpts' => self::$_settings[$addon_name]['custom_post_types'] , 'cts' => self::$_settings[$addon_name]['custom_taxonomies'], 'default_terms' => self::$_settings[$addon_name]['default_terms'] ) );
+		if ( ! empty(self::$_settings[$addon_name]['custom_post_types']) || ! empty(self::$_settings[$addon_name]['custom_taxonomies'])) {
+			EE_Register_CPT::register($addon_name, array('cpts' => self::$_settings[$addon_name]['custom_post_types'], 'cts' => self::$_settings[$addon_name]['custom_taxonomies'], 'default_terms' => self::$_settings[$addon_name]['default_terms']));
 		}
-		if( ! empty( self::$_settings[ $addon_name ][ 'payment_method_paths' ] ) ){
-			EE_Register_Payment_Method::register($addon_name, array( 'payment_method_paths' => self::$_settings[ $addon_name ][ 'payment_method_paths' ] ) );
+		if ( ! empty(self::$_settings[$addon_name]['payment_method_paths'])) {
+			EE_Register_Payment_Method::register($addon_name, array('payment_method_paths' => self::$_settings[$addon_name]['payment_method_paths']));
 		}
 		// load and instantiate main addon class
 		$addon = self::_load_and_init_addon_class($addon_name);
 		// call any additional admin_callback functions during load_admin_controller hook
-		if ( ! empty( self::$_settings[ $addon_name ]['admin_callback'] )) {
-			add_action( 'AHEE__EE_System__load_controllers__load_admin_controllers', array( $addon, self::$_settings[ $addon_name ]['admin_callback'] ));
+		if ( ! empty(self::$_settings[$addon_name]['admin_callback'])) {
+			add_action('AHEE__EE_System__load_controllers__load_admin_controllers', array($addon, self::$_settings[$addon_name]['admin_callback']));
 		}
 	}
 
@@ -394,22 +394,22 @@ 
 	 * @param string $addon_name
 	 * @return EE_Addon
 	 */
-	private static function _load_and_init_addon_class($addon_name){
-		$addon = EE_Registry::instance()->load_addon( dirname( self::$_settings[ $addon_name ]['main_file_path'] ), self::$_settings[ $addon_name ]['class_name'] );
-		$addon->set_name( $addon_name );
-		$addon->set_plugin_slug( self::$_settings[ $addon_name ][ 'plugin_slug' ] );
-		$addon->set_plugin_basename( self::$_settings[ $addon_name ][ 'plugin_basename' ] );
-		$addon->set_main_plugin_file( self::$_settings[ $addon_name ]['main_file_path'] );
-		$addon->set_plugin_action_slug( self::$_settings[ $addon_name ][ 'plugin_action_slug' ] );
-		$addon->set_plugins_page_row( self::$_settings[ $addon_name ][ 'plugins_page_row' ] );
-		$addon->set_version( self::$_settings[ $addon_name ]['version'] );
-		$addon->set_min_core_version( self::_effective_version( self::$_settings[ $addon_name ]['min_core_version'] ) );
-		$addon->set_config_section( self::$_settings[ $addon_name ]['config_section'] );
-		$addon->set_config_class( self::$_settings[ $addon_name ]['config_class'] );
-		$addon->set_config_name( self::$_settings[ $addon_name ]['config_name'] );
+	private static function _load_and_init_addon_class($addon_name) {
+		$addon = EE_Registry::instance()->load_addon(dirname(self::$_settings[$addon_name]['main_file_path']), self::$_settings[$addon_name]['class_name']);
+		$addon->set_name($addon_name);
+		$addon->set_plugin_slug(self::$_settings[$addon_name]['plugin_slug']);
+		$addon->set_plugin_basename(self::$_settings[$addon_name]['plugin_basename']);
+		$addon->set_main_plugin_file(self::$_settings[$addon_name]['main_file_path']);
+		$addon->set_plugin_action_slug(self::$_settings[$addon_name]['plugin_action_slug']);
+		$addon->set_plugins_page_row(self::$_settings[$addon_name]['plugins_page_row']);
+		$addon->set_version(self::$_settings[$addon_name]['version']);
+		$addon->set_min_core_version(self::_effective_version(self::$_settings[$addon_name]['min_core_version']));
+		$addon->set_config_section(self::$_settings[$addon_name]['config_section']);
+		$addon->set_config_class(self::$_settings[$addon_name]['config_class']);
+		$addon->set_config_name(self::$_settings[$addon_name]['config_name']);
 		//unfortunately this can't be hooked in upon construction, because we don't have
 		//the plugin mainfile's path upon construction.
-		register_deactivation_hook($addon->get_main_plugin_file(), array($addon,'deactivation'));
+		register_deactivation_hook($addon->get_main_plugin_file(), array($addon, 'deactivation'));
 		return $addon;
 	}
 
@@ -422,18 +422,18 @@ 
 	 */
 	public static function load_pue_update() {
 		// load PUE client
-		require_once  EE_THIRD_PARTY . 'pue' . DS . 'pue-client.php';
+		require_once  EE_THIRD_PARTY.'pue'.DS.'pue-client.php';
 		// cycle thru settings
-		foreach ( self::$_settings as $settings ) {
-			if ( ! empty( $settings['pue_options'] )) {
+		foreach (self::$_settings as $settings) {
+			if ( ! empty($settings['pue_options'])) {
 				// initiate the class and start the plugin update engine!
 				new PluginUpdateEngineChecker(
 				// host file URL
 					'https://eventespresso.com',
 					// plugin slug(s)
 					array(
-						'premium' => array( 'p' => $settings['pue_options']['pue_plugin_slug'] ),
-						'prerelease' => array( 'beta' => $settings['pue_options']['pue_plugin_slug'] . '-pr' )
+						'premium' => array('p' => $settings['pue_options']['pue_plugin_slug']),
+						'prerelease' => array('beta' => $settings['pue_options']['pue_plugin_slug'].'-pr')
 					),
 					// options
 					array(
@@ -461,9 +461,9 @@ 
 	 * @return void
 	 */
 	public static function register_message_types() {
-		foreach ( self::$_settings as $settings ) {
-			foreach( $settings['message_types'] as $message_type => $message_type_settings ) {
-				EE_Register_Message_Type::register( $message_type, $message_type_settings );
+		foreach (self::$_settings as $settings) {
+			foreach ($settings['message_types'] as $message_type => $message_type_settings) {
+				EE_Register_Message_Type::register($message_type, $message_type_settings);
 			}
 		}
 	}
@@ -479,60 +479,60 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function deregister( $addon_name = NULL ) {
-		if ( isset( self::$_settings[ $addon_name ] )) {
-			$class_name = self::$_settings[ $addon_name ]['class_name'];
-			if ( ! empty( self::$_settings[ $addon_name ]['dms_paths'] )) {
+	public static function deregister($addon_name = NULL) {
+		if (isset(self::$_settings[$addon_name])) {
+			$class_name = self::$_settings[$addon_name]['class_name'];
+			if ( ! empty(self::$_settings[$addon_name]['dms_paths'])) {
 				// setup DMS
-				EE_Register_Data_Migration_Scripts::deregister( $addon_name );
+				EE_Register_Data_Migration_Scripts::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['admin_path'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['admin_path'])) {
 				// register admin page
-				EE_Register_Admin_Page::deregister( $addon_name );
+				EE_Register_Admin_Page::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['module_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['module_paths'])) {
 				// add to list of modules to be registered
-				EE_Register_Module::deregister( $addon_name );
+				EE_Register_Module::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['shortcode_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['shortcode_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Shortcode::deregister( $addon_name );
+				EE_Register_Shortcode::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['config_class'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['config_class'])) {
 				// if config_class present let's register config.
-				EE_Register_Config::deregister( self::$_settings[ $addon_name ]['config_class']);
+				EE_Register_Config::deregister(self::$_settings[$addon_name]['config_class']);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['widget_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['widget_paths'])) {
 				// add to list of widgets to be registered
-				EE_Register_Widget::deregister( $addon_name );
+				EE_Register_Widget::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['model_paths'] ) ||
-					! empty( self::$_settings[ $addon_name ]['class_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['model_paths']) ||
+					! empty(self::$_settings[$addon_name]['class_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Model::deregister( $addon_name );
+				EE_Register_Model::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['model_extension_paths'] ) ||
-					! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['model_extension_paths']) ||
+					! empty(self::$_settings[$addon_name]['class_extension_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Model_Extensions::deregister( $addon_name );
+				EE_Register_Model_Extensions::deregister($addon_name);
 				}
-			if (  !empty( self::$_settings[$addon_name]['message_types'] ) ) {
-				foreach( self::$_settings[$addon_name]['message_types'] as $message_type => $message_type_settings ) {
-					EE_Register_Message_Type::deregister( $message_type );
+			if ( ! empty(self::$_settings[$addon_name]['message_types'])) {
+				foreach (self::$_settings[$addon_name]['message_types'] as $message_type => $message_type_settings) {
+					EE_Register_Message_Type::deregister($message_type);
 				}
 			}
 			//deregister capabilities for addon
-			if ( ! empty( self::$_settings[$addon_name]['capabilities'] ) || ! empty( self::$_settings[$addon_name]['capability_maps']) ) {
-				EE_Register_Capabilities::deregister( $addon_name );
+			if ( ! empty(self::$_settings[$addon_name]['capabilities']) || ! empty(self::$_settings[$addon_name]['capability_maps'])) {
+				EE_Register_Capabilities::deregister($addon_name);
 			}
 			//deregister custom_post_types for addon
-			if ( ! empty( self::$_settings[$addon_name]['custom_post_types'] ) ) {
-				EE_Register_CPT::deregister( $addon_name );
+			if ( ! empty(self::$_settings[$addon_name]['custom_post_types'])) {
+				EE_Register_CPT::deregister($addon_name);
 			}
-			remove_action('deactivate_'.EE_Registry::instance()->addons->{$class_name}->get_main_plugin_file_basename(),  array( EE_Registry::instance()->addons->{$class_name}, 'deactivation' ) );
-			remove_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( EE_Registry::instance()->addons->{$class_name}, 'initialize_db_if_no_migrations_required' ) );
+			remove_action('deactivate_'.EE_Registry::instance()->addons->{$class_name}->get_main_plugin_file_basename(), array(EE_Registry::instance()->addons->{$class_name}, 'deactivation'));
+			remove_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array(EE_Registry::instance()->addons->{$class_name}, 'initialize_db_if_no_migrations_required'));
 			unset(EE_Registry::instance()->addons->{$class_name});
-			unset( self::$_settings[ $addon_name ] );
+			unset(self::$_settings[$addon_name]);
 		}
 	}
 

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, custom post type, custom taxonomy
  * @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 custom post type or custom taxonomy for the EE CPT 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, capabilities
  * @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 new capabilities for the EE capabilities 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_Messages_Shortcode_Library.lib.php

Spacing +29 added lines, -29 removed lines

@@ -62,44 +62,44 @@ 
      * }
      * @return void
      */
-    public static function register( $name = NULL, $setup_args = array() ) {
+    public static function register($name = NULL, $setup_args = array()) {
 
         //required fields MUST be present, so let's make sure they are.
-        if ( empty( $name ) || ! is_array( $setup_args ) || empty( $setup_args['autoloadpaths'] ) ) {
-            throw new EE_Error( __( 'In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"', 'event_espresso' ) );
+        if (empty($name) || ! is_array($setup_args) || empty($setup_args['autoloadpaths'])) {
+            throw new EE_Error(__('In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"', 'event_espresso'));
         }
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_messages_shortcode_registry[ $name ] ) ){
+		if (isset(self::$_ee_messages_shortcode_registry[$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' )) {
-			EE_Error::doing_it_wrong(__METHOD__, sprintf( __('Should be only called on the "EE_Brewing_Regular___messages_caf" hook (Trying to register a library named %s).','event_espresso'), $name ), '4.3.0' );
+		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(__('Should be only called on the "EE_Brewing_Regular___messages_caf" hook (Trying to register a library named %s).', 'event_espresso'), $name), '4.3.0');
 		}
 
         $name = (string) $name;
         self::$_ee_messages_shortcode_registry[$name] = array(
             'autoloadpaths' => (array) $setup_args['autoloadpaths'],
-            'list_type_shortcodes' => !empty( $setup_args['list_type_shortcodes'] ) ? (array) $setup_args['list_type_shortcodes'] : array()
+            'list_type_shortcodes' => ! empty($setup_args['list_type_shortcodes']) ? (array) $setup_args['list_type_shortcodes'] : array()
             );
 
          //add filters
-         add_filter( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( 'EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'), 10 );
+         add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array('EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'), 10);
 
         //add below filters if the required callback is provided.
-        if ( !empty( $setup_args['msgr_validator_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2 );
+        if ( ! empty($setup_args['msgr_validator_callback']))
+            add_filter('FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2);
 
-        if ( !empty( $setup_args['msgr_template_fields_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2 );
+        if ( ! empty($setup_args['msgr_template_fields_callback']))
+            add_filter('FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2);
 
-        if ( !empty( $setup_args['valid_shortcodes_callback'] ) )
-            add_filter( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2 );
+        if ( ! empty($setup_args['valid_shortcodes_callback']))
+            add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2);
 
-        if ( !empty( $setup_args['list_type_shortcodes'] ) )
-            add_filter( 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array( 'EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10 );
+        if ( ! empty($setup_args['list_type_shortcodes']))
+            add_filter('FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array('EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10);
     }
 
 
@@ -112,9 +112,9 @@ 
      * @param  string $name name used to register the shortcode library.
      * @return  void
      */
-    public static function deregister( $name = NULL ) {
-    	if ( !empty( self::$_ee_messages_shortcode_registry[$name] ) )
-    		unset( self::$_ee_messages_shortcode_registry[$name] );
+    public static function deregister($name = NULL) {
+    	if ( ! empty(self::$_ee_messages_shortcode_registry[$name]))
+    		unset(self::$_ee_messages_shortcode_registry[$name]);
     }
 
 
@@ -127,13 +127,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_messages_shortcode_registry ) ) {
-             foreach ( self::$_ee_messages_shortcode_registry as $st_reg ) {
-                if ( empty( $st_reg['autoloadpaths'] ) )
+        if ( ! empty(self::$_ee_messages_shortcode_registry)) {
+             foreach (self::$_ee_messages_shortcode_registry as $st_reg) {
+                if (empty($st_reg['autoloadpaths']))
                     continue;
-                $paths = array_merge( $paths, $st_reg['autoloadpaths'] );
+                $paths = array_merge($paths, $st_reg['autoloadpaths']);
             }
         }
 
@@ -151,13 +151,13 @@ 
      * @param  array $original_shortcodes
      * @return  array                                   Modifications to original shortcodes.
      */
-    public static function register_list_type_shortcodes( $original_shortcodes ) {
-        if ( empty( self::$_ee_messages_shortcode_registry ) )
+    public static function register_list_type_shortcodes($original_shortcodes) {
+        if (empty(self::$_ee_messages_shortcode_registry))
             return $original_shortcodes;
 
-        foreach ( self::$_ee_messages_shortcode_registry as $sc_reg ) {
-            if ( !empty( $sc_reg['list_type_shortcodes'] ) )
-                $original_shortcodes = array_merge( $original_shortcodes, $sc_reg['list_type_shortcodes'] );
+        foreach (self::$_ee_messages_shortcode_registry as $sc_reg) {
+            if ( ! empty($sc_reg['list_type_shortcodes']))
+                $original_shortcodes = array_merge($original_shortcodes, $sc_reg['list_type_shortcodes']);
         }
 
         return $original_shortcodes;

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 shortcode library for the EE messages system.
@@ -89,17 +91,21 @@ 
          add_filter( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( 'EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'), 10 );
 
         //add below filters if the required callback is provided.
-        if ( !empty( $setup_args['msgr_validator_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2 );
+        if ( !empty( $setup_args['msgr_validator_callback'] ) ) {
+                    add_filter( 'FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2 );
+        }
 
-        if ( !empty( $setup_args['msgr_template_fields_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2 );
+        if ( !empty( $setup_args['msgr_template_fields_callback'] ) ) {
+                    add_filter( 'FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2 );
+        }
 
-        if ( !empty( $setup_args['valid_shortcodes_callback'] ) )
-            add_filter( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2 );
+        if ( !empty( $setup_args['valid_shortcodes_callback'] ) ) {
+                    add_filter( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2 );
+        }
 
-        if ( !empty( $setup_args['list_type_shortcodes'] ) )
-            add_filter( 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array( 'EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10 );
+        if ( !empty( $setup_args['list_type_shortcodes'] ) ) {
+                    add_filter( 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array( 'EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10 );
+        }
     }
 
 
@@ -113,8 +119,9 @@ 
      * @return  void
      */
     public static function deregister( $name = NULL ) {
-    	if ( !empty( self::$_ee_messages_shortcode_registry[$name] ) )
-    		unset( self::$_ee_messages_shortcode_registry[$name] );
+    	if ( !empty( self::$_ee_messages_shortcode_registry[$name] ) ) {
+    	    		unset( self::$_ee_messages_shortcode_registry[$name] );
+    	}
     }
 
 
@@ -131,8 +138,9 @@ 
 
         if ( !empty( self::$_ee_messages_shortcode_registry ) ) {
              foreach ( self::$_ee_messages_shortcode_registry as $st_reg ) {
-                if ( empty( $st_reg['autoloadpaths'] ) )
-                    continue;
+                if ( empty( $st_reg['autoloadpaths'] ) ) {
+                                    continue;
+                }
                 $paths = array_merge( $paths, $st_reg['autoloadpaths'] );
             }
         }
@@ -152,12 +160,14 @@ 
      * @return  array                                   Modifications to original shortcodes.
      */
     public static function register_list_type_shortcodes( $original_shortcodes ) {
-        if ( empty( self::$_ee_messages_shortcode_registry ) )
-            return $original_shortcodes;
+        if ( empty( self::$_ee_messages_shortcode_registry ) ) {
+                    return $original_shortcodes;
+        }
 
         foreach ( self::$_ee_messages_shortcode_registry as $sc_reg ) {
-            if ( !empty( $sc_reg['list_type_shortcodes'] ) )
-                $original_shortcodes = array_merge( $original_shortcodes, $sc_reg['list_type_shortcodes'] );
+            if ( !empty( $sc_reg['list_type_shortcodes'] ) ) {
+                            $original_shortcodes = array_merge( $original_shortcodes, $sc_reg['list_type_shortcodes'] );
+            }
         }
 
         return $original_shortcodes;

Indentation +133 added lines, -133 removed lines

@@ -18,56 +18,56 @@ 
 class EE_Register_Messages_Shortcode_Library implements EEI_Plugin_API {
 
 
-    /**
-     * holds values for registered messages shortcode libraries
-     * @var array
-     */
-    protected static $_ee_messages_shortcode_registry = array();
-
-
-
-
-    /**
-     * Helper method for registring a new shortcodes library class for the messages system.
-     *
-     * Note this is not used for adding shortcodes to existing libraries.  It's for registering anything
-     * related to registering a new EE_{shortcode_library_name}_Shortcodes.lib.php class.
-     *
-     * @since    4.3.0
-     *
-     * @param  array  $setup_args {
-     *       An array of arguments provided for registering the new messages shortcode library.
-     *
-     *       @type string $name                                         What is the name of this shortcode library
-     *                                                                              (e.g. 'question_list');
-     *       @type array  $autoloadpaths                          An array of paths to add to the messages
-     *                                                                              autoloader for the new shortcode library
-     *                                                                              class file.
-     *       @type string $msgr_validator_callback            Callback for a method that will register the
-     *                                                                              library with the messenger
-     *                                                                              _validator_config. Optional.
-     *       @type string $msgr_template_fields_callback  Callback for changing adding the
-     *                                                                              _template_fields property for messenger.
-     *                                                                              For example, the shortcode library may add
-     *                                                                              a new field to the message templates.
-     *                                                                              Optional.
-     *       @type string $valid_shortcodes_callback         Callback for message types
-     *                                                                              _valid_shortcodes array setup. Optional.
-     *       @type array  $list_type_shortcodes                 If there are any specific shortcodes with this
-     *                                                                             message shortcode library that should be
-     *                                                                             considered "list type" then include them in an
-     *                                                                             array.  List Type shortcodes are shortcodes that
-     *                                                                             have a corresponding field that indicates how
-     *                                                                             they are parsed. Optional.
-     * }
-     * @return void
-     */
-    public static function register( $name = NULL, $setup_args = array() ) {
-
-        //required fields MUST be present, so let's make sure they are.
-        if ( empty( $name ) || ! is_array( $setup_args ) || empty( $setup_args['autoloadpaths'] ) ) {
-            throw new EE_Error( __( 'In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"', 'event_espresso' ) );
-        }
+	/**
+	 * holds values for registered messages shortcode libraries
+	 * @var array
+	 */
+	protected static $_ee_messages_shortcode_registry = array();
+
+
+
+
+	/**
+	 * Helper method for registring a new shortcodes library class for the messages system.
+	 *
+	 * Note this is not used for adding shortcodes to existing libraries.  It's for registering anything
+	 * related to registering a new EE_{shortcode_library_name}_Shortcodes.lib.php class.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param  array  $setup_args {
+	 *       An array of arguments provided for registering the new messages shortcode library.
+	 *
+	 *       @type string $name                                         What is the name of this shortcode library
+	 *                                                                              (e.g. 'question_list');
+	 *       @type array  $autoloadpaths                          An array of paths to add to the messages
+	 *                                                                              autoloader for the new shortcode library
+	 *                                                                              class file.
+	 *       @type string $msgr_validator_callback            Callback for a method that will register the
+	 *                                                                              library with the messenger
+	 *                                                                              _validator_config. Optional.
+	 *       @type string $msgr_template_fields_callback  Callback for changing adding the
+	 *                                                                              _template_fields property for messenger.
+	 *                                                                              For example, the shortcode library may add
+	 *                                                                              a new field to the message templates.
+	 *                                                                              Optional.
+	 *       @type string $valid_shortcodes_callback         Callback for message types
+	 *                                                                              _valid_shortcodes array setup. Optional.
+	 *       @type array  $list_type_shortcodes                 If there are any specific shortcodes with this
+	 *                                                                             message shortcode library that should be
+	 *                                                                             considered "list type" then include them in an
+	 *                                                                             array.  List Type shortcodes are shortcodes that
+	 *                                                                             have a corresponding field that indicates how
+	 *                                                                             they are parsed. Optional.
+	 * }
+	 * @return void
+	 */
+	public static function register( $name = NULL, $setup_args = array() ) {
+
+		//required fields MUST be present, so let's make sure they are.
+		if ( empty( $name ) || ! is_array( $setup_args ) || empty( $setup_args['autoloadpaths'] ) ) {
+			throw new EE_Error( __( 'In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"', 'event_espresso' ) );
+		}
 
 		//make sure we don't register twice
 		if( isset( self::$_ee_messages_shortcode_registry[ $name ] ) ){
@@ -79,88 +79,88 @@ 
 			EE_Error::doing_it_wrong(__METHOD__, sprintf( __('Should be only called on the "EE_Brewing_Regular___messages_caf" hook (Trying to register a library named %s).','event_espresso'), $name ), '4.3.0' );
 		}
 
-        $name = (string) $name;
-        self::$_ee_messages_shortcode_registry[$name] = array(
-            'autoloadpaths' => (array) $setup_args['autoloadpaths'],
-            'list_type_shortcodes' => !empty( $setup_args['list_type_shortcodes'] ) ? (array) $setup_args['list_type_shortcodes'] : array()
-            );
-
-         //add filters
-         add_filter( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( 'EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'), 10 );
-
-        //add below filters if the required callback is provided.
-        if ( !empty( $setup_args['msgr_validator_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2 );
-
-        if ( !empty( $setup_args['msgr_template_fields_callback'] ) )
-            add_filter( 'FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2 );
-
-        if ( !empty( $setup_args['valid_shortcodes_callback'] ) )
-            add_filter( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2 );
-
-        if ( !empty( $setup_args['list_type_shortcodes'] ) )
-            add_filter( 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array( 'EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10 );
-    }
-
-
-
-
-    /**
-     * This deregisters any messages shortcode library previously registered with the given name.
-     *
-     * @since    4.3.0
-     * @param  string $name name used to register the shortcode library.
-     * @return  void
-     */
-    public static function deregister( $name = NULL ) {
-    	if ( !empty( self::$_ee_messages_shortcode_registry[$name] ) )
-    		unset( self::$_ee_messages_shortcode_registry[$name] );
-    }
-
-
-
-     /**
-     * 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_messages_shortcode_registry ) ) {
-             foreach ( self::$_ee_messages_shortcode_registry as $st_reg ) {
-                if ( empty( $st_reg['autoloadpaths'] ) )
-                    continue;
-                $paths = array_merge( $paths, $st_reg['autoloadpaths'] );
-            }
-        }
-
-        return $paths;
-    }
-
-
-
-    /**
-     * This is the callback for the FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes
-     * filter which is used to add additional list type shortcodes.
-     *
-     * @since 4.3.0
-     *
-     * @param  array $original_shortcodes
-     * @return  array                                   Modifications to original shortcodes.
-     */
-    public static function register_list_type_shortcodes( $original_shortcodes ) {
-        if ( empty( self::$_ee_messages_shortcode_registry ) )
-            return $original_shortcodes;
-
-        foreach ( self::$_ee_messages_shortcode_registry as $sc_reg ) {
-            if ( !empty( $sc_reg['list_type_shortcodes'] ) )
-                $original_shortcodes = array_merge( $original_shortcodes, $sc_reg['list_type_shortcodes'] );
-        }
-
-        return $original_shortcodes;
-    }
+		$name = (string) $name;
+		self::$_ee_messages_shortcode_registry[$name] = array(
+			'autoloadpaths' => (array) $setup_args['autoloadpaths'],
+			'list_type_shortcodes' => !empty( $setup_args['list_type_shortcodes'] ) ? (array) $setup_args['list_type_shortcodes'] : array()
+			);
+
+		 //add filters
+		 add_filter( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( 'EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'), 10 );
+
+		//add below filters if the required callback is provided.
+		if ( !empty( $setup_args['msgr_validator_callback'] ) )
+			add_filter( 'FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2 );
+
+		if ( !empty( $setup_args['msgr_template_fields_callback'] ) )
+			add_filter( 'FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2 );
+
+		if ( !empty( $setup_args['valid_shortcodes_callback'] ) )
+			add_filter( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2 );
+
+		if ( !empty( $setup_args['list_type_shortcodes'] ) )
+			add_filter( 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', array( 'EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'), 10 );
+	}
+
+
+
+
+	/**
+	 * This deregisters any messages shortcode library previously registered with the given name.
+	 *
+	 * @since    4.3.0
+	 * @param  string $name name used to register the shortcode library.
+	 * @return  void
+	 */
+	public static function deregister( $name = NULL ) {
+		if ( !empty( self::$_ee_messages_shortcode_registry[$name] ) )
+			unset( self::$_ee_messages_shortcode_registry[$name] );
+	}
+
+
+
+	 /**
+	  * 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_messages_shortcode_registry ) ) {
+			 foreach ( self::$_ee_messages_shortcode_registry as $st_reg ) {
+				if ( empty( $st_reg['autoloadpaths'] ) )
+					continue;
+				$paths = array_merge( $paths, $st_reg['autoloadpaths'] );
+			}
+		}
+
+		return $paths;
+	}
+
+
+
+	/**
+	 * This is the callback for the FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes
+	 * filter which is used to add additional list type shortcodes.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param  array $original_shortcodes
+	 * @return  array                                   Modifications to original shortcodes.
+	 */
+	public static function register_list_type_shortcodes( $original_shortcodes ) {
+		if ( empty( self::$_ee_messages_shortcode_registry ) )
+			return $original_shortcodes;
+
+		foreach ( self::$_ee_messages_shortcode_registry as $sc_reg ) {
+			if ( !empty( $sc_reg['list_type_shortcodes'] ) )
+				$original_shortcodes = array_merge( $original_shortcodes, $sc_reg['list_type_shortcodes'] );
+		}
+
+		return $original_shortcodes;
+	}
 
 }

core/libraries/plugin_api/EE_Register_Messages_Template_Pack.lib.php

Indentation +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@
 	 */
 	public static function deregister( $variation_ref = NULL ) {
 		if ( !empty( self::$_registry[$variation_ref] ) ) {
-    			unset( self::$_registry[$variation_ref] );
-    		}
+				unset( self::$_registry[$variation_ref] );
+			}
 	}
 }

Spacing +24 added lines, -24 removed lines

@@ -54,39 +54,39 @@ 
 	 *
 	 * @return void
 	 */
-	public static function register( $ref = NULL, $setup_args = array() ) {
+	public static function register($ref = NULL, $setup_args = array()) {
 
 		//check for required params
-		if ( empty( $ref ) || empty( $setup_args['path'] ) || empty( $setup_args['classname'] ) ) {
+		if (empty($ref) || empty($setup_args['path']) || empty($setup_args['classname'])) {
 			throw new EE_Error(
 				__('In order to register a new template pack for the EE Messages system, you must include a value to reference the template pack being registered and the setup_args must have the path for the new template pack class as well as the classname for the new Template Pack Class. ', 'event_espresso')
 				);
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_registry[ $ref ] ) ){
+		if (isset(self::$_registry[$ref])) {
 			return;
 		}
 
 		//check that incoming $ref doesn't already exist. If it does then we'll create a unique reference for this template pack.
-		if ( isset( self::$_registry[$ref] ) ) {
-			$ref = uniqid() . '_' . $ref;
+		if (isset(self::$_registry[$ref])) {
+			$ref = uniqid().'_'.$ref;
 		}
 
 
 		//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 EE Messages Template Pack given the reference "%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 EE Messages Template Pack given the reference "%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'),
 					$ref
 				),
 				'4.5.0'
 			);
 		}
 
-		if ( self::_verify_class_not_exist( $setup_args['classname'] ) ) {
+		if (self::_verify_class_not_exist($setup_args['classname'])) {
 			self::$_registry[$ref] = array(
 				'path' => (string) $setup_args['path'],
 				'classname' => (string) $setup_args['classname']
@@ -94,8 +94,8 @@ 
 		}
 
 		//hook into the system
-		add_filter( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( 'EE_Register_Messages_Template_Pack', 'set_template_pack_path'), 10 );
-		add_filter( 'FHEE__EED_Messages__get_template_packs__template_packs', array( 'EE_Register_Messages_Template_Pack', 'set_template_pack' ), 10 );
+		add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array('EE_Register_Messages_Template_Pack', 'set_template_pack_path'), 10);
+		add_filter('FHEE__EED_Messages__get_template_packs__template_packs', array('EE_Register_Messages_Template_Pack', 'set_template_pack'), 10);
 
 	}
 
@@ -112,8 +112,8 @@ 
 	 *
 	 * @return array
 	 */
-	public static function set_template_pack_path( $paths ) {
-		foreach( self::$_registry as $ref => $args ) {
+	public static function set_template_pack_path($paths) {
+		foreach (self::$_registry as $ref => $args) {
 			$paths[] = $args['path'];
 		}
 		return $paths;
@@ -130,15 +130,15 @@ 
 	 * @param EE_Messages_Template_Pack[] $template_packs
 	 * @return EE_Messages_Template_Pack[]
 	 */
-	public static function set_template_pack( $template_packs ) {
-		foreach( self::$_registry as $ref => $args ) {
+	public static function set_template_pack($template_packs) {
+		foreach (self::$_registry as $ref => $args) {
 			//verify class_exists
-			if ( ! class_exists( $args['classname'] ) ) {
-				require_once( $args['path'] . '/' . $args['classname'] . '.class.php' );
+			if ( ! class_exists($args['classname'])) {
+				require_once($args['path'].'/'.$args['classname'].'.class.php');
 			}
 
 			//check again!
-			if ( class_exists( $args['classname'] ) ) {
+			if (class_exists($args['classname'])) {
 				$template_pack = new $args['classname'];
 				$template_packs[$template_pack->dbref] = $template_pack;
 			}
@@ -159,12 +159,12 @@ 
 	 *
 	 * @return bool
 	 */
-	private static function _verify_class_not_exist( $classname ) {
+	private static function _verify_class_not_exist($classname) {
 
 		//loop through the existing registry and see if the classname is already present.
-		foreach ( self::$_registry as $ref => $args ) {
-			if ( $args['classname'] == $classname ) {
-				EE_Error::add_error( sprintf( __('The %s template pack that you just activated cannot be registered with the messages system because there is already a template pack active using the same classname.  Contact the author of this template pack to let them know of the conflict.  To stop seeing this message you will need to deactivate this template pack.', 'event_espresso' ), (string) $setup_args['classname'] ), __FILE__, __LINE__, __FUNCTION__ );
+		foreach (self::$_registry as $ref => $args) {
+			if ($args['classname'] == $classname) {
+				EE_Error::add_error(sprintf(__('The %s template pack that you just activated cannot be registered with the messages system because there is already a template pack active using the same classname.  Contact the author of this template pack to let them know of the conflict.  To stop seeing this message you will need to deactivate this template pack.', 'event_espresso'), (string) $setup_args['classname']), __FILE__, __LINE__, __FUNCTION__);
 				return false;
 			}
 		}
@@ -183,9 +183,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function deregister( $variation_ref = NULL ) {
-		if ( !empty( self::$_registry[$variation_ref] ) ) {
-    			unset( self::$_registry[$variation_ref] );
+	public static function deregister($variation_ref = NULL) {
+		if ( ! empty(self::$_registry[$variation_ref])) {
+    			unset(self::$_registry[$variation_ref]);
     		}
 	}
 }

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 for the EE messages system.

core/libraries/plugin_api/EE_Register_Messages_Template_Variations.lib.php

Spacing +41 added lines, -41 removed lines

@@ -68,38 +68,38 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $variation_ref = NULL,  $setup_args = array() ) {
+	public static function register($variation_ref = NULL, $setup_args = array()) {
 
 		//check for required params
-		if ( empty( $variation_ref ) ) {
+		if (empty($variation_ref)) {
 			throw new EE_Error(
 				__('In order to register variations for a EE_Message_Template_Pack, you must include a value to reference the variations being registered', 'event_espresso')
 				);
 		}
 
-		if ( ! is_array( $setup_args ) || empty( $setup_args['variations'] ) || empty( $setup_args['base_path'] ) || empty( $setup_args['base_url'] ) ) {
+		if ( ! is_array($setup_args) || empty($setup_args['variations']) || empty($setup_args['base_path']) || empty($setup_args['base_url'])) {
 			throw new EE_Error(
 				__('In order to register variations for a EE_Message_Template_Pack, you must include an array containing the following keys: "variations", "base_path", "base_url", "extension"', 'event_espresso')
 				);
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_registry[ $variation_ref ] ) ){
+		if (isset(self::$_registry[$variation_ref])) {
 			return;
 		}
 
 		//make sure variation ref is unique.
-		if ( isset( self::$_registry[$variation_ref] ) ) {
-			$variation_ref = uniqid() . '_' . $variation_ref;
+		if (isset(self::$_registry[$variation_ref])) {
+			$variation_ref = uniqid().'_'.$variation_ref;
 		}
 
 
 		//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(
-					__('Messages Templates Variations given the reference "%s" has been attempted to be registered with the EE Messages Template Pack System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.','event_espresso'),
+					__('Messages Templates Variations given the reference "%s" has been attempted to be registered with the EE Messages Template Pack System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.', 'event_espresso'),
 					$variation_ref
 				),
 				'4.5.0'
@@ -115,11 +115,11 @@ 
 
 
 		//check that no reserved variation names are in use and also checks if there are already existing variation names for a given template pack.  The former will throw an error.  The latter will remove the conflicting variation name but still register the others and will add EE_Error notice.
-		$validated = self::_verify_variations( $variation_ref, $validated );
+		$validated = self::_verify_variations($variation_ref, $validated);
 		self::$_registry[$variation_ref] = $validated;
 
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variations', array( 'EE_Register_Messages_Template_Variations', 'get_variations' ), 10, 4 );
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( 'EE_Register_Messages_Template_Variations', 'get_variation' ), 10, 8 );
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variations', array('EE_Register_Messages_Template_Variations', 'get_variations'), 10, 4);
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array('EE_Register_Messages_Template_Variations', 'get_variation'), 10, 8);
 	}
 
 
@@ -136,13 +136,13 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	private static function _verify_variations( $variation_ref, $validated_variations ) {
-		foreach ( self::$_registry as $variation_ref => $settings ) {
-			foreach ( $settings['variations'] as $template_pack => $messenger ) {
-				foreach ( $messenger as $all_variations ) {
-					if ( isset( $all_variations['default'] ) ) {
+	private static function _verify_variations($variation_ref, $validated_variations) {
+		foreach (self::$_registry as $variation_ref => $settings) {
+			foreach ($settings['variations'] as $template_pack => $messenger) {
+				foreach ($messenger as $all_variations) {
+					if (isset($all_variations['default'])) {
 						throw new EE_Error(
-							sprintf( __('Variations registered through the EE_Register_Messages_Template_Variations api cannot override the default variation for the default template.  Please check the code registering variations with this reference, "%s" and modify.', 'event_espresso' ), $variation_ref )
+							sprintf(__('Variations registered through the EE_Register_Messages_Template_Variations api cannot override the default variation for the default template.  Please check the code registering variations with this reference, "%s" and modify.', 'event_espresso'), $variation_ref)
 							);
 					}
 				}
@@ -150,13 +150,13 @@ 
 		}
 
 		//is there already a variation registered with a given variation slug?
-		foreach ( $validated_variations['variations'] as $template_pack => $messenger  ) {
-			foreach ( $messenger as $message_type => $variations ) {
-				foreach( $variations as $slug => $label ) {
-					foreach ( self::$_registry as $registered_var => $reg_settings ) {
-						if ( isset( $reg_settings['variations'][$template_pack][$messenger][$message_type][$slug] ) ) {
-							unset( $validated_variations['variations'][$template_pack][$messenger][$message_type][$slug] );
-							EE_Error::add_error( sprintf( __('Unable to register the %s variation for the %s template pack with the %s messenger and %s message_type because a variation with this slug was already registered for this template pack and messenger and message type by an addon using this key %s.', 'event_espresso' ), $label, $template_pack, $messenger, $message_type, $registered_var  ) );
+		foreach ($validated_variations['variations'] as $template_pack => $messenger) {
+			foreach ($messenger as $message_type => $variations) {
+				foreach ($variations as $slug => $label) {
+					foreach (self::$_registry as $registered_var => $reg_settings) {
+						if (isset($reg_settings['variations'][$template_pack][$messenger][$message_type][$slug])) {
+							unset($validated_variations['variations'][$template_pack][$messenger][$message_type][$slug]);
+							EE_Error::add_error(sprintf(__('Unable to register the %s variation for the %s template pack with the %s messenger and %s message_type because a variation with this slug was already registered for this template pack and messenger and message type by an addon using this key %s.', 'event_espresso'), $label, $template_pack, $messenger, $message_type, $registered_var));
 						}
 					}
 				}
@@ -185,15 +185,15 @@ 
 	 *
 	 * @return string                    The path to the requested variation.
 	 */
-	public static function get_variation( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) {
+	public static function get_variation($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 
 		//so let's loop through our registered variations and then pull any details matching the request.
-		foreach ( self::$_registry as $registry_slug => $registry_settings ) {
+		foreach (self::$_registry as $registry_slug => $registry_settings) {
 			$base = $url ? $registry_settings['base_url'] : $registry_settings['base_path'];
-			$file_string = $messenger . '_' . $type. '_' . $variation . $file_extension;
+			$file_string = $messenger.'_'.$type.'_'.$variation.$file_extension;
 			//see if this file exists
-			if ( is_readable( $registry_settings['base_path'] . $file_string ) ) {
-				return $base . $file_string;
+			if (is_readable($registry_settings['base_path'].$file_string)) {
+				return $base.$file_string;
 			}
 		}
 
@@ -217,21 +217,21 @@ 
 	 *
 	 * @return array                   new variations array (or existing one if nothing registered)
 	 */
-	public static function get_variations( $variations, $messenger,  $message_type, EE_Messages_Template_Pack $template_pack ) {
+	public static function get_variations($variations, $messenger, $message_type, EE_Messages_Template_Pack $template_pack) {
 		//first let's check if we even have registered variations and get out early.
-		if ( empty( self::$_registry ) ) {
+		if (empty(self::$_registry)) {
 			return $variations;
 		}
 
 		//do we have any new variations for the given messenger, $message_type, and template packs
-		foreach ( self::$_registry as $registry_slug => $registry_settings ) {
+		foreach (self::$_registry as $registry_slug => $registry_settings) {
 			//allow for different conditions.
-			if ( empty( $messenger) ) {
-				$variations =  array_merge( $registry_settings['variations'], $variations );
-			} else if ( ! empty( $messenger ) && empty( $message_type ) && ! empty( $registry_settings['variations'][$template_pack->dbref][$messenger] ) ) {
-				$variations =  array_merge( $registry_settings['variations'][$template_pack->dbref][$messenger], $variations );
-			} else if ( ! empty( $messenger ) && ! empty( $message_type ) && ! empty( $registry_settings['variations'][$template_pack->dbref][$messenger][$message_type] ) ) {
-				$variations = array_merge( $registry_settings['variations'][$template_pack->dbref][$messenger][$message_type], $variations );
+			if (empty($messenger)) {
+				$variations = array_merge($registry_settings['variations'], $variations);
+			} else if ( ! empty($messenger) && empty($message_type) && ! empty($registry_settings['variations'][$template_pack->dbref][$messenger])) {
+				$variations = array_merge($registry_settings['variations'][$template_pack->dbref][$messenger], $variations);
+			} else if ( ! empty($messenger) && ! empty($message_type) && ! empty($registry_settings['variations'][$template_pack->dbref][$messenger][$message_type])) {
+				$variations = array_merge($registry_settings['variations'][$template_pack->dbref][$messenger][$message_type], $variations);
 			}
 		}
 		return $variations;
@@ -250,9 +250,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function deregister( $variation_ref = NULL ) {
-		if ( !empty( self::$_registry[$variation_ref] ) ) {
-    			unset( self::$_registry[$variation_ref] );
+	public static function deregister($variation_ref = NULL) {
+		if ( ! empty(self::$_registry[$variation_ref])) {
+    			unset(self::$_registry[$variation_ref]);
     		}
 	}
 

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.

Indentation +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@
 	 */
 	public static function deregister( $variation_ref = NULL ) {
 		if ( !empty( self::$_registry[$variation_ref] ) ) {
-    			unset( self::$_registry[$variation_ref] );
-    		}
+				unset( self::$_registry[$variation_ref] );
+			}
 	}
 }