eventespresso / event-espresso-core

core/libraries/form_sections/form_handlers/SequentialStepForm.php

Spacing +27 added lines, -27 removed lines

@@ -4,8 +4,8 @@ 
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 use InvalidArgumentException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -86,8 +86,8 @@ 
 		$form_config = 'add_form_tags_and_submit',
 		\EE_Registry $registry
 	) {
-		$this->setOrder( $order );
-		parent::__construct( $form_name, $admin_name, $slug, $form_action, $form_config, $registry );
+		$this->setOrder($order);
+		parent::__construct($form_name, $admin_name, $slug, $form_action, $form_config, $registry);
 	}
 
 
@@ -105,11 +105,11 @@ 
 	 * @param int $order
 	 * @throws InvalidArgumentException
 	 */
-	public function setOrder( $order ) {
-		$order = absint( $order );
-		if ( ! $order > 0 ) {
+	public function setOrder($order) {
+		$order = absint($order);
+		if ( ! $order > 0) {
 			throw new InvalidArgumentException(
-				__( 'The form order property must be a positive integer.', 'event_espresso' )
+				__('The form order property must be a positive integer.', 'event_espresso')
 			);
 		}
 		$this->order = $order;
@@ -122,8 +122,8 @@ 
 	 * @return string
 	 */
 	public function redirectUrl() {
-		return ! empty( $this->redirect_args )
-			? add_query_arg( $this->redirect_args, $this->redirect_url )
+		return ! empty($this->redirect_args)
+			? add_query_arg($this->redirect_args, $this->redirect_url)
 			: $this->redirect_url;
 	}
 
@@ -134,13 +134,13 @@ 
 	 * @throws InvalidDataTypeException
 	 * @throws InvalidArgumentException
 	 */
-	public function setRedirectUrl( $redirect_url ) {
-		if ( ! is_string( $redirect_url ) ) {
-			throw new InvalidDataTypeException( '$redirect_url', $redirect_url, 'string' );
+	public function setRedirectUrl($redirect_url) {
+		if ( ! is_string($redirect_url)) {
+			throw new InvalidDataTypeException('$redirect_url', $redirect_url, 'string');
 		}
-		if ( empty( $redirect_url ) ) {
+		if (empty($redirect_url)) {
 			throw new InvalidArgumentException(
-				__( 'The redirect URL can not be an empty string.', 'event_espresso' )
+				__('The redirect URL can not be an empty string.', 'event_espresso')
 			);
 		}
 		$this->redirect_url = $redirect_url;
@@ -153,20 +153,20 @@ 
 	 * @throws InvalidDataTypeException
 	 * @throws InvalidArgumentException
 	 */
-	public function addRedirectArgs( $redirect_args = array() ) {
-		if ( is_object( $redirect_args ) ) {
+	public function addRedirectArgs($redirect_args = array()) {
+		if (is_object($redirect_args)) {
 			throw new InvalidDataTypeException(
 				'$redirect_args',
 				$redirect_args,
 				'anything other than an object was expected.'
 			);
 		}
-		if ( empty( $redirect_args ) ) {
+		if (empty($redirect_args)) {
 			throw new InvalidArgumentException(
-				__( 'The redirect argument can not be an empty array.', 'event_espresso' )
+				__('The redirect argument can not be an empty array.', 'event_espresso')
 			);
 		}
-		$this->redirect_args = array_merge( $this->redirect_args, (array) $redirect_args );
+		$this->redirect_args = array_merge($this->redirect_args, (array) $redirect_args);
 	}
 
 
@@ -176,21 +176,21 @@ 
 	 * @throws InvalidDataTypeException
 	 * @throws InvalidArgumentException
 	 */
-	public function removeRedirectArgs( $redirect_arg_keys_to_remove = array() ) {
-		if ( is_object( $redirect_arg_keys_to_remove ) ) {
+	public function removeRedirectArgs($redirect_arg_keys_to_remove = array()) {
+		if (is_object($redirect_arg_keys_to_remove)) {
 			throw new InvalidDataTypeException(
 				'$redirect_arg_keys_to_remove',
 				$redirect_arg_keys_to_remove,
 				'anything other than an object was expected.'
 			);
 		}
-		if ( empty( $redirect_arg_keys_to_remove ) ) {
+		if (empty($redirect_arg_keys_to_remove)) {
 			throw new InvalidArgumentException(
-				__( 'The $redirect_arg_keys_to_remove argument can not be an empty array.', 'event_espresso' )
+				__('The $redirect_arg_keys_to_remove argument can not be an empty array.', 'event_espresso')
 			);
 		}
-		foreach ( $redirect_arg_keys_to_remove as $redirect_arg_key ) {
-			unset( $this->redirect_args[ $redirect_arg_key ] );
+		foreach ($redirect_arg_keys_to_remove as $redirect_arg_key) {
+			unset($this->redirect_args[$redirect_arg_key]);
 		}
 	}
 
@@ -208,7 +208,7 @@ 
 	/**
 	 * @param string $redirect_to
 	 */
-	public function setRedirectTo( $redirect_to ) {
+	public function setRedirectTo($redirect_to) {
 		if (
 			! in_array(
 				$redirect_to,

core/services/commands/CommandHandlerManager.php

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	 *      "Vendor\a\totally\different\namespace\for\DoSomethingCommandHandler"
 	 *      then the following code:
 	 *
-     *      $CommandHandlerManager = EE_Registry::instance()->create( 'CommandHandlerManagerInterface' );
+	 *      $CommandHandlerManager = EE_Registry::instance()->create( 'CommandHandlerManagerInterface' );
 	 *      $CommandHandlerManager->addCommandHandler(
 	 *          new Vendor\a\totally\different\namespace\for\DoSomethingCommandHandler(),
 	 *          'Vendor\some\namespace\DoSomethingCommand'

Spacing +17 added lines, -17 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\commands;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -37,7 +37,7 @@ 
 	 *
 	 * @param \EE_Registry $registry
 	 */
-	public function __construct( \EE_Registry $registry ) {
+	public function __construct(\EE_Registry $registry) {
 		$this->registry = $registry;
 	}
 
@@ -71,15 +71,15 @@ 
 	 * @param string $fqcn_for_command Fully Qualified ClassName for Command
 	 * @return mixed
 	 */
-	public function addCommandHandler( CommandHandlerInterface $command_handler, $fqcn_for_command = '' )
+	public function addCommandHandler(CommandHandlerInterface $command_handler, $fqcn_for_command = '')
 	{
-		$command = ! empty( $fqcn_for_command )
+		$command = ! empty($fqcn_for_command)
 			? $fqcn_for_command
-			: str_replace( 'CommandHandler', 'Command', get_class( $command_handler ) );
-		if ( empty( $command ) ) {
-			throw new InvalidCommandHandlerException( $command );
+			: str_replace('CommandHandler', 'Command', get_class($command_handler));
+		if (empty($command)) {
+			throw new InvalidCommandHandlerException($command);
 		}
-		$this->commandHandlers[ $command ] = $command_handler;
+		$this->commandHandlers[$command] = $command_handler;
 	}
 
 
@@ -88,18 +88,18 @@ 
 	 * @param \EventEspresso\core\services\commands\CommandInterface $command
 	 * @return mixed
 	 */
-	public function getCommandHandler( CommandInterface $command )
+	public function getCommandHandler(CommandInterface $command)
 	{
-		$command_name = get_class( $command );
-		$command_handler = str_replace( 'Command', 'CommandHandler', $command_name );
+		$command_name = get_class($command);
+		$command_handler = str_replace('Command', 'CommandHandler', $command_name);
 		// has a command handler already been set for this class ?
 		// if not, can we find one via the FQCN ?
-		if ( isset( $this->commandHandlers[ $command_name ] ) ) {
-			return $this->commandHandlers[ $command_name ];
-		} else if ( class_exists( $command_handler ) ) {
-			return $this->registry->create( $command_handler );
+		if (isset($this->commandHandlers[$command_name])) {
+			return $this->commandHandlers[$command_name];
+		} else if (class_exists($command_handler)) {
+			return $this->registry->create($command_handler);
 		}
-		throw new CommandHandlerNotFoundException( $command_handler );
+		throw new CommandHandlerNotFoundException($command_handler);
 	}
 
 

modules/messages/EED_Messages.module.php

Spacing +187 added lines, -187 removed lines

@@ -69,7 +69,7 @@ 
 	 * @return EED_Messages
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -84,11 +84,11 @@ 
 	 */
 	public static function set_hooks() {
 		//actions
-		add_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', array( 'EED_Messages', 'payment' ), 10, 2 );
-		add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array( 'EED_Messages', 'maybe_registration' ), 10, 2 );
+		add_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', array('EED_Messages', 'payment'), 10, 2);
+		add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array('EED_Messages', 'maybe_registration'), 10, 2);
 		//filters
-		add_filter( 'FHEE__EE_Registration__receipt_url__receipt_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
-		add_filter( 'FHEE__EE_Registration__invoice_url__invoice_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
+		add_filter('FHEE__EE_Registration__receipt_url__receipt_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
+		add_filter('FHEE__EE_Registration__invoice_url__invoice_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
 		//register routes
 		self::_register_routes();
 	}
@@ -101,16 +101,16 @@ 
 	 */
 	public static function set_hooks_admin() {
 		//actions
-		add_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', array( 'EED_Messages', 'payment' ), 10, 2 );
-		add_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', array( 'EED_Messages', 'payment_reminder' ), 10 );
-		add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array( 'EED_Messages', 'maybe_registration' ), 10, 3 );
-		add_action( 'AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send__with_registrations', array( 'EED_Messages', 'send_newsletter_message' ), 10, 2 );
-		add_action( 'AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', array( 'EED_Messages', 'cancelled_registration' ), 10 );
-		add_action( 'AHEE__EE_Admin_Page___process_admin_payment_notification', array( 'EED_Messages', 'process_admin_payment' ), 10, 1 );
+		add_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', array('EED_Messages', 'payment'), 10, 2);
+		add_action('AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', array('EED_Messages', 'payment_reminder'), 10);
+		add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array('EED_Messages', 'maybe_registration'), 10, 3);
+		add_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send__with_registrations', array('EED_Messages', 'send_newsletter_message'), 10, 2);
+		add_action('AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', array('EED_Messages', 'cancelled_registration'), 10);
+		add_action('AHEE__EE_Admin_Page___process_admin_payment_notification', array('EED_Messages', 'process_admin_payment'), 10, 1);
 		//filters
-		add_filter( 'FHEE__EE_Admin_Page___process_resend_registration__success', array( 'EED_Messages', 'process_resend' ), 10, 2 );
-		add_filter( 'FHEE__EE_Registration__receipt_url__receipt_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
-		add_filter( 'FHEE__EE_Registration__invoice_url__invoice_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
+		add_filter('FHEE__EE_Admin_Page___process_resend_registration__success', array('EED_Messages', 'process_resend'), 10, 2);
+		add_filter('FHEE__EE_Registration__receipt_url__receipt_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
+		add_filter('FHEE__EE_Registration__invoice_url__invoice_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
 	}
 
 
@@ -124,11 +124,11 @@ 
 	 * @return void
 	 */
 	protected static function _register_routes() {
-		EE_Config::register_route( 'msg_url_trigger', 'Messages', 'run' );
-		EE_Config::register_route( 'msg_cron_trigger', 'Messages', 'execute_batch_request' );
-		EE_Config::register_route( 'msg_browser_trigger', 'Messages', 'browser_trigger' );
-		EE_Config::register_route( 'msg_browser_error_trigger', 'Messages', 'browser_error_trigger' );
-		do_action( 'AHEE__EED_Messages___register_routes' );
+		EE_Config::register_route('msg_url_trigger', 'Messages', 'run');
+		EE_Config::register_route('msg_cron_trigger', 'Messages', 'execute_batch_request');
+		EE_Config::register_route('msg_browser_trigger', 'Messages', 'browser_trigger');
+		EE_Config::register_route('msg_browser_error_trigger', 'Messages', 'browser_error_trigger');
+		do_action('AHEE__EED_Messages___register_routes');
 	}
 
 
@@ -139,18 +139,18 @@ 
 	 * @since 4.9.0
 	 * @param WP $WP
 	 */
-	public function browser_trigger( $WP ) {
+	public function browser_trigger($WP) {
 		//ensure controller is loaded
 		self::_load_controller();
-		$token = EE_Registry::instance()->REQ->get( 'token' );
+		$token = EE_Registry::instance()->REQ->get('token');
 		try {
-			$mtg = new EE_Message_Generated_From_Token( $token, 'html', self::$_message_resource_manager );
-			self::$_MSG_PROCESSOR->generate_and_send_now( $mtg );
-		} catch( EE_Error $e ) {
-			$error_msg = __( 'Please note that a system message failed to send due to a technical issue.', 'event_espresso' );
+			$mtg = new EE_Message_Generated_From_Token($token, 'html', self::$_message_resource_manager);
+			self::$_MSG_PROCESSOR->generate_and_send_now($mtg);
+		} catch (EE_Error $e) {
+			$error_msg = __('Please note that a system message failed to send due to a technical issue.', 'event_espresso');
 			// add specific message for developers if WP_DEBUG in on
-			$error_msg .= '||' . $e->getMessage();
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$error_msg .= '||'.$e->getMessage();
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -166,20 +166,20 @@ 
 	 * @since 4.9.0
 	 * @param $WP
 	 */
-	public function browser_error_trigger( $WP ) {
-		$token = EE_Registry::instance()->REQ->get( 'token' );
-		if ( $token ) {
-			$message = EEM_Message::instance()->get_one_by_token( $token );
-			if ( $message instanceof EE_Message ) {
-				header( 'HTTP/1.1 200 OK' );
-				$error_msg = nl2br( $message->error_message() );
+	public function browser_error_trigger($WP) {
+		$token = EE_Registry::instance()->REQ->get('token');
+		if ($token) {
+			$message = EEM_Message::instance()->get_one_by_token($token);
+			if ($message instanceof EE_Message) {
+				header('HTTP/1.1 200 OK');
+				$error_msg = nl2br($message->error_message());
 				?>
 				<!DOCTYPE html>
 				<html>
 					<head></head>
 					<body>
-						<?php echo empty( $error_msg )
-						? esc_html__( 'Unfortunately, we were unable to capture the error message for this message.', 'event_espresso' )
+						<?php echo empty($error_msg)
+						? esc_html__('Unfortunately, we were unable to capture the error message for this message.', 'event_espresso')
 						: wp_kses(
 							$error_msg,
 							array(
@@ -214,19 +214,19 @@ 
 	 * @throws EE_Error
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		//ensure controller is loaded
 		self::_load_controller();
 		// attempt to process message
 		try {
 			/** @type EE_Message_To_Generate_From_Request $message_to_generate */
-			$message_to_generate = EE_Registry::instance()->load_lib( 'Message_To_Generate_From_Request' );
-			self::$_MSG_PROCESSOR->generate_and_send_now( $message_to_generate );
-		} catch ( EE_Error $e ) {
-			$error_msg = __( 'Please note that a system message failed to send due to a technical issue.', 'event_espresso' );
+			$message_to_generate = EE_Registry::instance()->load_lib('Message_To_Generate_From_Request');
+			self::$_MSG_PROCESSOR->generate_and_send_now($message_to_generate);
+		} catch (EE_Error $e) {
+			$error_msg = __('Please note that a system message failed to send due to a technical issue.', 'event_espresso');
 			// add specific message for developers if WP_DEBUG in on
-			$error_msg .= '||' . $e->getMessage();
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$error_msg .= '||'.$e->getMessage();
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -235,9 +235,9 @@ 
 	 * This is triggered by the 'msg_cron_trigger' route.
 	 * @param WP $WP
 	 */
-	public function execute_batch_request( $WP ) {
+	public function execute_batch_request($WP) {
 		$this->run_cron();
-		header( 'HTTP/1.1 200 OK' );
+		header('HTTP/1.1 200 OK');
 		exit();
 	}
 
@@ -251,35 +251,35 @@ 
 	public function run_cron() {
 		self::_load_controller();
 		//get required vars
-		$cron_type = EE_Registry::instance()->REQ->get( 'type' );
-		$transient_key = EE_Registry::instance()->REQ->get( 'key' );
+		$cron_type = EE_Registry::instance()->REQ->get('type');
+		$transient_key = EE_Registry::instance()->REQ->get('key');
 
 		//now let's verify transient, if not valid exit immediately
-		if ( ! get_transient( $transient_key ) ) {
+		if ( ! get_transient($transient_key)) {
 			/**
 			 * trigger error so this gets in the error logs.  This is important because it happens on a non-user request.
 			 */
-			trigger_error( esc_attr__( 'Invalid Request (Transient does not exist)', 'event_espresso' ) );
+			trigger_error(esc_attr__('Invalid Request (Transient does not exist)', 'event_espresso'));
 		}
 
 		//if made it here, lets' delete the transient to keep the db clean
-		delete_transient( $transient_key );
+		delete_transient($transient_key);
 
-		if ( apply_filters( 'FHEE__EED_Messages__run_cron__use_wp_cron', true ) ) {
+		if (apply_filters('FHEE__EED_Messages__run_cron__use_wp_cron', true)) {
 
-			$method = 'batch_' . $cron_type . '_from_queue';
-			if ( method_exists( self::$_MSG_PROCESSOR, $method ) ) {
+			$method = 'batch_'.$cron_type.'_from_queue';
+			if (method_exists(self::$_MSG_PROCESSOR, $method)) {
 				self::$_MSG_PROCESSOR->$method();
 			} else {
 				//no matching task
 				/**
 				 * trigger error so this gets in the error logs.  This is important because it happens on a non user request.
 				 */
-				trigger_error( esc_attr( sprintf( __( 'There is no task corresponding to this route %s', 'event_espresso' ), $cron_type ) ) );
+				trigger_error(esc_attr(sprintf(__('There is no task corresponding to this route %s', 'event_espresso'), $cron_type)));
 			}
 		}
 
-		do_action( 'FHEE__EED_Messages__run_cron__end' );
+		do_action('FHEE__EED_Messages__run_cron__end');
 	}
 
 
@@ -295,9 +295,9 @@ 
 	 *
 	 * @return EE_Messages_Template_Pack
 	 */
-	public static function get_template_pack( $template_pack_name ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::get_template_pack( $template_pack_name );
+	public static function get_template_pack($template_pack_name) {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::get_template_pack($template_pack_name);
 	}
 
 
@@ -311,14 +311,14 @@ 
 	 * @return EE_Messages_Template_Pack[]
 	 */
 	public static function get_template_packs() {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
 		//for backward compat, let's make sure this returns in the same format as originally.
 		$template_pack_collection = EEH_MSG_Template::get_template_pack_collection();
 		$template_pack_collection->rewind();
 		$template_packs = array();
-		while ( $template_pack_collection->valid() ) {
-			$template_packs[ $template_pack_collection->current()->dbref ] = $template_pack_collection->current();
+		while ($template_pack_collection->valid()) {
+			$template_packs[$template_pack_collection->current()->dbref] = $template_pack_collection->current();
 			$template_pack_collection->next();
 		}
 		return $template_packs;
@@ -334,14 +334,14 @@ 
 	 * @return void
 	 */
 	public static function set_autoloaders() {
-		if ( empty( self::$_MSG_PATHS ) ) {
+		if (empty(self::$_MSG_PATHS)) {
 			self::_set_messages_paths();
-			foreach ( self::$_MSG_PATHS as $path ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $path );
+			foreach (self::$_MSG_PATHS as $path) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($path);
 			}
 			// add aliases
-			EEH_Autoloader::add_alias( 'EE_messages', 'EE_messages' );
-			EEH_Autoloader::add_alias( 'EE_messenger', 'EE_messenger' );
+			EEH_Autoloader::add_alias('EE_messages', 'EE_messages');
+			EEH_Autoloader::add_alias('EE_messenger', 'EE_messenger');
 		}
 	}
 
@@ -369,10 +369,10 @@ 
 			'shortcodes',
 			);
 		$paths = array();
-		foreach ( $dir_ref as $index => $dir ) {
-			$paths[ $index ] = EE_LIBRARIES . $dir;
+		foreach ($dir_ref as $index => $dir) {
+			$paths[$index] = EE_LIBRARIES.$dir;
 		}
-		self::$_MSG_PATHS = apply_filters( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', $paths );
+		self::$_MSG_PATHS = apply_filters('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', $paths);
 	}
 
 
@@ -383,12 +383,12 @@ 
 	 * @return void
 	 */
 	protected static function _load_controller() {
-		if ( ! self::$_MSG_PROCESSOR instanceof EE_Messages_Processor ) {
-			EE_Registry::instance()->load_core( 'Request_Handler' );
+		if ( ! self::$_MSG_PROCESSOR instanceof EE_Messages_Processor) {
+			EE_Registry::instance()->load_core('Request_Handler');
 			self::set_autoloaders();
-			self::$_EEMSG = EE_Registry::instance()->load_lib( 'messages' );
-			self::$_MSG_PROCESSOR = EE_Registry::instance()->load_lib( 'Messages_Processor' );
-			self::$_message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+			self::$_EEMSG = EE_Registry::instance()->load_lib('messages');
+			self::$_MSG_PROCESSOR = EE_Registry::instance()->load_lib('Messages_Processor');
+			self::$_message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		}
 	}
 
@@ -397,10 +397,10 @@ 
 	/**
 	 * @param EE_Transaction $transaction
 	 */
-	public static function payment_reminder( EE_Transaction $transaction ) {
+	public static function payment_reminder(EE_Transaction $transaction) {
 		self::_load_controller();
-		$data = array( $transaction, null );
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'payment_reminder', $data );
+		$data = array($transaction, null);
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('payment_reminder', $data);
 	}
 
 
@@ -411,14 +411,14 @@ 
 	 * @param  EE_Payment object
 	 * @return void
 	 */
-	public static function payment( EE_Transaction $transaction, EE_Payment $payment ) {
+	public static function payment(EE_Transaction $transaction, EE_Payment $payment) {
 		self::_load_controller();
-		$data = array( $transaction, $payment );
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		$message_type = EEH_MSG_Template::convert_payment_status_to_message_type( $payment->STS_ID() );
+		$data = array($transaction, $payment);
+		EE_Registry::instance()->load_helper('MSG_Template');
+		$message_type = EEH_MSG_Template::convert_payment_status_to_message_type($payment->STS_ID());
 		//if payment amount is less than 0 then switch to payment_refund message type.
 		$message_type = $payment->amount() < 0 ? 'payment_refund' : $message_type;
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( $message_type, $data );
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers($message_type, $data);
 	}
 
 
@@ -426,10 +426,10 @@ 
 	/**
 	 * @param EE_Transaction $transaction
 	 */
-	public static function cancelled_registration( EE_Transaction $transaction ) {
+	public static function cancelled_registration(EE_Transaction $transaction) {
 		self::_load_controller();
-		$data = array( $transaction, null );
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'cancelled_registration', $data );
+		$data = array($transaction, null);
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('cancelled_registration', $data);
 	}
 
 
@@ -442,9 +442,9 @@ 
 	 * @param array $extra_details
 	 * @return void
 	 */
-	public static function maybe_registration( EE_Registration $registration, $extra_details = array() ) {
+	public static function maybe_registration(EE_Registration $registration, $extra_details = array()) {
 
-		if ( ! self::_verify_registration_notification_send( $registration, $extra_details ) ) {
+		if ( ! self::_verify_registration_notification_send($registration, $extra_details)) {
 			//no messages please
 			return;
 		}
@@ -459,22 +459,22 @@ 
 		$mtgs = array();
 
 		//loop through registrations and trigger messages once per status.
-		foreach ( $all_registrations as $reg ) {
+		foreach ($all_registrations as $reg) {
 
 			//already triggered?
-			if ( in_array( $reg->status_ID(), $statuses_sent ) ) {
+			if (in_array($reg->status_ID(), $statuses_sent)) {
 				continue;
 			}
 
-			$message_type = EEH_MSG_Template::convert_reg_status_to_message_type( $reg->status_ID() );
-			$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers( $message_type, array( $registration->transaction(), null, $reg->status_ID() ) );
+			$message_type = EEH_MSG_Template::convert_reg_status_to_message_type($reg->status_ID());
+			$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers($message_type, array($registration->transaction(), null, $reg->status_ID()));
 			$statuses_sent[] = $reg->status_ID();
 		}
 
-		$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers( 'registration_summary', array( $registration->transaction(), null ) );
+		$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers('registration_summary', array($registration->transaction(), null));
 
 		//batch queue and initiate request
-		self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist( $mtgs );
+		self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist($mtgs);
 		self::$_MSG_PROCESSOR->get_queue()->initiate_request_by_priority();
 	}
 
@@ -489,39 +489,39 @@ 
 	 *
 	 * @return bool          true = send away, false = nope halt the presses.
 	 */
-	protected static function _verify_registration_notification_send( EE_Registration $registration, $extra_details = array() ) {
+	protected static function _verify_registration_notification_send(EE_Registration $registration, $extra_details = array()) {
 		 //self::log(
 		 //	__CLASS__, __FUNCTION__, __LINE__,
 		 //	$registration->transaction(),
 		 //	array( '$extra_details' => $extra_details )
 		 //);
 		// currently only using this to send messages for the primary registrant
-		if ( ! $registration->is_primary_registrant() ) {
+		if ( ! $registration->is_primary_registrant()) {
 			return false;
 		}
 		// first we check if we're in admin and not doing front ajax
-		if ( is_admin() && ! EE_FRONT_AJAX ) {
+		if (is_admin() && ! EE_FRONT_AJAX) {
 			//make sure appropriate admin params are set for sending messages
-			if ( empty( $_REQUEST['txn_reg_status_change']['send_notifications'] ) || ! absint( $_REQUEST['txn_reg_status_change']['send_notifications'] ) ) {
+			if (empty($_REQUEST['txn_reg_status_change']['send_notifications']) || ! absint($_REQUEST['txn_reg_status_change']['send_notifications'])) {
 				//no messages sent please.
 				return false;
 			}
 		} else {
 			// frontend request (either regular or via AJAX)
 			// TXN is NOT finalized ?
-			if ( ! isset( $extra_details['finalized'] ) || $extra_details['finalized'] === false ) {
+			if ( ! isset($extra_details['finalized']) || $extra_details['finalized'] === false) {
 				return false;
 			}
 			// return visit but nothing changed ???
 			if (
-				isset( $extra_details['revisit'], $extra_details['status_updates'] ) &&
+				isset($extra_details['revisit'], $extra_details['status_updates']) &&
 				$extra_details['revisit'] && ! $extra_details['status_updates']
 			) {
 				return false;
 			}
 			// NOT sending messages && reg status is something other than "Not-Approved"
 			if (
-				! apply_filters( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', false ) &&
+				! apply_filters('FHEE__EED_Messages___maybe_registration__deliver_notifications', false) &&
 				$registration->status_ID() !== EEM_Registration::status_id_not_approved
 			) {
 				return false;
@@ -543,10 +543,10 @@ 
 	 *
 	 * @return array
 	 */
-	protected static function _get_reg_status_array( $reg_status = '' ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::convert_reg_status_to_message_type( $reg_status )
-			? EEH_MSG_Template::convert_reg_status_to_message_type( $reg_status )
+	protected static function _get_reg_status_array($reg_status = '') {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::convert_reg_status_to_message_type($reg_status)
+			? EEH_MSG_Template::convert_reg_status_to_message_type($reg_status)
 			: EEH_MSG_Template::reg_status_to_message_type_array();
 	}
 
@@ -562,10 +562,10 @@ 
 	 *
 	 * @return string|bool The payment message type slug matching the status or false if no match.
 	 */
-	protected static function _get_payment_message_type( $payment_status ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::convert_payment_status_to_message_type( $payment_status )
-			? EEH_MSG_Template::convert_payment_status_to_message_type( $payment_status )
+	protected static function _get_payment_message_type($payment_status) {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::convert_payment_status_to_message_type($payment_status)
+			? EEH_MSG_Template::convert_payment_status_to_message_type($payment_status)
 			: false;
 	}
 
@@ -579,33 +579,33 @@ 
 	 * @param array $req_data This is the $_POST & $_GET data sent from EE_Admin Pages
 	 * @return bool          success/fail
 	 */
-	public static function process_resend( $req_data ) {
+	public static function process_resend($req_data) {
 		self::_load_controller();
 
 		//if $msgID in this request then skip to the new resend_message
-		if ( EE_Registry::instance()->REQ->get( 'MSG_ID' ) ) {
+		if (EE_Registry::instance()->REQ->get('MSG_ID')) {
 			return self::resend_message();
 		}
 
 		//make sure any incoming request data is set on the REQ so that it gets picked up later.
 		$req_data = (array) $req_data;
-		foreach( $req_data as $request_key => $request_value ) {
-			EE_Registry::instance()->REQ->set( $request_key, $request_value );
+		foreach ($req_data as $request_key => $request_value) {
+			EE_Registry::instance()->REQ->set($request_key, $request_value);
 		}
 
-		if ( ! $messages_to_send = self::$_MSG_PROCESSOR->setup_messages_to_generate_from_registration_ids_in_request() ) {
+		if ( ! $messages_to_send = self::$_MSG_PROCESSOR->setup_messages_to_generate_from_registration_ids_in_request()) {
 			return false;
 		}
 
 		try {
-			self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist( $messages_to_send );
+			self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist($messages_to_send);
 			self::$_MSG_PROCESSOR->get_queue()->initiate_request_by_priority();
-		} catch( EE_Error $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+		} catch (EE_Error $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		EE_Error::add_success(
-			__( 'Messages have been successfully queued for generation and sending.', 'event_espresso' )
+			__('Messages have been successfully queued for generation and sending.', 'event_espresso')
 		);
 		return true; //everything got queued.
 	}
@@ -618,17 +618,17 @@ 
 	public static function resend_message() {
 		self::_load_controller();
 
-		$msgID = EE_Registry::instance()->REQ->get( 'MSG_ID' );
-		if ( ! $msgID ) {
-			EE_Error::add_error( __( 'Something went wrong because there is no "MSG_ID" value in the request', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$msgID = EE_Registry::instance()->REQ->get('MSG_ID');
+		if ( ! $msgID) {
+			EE_Error::add_error(__('Something went wrong because there is no "MSG_ID" value in the request', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
-		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send( (array) $msgID );
+		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send((array) $msgID);
 
 		//setup success message.
-		$count_ready_for_resend = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::status_resend );
-		EE_Error::add_success( sprintf(
+		$count_ready_for_resend = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::status_resend);
+		EE_Error::add_success(sprintf(
 			_n(
 				'There was %d message queued for resending.',
 				'There were %d messages queued for resending.',
@@ -636,7 +636,7 @@ 
 				'event_espresso'
 			),
 			$count_ready_for_resend
-		) );
+		));
 		return true;
 	}
 
@@ -649,13 +649,13 @@ 
 	 * @param  EE_Payment $payment EE_payment object
 	 * @return bool              success/fail
 	 */
-	public static function process_admin_payment( EE_Payment $payment ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+	public static function process_admin_payment(EE_Payment $payment) {
+		EE_Registry::instance()->load_helper('MSG_Template');
 		//we need to get the transaction object
 		$transaction = $payment->transaction();
-		if ( $transaction instanceof EE_Transaction ) {
-			$data = array( $transaction, $payment );
-			$message_type = EEH_MSG_Template::convert_payment_status_to_message_type( $payment->STS_ID() );
+		if ($transaction instanceof EE_Transaction) {
+			$data = array($transaction, $payment);
+			$message_type = EEH_MSG_Template::convert_payment_status_to_message_type($payment->STS_ID());
 
 			//if payment amount is less than 0 then switch to payment_refund message type.
 			$message_type = $payment->amount() < 0 ? 'payment_refund' : $message_type;
@@ -665,22 +665,22 @@ 
 
 			self::_load_controller();
 
-			self::$_MSG_PROCESSOR->generate_for_all_active_messengers( $message_type, $data );
+			self::$_MSG_PROCESSOR->generate_for_all_active_messengers($message_type, $data);
 
 			//get count of queued for generation
-			$count_to_generate = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( array( EEM_Message::status_incomplete, EEM_Message::status_idle ) );
+			$count_to_generate = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(array(EEM_Message::status_incomplete, EEM_Message::status_idle));
 
-			if ( $count_to_generate > 0 && self::$_MSG_PROCESSOR->get_queue()->get_message_repository()->count() !== 0 ) {
-				add_filter( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true' );
+			if ($count_to_generate > 0 && self::$_MSG_PROCESSOR->get_queue()->get_message_repository()->count() !== 0) {
+				add_filter('FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true');
 				return true;
 			} else {
-				$count_failed = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::instance()->stati_indicating_failed_sending() );
+				$count_failed = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::instance()->stati_indicating_failed_sending());
 				/**
 				 * Verify that there are actually errors.  If not then we return a success message because the queue might have been emptied due to successful
 				 * IMMEDIATE generation.
 				 */
-				if ( $count_failed > 0 ) {
-					EE_Error::add_error( sprintf(
+				if ($count_failed > 0) {
+					EE_Error::add_error(sprintf(
 						_n(
 							'The payment notification generation failed.',
 							'%d payment notifications failed being sent.',
@@ -688,11 +688,11 @@ 
 							'event_espresso'
 						),
 						$count_failed
-					), __FILE__, __FUNCTION__, __LINE__ );
+					), __FILE__, __FUNCTION__, __LINE__);
 
 					return false;
 				} else {
-					add_filter( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true' );
+					add_filter('FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true');
 					return true;
 				}
 			}
@@ -716,11 +716,11 @@ 
 	 * @param  int      	      $grp_id     a specific message template group id.
 	 * @return void
 	 */
-	public static function send_newsletter_message( $registrations, $grp_id ) {
+	public static function send_newsletter_message($registrations, $grp_id) {
 		//make sure mtp is id and set it in the EE_Request Handler later messages setup.
-		EE_Registry::instance()->REQ->set( 'GRP_ID', (int) $grp_id );
+		EE_Registry::instance()->REQ->set('GRP_ID', (int) $grp_id);
 		self::_load_controller();
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'newsletter', $registrations );
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('newsletter', $registrations);
 	}
 
 
@@ -735,9 +735,9 @@ 
 	 * @param string 	$message_type
 	 * @return 	string
 	 */
-	public static function registration_message_trigger_url( $registration_message_trigger_url, EE_Registration $registration, $messenger = 'html', $message_type = 'invoice' ) {
+	public static function registration_message_trigger_url($registration_message_trigger_url, EE_Registration $registration, $messenger = 'html', $message_type = 'invoice') {
 		// whitelist $messenger
-		switch ( $messenger ) {
+		switch ($messenger) {
 			case 'pdf' :
 				$sending_messenger = 'pdf';
 				$generating_messenger = 'html';
@@ -749,7 +749,7 @@ 
 				break;
 		}
 		// whitelist $message_type
-		switch ( $message_type ) {
+		switch ($message_type) {
 			case 'receipt' :
 				$message_type = 'receipt';
 				break;
@@ -759,7 +759,7 @@ 
 				break;
 		}
 		// verify that both the messenger AND the message type are active
-		if ( EEH_MSG_Template::is_messenger_active( $sending_messenger ) && EEH_MSG_Template::is_mt_active( $message_type ) ) {
+		if (EEH_MSG_Template::is_messenger_active($sending_messenger) && EEH_MSG_Template::is_mt_active($message_type)) {
 			//need to get the correct message template group for this (i.e. is there a custom invoice for the event this registration is registered for?)
 			$template_query_params = array(
 				'MTP_is_active' => true,
@@ -768,16 +768,16 @@ 
 				'Event.EVT_ID' => $registration->event_ID()
 			);
 			//get the message template group.
-			$msg_template_group = EEM_Message_Template_Group::instance()->get_one( array( $template_query_params ) );
+			$msg_template_group = EEM_Message_Template_Group::instance()->get_one(array($template_query_params));
 			//if we don't have an EE_Message_Template_Group then return
-			if ( ! $msg_template_group instanceof EE_Message_Template_Group ) {
+			if ( ! $msg_template_group instanceof EE_Message_Template_Group) {
 				// remove EVT_ID from query params so that global templates get picked up
-				unset( $template_query_params['Event.EVT_ID'] );
+				unset($template_query_params['Event.EVT_ID']);
 				//get global template as the fallback
-				$msg_template_group = EEM_Message_Template_Group::instance()->get_one( array( $template_query_params ) );
+				$msg_template_group = EEM_Message_Template_Group::instance()->get_one(array($template_query_params));
 			}
 			//if we don't have an EE_Message_Template_Group then return
-			if ( ! $msg_template_group instanceof EE_Message_Template_Group ) {
+			if ( ! $msg_template_group instanceof EE_Message_Template_Group) {
 				return '';
 			}
 			// generate the URL
@@ -806,7 +806,7 @@ 
 	 * @param bool 	  $send true we will do a test send using the messenger delivery, false we just do a regular preview
 	 * @return string|bool          The body of the message or if send is requested, sends.
 	 */
-	public static function preview_message( $type, $context, $messenger, $send = false ) {
+	public static function preview_message($type, $context, $messenger, $send = false) {
 		self::_load_controller();
 		$mtg = new EE_Message_To_Generate(
 			$messenger,
@@ -815,8 +815,8 @@ 
 			$context,
 			true
 		);
-		$generated_preview_queue = self::$_MSG_PROCESSOR->generate_for_preview( $mtg, $send );
-		if ( $generated_preview_queue instanceof EE_Messages_Queue ) {
+		$generated_preview_queue = self::$_MSG_PROCESSOR->generate_for_preview($mtg, $send);
+		if ($generated_preview_queue instanceof EE_Messages_Queue) {
 			return $generated_preview_queue->get_message_repository()->current()->content();
 		} else {
 			return $generated_preview_queue;
@@ -843,7 +843,7 @@ 
 	 *
 	 * @return bool          success or fail.
 	 */
-	public static function send_message_with_messenger_only( $messenger, $message_type, EE_Messages_Queue $queue, $custom_subject = '' ) {
+	public static function send_message_with_messenger_only($messenger, $message_type, EE_Messages_Queue $queue, $custom_subject = '') {
 		self::_load_controller();
 		/** @type EE_Message_To_Generate_From_Queue $message_to_generate */
 		$message_to_generate = EE_Registry::instance()->load_lib(
@@ -855,7 +855,7 @@ 
 				$custom_subject,
 			)
 		);
-		return self::$_MSG_PROCESSOR->queue_for_sending( $message_to_generate );
+		return self::$_MSG_PROCESSOR->queue_for_sending($message_to_generate);
 	}
 
 
@@ -868,24 +868,24 @@ 
 	 * @param array     $message_ids An array of message ids
 	 * @return bool | EE_Messages_Queue     false if nothing was generated, EE_Messages_Queue containing generated messages.
 	 */
-	public static function generate_now( $message_ids ) {
+	public static function generate_now($message_ids) {
 		self::_load_controller();
 		$messages = EEM_Message::instance()->get_all(
 			array(
 				0 => array(
-					'MSG_ID' => array( 'IN', $message_ids ),
+					'MSG_ID' => array('IN', $message_ids),
 					'STS_ID' => EEM_Message::status_incomplete,
 				)
 			)
 		);
 		$generated_queue = false;
-		if ( $messages ) {
-			$generated_queue = self::$_MSG_PROCESSOR->batch_generate_from_queue( $messages );
+		if ($messages) {
+			$generated_queue = self::$_MSG_PROCESSOR->batch_generate_from_queue($messages);
 		}
 
-		if ( ! $generated_queue instanceof EE_Messages_Queue ) {
+		if ( ! $generated_queue instanceof EE_Messages_Queue) {
 			EE_Error::add_error(
-				__( 'The messages were not generated. This could mean there is already a batch being generated on a separate request, or because the selected messages are not ready for generation. Please wait a minute or two and try again.', 'event_espresso' ),
+				__('The messages were not generated. This could mean there is already a batch being generated on a separate request, or because the selected messages are not ready for generation. Please wait a minute or two and try again.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -904,30 +904,30 @@ 
 	 *
 	 * @return bool | EE_Messages_Queue  false if no messages sent.
 	 */
-	public static function send_now( $message_ids ) {
+	public static function send_now($message_ids) {
 		self::_load_controller();
 		$messages = EEM_Message::instance()->get_all(
 			array(
 				0 => array(
-					'MSG_ID' => array( 'IN', $message_ids ),
-					'STS_ID' => array( 'IN', array( EEM_Message::status_idle, EEM_Message::status_resend, EEM_Message::status_retry ) )
+					'MSG_ID' => array('IN', $message_ids),
+					'STS_ID' => array('IN', array(EEM_Message::status_idle, EEM_Message::status_resend, EEM_Message::status_retry))
 				)
 			)
 		);
 		$sent_queue = false;
-		if ( $messages ) {
-			$sent_queue = self::$_MSG_PROCESSOR->batch_send_from_queue( $messages );
+		if ($messages) {
+			$sent_queue = self::$_MSG_PROCESSOR->batch_send_from_queue($messages);
 		}
 
-		if ( ! $sent_queue instanceof EE_Messages_Queue ) {
+		if ( ! $sent_queue instanceof EE_Messages_Queue) {
 			EE_Error::add_error(
-				__( 'The messages were not sent. This could mean there is already a batch being sent on a separate request, or because the selected messages are not sendable. Please wait a minute or two and try again.', 'event_espresso' ),
+				__('The messages were not sent. This could mean there is already a batch being sent on a separate request, or because the selected messages are not sendable. Please wait a minute or two and try again.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		} else {
 			//can count how many sent by using the messages in the queue
-			$sent_count = $sent_queue->count_STS_in_queue( EEM_Message::instance()->stati_indicating_sent() );
-			if ( $sent_count > 0 ) {
+			$sent_count = $sent_queue->count_STS_in_queue(EEM_Message::instance()->stati_indicating_sent());
+			if ($sent_count > 0) {
 				EE_Error::add_success(
 					sprintf(
 						_n(
@@ -942,8 +942,8 @@ 
 			} else {
 				EE_Error::overwrite_errors();
 				EE_Error::add_error(
-					__( 'No message was sent because of problems with sending. Either all the messages you selected were not a sendable message, they were ALREADY sent on a different scheduled task, or there was an error.
-					If there was an error, you can look at the messages in the message activity list table for any error messages.', 'event_espresso' ),
+					__('No message was sent because of problems with sending. Either all the messages you selected were not a sendable message, they were ALREADY sent on a different scheduled task, or there was an error.
+					If there was an error, you can look at the messages in the message activity list table for any error messages.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -964,12 +964,12 @@ 
 	 *
 	 * @return bool  true means messages were successfully queued for resending, false means none were queued for resending.
 	 */
-	public static function queue_for_resending( $message_ids ) {
+	public static function queue_for_resending($message_ids) {
 		self::_load_controller();
-		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send( $message_ids );
+		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send($message_ids);
 
 		//get queue and count
-		$queue_count = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::status_resend );
+		$queue_count = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::status_resend);
 
 		if (
 			$queue_count > 0
@@ -989,11 +989,11 @@ 
 		 * @see filter usage in EE_Messages_Queue::initiate_request_by_priority
 		 */
 		} elseif (
-			apply_filters( 'FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', true )
+			apply_filters('FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', true)
 			|| EE_Registry::instance()->NET_CFG->core->do_messages_on_same_request
 		) {
-			$queue_count = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::status_sent );
-			if ( $queue_count > 0 ) {
+			$queue_count = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::status_sent);
+			if ($queue_count > 0) {
 				EE_Error::add_success(
 					sprintf(
 						_n(
@@ -1007,13 +1007,13 @@ 
 				);
 			} else {
 				EE_Error::add_error(
-					__( 'No messages were queued for resending. This usually only happens when all the messages flagged for resending are not a status that can be resent.', 'event_espresso' ),
+					__('No messages were queued for resending. This usually only happens when all the messages flagged for resending are not a status that can be resent.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
 		} else {
 			EE_Error::add_error(
-				__( 'No messages were queued for resending. This usually only happens when all the messages flagged for resending are not a status that can be resent.', 'event_espresso' ),
+				__('No messages were queued for resending. This usually only happens when all the messages flagged for resending are not a status that can be resent.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -1035,16 +1035,16 @@ 
 	 * @param array $info
 	 * @param bool $display_request
 	 */
-	protected static function log( $class = '', $func = '', $line = '', EE_Transaction $transaction, $info = array(), $display_request = false ) {
-		if ( WP_DEBUG && false ) {
-			if ( $transaction instanceof EE_Transaction ) {
+	protected static function log($class = '', $func = '', $line = '', EE_Transaction $transaction, $info = array(), $display_request = false) {
+		if (WP_DEBUG && false) {
+			if ($transaction instanceof EE_Transaction) {
 				// don't serialize objects
-				$info = EEH_Debug_Tools::strip_objects( $info );
+				$info = EEH_Debug_Tools::strip_objects($info);
 				$info['TXN_status'] = $transaction->status_ID();
 				$info['TXN_reg_steps'] = $transaction->reg_steps();
-				if ( $transaction->ID() ) {
-					$index = 'EE_Transaction: ' . $transaction->ID();
-					EEH_Debug_Tools::log( $class, $func, $line, $info, $display_request, $index );
+				if ($transaction->ID()) {
+					$index = 'EE_Transaction: '.$transaction->ID();
+					EEH_Debug_Tools::log($class, $func, $line, $info, $display_request, $index);
 				}
 			}
 		}

Doc Comments +1 added lines, -1 removed lines

@@ -560,7 +560,7 @@
 	 *
 	 * @param string  $payment_status The payment status being matched.
 	 *
-	 * @return string|bool The payment message type slug matching the status or false if no match.
+	 * @return string|false The payment message type slug matching the status or false if no match.
 	 */
 	protected static function _get_payment_message_type( $payment_status ) {
 		EE_Registry::instance()->load_helper( 'MSG_Template' );

Braces +3 added lines, -1 removed lines

@@ -6,7 +6,9 @@
  * @package  Event Espresso
  * @subpackage modules, messages
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  *
  * Messages module.  Takes care of registering all the triggers for messages.

caffeinated/admin/extend/support/Extend_Support_Admin_Page.core.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,16 +29,16 @@ 
  */
 class Extend_Support_Admin_Page extends Support_Admin_Page {
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'support/templates/' );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'support/templates/');
 	}
 
 
 
 
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'support';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'support';
 		//new routes and new configs (or overrides )
 		$new_page_routes = array(
 			'faq' => array(
@@ -46,7 +46,7 @@ 
 				'capability' => 'ee_read_ee'
 				)
 			);
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 		$new_page_config = array(
 			'faq' => array(
@@ -57,7 +57,7 @@ 
 				'require_nonce' => FALSE
 				)
 			);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 
 		$this->_page_config['default']['metaboxes'][] = '_installation_boxes';
 	}
@@ -66,8 +66,8 @@ 
 
 
 	protected function _faq() {
-		$template_path = EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH . 'support_admin_details_faq.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, '', TRUE);
+		$template_path = EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH.'support_admin_details_faq.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, '', TRUE);
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -75,8 +75,8 @@ 
 
 
 	protected function _installation_boxes() {
-		$callback_args = array('template_path' => EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH . 'support_admin_details_additional_information.template.php');
-		add_meta_box( 'espresso_additional_information_support', __('Additional Information', 'event_espresso'), create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE);' ), $this->_current_screen->id, 'normal', 'high', $callback_args);
+		$callback_args = array('template_path' => EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH.'support_admin_details_additional_information.template.php');
+		add_meta_box('espresso_additional_information_support', __('Additional Information', 'event_espresso'), create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE);'), $this->_current_screen->id, 'normal', 'high', $callback_args);
 	}
 
 

Braces +2 added lines, -1 removed lines

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

core/libraries/form_sections/strategies/layout/EE_Admin_Two_Column_Layout.strategy.php

Spacing +17 added lines, -17 removed lines

@@ -13,9 +13,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function layout_form_begin( $additional_args = array() ) {
+	public function layout_form_begin($additional_args = array()) {
 		$this->_form_section->set_html_class('form-table');
-		return parent::layout_form_begin( $additional_args );
+		return parent::layout_form_begin($additional_args);
 	}
 
 
@@ -25,11 +25,11 @@ 
 	 * @param EE_Form_Section_Proper $form_section
 	 * @return string
 	 */
-	public function layout_subsection( $form_section ){
-		if ( $form_section instanceof EE_Form_Section_Proper ) {
-			return EEH_HTML::no_row( $form_section->get_html(), 2 );
-		} else if ( $form_section instanceof EE_Form_Section_HTML ) {
-			return EEH_HTML::no_row( $form_section->get_html(), 2 );
+	public function layout_subsection($form_section) {
+		if ($form_section instanceof EE_Form_Section_Proper) {
+			return EEH_HTML::no_row($form_section->get_html(), 2);
+		} else if ($form_section instanceof EE_Form_Section_HTML) {
+			return EEH_HTML::no_row($form_section->get_html(), 2);
 		}
 		return '';
 	}
@@ -41,30 +41,30 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function layout_input( $input ) {
+	public function layout_input($input) {
 
 		if (
 			$input->get_display_strategy() instanceof EE_Text_Area_Display_Strategy ||
 			$input->get_display_strategy() instanceof EE_Text_Input_Display_Strategy ||
 			$input->get_display_strategy() instanceof EE_Admin_File_Uploader_Display_Strategy
 		) {
-			$input->set_html_class( $input->html_class() . ' large-text' );
+			$input->set_html_class($input->html_class().' large-text');
 		}
-		if ( $input instanceof EE_Text_Area_Input ) {
-			$input->set_rows( 4 );
-			$input->set_cols( 60 );
+		if ($input instanceof EE_Text_Area_Input) {
+			$input->set_rows(4);
+			$input->set_cols(60);
 		}
 		$input_html = $input->get_html_for_input();
 		// maybe add errors and help text ?
-		$input_html .= $input->get_html_for_errors() != '' ? EEH_HTML::nl() . $input->get_html_for_errors() : '';
-		$input_html .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
+		$input_html .= $input->get_html_for_errors() != '' ? EEH_HTML::nl().$input->get_html_for_errors() : '';
+		$input_html .= $input->get_html_for_help() != '' ? EEH_HTML::nl().$input->get_html_for_help() : '';
 		//overriding parent to add wp admin specific things.
 		$html = '';
-		if ( $input instanceof EE_Hidden_Input ) {
-			$html .= EEH_HTML::no_row( $input->get_html_for_input(), 2 );
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::no_row($input->get_html_for_input(), 2);
 		} else {
 			$html .= EEH_HTML::tr(
-				EEH_HTML::th( $input->get_html_for_label(), '', '',  '', 'scope="row"' ) . EEH_HTML::td( $input_html )
+				EEH_HTML::th($input->get_html_for_label(), '', '', '', 'scope="row"').EEH_HTML::td($input_html)
 			);
 		}
 		return $html;

core/services/commands/registration/UpdateRegistrationAndTransactionAfterChangeCommand.php

Indentation +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
  * DTO for passing data to a UpdateRegistrationAndTransactionAfterChangeCommandHandler
  *
  * @package       Event Espresso
-
-*@author        Brent Christensen
+ *@author        Brent Christensen
  * @since         $VID:$
  */
 class UpdateRegistrationAndTransactionAfterChangeCommand extends SingleRegistrationCommand

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 namespace EventEspresso\core\services\commands\registration;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 

core/services/commands/CommandBusInterface.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\commands;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -23,7 +23,7 @@ 
 	 * @param \EventEspresso\core\services\commands\CommandInterface $command
 	 * @return mixed
 	 */
-	public function execute( $command );
+	public function execute($command);
 
 }
 // End of file CommandBusInterface.php

core/exceptions/InvalidDataTypeException.php

Spacing +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\exceptions;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -28,10 +28,10 @@ 
 	 * @param int        $code
 	 * @param \Exception $previous
 	 */
-	public function __construct( $var_name, $variable, $expected, $message = '', $code = 0, \Exception $previous = null ) {
-		if ( empty( $message ) ) {
-			$expected = strpos( ' was expected.', $expected ) === false
-				? $this->addIndefiniteArticle( $expected ) . ' was expected.'
+	public function __construct($var_name, $variable, $expected, $message = '', $code = 0, \Exception $previous = null) {
+		if (empty($message)) {
+			$expected = strpos(' was expected.', $expected) === false
+				? $this->addIndefiniteArticle($expected).' was expected.'
 				: $expected;
 			$message = sprintf(
 				__(
@@ -39,11 +39,11 @@ 
 					'event_espresso'
 				),
 				$var_name,
-				$this->addIndefiniteArticle( gettype( $variable ) ),
+				$this->addIndefiniteArticle(gettype($variable)),
 				$expected
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 
@@ -52,11 +52,11 @@ 
 	 * @param $string
 	 * @return string
 	 */
-	protected function addIndefiniteArticle( $string ) {
-		if ( strtolower( $string ) === 'null' ) {
+	protected function addIndefiniteArticle($string) {
+		if (strtolower($string) === 'null') {
 			return $string;
 		}
-		return ( stripos( 'aeiou', $string[0] ) !== false ? 'an ' : 'a ' ) . $string;
+		return (stripos('aeiou', $string[0]) !== false ? 'an ' : 'a ').$string;
 	}
 }
 // End of file InvalidDataTypeException.php

core/db_models/EEM_Question_Option.model.php

Spacing +18 added lines, -18 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once( EE_CLASSES . 'EE_Question_Option.class.php');
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once(EE_CLASSES.'EE_Question_Option.class.php');
 
 
 class EEM_Question_Option extends EEM_Soft_Delete_Base {
@@ -30,22 +30,22 @@ 
   	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Question Option','event_espresso');
-		$this->plural_item = __('Question Options','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Question Option', 'event_espresso');
+		$this->plural_item = __('Question Options', 'event_espresso');
 
 		$this->_tables = array(
-			'Question_Option'=>new EE_Primary_Table('esp_question_option','QSO_ID')
+			'Question_Option'=>new EE_Primary_Table('esp_question_option', 'QSO_ID')
 		);
 		$this->_fields = array(
 			'Question_Option'=>array(
-					'QSO_ID'=>new EE_Primary_Key_Int_Field('QSO_ID', __('Question Option ID','event_espresso')),
-					'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID','event_espresso'), false, 0, 'Question'),
-					'QSO_value'=>new EE_Plain_Text_Field('QSO_value',  __("Question Option Value", "event_espresso"),false,''),
-					'QSO_desc'=>new EE_Post_Content_Field('QSO_desc', __('Question Option Description','event_espresso'), false, ''),
-					'QSO_order' => new EE_Integer_Field('QSO_order', __('Question Option Order', 'event_espresso' ), false, 0 ),
-					'QSO_system'=>new EE_Plain_Text_Field('QSO_system', __('Internal string ID for question option','event_espresso'), TRUE, NULL ),
-					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed','event_espresso'), false, false)
+					'QSO_ID'=>new EE_Primary_Key_Int_Field('QSO_ID', __('Question Option ID', 'event_espresso')),
+					'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso'), false, 0, 'Question'),
+					'QSO_value'=>new EE_Plain_Text_Field('QSO_value', __("Question Option Value", "event_espresso"), false, ''),
+					'QSO_desc'=>new EE_Post_Content_Field('QSO_desc', __('Question Option Description', 'event_espresso'), false, ''),
+					'QSO_order' => new EE_Integer_Field('QSO_order', __('Question Option Order', 'event_espresso'), false, 0),
+					'QSO_system'=>new EE_Plain_Text_Field('QSO_system', __('Internal string ID for question option', 'event_espresso'), TRUE, NULL),
+					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed', 'event_espresso'), false, false)
 				)
 		);
 		$this->_model_relations = array(
@@ -54,12 +54,12 @@ 
 
 		$this->_model_chain_to_wp_user = 'Question';
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('Question_Option');
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('Question_Option');
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('Question_Option');
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('Question_Option');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('Question_Option');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('Question_Option');
 		$this->_caps_slug = 'questions';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 

Braces +3 added lines, -1 removed lines

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