eventespresso / event-espresso-core

core/libraries/messages/EE_messages.lib.php

Doc Comments +5 added lines, -5 removed lines

@@ -231,7 +231,7 @@ 
 	 * >>>>>>>>>>>> 2 usages found in this file: ensure_message_type_is_active() and ensure_messenger_is_active()
 	 *
 	 * @param string $messenger_name
-	 * @param array $mts_to_activate (optional) An array of message types to activate with this messenger.  If
+	 * @param string[] $mts_to_activate (optional) An array of message types to activate with this messenger.  If
 	 *                             				included we do NOT setup the default message types (assuming
 	 *                             				they are already setup.)
 	 * @return boolean an array of generated templates or false if nothing generated/activated.
@@ -594,7 +594,7 @@ 
 	 * @param  string $context This should correspond with a valid context for the message type
 	 * @param  string $messenger This should correspond with a valid messenger.
 	 * @param bool 	$send true we will do a test send using the messenger delivery, false we just do a regular preview
-	 * @return string          The body of the message.
+	 * @return boolean          The body of the message.
 	 */
 	public function preview_message( $type, $context, $messenger, $send = FALSE ) {
 		return EED_Messages::preview_message( $type, $context, $messenger, $send );
@@ -721,7 +721,7 @@ 
 	 *
 	 * >>>>>>>>>>>> 1 usage in \EEH_MSG_Template::generate_new_templates()
 	 *
-	 * @param         $messenger
+	 * @param         string $messenger
 	 * @param  string $message_type message type that the templates are being created for
 	 * @param int     $GRP_ID
 	 * @param bool    $is_global
@@ -749,8 +749,8 @@ 
 
 
 	/**
-	 * @param $GRP_ID
-	 * @param $is_global
+	 * @param integer $GRP_ID
+	 * @param boolean $is_global
 	 * @return array|mixed
 	 */
 	protected function _create_new_templates( $GRP_ID, $is_global) {

Spacing +165 added lines, -165 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -144,23 +144,23 @@ 
 		$actives = is_array($_actives) ? array_keys($_actives) : $_actives;
 		$active_names = $this->_load_files('messenger', $actives);
 
-		if ( is_array($active_names) ) {
-			foreach ( $active_names as $name => $class ) {
+		if (is_array($active_names)) {
+			foreach ($active_names as $name => $class) {
 				$active = new $class();
-				if ( ! $active instanceof EE_Messenger ) {
+				if ( ! $active instanceof EE_Messenger) {
 					//we've got an error so let's bubble up the error_object to be caught by caller.
 					//todo: would be better to just catch the errors and then return any aggregated errors later.
 					EE_Error::add_error(
 						sprintf(
-							__( 'The "%1$s" messenger is not installed or is invalid', 'event_espresso' ),
+							__('The "%1$s" messenger is not installed or is invalid', 'event_espresso'),
 							$class
 						),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
 				$this->_active_messengers[$name] = $active;
-				$this->_active_message_types[$name] = ! empty( $_actives[$name]['settings'][$name . '-message_types'] )
-					? $_actives[$name]['settings'][$name . '-message_types']
+				$this->_active_message_types[$name] = ! empty($_actives[$name]['settings'][$name.'-message_types'])
+					? $_actives[$name]['settings'][$name.'-message_types']
 					: array();
 			}
 		}
@@ -176,13 +176,13 @@ 
 	 * @param string $messenger_name
 	 * @return boolean TRUE if it was PREVIOUSLY active, and FALSE if it was previously inactive
 	 */
-	public function ensure_messenger_is_active( $messenger_name ){
+	public function ensure_messenger_is_active($messenger_name) {
 		//note: active messengers indexed by their names
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
-		if( ! isset( $active_messengers[ $messenger_name ] ) ) {
-			$this->activate_messenger( $messenger_name );
+		if ( ! isset($active_messengers[$messenger_name])) {
+			$this->activate_messenger($messenger_name);
 			return FALSE;
-		}else{
+		} else {
 			return TRUE;
 		}
 	}
@@ -201,19 +201,19 @@ 
 	 * @return bool true if it got activated (or was active) and false if not.
 	 * @throws \EE_Error
 	 */
-	public function ensure_message_type_is_active( $message_type, $messenger ) {
+	public function ensure_message_type_is_active($message_type, $messenger) {
 		//first validate that the incoming messenger allows this message type to be activated.
 		$messengers = $this->get_installed_messengers();
-		if ( ! isset( $messengers[$messenger] ) ) {
-			throw new EE_Error( sprintf( __('The messenger sent to %s is not installed', 'event_espresso'), __METHOD__ ) );
+		if ( ! isset($messengers[$messenger])) {
+			throw new EE_Error(sprintf(__('The messenger sent to %s is not installed', 'event_espresso'), __METHOD__));
 		}
 
 		$msgr = $messengers[$messenger];
 		$valid_message_types = $msgr instanceof EE_Messenger ? $msgr->get_valid_message_types() : array();
-		if ( ! in_array( $message_type, $valid_message_types ) ) {
+		if ( ! in_array($message_type, $valid_message_types)) {
 			throw new EE_Error(
 				sprintf(
-					__('The message type (%1$s) sent to %2$s is not valid for the %3$s messenger.  Double-check the spelling and verify that message type has been registered as a valid type with the messenger.', 'event_espresso' ),
+					__('The message type (%1$s) sent to %2$s is not valid for the %3$s messenger.  Double-check the spelling and verify that message type has been registered as a valid type with the messenger.', 'event_espresso'),
 					$message_type,
 					__METHOD__,
 					$messenger
@@ -222,7 +222,7 @@ 
 		}
 
 		//all is good so let's just get it active
-		return $this->activate_messenger( $messenger, array( $message_type ) );
+		return $this->activate_messenger($messenger, array($message_type));
 	}
 
 	/**
@@ -236,40 +236,40 @@ 
 	 *                             				they are already setup.)
 	 * @return boolean an array of generated templates or false if nothing generated/activated.
 	 */
-	public function activate_messenger( $messenger_name, $mts_to_activate = array() ){
+	public function activate_messenger($messenger_name, $mts_to_activate = array()) {
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
 		$message_types = $this->get_installed_message_types();
 		$installed_messengers = $this->get_installed_messengers();
 		$templates = false;
 		$settings = array();
 		//get has_active so we can be sure its kept up to date.
-		$has_activated = get_option( 'ee_has_activated_messenger' );
+		$has_activated = get_option('ee_has_activated_messenger');
 
 		//grab the messenger to work with.
-		$messenger = isset( $installed_messengers[$messenger_name] ) ? $installed_messengers[$messenger_name] : null;
+		$messenger = isset($installed_messengers[$messenger_name]) ? $installed_messengers[$messenger_name] : null;
 
 		//it's inactive. Activate it.
 
-		if( $messenger instanceof EE_Messenger ) {
-			$active_messengers[ $messenger->name ][ 'obj' ] = $messenger;
+		if ($messenger instanceof EE_Messenger) {
+			$active_messengers[$messenger->name]['obj'] = $messenger;
 
 			/** @var EE_Messenger[] $installed_messengers  */
-			$mts_to_activate = ! empty( $mts_to_activate ) ? $mts_to_activate :  $messenger->get_default_message_types();
-			foreach ( $mts_to_activate as $message_type ) {
+			$mts_to_activate = ! empty($mts_to_activate) ? $mts_to_activate : $messenger->get_default_message_types();
+			foreach ($mts_to_activate as $message_type) {
 				//we need to setup any initial settings for message types
 				/** @var EE_message_type[] $installed_mts */
-				$settings_fields = isset( $message_types[$message_type] ) ? $message_types[ $message_type ]->get_admin_settings_fields() : array();
-				if ( !empty( $settings_fields ) ) {
-					foreach ( $settings_fields as $field => $values ) {
-						$settings[$field] = $values[ 'default' ];
+				$settings_fields = isset($message_types[$message_type]) ? $message_types[$message_type]->get_admin_settings_fields() : array();
+				if ( ! empty($settings_fields)) {
+					foreach ($settings_fields as $field => $values) {
+						$settings[$field] = $values['default'];
 					}
 				} else {
 					$settings = array();
 				}
 
-				$active_messengers[ $messenger->name ][ 'settings' ][ $messenger->name . '-message_types' ][ $message_type ][ 'settings' ] = $settings;
+				$active_messengers[$messenger->name]['settings'][$messenger->name.'-message_types'][$message_type]['settings'] = $settings;
 
-				if (  ! empty( $has_activated[$messenger->name] ) && ! in_array( $message_type, $has_activated[$messenger->name] ) ) {
+				if ( ! empty($has_activated[$messenger->name]) && ! in_array($message_type, $has_activated[$messenger->name])) {
 					$has_activated[$messenger->name][] = $message_type;
 				}
 			}
@@ -277,22 +277,22 @@ 
 			//setup any initial settings for the messenger
 			$msgr_settings = $messenger->get_admin_settings_fields();
 
-			if ( !empty( $msgr_settings ) ) {
-				foreach ( $msgr_settings as $field => $value ) {
-					$active_messengers[ $messenger->name ][ 'settings' ][ $field ] = $value;
+			if ( ! empty($msgr_settings)) {
+				foreach ($msgr_settings as $field => $value) {
+					$active_messengers[$messenger->name]['settings'][$field] = $value;
 				}
 			}
 
-			EEH_MSG_Template::update_active_messengers_in_db( $active_messengers );
-			update_option( 'ee_has_activated_messenger', $has_activated );
+			EEH_MSG_Template::update_active_messengers_in_db($active_messengers);
+			update_option('ee_has_activated_messenger', $has_activated);
 
 			//make sure that the cached active_messengers is set on this object
 			$this->_active_messengers[$messenger->name] = $messenger;
 			$this->_active_message_types[$messenger->name] = $active_messengers[$messenger->name];
 
 			//might need to generate new templates
-			if ( ! empty( $mts_to_activate ) ) {
-				$templates = EEH_MSG_Template::generate_new_templates( $messenger->name, $mts_to_activate, 0, TRUE );
+			if ( ! empty($mts_to_activate)) {
+				$templates = EEH_MSG_Template::generate_new_templates($messenger->name, $mts_to_activate, 0, TRUE);
 			}
 		}
 
@@ -312,8 +312,8 @@ 
 	 */
 	private function _load_files($kind, $actives) {
 		$active_names = array();
-		$base_path = EE_LIBRARIES . 'messages' . DS . $kind . DS;
-		if ( empty($actives) ) return false;
+		$base_path = EE_LIBRARIES.'messages'.DS.$kind.DS;
+		if (empty($actives)) return false;
 
 		//make sure autoloaders are set (fail-safe)
 		EED_Messages::set_autoloaders();
@@ -321,12 +321,12 @@ 
 		//make sure $actives is an array
 		$actives = (array) $actives;
 
-		EE_Registry::instance()->load_helper( 'File' );
-		foreach ( $actives as $active ) {
-			$msg_name = 'EE_' . ucwords( str_replace( ' ', '_', $active) ) . '_' . $kind;
-			$filename = $msg_name . '.class.php';
-			$load_file = $base_path . DS . $filename;
-			if ( is_readable($load_file) ) {
+		EE_Registry::instance()->load_helper('File');
+		foreach ($actives as $active) {
+			$msg_name = 'EE_'.ucwords(str_replace(' ', '_', $active)).'_'.$kind;
+			$filename = $msg_name.'.class.php';
+			$load_file = $base_path.DS.$filename;
+			if (is_readable($load_file)) {
 				require_once($load_file);
 				$active_names[$active] = $msg_name;
 			} else {
@@ -357,25 +357,25 @@ 
 	 * @param  string $kind        messenger or message_type?
 	 * @return void
 	 */
-	private function _unset_active( $active_name, $kind ) {
+	private function _unset_active($active_name, $kind) {
 		//pluralize
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		if ( $kind == 'messenger' ) {
-			unset( $active_messengers[$active_name] );
-			EEH_MSG_Template::update_to_inactive( $active_name );
-			if ( isset( $this->_active_messengers[$active_name] ) ) {
-				unset( $this->_active_messengers[$active_name] );
+		EE_Registry::instance()->load_helper('MSG_Template');
+		if ($kind == 'messenger') {
+			unset($active_messengers[$active_name]);
+			EEH_MSG_Template::update_to_inactive($active_name);
+			if (isset($this->_active_messengers[$active_name])) {
+				unset($this->_active_messengers[$active_name]);
 			}
 		} else {
-			foreach( $active_messengers as $messenger => $settings ) {
-				if ( ! empty( $settings['settings'][$messenger . '-message_types'][$active_name] ) ) {
-					unset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$active_name] );
+			foreach ($active_messengers as $messenger => $settings) {
+				if ( ! empty($settings['settings'][$messenger.'-message_types'][$active_name])) {
+					unset($active_messengers[$messenger]['settings'][$messenger.'-message_types'][$active_name]);
 				}
 			}
-			EEH_MSG_Template::update_to_inactive( '', $active_name );
-			if ( isset( $this->_active_message_types[$active_name] ) ) {
-				unset( $this->_active_message_types[$active_name] );
+			EEH_MSG_Template::update_to_inactive('', $active_name);
+			if (isset($this->_active_message_types[$active_name])) {
+				unset($this->_active_message_types[$active_name]);
 			}
 		}
 
@@ -395,12 +395,12 @@ 
 	 *
 	 * @return bool true is a generating messenger and can be sent OR FALSE meaning cannot send.
 	 */
-	public function is_generating_messenger_and_active( EE_Messenger $messenger, EE_message_type $message_type ) {
+	public function is_generating_messenger_and_active(EE_Messenger $messenger, EE_message_type $message_type) {
 		//get the $messengers the message type says it can be used with.
 		$used_with = $message_type->with_messengers();
 
-		foreach ( $used_with as $generating_msgr => $secondary_msgrs ) {
-			if ( $messenger->name == $generating_msgr && isset( $this->_active_message_types[$generating_msgr][$message_type->name] ) ) {
+		foreach ($used_with as $generating_msgr => $secondary_msgrs) {
+			if ($messenger->name == $generating_msgr && isset($this->_active_message_types[$generating_msgr][$message_type->name])) {
 				return true;
 			}
 		}
@@ -420,8 +420,8 @@ 
 	 * @param string    $messenger
 	 * @return EE_Messenger | null
 	 */
-	public function get_messenger_if_active( $messenger ) {
-		return ! empty( $this->_active_messengers[$messenger] ) ? $this->_active_messengers[$messenger] : null;
+	public function get_messenger_if_active($messenger) {
+		return ! empty($this->_active_messengers[$messenger]) ? $this->_active_messengers[$messenger] : null;
 	}
 
 
@@ -448,9 +448,9 @@ 
 	 *                  'message_type' => null
 	 *                )
 	 */
-	public function validate_for_use( EE_Message $message ) {
+	public function validate_for_use(EE_Message $message) {
 		$validated_for_use['messenger'] = $this->get_messenger_if_active($message->messenger());
-		$validated_for_use['message_type'] = $this->get_active_message_type( $message->messenger(), $message->message_type() );
+		$validated_for_use['message_type'] = $this->get_active_message_type($message->messenger(), $message->message_type());
 		return $validated_for_use;
 	}
 
@@ -472,35 +472,35 @@ 
 	 * @param bool  $send 			       Default TRUE.  If false, then this will just return the generated EE_Messages objects which might be used by the trigger to setup a batch message (typically html messenger uses it).
 	 * @return bool
 	 */
-	public function send_message( $type, $vars, $sending_messenger = '', $generating_messenger='', $context='', $send = TRUE ) {
-		$processor = new EE_Messages_Processor( $this );
+	public function send_message($type, $vars, $sending_messenger = '', $generating_messenger = '', $context = '', $send = TRUE) {
+		$processor = new EE_Messages_Processor($this);
 		$error = FALSE;
 
 		//try to intelligently determine what method we'll call based on the incoming data.
 		//if generating and sending are different then generate and send immediately.
-		if ( ! empty( $sending_messenger ) && $sending_messenger != $generating_messenger && $send ) {
+		if ( ! empty($sending_messenger) && $sending_messenger != $generating_messenger && $send) {
 			//in the legacy system, when generating and sending were different, that means all the
 			//vars are already in the request object.  So let's just use that.
 			try {
-				$mtg = new EE_Message_To_Generate_From_Request( $this, EE_Registry::instance()->REQ );
-				$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_To_Generate_From_Request($this, EE_Registry::instance()->REQ);
+				$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__);
 				$error = true;
 			}
 		} else {
-			$processor->generate_for_all_active_messengers( $type, $vars, $send );
+			$processor->generate_for_all_active_messengers($type, $vars, $send);
 			//let's find out if there were any errors and how many successfully were queued.
-			$count_errors = $processor->get_queue()->count_STS_in_queue( EEM_Message::status_failed );
-			$count_queued = $processor->get_queue()->count_STS_in_queue( EEM_Message::status_incomplete );
-			$count_retry = $processor->get_queue()->count_STS_in_queue( EEM_Message::status_retry );
+			$count_errors = $processor->get_queue()->count_STS_in_queue(EEM_Message::status_failed);
+			$count_queued = $processor->get_queue()->count_STS_in_queue(EEM_Message::status_incomplete);
+			$count_retry = $processor->get_queue()->count_STS_in_queue(EEM_Message::status_retry);
 			$count_errors = $count_errors + $count_retry;
-			if ( $count_errors > 0 ) {
+			if ($count_errors > 0) {
 				$error = true;
-				if ( $count_errors > 1 && $count_retry > 1 && $count_queued > 1  ) {
+				if ($count_errors > 1 && $count_retry > 1 && $count_queued > 1) {
 					$message = sprintf(
 						__(
 							'There were %d errors and %d messages successfully queued for generation and sending',
@@ -509,7 +509,7 @@ 
 						$count_errors,
 						$count_queued
 					);
-				} elseif ( $count_errors > 1 && $count_queued === 1 ) {
+				} elseif ($count_errors > 1 && $count_queued === 1) {
 					$message = sprintf(
 						__(
 							'There were %d errors and %d message successfully queued for generation.',
@@ -518,7 +518,7 @@ 
 						$count_errors,
 						$count_queued
 					);
-				} elseif ( $count_errors === 1 && $count_queued > 1 ) {
+				} elseif ($count_errors === 1 && $count_queued > 1) {
 					$message = sprintf(
 						__(
 							'There was %d error and %d messages successfully queued for generation.',
@@ -536,9 +536,9 @@ 
 						$count_errors
 					);
 				}
-				EE_Error::add_error( $message, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($message, __FILE__, __FUNCTION__, __LINE__);
 			} else {
-				if ( $count_queued === 1 ) {
+				if ($count_queued === 1) {
 					$message = sprintf(
 						__(
 							'%d message successfully queued for generation.',
@@ -555,18 +555,18 @@ 
 						$count_queued
 					);
 				}
-				EE_Error::add_success( $message );
+				EE_Error::add_success($message);
 			}
 		}
 		//if no error then return the generated message(s).
-		if ( ! $error && ! $send ) {
-			$generated_queue = $processor->generate_queue( false );
+		if ( ! $error && ! $send) {
+			$generated_queue = $processor->generate_queue(false);
 			//get message and return.
 			$generated_queue->get_queue()->rewind();
 			$messages = array();
-			while( $generated_queue->get_queue()->valid() ) {
+			while ($generated_queue->get_queue()->valid()) {
 				$message = $generated_queue->get_queue()->current();
-				if ( $message instanceof EE_Message ) {
+				if ($message instanceof EE_Message) {
 					//set properties that might be expected by add-ons (backward compat)
 					$message->content = $message->content();
 					$message->template_pack = $message->get_template_pack();
@@ -596,8 +596,8 @@ 
 	 * @param bool 	$send true we will do a test send using the messenger delivery, false we just do a regular preview
 	 * @return string          The body of the message.
 	 */
-	public function preview_message( $type, $context, $messenger, $send = FALSE ) {
-		return EED_Messages::preview_message( $type, $context, $messenger, $send );
+	public function preview_message($type, $context, $messenger, $send = FALSE) {
+		return EED_Messages::preview_message($type, $context, $messenger, $send);
 	}
 
 
@@ -614,11 +614,11 @@ 
 	 *
 	 * @return bool          success or fail.
 	 */
-	public function send_message_with_messenger_only( $messenger, $message_type, $message ) {
+	public function send_message_with_messenger_only($messenger, $message_type, $message) {
 		//setup for sending to new method.
-		$queue = new EE_Messages_Queue( $this );
+		$queue = new EE_Messages_Queue($this);
 		//make sure we have a proper message object
-		if ( ! $message instanceof EE_Message && is_object( $message ) && isset( $message->content ) ) {
+		if ( ! $message instanceof EE_Message && is_object($message) && isset($message->content)) {
 			$msg = EE_Message_Factory::create(
 				array(
 					'MSG_messenger' => $messenger,
@@ -631,15 +631,15 @@ 
 			$msg = $message;
 		}
 
-		if ( ! $msg instanceof EE_Message ) {
+		if ( ! $msg instanceof EE_Message) {
 			return false;
 		}
 		//make sure any content in a content property (if not empty) is set on the MSG_content.
-		if ( ! empty( $msg->content ) ) {
-			$msg->set( 'MSG_content', $msg->content );
+		if ( ! empty($msg->content)) {
+			$msg->set('MSG_content', $msg->content);
 		}
-		$queue->add( $msg );
-		return EED_Messages::send_message_with_messenger_only( $messenger, $message_type, $queue );
+		$queue->add($msg);
+		return EED_Messages::send_message_with_messenger_only($messenger, $message_type, $queue);
 	}
 
 
@@ -660,7 +660,7 @@ 
 	 */
 	private function _validate_setup($messenger, $message_type, $is_global = FALSE) {
 
-		$message_type = strtolower(str_replace(' ', '_', $message_type) );
+		$message_type = strtolower(str_replace(' ', '_', $message_type));
 		$messenger = strtolower(str_replace(' ', '_', $messenger));
 		$installed_message_types = $this->get_installed_message_types();
 
@@ -676,7 +676,7 @@ 
 
 
 		//do we have the necessary objects loaded?
-		if ( empty( $this->_messenger ) || empty( $this->_message_type ) ) {
+		if (empty($this->_messenger) || empty($this->_message_type)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -689,7 +689,7 @@ 
 			);
 		}
 		//is given message_type valid for given messenger (if this is not a global save)
-		if ( !$is_global ) {
+		if ( ! $is_global) {
 			$has_active = EEM_Message_Template_Group::instance()->count(
 				array(
 					array(
@@ -698,7 +698,7 @@ 
 					)
 				)
 			);
-			if ( $has_active == 0 ) {
+			if ($has_active == 0) {
 				EE_Error::add_error(
 					sprintf(
 						__(' The %1$s message type is not registered with the %2$s messenger. Please visit the Messenger activation page to assign this message type first if you want to use it.', 'event_espresso'),
@@ -728,16 +728,16 @@ 
 	 * @return array|object if creation is successful then we return an array of info, otherwise an error_object is returned.
 	 * @throws \EE_Error
 	 */
-	public function create_new_templates( $messenger, $message_type, $GRP_ID = 0, $is_global = false ) {
+	public function create_new_templates($messenger, $message_type, $GRP_ID = 0, $is_global = false) {
 
 		$valid_mt = $this->_validate_setup($messenger, $message_type, $is_global);
 
-		if ( is_wp_error($valid_mt) && $is_global ) {
+		if (is_wp_error($valid_mt) && $is_global) {
 			//we're setting up a brand new global templates (with messenger activation) so we're assuming that the message types sent in are valid.
 			$valid_mt = true;
 		}
 
-		if ( is_wp_error($valid_mt) ) {
+		if (is_wp_error($valid_mt)) {
 			//if we've still got no valid_mt then bubble up error object
 			return $valid_mt;
 		}
@@ -753,13 +753,13 @@ 
 	 * @param $is_global
 	 * @return array|mixed
 	 */
-	protected function _create_new_templates( $GRP_ID, $is_global) {
+	protected function _create_new_templates($GRP_ID, $is_global) {
 
 		//if we're creating a custom template then we don't need to use the defaults class
-		if ( ! $is_global )
-			return $this->_create_custom_template_group( $GRP_ID );
+		if ( ! $is_global)
+			return $this->_create_custom_template_group($GRP_ID);
 
-		$DFLT = new EE_Message_Template_Defaults( $this, $this->_messenger->name, $this->_message_type->name, $GRP_ID );
+		$DFLT = new EE_Message_Template_Defaults($this, $this->_messenger->name, $this->_message_type->name, $GRP_ID);
 
 		//generate templates
 		$success = $DFLT->create_new_templates();
@@ -787,16 +787,16 @@ 
 	 *                                     			)
 	 * @access private
 	 */
-	private function _create_custom_template_group( $GRP_ID ) {
+	private function _create_custom_template_group($GRP_ID) {
 		//defaults
-		$success = array( 'GRP_ID' => NULL, 'MTP_context' => '' );
+		$success = array('GRP_ID' => NULL, 'MTP_context' => '');
 
 		//get the template group to use as a template from the db.  If $GRP_ID is empty then we'll assume the base will be the global template matching the messenger and message type.
-		$mtg = empty( $GRP_ID ) ? EEM_Message_Template_Group::instance()->get_one( array( array( 'MTP_messenger' => $this->_messenger->name, 'MTP_message_type' => $this->_message_type->name, 'MTP_is_global' => TRUE ) ) ) : EEM_Message_Template_Group::instance()->get_one_by_ID( $GRP_ID );
+		$mtg = empty($GRP_ID) ? EEM_Message_Template_Group::instance()->get_one(array(array('MTP_messenger' => $this->_messenger->name, 'MTP_message_type' => $this->_message_type->name, 'MTP_is_global' => TRUE))) : EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
 
 		//if we don't have a mtg at this point then we need to bail.
-		if ( ! $mtg instanceof EE_Message_Template_Group ) {
-			EE_Error::add_error( sprintf( __('Something went wrong with generating the custom template from this group id: %s.  This usually happens when there is no matching message template group in the db.', 'event_espresso'), $GRP_ID ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $mtg instanceof EE_Message_Template_Group) {
+			EE_Error::add_error(sprintf(__('Something went wrong with generating the custom template from this group id: %s.  This usually happens when there is no matching message template group in the db.', 'event_espresso'), $GRP_ID), __FILE__, __FUNCTION__, __LINE__);
 			return $success;
 		}
 
@@ -808,27 +808,27 @@ 
 		$new_mtg->set('GRP_ID', 0);
 		$new_mtg->set('MTP_is_global', FALSE);
 
-		$template_name = defined('DOING_AJAX') && !empty( $_POST['templateName'] ) ? $_POST['templateName'] : __('New Custom Template', 'event_espresso');
-		$template_description = defined("DOING_AJAX") && !empty( $_POST['templateDescription'] ) ? $_POST['templateDescription'] : sprintf( __('This is a custom template that was created for the %s messenger and %s message type.', 'event_espresso' ), $new_mtg->messenger_obj()->label['singular'], $new_mtg->message_type_obj()->label['singular'] );
+		$template_name = defined('DOING_AJAX') && ! empty($_POST['templateName']) ? $_POST['templateName'] : __('New Custom Template', 'event_espresso');
+		$template_description = defined("DOING_AJAX") && ! empty($_POST['templateDescription']) ? $_POST['templateDescription'] : sprintf(__('This is a custom template that was created for the %s messenger and %s message type.', 'event_espresso'), $new_mtg->messenger_obj()->label['singular'], $new_mtg->message_type_obj()->label['singular']);
 
 
-		$new_mtg->set('MTP_name', $template_name );
-		$new_mtg->set('MTP_description', $template_description );
+		$new_mtg->set('MTP_name', $template_name);
+		$new_mtg->set('MTP_description', $template_description);
 		//remove ALL relations on this template group so they don't get saved!
-		$new_mtg->_remove_relations( 'Message_Template' );
+		$new_mtg->_remove_relations('Message_Template');
 		$new_mtg->save();
 		$success['GRP_ID'] = $new_mtg->ID();
 		$success['template_name'] = $template_name;
 
 		//add new message templates and add relation to.
-		foreach ( $mtts as $mtt ) {
-			if ( ! $mtt instanceof EE_Message_Template )
+		foreach ($mtts as $mtt) {
+			if ( ! $mtt instanceof EE_Message_Template)
 				continue;
 			$nmtt = clone $mtt;
 			$nmtt->set('MTP_ID', 0);
-			$nmtt->set( 'GRP_ID', $new_mtg->ID() ); //relation
+			$nmtt->set('GRP_ID', $new_mtg->ID()); //relation
 			$nmtt->save();
-			if ( empty( $success['MTP_context'] ) )
+			if (empty($success['MTP_context']))
 				$success['MTP_context'] = $nmtt->get('MTP_context');
 		}
 
@@ -856,14 +856,14 @@ 
 
 
 		//okay now let's assemble an array with the messenger template fields added to the message_type contexts.
-		foreach ( $this->_message_type->get_contexts() as $context => $details ) {
-			foreach ( $this->_messenger->get_template_fields() as $field => $value ) {
+		foreach ($this->_message_type->get_contexts() as $context => $details) {
+			foreach ($this->_messenger->get_template_fields() as $field => $value) {
 				$template_fields[$context][$field] = $value;
 			}
 		}
 
-		if ( empty($template_fields) ) {
-			EE_Error::add_error( __('Something went wrong and we couldn\'t get any templates assembled', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($template_fields)) {
+			EE_Error::add_error(__('Something went wrong and we couldn\'t get any templates assembled', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -884,30 +884,30 @@ 
 	 * @return array                    multidimensional array of messenger and message_type objects
 	 *                                    (messengers index, and message_type index);
 	 */
-	public function get_installed( $type = 'all', $skip_cache = false ) {
+	public function get_installed($type = 'all', $skip_cache = false) {
 		$installed = array();
 
 		//first let's account for caching
-		if ( $skip_cache ) {
-			$message_base = EE_LIBRARIES . "messages" . DS;
+		if ($skip_cache) {
+			$message_base = EE_LIBRARIES."messages".DS;
 
-			$messenger_files = $type == 'all' || $type == 'messengers' ? scandir( $message_base . "messenger", 1) : NULL;
-			$messagetype_files = $type == 'all' || $type == 'message_types' ? scandir( $message_base . "message_type", 1) : NULL;
+			$messenger_files = $type == 'all' || $type == 'messengers' ? scandir($message_base."messenger", 1) : NULL;
+			$messagetype_files = $type == 'all' || $type == 'message_types' ? scandir($message_base."message_type", 1) : NULL;
 
 
 			//allow plugins to filter in their messenger/message_type files
-			$messenger_files = apply_filters('FHEE__EE_messages__get_installed__messenger_files', $messenger_files, $type );
-			$messagetype_files = apply_filters('FHEE__EE_messages__get_installed__messagetype_files', $messagetype_files, $type );
+			$messenger_files = apply_filters('FHEE__EE_messages__get_installed__messenger_files', $messenger_files, $type);
+			$messagetype_files = apply_filters('FHEE__EE_messages__get_installed__messagetype_files', $messagetype_files, $type);
 
-			$installed['messengers'] = !empty($messenger_files ) ? $this->_get_installed($messenger_files) : '';
-			$installed['message_types'] = !empty($messagetype_files) ? $this->_get_installed($messagetype_files) : '';
+			$installed['messengers'] = ! empty($messenger_files) ? $this->_get_installed($messenger_files) : '';
+			$installed['message_types'] = ! empty($messagetype_files) ? $this->_get_installed($messagetype_files) : '';
 		} else {
 			$installed['messengers'] = $this->get_installed_messengers();
 			$installed['message_types'] = $this->get_installed_message_types();
 		}
 
 
-		if ( $type != 'all' ) {
+		if ($type != 'all') {
 			$installed = $type == 'messengers' ? $installed['messengers'] : $installed['message_types'];
 		}
 
@@ -926,15 +926,15 @@ 
 		$the_goods = array();
 		$filenames = (array) $filenames;
 		$replace = ".class.php";
-		foreach ( $filenames as $filename ) {
-			$classname = preg_match("/" . $replace . "/", $filename ) ? str_replace($replace, "", $filename) : false;
+		foreach ($filenames as $filename) {
+			$classname = preg_match("/".$replace."/", $filename) ? str_replace($replace, "", $filename) : false;
 
 			//no classname? no match? move along, nothing to see here. note, the stripos is checking to make sure the filename (classname) begins with EE.
-			if ( !$classname || 0 !== stripos($classname, 'EE') ) continue;
+			if ( ! $classname || 0 !== stripos($classname, 'EE')) continue;
 
 			//note: I'm not sure if this will work without including the file.  We do have autoloaders so it "may" work.
 			$object = new $classname();
-			$the_goods[ $object->name ] = $object;
+			$the_goods[$object->name] = $object;
 		}
 		return $the_goods;
 	}
@@ -959,9 +959,9 @@ 
 	 */
 	public function get_active_message_types() {
 		$message_types = array();
-		foreach ( $this->_active_message_types as $messenger => $mtvalues ) {
-			foreach ( $mtvalues as $mt => $config ) {
-				if ( !in_array( $mt, $message_types ) )
+		foreach ($this->_active_message_types as $messenger => $mtvalues) {
+			foreach ($mtvalues as $mt => $config) {
+				if ( ! in_array($mt, $message_types))
 					$message_types[] = $mt;
 			}
 		}
@@ -982,8 +982,8 @@ 
 		$message_types = array();
 		$message_type_refs = $this->get_active_message_types();
 		$installed_message_types = $this->get_installed_message_types();
-		foreach ( $message_type_refs as $ref ) {
-			if ( isset( $installed_message_types[$ref] ) ) {
+		foreach ($message_type_refs as $ref) {
+			if (isset($installed_message_types[$ref])) {
 				$message_types[] = $installed_message_types[$ref];
 			}
 		}
@@ -1004,17 +1004,17 @@ 
 	 *
 	 * @return EE_message_type[]    (or empty array if none present)
 	 */
-	public function get_active_message_types_per_messenger( $messenger ) {
+	public function get_active_message_types_per_messenger($messenger) {
 		$messenger = (string) $messenger;
-		if ( empty( $this->_active_message_types[$messenger] ) ) {
+		if (empty($this->_active_message_types[$messenger])) {
 			return array();
 		}
 
 		$mts = array();
 		$message_types = $this->_active_message_types[$messenger];
 		$installed_message_types = $this->get_installed_message_types();
-		foreach ( $message_types as $mt => $settings ) {
-			if ( ! empty( $installed_message_types[$mt] ) )  {
+		foreach ($message_types as $mt => $settings) {
+			if ( ! empty($installed_message_types[$mt])) {
 				$mts[] = $installed_message_types[$mt];
 			}
 		}
@@ -1034,9 +1034,9 @@ 
 	 *
 	 * @return EE_Message_Type|null
 	 */
-	public function get_active_message_type( $messenger, $message_type ) {
+	public function get_active_message_type($messenger, $message_type) {
 		$installed_message_types = $this->get_installed_message_types();
-		if ( !empty( $this->_active_message_types[$messenger][$message_type] ) && !empty( $installed_message_types[$message_type] ) )  {
+		if ( ! empty($this->_active_message_types[$messenger][$message_type]) && ! empty($installed_message_types[$message_type])) {
 			return $installed_message_types[$message_type];
 		}
 		return NULL;
@@ -1059,8 +1059,8 @@ 
 	 * @return array|\EE_message_type[]
 	 */
 	public function get_installed_message_types() {
-		$this->_installed_message_types = empty( $this->_installed_message_types )
-			? $this->get_installed( 'message_types', true )
+		$this->_installed_message_types = empty($this->_installed_message_types)
+			? $this->get_installed('message_types', true)
 			: $this->_installed_message_types;
 		return $this->_installed_message_types;
 	}
@@ -1077,8 +1077,8 @@ 
 	 * @return array
 	 */
 	public function get_installed_messengers() {
-		$this->_installed_messengers = empty( $this->_installed_messengers )
-			? $this->get_installed( 'messengers', true )
+		$this->_installed_messengers = empty($this->_installed_messengers)
+			? $this->get_installed('messengers', true)
 			: $this->_installed_messengers;
 		return $this->_installed_messengers;
 	}
@@ -1114,21 +1114,21 @@ 
 	 * @param   bool    $slugs_only     Whether to return an array of just slugs and labels (true) or all contexts indexed by message type.
 	 * @return array
 	 */
-	public function get_all_contexts( $slugs_only = true ) {
+	public function get_all_contexts($slugs_only = true) {
 		$key = $slugs_only ? 'slugs' : 'all';
-		if ( ! empty( $this->_contexts[$key] ) ) {
+		if ( ! empty($this->_contexts[$key])) {
 			return $this->_contexts[$key];
 		}
 
 		//contexts has not been setup yet.  So let's get all active message type objects and loop through to get all
 		//unique contexts
 		$contexts = array();
-		foreach ( $this->get_active_message_type_objects() as $mt ) {
-			if ( $mt instanceof EE_message_type ) {
+		foreach ($this->get_active_message_type_objects() as $mt) {
+			if ($mt instanceof EE_message_type) {
 				$mt_contexts = $mt->get_contexts();
-				if ( $slugs_only ) {
-					foreach ( $mt_contexts as $context => $context_details ) {
-						$contexts[ $context ] = $context_details['label'];
+				if ($slugs_only) {
+					foreach ($mt_contexts as $context => $context_details) {
+						$contexts[$context] = $context_details['label'];
 					}
 				} else {
 					$contexts[$mt->name] = $mt_contexts;
@@ -1152,7 +1152,7 @@ 
 	 * @param string $data_handler_reference
 	 * @return string
 	 */
-	public function verify_and_retrieve_class_name_for_data_handler_reference( $data_handler_reference ) {
+	public function verify_and_retrieve_class_name_for_data_handler_reference($data_handler_reference) {
 		return EE_Message_To_Generate::verify_and_retrieve_class_name_for_data_handler_reference(
 			$data_handler_reference
 		);

Braces +21 added lines, -12 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * EE_Messages class
@@ -182,7 +183,7 @@ 
 		if( ! isset( $active_messengers[ $messenger_name ] ) ) {
 			$this->activate_messenger( $messenger_name );
 			return FALSE;
-		}else{
+		} else{
 			return TRUE;
 		}
 	}
@@ -313,7 +314,9 @@ 
 	private function _load_files($kind, $actives) {
 		$active_names = array();
 		$base_path = EE_LIBRARIES . 'messages' . DS . $kind . DS;
-		if ( empty($actives) ) return false;
+		if ( empty($actives) ) {
+			return false;
+		}
 
 		//make sure autoloaders are set (fail-safe)
 		EED_Messages::set_autoloaders();
@@ -756,8 +759,9 @@ 
 	protected function _create_new_templates( $GRP_ID, $is_global) {
 
 		//if we're creating a custom template then we don't need to use the defaults class
-		if ( ! $is_global )
-			return $this->_create_custom_template_group( $GRP_ID );
+		if ( ! $is_global ) {
+					return $this->_create_custom_template_group( $GRP_ID );
+		}
 
 		$DFLT = new EE_Message_Template_Defaults( $this, $this->_messenger->name, $this->_message_type->name, $GRP_ID );
 
@@ -822,14 +826,16 @@ 
 
 		//add new message templates and add relation to.
 		foreach ( $mtts as $mtt ) {
-			if ( ! $mtt instanceof EE_Message_Template )
-				continue;
+			if ( ! $mtt instanceof EE_Message_Template ) {
+							continue;
+			}
 			$nmtt = clone $mtt;
 			$nmtt->set('MTP_ID', 0);
 			$nmtt->set( 'GRP_ID', $new_mtg->ID() ); //relation
 			$nmtt->save();
-			if ( empty( $success['MTP_context'] ) )
-				$success['MTP_context'] = $nmtt->get('MTP_context');
+			if ( empty( $success['MTP_context'] ) ) {
+							$success['MTP_context'] = $nmtt->get('MTP_context');
+			}
 		}
 
 		return $success;
@@ -930,7 +936,9 @@ 
 			$classname = preg_match("/" . $replace . "/", $filename ) ? str_replace($replace, "", $filename) : false;
 
 			//no classname? no match? move along, nothing to see here. note, the stripos is checking to make sure the filename (classname) begins with EE.
-			if ( !$classname || 0 !== stripos($classname, 'EE') ) continue;
+			if ( !$classname || 0 !== stripos($classname, 'EE') ) {
+				continue;
+			}
 
 			//note: I'm not sure if this will work without including the file.  We do have autoloaders so it "may" work.
 			$object = new $classname();
@@ -961,8 +969,9 @@ 
 		$message_types = array();
 		foreach ( $this->_active_message_types as $messenger => $mtvalues ) {
 			foreach ( $mtvalues as $mt => $config ) {
-				if ( !in_array( $mt, $message_types ) )
-					$message_types[] = $mt;
+				if ( !in_array( $mt, $message_types ) ) {
+									$message_types[] = $mt;
+				}
 			}
 		}
 

core/EE_Registry.core.php

Spacing +162 added lines, -162 removed lines

@@ -168,7 +168,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Registry ) {
+		if ( ! self::$_instance instanceof EE_Registry) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -205,8 +205,8 @@ 
 		$this->modules = new StdClass();
 		$this->shortcodes = new StdClass();
 		$this->widgets = new StdClass();
-		$this->load_core( 'Base', array(), true );
-		add_action( 'AHEE__EE_System__set_hooks_for_core', array( $this, 'init' ) );
+		$this->load_core('Base', array(), true);
+		add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'init'));
 	}
 
 
@@ -219,10 +219,10 @@ 
 	 */
 	public function init() {
 		// Get current page protocol
-		$protocol = isset( $_SERVER[ 'HTTPS' ] ) ? 'https://' : 'http://';
+		$protocol = isset($_SERVER['HTTPS']) ? 'https://' : 'http://';
 		// Output admin-ajax.php URL with same protocol as current page
-		self::$i18n_js_strings[ 'ajax_url' ] = admin_url( 'admin-ajax.php', $protocol );
-		self::$i18n_js_strings[ 'wp_debug' ] = defined( 'WP_DEBUG' ) ? WP_DEBUG : false;
+		self::$i18n_js_strings['ajax_url'] = admin_url('admin-ajax.php', $protocol);
+		self::$i18n_js_strings['wp_debug'] = defined('WP_DEBUG') ? WP_DEBUG : false;
 	}
 
 
@@ -233,14 +233,14 @@ 
 	 * @return string
 	 */
 	public static function localize_i18n_js_strings() {
-		$i18n_js_strings = (array)EE_Registry::$i18n_js_strings;
-		foreach ( $i18n_js_strings as $key => $value ) {
-			if ( is_scalar( $value ) ) {
-				$i18n_js_strings[ $key ] = html_entity_decode( (string)$value, ENT_QUOTES, 'UTF-8' );
+		$i18n_js_strings = (array) EE_Registry::$i18n_js_strings;
+		foreach ($i18n_js_strings as $key => $value) {
+			if (is_scalar($value)) {
+				$i18n_js_strings[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 			}
 		}
 
-		return "/* <![CDATA[ */ var eei18n = " . wp_json_encode( $i18n_js_strings ) . '; /* ]]> */';
+		return "/* <![CDATA[ */ var eei18n = ".wp_json_encode($i18n_js_strings).'; /* ]]> */';
 	}
 
 
@@ -248,15 +248,15 @@ 
 	/**
 	 * @param mixed string | EED_Module $module
 	 */
-	public function add_module( $module ) {
-		if ( $module instanceof EED_Module ) {
-			$module_class = get_class( $module );
+	public function add_module($module) {
+		if ($module instanceof EED_Module) {
+			$module_class = get_class($module);
 			$this->modules->{$module_class} = $module;
 		} else {
-			if ( ! class_exists( 'EE_Module_Request_Router' ) ) {
-				$this->load_core( 'Module_Request_Router' );
+			if ( ! class_exists('EE_Module_Request_Router')) {
+				$this->load_core('Module_Request_Router');
 			}
-			$this->modules->{$module} = EE_Module_Request_Router::module_factory( $module );
+			$this->modules->{$module} = EE_Module_Request_Router::module_factory($module);
 		}
 	}
 
@@ -266,8 +266,8 @@ 
 	 * @param string $module_name
 	 * @return mixed EED_Module | NULL
 	 */
-	public function get_module( $module_name = '' ) {
-		return isset( $this->modules->{$module_name} ) ? $this->modules->{$module_name} : null;
+	public function get_module($module_name = '') {
+		return isset($this->modules->{$module_name} ) ? $this->modules->{$module_name} : null;
 	}
 
 
@@ -282,18 +282,18 @@ 
 	 * @param bool $resolve_dependencies
 	 * @return mixed
 	 */
-	public function load_core( $class_name, $arguments = array(), $load_only = false, $resolve_dependencies = false ) {
+	public function load_core($class_name, $arguments = array(), $load_only = false, $resolve_dependencies = false) {
 		$core_paths = apply_filters(
 			'FHEE__EE_Registry__load_core__core_paths',
 			array(
 				EE_CORE,
 				EE_ADMIN,
 				EE_CPTS,
-				EE_CORE . 'data_migration_scripts' . DS
+				EE_CORE.'data_migration_scripts'.DS
 			)
 		);
 		// retrieve instantiated class
-		return $this->_load( $core_paths, 'EE_', $class_name, 'core', $arguments, false, true, $load_only, $resolve_dependencies );
+		return $this->_load($core_paths, 'EE_', $class_name, 'core', $arguments, false, true, $load_only, $resolve_dependencies);
 	}
 
 
@@ -307,15 +307,15 @@ 
 	 * @param bool $load_only
 	 * @return mixed
 	 */
-	public function load_service( $class_name, $arguments = array(), $load_only = false ) {
+	public function load_service($class_name, $arguments = array(), $load_only = false) {
 		$service_paths = apply_filters(
 			'FHEE__EE_Registry__load_service__service_paths',
 			array(
-				EE_CORE . 'services' . DS,
+				EE_CORE.'services'.DS,
 			)
 		);
 		// retrieve instantiated class
-		return $this->_load( $service_paths, 'EE_', $class_name, 'class', $arguments, false, true, $load_only, true );
+		return $this->_load($service_paths, 'EE_', $class_name, 'class', $arguments, false, true, $load_only, true);
 	}
 
 
@@ -328,9 +328,9 @@ 
 	 * @param mixed $arguments
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	public function load_dms( $class_name, $arguments = array() ) {
+	public function load_dms($class_name, $arguments = array()) {
 		// retrieve instantiated class
-		return $this->_load( EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_', $class_name, 'dms', $arguments, false, false, false );
+		return $this->_load(EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_', $class_name, 'dms', $arguments, false, false, false);
 	}
 
 
@@ -345,14 +345,14 @@ 
 	 * @param bool $load_only whether or not to just load the file and NOT instantiate, or load AND instantiate (default)
 	 * @return EE_Base_Class
 	 */
-	public function load_class( $class_name, $arguments = array(), $from_db = false, $cache = true, $load_only = false ) {
-		$paths = apply_filters( 'FHEE__EE_Registry__load_class__paths', array(
+	public function load_class($class_name, $arguments = array(), $from_db = false, $cache = true, $load_only = false) {
+		$paths = apply_filters('FHEE__EE_Registry__load_class__paths', array(
 			EE_CORE,
 			EE_CLASSES,
 			EE_BUSINESS
-		) );
+		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, 'class', $arguments, $from_db, $cache, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'class', $arguments, $from_db, $cache, $load_only);
 	}
 
 
@@ -365,10 +365,10 @@ 
 	 * @param bool $load_only
 	 * @return EEH_Base
 	 */
-	public function load_helper( $class_name, $arguments = array(), $load_only = true ) {
-		$helper_paths = apply_filters( 'FHEE__EE_Registry__load_helper__helper_paths', array( EE_HELPERS ) );
+	public function load_helper($class_name, $arguments = array(), $load_only = true) {
+		$helper_paths = apply_filters('FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS));
 		// retrieve instantiated class
-		return $this->_load( $helper_paths, 'EEH_', $class_name, 'helper', $arguments, false, true, $load_only );
+		return $this->_load($helper_paths, 'EEH_', $class_name, 'helper', $arguments, false, true, $load_only);
 	}
 
 
@@ -382,16 +382,16 @@ 
 	 * @param bool $load_only
 	 * @return mixed
 	 */
-	public function load_lib( $class_name, $arguments = array(), $load_only = false ) {
+	public function load_lib($class_name, $arguments = array(), $load_only = false) {
 		$paths = array(
 			EE_LIBRARIES,
-			EE_LIBRARIES . 'messages' . DS,
-			EE_LIBRARIES . 'shortcodes' . DS,
-			EE_LIBRARIES . 'qtips' . DS,
-			EE_LIBRARIES . 'payment_methods' . DS,
+			EE_LIBRARIES.'messages'.DS,
+			EE_LIBRARIES.'shortcodes'.DS,
+			EE_LIBRARIES.'qtips'.DS,
+			EE_LIBRARIES.'payment_methods'.DS,
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, 'lib', $arguments, false, true, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'lib', $arguments, false, true, $load_only);
 	}
 
 
@@ -404,13 +404,13 @@ 
 	 * @param bool $load_only
 	 * @return EEM_Base
 	 */
-	public function load_model( $class_name, $arguments = array(), $load_only = false ) {
-		$paths = apply_filters( 'FHEE__EE_Registry__load_model__paths', array(
+	public function load_model($class_name, $arguments = array(), $load_only = false) {
+		$paths = apply_filters('FHEE__EE_Registry__load_model__paths', array(
 			EE_MODELS,
 			EE_CORE
-		) );
+		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EEM_', $class_name, 'model', $arguments, false, true, $load_only );
+		return $this->_load($paths, 'EEM_', $class_name, 'model', $arguments, false, true, $load_only);
 	}
 
 
@@ -423,15 +423,15 @@ 
 	 * @param bool $load_only
 	 * @return mixed
 	 */
-	public function load_model_class( $class_name, $arguments = array(), $load_only = true ) {
+	public function load_model_class($class_name, $arguments = array(), $load_only = true) {
 		$paths = array(
-			EE_MODELS . 'fields' . DS,
-			EE_MODELS . 'helpers' . DS,
-			EE_MODELS . 'relations' . DS,
-			EE_MODELS . 'strategies' . DS
+			EE_MODELS.'fields'.DS,
+			EE_MODELS.'helpers'.DS,
+			EE_MODELS.'relations'.DS,
+			EE_MODELS.'strategies'.DS
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, '', $arguments, false, true, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, '', $arguments, false, true, $load_only);
 	}
 
 
@@ -441,8 +441,8 @@ 
 	 * @param string $model_name like Event, Attendee, Question_Group_Question, etc.
 	 * @return boolean
 	 */
-	public function is_model_name( $model_name ) {
-		return isset( $this->models[ $model_name ] ) ? true : false;
+	public function is_model_name($model_name) {
+		return isset($this->models[$model_name]) ? true : false;
 	}
 
 
@@ -457,9 +457,9 @@ 
 	 * @param bool $load_only
 	 * @return mixed
 	 */
-	public function load_file( $path_to_file, $file_name, $type = '', $arguments = array(), $load_only = true ) {
+	public function load_file($path_to_file, $file_name, $type = '', $arguments = array(), $load_only = true) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, '', $file_name, $type, $arguments, false, true, $load_only );
+		return $this->_load($path_to_file, '', $file_name, $type, $arguments, false, true, $load_only);
 	}
 
 
@@ -474,9 +474,9 @@ 
 	 * @param bool $load_only
 	 * @return EE_Addon
 	 */
-	public function load_addon( $path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = false ) {
+	public function load_addon($path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = false) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, 'addon', $class_name, $type, $arguments, false, true, $load_only );
+		return $this->_load($path_to_file, 'addon', $class_name, $type, $arguments, false, true, $load_only);
 	}
 
 
@@ -508,27 +508,27 @@ 
 		$resolve_dependencies = false
 	) {
 		// strip php file extension
-		$class_name = str_replace( '.php', '', trim( $class_name ) );
+		$class_name = str_replace('.php', '', trim($class_name));
 		// does the class have a prefix ?
-		if ( ! empty( $class_prefix ) && $class_prefix != 'addon' ) {
+		if ( ! empty($class_prefix) && $class_prefix != 'addon') {
 			// make sure $class_prefix is uppercase
-			$class_prefix = strtoupper( trim( $class_prefix ) );
+			$class_prefix = strtoupper(trim($class_prefix));
 			// add class prefix ONCE!!!
-			$class_name = $class_prefix . str_replace( $class_prefix, '', $class_name );
+			$class_name = $class_prefix.str_replace($class_prefix, '', $class_name);
 		}
 		// return object if it's already cached
-		$cached_class = $this->_get_cached_class( $class_name, $class_prefix );
-		if ( $cached_class !== null ) {
+		$cached_class = $this->_get_cached_class($class_name, $class_prefix);
+		if ($cached_class !== null) {
 			return $cached_class;
 		}
 		// get full path to file
-		$path = $this->_resolve_path( $class_name, $type, $file_paths );
+		$path = $this->_resolve_path($class_name, $type, $file_paths);
 		// load the file
-		$this->_require_file( $path, $class_name, $type, $file_paths );
+		$this->_require_file($path, $class_name, $type, $file_paths);
 		// instantiate the requested object
-		$class_obj = $this->_create_object( $class_name, $arguments, $type, $from_db, $load_only, $resolve_dependencies );
+		$class_obj = $this->_create_object($class_name, $arguments, $type, $from_db, $load_only, $resolve_dependencies);
 		// save it for later... kinda like gum  { : $
-		$this->_set_cached_class( $class_obj, $class_name, $class_prefix, $from_db, $cache );
+		$this->_set_cached_class($class_obj, $class_name, $class_prefix, $from_db, $cache);
 		return $class_obj;
 	}
 
@@ -549,21 +549,21 @@ 
 	 * @param string $class_prefix
 	 * @return null|object
 	 */
-	protected function _get_cached_class( $class_name, $class_prefix = '' ) {
-		if ( isset( $this->_class_abbreviations[ $class_name ] ) ) {
-			$class_abbreviation = $this->_class_abbreviations[ $class_name ];
+	protected function _get_cached_class($class_name, $class_prefix = '') {
+		if (isset($this->_class_abbreviations[$class_name])) {
+			$class_abbreviation = $this->_class_abbreviations[$class_name];
 		} else {
 			// have to specify something, but not anything that will conflict
 			$class_abbreviation = 'FANCY_BATMAN_PANTS';
 		}
 		// check if class has already been loaded, and return it if it has been
-		if ( isset( $this->{$class_abbreviation} ) && ! is_null( $this->{$class_abbreviation} ) ) {
+		if (isset($this->{$class_abbreviation} ) && ! is_null($this->{$class_abbreviation} )) {
 			return $this->{$class_abbreviation};
-		} else if ( isset ( $this->{$class_name} ) ) {
+		} else if (isset ($this->{$class_name} )) {
 			return $this->{$class_name};
-		} else if ( isset ( $this->LIB->{$class_name} ) ) {
+		} else if (isset ($this->LIB->{$class_name} )) {
 			return $this->LIB->{$class_name};
-		} else if ( $class_prefix == 'addon' && isset ( $this->addons->{$class_name} ) ) {
+		} else if ($class_prefix == 'addon' && isset ($this->addons->{$class_name} )) {
 			return $this->addons->{$class_name};
 		}
 		return null;
@@ -584,20 +584,20 @@ 
 	 * @param array $file_paths
 	 * @return string | bool
 	 */
-	protected function _resolve_path( $class_name, $type = '', $file_paths = array() ) {
+	protected function _resolve_path($class_name, $type = '', $file_paths = array()) {
 		// make sure $file_paths is an array
-		$file_paths = is_array( $file_paths ) ? $file_paths : array( $file_paths );
+		$file_paths = is_array($file_paths) ? $file_paths : array($file_paths);
 		// cycle thru paths
-		foreach ( $file_paths as $key => $file_path ) {
+		foreach ($file_paths as $key => $file_path) {
 			// convert all separators to proper DS, if no filepath, then use EE_CLASSES
-			$file_path = $file_path ? str_replace( array( '/', '\\' ), DS, $file_path ) : EE_CLASSES;
+			$file_path = $file_path ? str_replace(array('/', '\\'), DS, $file_path) : EE_CLASSES;
 			// prep file type
-			$type = ! empty( $type ) ? trim( $type, '.' ) . '.' : '';
+			$type = ! empty($type) ? trim($type, '.').'.' : '';
 			// build full file path
-			$file_paths[ $key ] = rtrim( $file_path, DS ) . DS . $class_name . '.' . $type . 'php';
+			$file_paths[$key] = rtrim($file_path, DS).DS.$class_name.'.'.$type.'php';
 			//does the file exist and can be read ?
-			if ( is_readable( $file_paths[ $key ] ) ) {
-				return $file_paths[ $key ];
+			if (is_readable($file_paths[$key])) {
+				return $file_paths[$key];
 			}
 		}
 		return false;
@@ -619,29 +619,29 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _require_file( $path, $class_name, $type = '', $file_paths = array() ) {
+	protected function _require_file($path, $class_name, $type = '', $file_paths = array()) {
 		// don't give up! you gotta...
 		try {
 			//does the file exist and can it be read ?
-			if ( ! $path ) {
+			if ( ! $path) {
 				// so sorry, can't find the file
-				throw new EE_Error (
+				throw new EE_Error(
 					sprintf(
-						__( 'The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s', 'event_espresso' ),
-						trim( $type, '.' ),
+						__('The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s', 'event_espresso'),
+						trim($type, '.'),
 						$class_name,
-						'<br />' . implode( ',<br />', $file_paths )
+						'<br />'.implode(',<br />', $file_paths)
 					)
 				);
 			}
 			// get the file
-			require_once( $path );
+			require_once($path);
 			// if the class isn't already declared somewhere
-			if ( class_exists( $class_name, false ) === false ) {
+			if (class_exists($class_name, false) === false) {
 				// so sorry, not a class
 				throw new EE_Error(
 					sprintf(
-						__( 'The %s file %s does not appear to contain the %s Class.', 'event_espresso' ),
+						__('The %s file %s does not appear to contain the %s Class.', 'event_espresso'),
 						$type,
 						$path,
 						$class_name
@@ -649,7 +649,7 @@ 
 				);
 			}
 
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -681,52 +681,52 @@ 
 	 * @return null | object
 	 * @throws \EE_Error
 	 */
-	protected function _create_object( $class_name, $arguments = array(), $type = '', $from_db = false, $load_only = false, $resolve_dependencies = true ) {
+	protected function _create_object($class_name, $arguments = array(), $type = '', $from_db = false, $load_only = false, $resolve_dependencies = true) {
 		$class_obj = null;
-		$resolve_dependencies = isset( $this->_auto_resolve_dependencies[ $class_name ] ) /*&& empty( $arguments )*/ ? true : $resolve_dependencies;
+		$resolve_dependencies = isset($this->_auto_resolve_dependencies[$class_name]) /*&& empty( $arguments )*/ ? true : $resolve_dependencies;
 		// don't give up! you gotta...
 		try {
 			// create reflection
-			$reflector = $this->get_ReflectionClass( $class_name );
+			$reflector = $this->get_ReflectionClass($class_name);
 			// make sure arguments are an array
-			$arguments = is_array( $arguments ) ? $arguments : array( $arguments );
+			$arguments = is_array($arguments) ? $arguments : array($arguments);
 			// and if arguments array is NOT numerically indexed, then we want it to stay as an array,
 			// so wrap it in an additional array so that it doesn't get split into multiple parameters
-			$arguments = isset( $arguments[ 0 ] ) ? $arguments : array( $arguments );
+			$arguments = isset($arguments[0]) ? $arguments : array($arguments);
 			// attempt to inject dependencies ?
-			if ( $resolve_dependencies && ! $from_db && ! $load_only && ! $reflector->isSubclassOf( 'EE_Base_Class' ) ) {
-				$arguments = $this->_resolve_dependencies( $reflector, $class_name, $arguments );
+			if ($resolve_dependencies && ! $from_db && ! $load_only && ! $reflector->isSubclassOf('EE_Base_Class')) {
+				$arguments = $this->_resolve_dependencies($reflector, $class_name, $arguments);
 			}
 			// instantiate the class and add to the LIB array for tracking
 			// EE_Base_Classes are instantiated via new_instance by default (models call them via new_instance_from_db)
-			if ( $reflector->getConstructor() === null || $reflector->isAbstract() || $load_only ) {
+			if ($reflector->getConstructor() === null || $reflector->isAbstract() || $load_only) {
 				// no constructor = static methods only... nothing to instantiate, loading file was enough
 				//$instantiation_mode = "no constructor";
 				return true;
-			} else if ( $from_db && method_exists( $class_name, 'new_instance_from_db' ) ) {
+			} else if ($from_db && method_exists($class_name, 'new_instance_from_db')) {
 				//$instantiation_mode = "new_instance_from_db";
-				$class_obj = call_user_func_array( array( $class_name, 'new_instance_from_db' ), $arguments );
-			} else if ( method_exists( $class_name, 'new_instance' ) ) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance_from_db'), $arguments);
+			} else if (method_exists($class_name, 'new_instance')) {
 				//$instantiation_mode = "new_instance";
-				$class_obj = call_user_func_array( array( $class_name, 'new_instance' ), $arguments );
-			} else if ( method_exists( $class_name, 'instance' ) ) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance'), $arguments);
+			} else if (method_exists($class_name, 'instance')) {
 				//$instantiation_mode = "instance";
-				$class_obj = call_user_func_array( array( $class_name, 'instance' ), $arguments );
-			} else if ( $reflector->isInstantiable() ) {
+				$class_obj = call_user_func_array(array($class_name, 'instance'), $arguments);
+			} else if ($reflector->isInstantiable()) {
 				//$instantiation_mode = "isInstantiable";
-				$class_obj = $reflector->newInstanceArgs( $arguments );
-			} else if ( ! $load_only ) {
+				$class_obj = $reflector->newInstanceArgs($arguments);
+			} else if ( ! $load_only) {
 				// heh ? something's not right !
 				//$instantiation_mode = 'none';
 				throw new EE_Error(
 					sprintf(
-						__( 'The %s file %s could not be instantiated.', 'event_espresso' ),
+						__('The %s file %s could not be instantiated.', 'event_espresso'),
 						$type,
 						$class_name
 					)
 				);
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		return $class_obj;
@@ -744,14 +744,14 @@ 
 	 * @param string $class_name
 	 * @return ReflectionClass
 	 */
-	public function get_ReflectionClass( $class_name ) {
+	public function get_ReflectionClass($class_name) {
 		if (
-			! isset( $this->_reflectors[ $class_name ] )
-			|| ! $this->_reflectors[ $class_name ] instanceof ReflectionClass
+			! isset($this->_reflectors[$class_name])
+			|| ! $this->_reflectors[$class_name] instanceof ReflectionClass
 		) {
-			$this->_reflectors[ $class_name ] = new ReflectionClass( $class_name );
+			$this->_reflectors[$class_name] = new ReflectionClass($class_name);
 		}
-		return $this->_reflectors[ $class_name ];
+		return $this->_reflectors[$class_name];
 	}
 
 
@@ -776,19 +776,19 @@ 
 	 * @param array $arguments
 	 * @return array
 	 */
-	protected function _resolve_dependencies( ReflectionClass $reflector, $class_name, $arguments = array() ) {
+	protected function _resolve_dependencies(ReflectionClass $reflector, $class_name, $arguments = array()) {
 		// let's examine the constructor
 		$constructor = $reflector->getConstructor();
 		// whu? huh? nothing?
-		if ( ! $constructor ) {
+		if ( ! $constructor) {
 			return $arguments;
 		}
 		// get constructor parameters
 		$params = $constructor->getParameters();
 		// and the keys for the incoming arguments array so that we can compare existing arguments with what is expected
-		$argument_keys = array_keys( $arguments );
+		$argument_keys = array_keys($arguments);
 		// now loop thru all of the constructors expected parameters
-		foreach ( $params as $index => $param ) {
+		foreach ($params as $index => $param) {
 			// is this a dependency for a specific class ?
 			$param_class = $param->getClass() ? $param->getClass()->name : null;
 			if (
@@ -796,40 +796,40 @@ 
 				$param_class === null ||
 				(
 					// something already exists in the incoming arguments for this param
-					isset( $argument_keys[ $index ], $arguments[ $argument_keys[ $index ] ] )
+					isset($argument_keys[$index], $arguments[$argument_keys[$index]])
 					// AND it's the correct class
-					&& $arguments[ $argument_keys[ $index ] ] instanceof $param_class
+					&& $arguments[$argument_keys[$index]] instanceof $param_class
 				)
 
 			) {
 				// so let's skip this argument and move on to the next
 				continue;
 			} else if (
-				isset( $this->_auto_resolve_dependencies[ $class_name ] )
-				&& in_array( $param_class, $this->_auto_resolve_dependencies[ $class_name ] )
+				isset($this->_auto_resolve_dependencies[$class_name])
+				&& in_array($param_class, $this->_auto_resolve_dependencies[$class_name])
 			) {
 				// we might have a dependency... let's try and find it in our cache
-				$cached_class = $this->_get_cached_class( $param_class );
+				$cached_class = $this->_get_cached_class($param_class);
 				$dependency = null;
 				// and grab it if it exists
-				if ( $cached_class instanceof $param_class ) {
+				if ($cached_class instanceof $param_class) {
 					$dependency = $cached_class;
-				} else if ( $param_class != $class_name ) {
-					$loader = EE_Dependency_Map::class_loader( $param_class );
+				} else if ($param_class != $class_name) {
+					$loader = EE_Dependency_Map::class_loader($param_class);
 					// or if not cached, then let's try and load it directly
-					$core_class = $this->$loader( $param_class );
+					$core_class = $this->$loader($param_class);
 					// as long as we aren't creating some recursive loading loop
-					if ( $core_class instanceof $param_class ) {
+					if ($core_class instanceof $param_class) {
 						$dependency = $core_class;
 					}
 				}
 				// did we successfully find the correct dependency ?
-				if ( $dependency instanceof $param_class ) {
+				if ($dependency instanceof $param_class) {
 					// then let's inject it into the incoming array of arguments at the correct location
-					array_splice( $arguments, $index, 1, array( $dependency ) );
+					array_splice($arguments, $index, 1, array($dependency));
 				}
 			} else {
-				$arguments[ $index ] = null;
+				$arguments[$index] = null;
 			}
 
 		}
@@ -858,16 +858,16 @@ 
 	 * @param bool $cache
 	 * @return void
 	 */
-	protected function _set_cached_class( $class_obj, $class_name, $class_prefix = '', $from_db = false, $cache = true ) {
+	protected function _set_cached_class($class_obj, $class_name, $class_prefix = '', $from_db = false, $cache = true) {
 		// return newly instantiated class
-		if ( isset( $this->_class_abbreviations[ $class_name ] ) ) {
-			$class_abbreviation = $this->_class_abbreviations[ $class_name ];
+		if (isset($this->_class_abbreviations[$class_name])) {
+			$class_abbreviation = $this->_class_abbreviations[$class_name];
 			$this->{$class_abbreviation} = $class_obj;
-		} else if ( property_exists( $this, $class_name ) ) {
+		} else if (property_exists($this, $class_name)) {
 			$this->{$class_name} = $class_obj;
-		} else if ( $class_prefix == 'addon' && $cache ) {
+		} else if ($class_prefix == 'addon' && $cache) {
 			$this->addons->{$class_name} = $class_obj;
-		} else if ( ! $from_db && $cache ) {
+		} else if ( ! $from_db && $cache) {
 			$this->LIB->{$class_name} = $class_obj;
 		}
 	}
@@ -880,9 +880,9 @@ 
 	 * @param string $name
 	 * @return EE_Addon
 	 */
-	public function get_addon_by_name( $name ) {
-		foreach ( $this->addons as $addon ) {
-			if ( $addon->name() == $name ) {
+	public function get_addon_by_name($name) {
+		foreach ($this->addons as $addon) {
+			if ($addon->name() == $name) {
 				return $addon;
 			}
 		}
@@ -898,8 +898,8 @@ 
 	 */
 	public function get_addons_by_name() {
 		$addons = array();
-		foreach ( $this->addons as $addon ) {
-			$addons[ $addon->name() ] = $addon;
+		foreach ($this->addons as $addon) {
+			$addons[$addon->name()] = $addon;
 		}
 		return $addons;
 	}
@@ -914,14 +914,14 @@ 
 	 * @return \EEM_Base
 	 * @throws \EE_Error
 	 */
-	public function reset_model( $model_name ) {
-		$model = $this->load_model( $model_name );
-		$model_class_name = get_class( $model );
+	public function reset_model($model_name) {
+		$model = $this->load_model($model_name);
+		$model_class_name = get_class($model);
 		//get that model reset it and make sure we nuke the old reference to it
-		if ( $model instanceof $model_class_name && is_callable( array( $model_class_name, 'reset' ))) {
+		if ($model instanceof $model_class_name && is_callable(array($model_class_name, 'reset'))) {
 			$this->LIB->$model_class_name = $model::reset();
 		} else {
-			throw new EE_Error( sprintf( __( 'Model %s does not have a method "reset"', 'event_espresso' ), $model_name ) );
+			throw new EE_Error(sprintf(__('Model %s does not have a method "reset"', 'event_espresso'), $model_name));
 		}
 		return $this->LIB->$model_class_name;
 	}
@@ -939,15 +939,15 @@ 
 	 * currently reinstantiate the singletons at the moment)
 	 * @return EE_Registry
 	 */
-	public static function reset( $hard = false, $reinstantiate = true ) {
+	public static function reset($hard = false, $reinstantiate = true) {
 		$instance = self::instance();
-		$instance->load_helper( 'Activation' );
+		$instance->load_helper('Activation');
 		EEH_Activation::reset();
-		$instance->CFG = EE_Config::reset( $hard, $reinstantiate );
+		$instance->CFG = EE_Config::reset($hard, $reinstantiate);
 		$instance->LIB->EE_Data_Migration_Manager = EE_Data_Migration_Manager::reset();
 		$instance->LIB = new stdClass();
-		foreach ( array_keys( $instance->non_abstract_db_models ) as $model_name ) {
-			$instance->reset_model( $model_name );
+		foreach (array_keys($instance->non_abstract_db_models) as $model_name) {
+			$instance->reset_model($model_name);
 		}
 		return $instance;
 	}
@@ -967,7 +967,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __call( $a, $b ) {
+	final function __call($a, $b) {
 	}
 
 
@@ -975,7 +975,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __get( $a ) {
+	final function __get($a) {
 	}
 
 
@@ -984,7 +984,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __set( $a, $b ) {
+	final function __set($a, $b) {
 	}
 
 
@@ -992,7 +992,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __isset( $a ) {
+	final function __isset($a) {
 	}
 
 
@@ -1000,7 +1000,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __unset( $a ) {
+	final function __unset($a) {
 	}
 
 
@@ -1047,7 +1047,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final static function __callStatic( $a, $b ) {
+	final static function __callStatic($a, $b) {
 	}
 
 	/**
@@ -1056,9 +1056,9 @@ 
 	 */
 	public function cpt_models() {
 		$cpt_models = array();
-		foreach( $this->non_abstract_db_models as $short_name => $classname ) {
-			if( is_subclass_of(  $classname, 'EEM_CPT_Base' ) ) {
-				$cpt_models[ $short_name ] = $classname;
+		foreach ($this->non_abstract_db_models as $short_name => $classname) {
+			if (is_subclass_of($classname, 'EEM_CPT_Base')) {
+				$cpt_models[$short_name] = $classname;
 			}
 		}
 		return $cpt_models;

core/EE_Dependency_Map.core.php

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -42,7 +42,7 @@ 
 	protected function __construct() {
 		$this->_register_core_dependencies();
 		$this->_register_core_class_loaders();
-		do_action( 'EE_Dependency_Map____construct' );
+		do_action('EE_Dependency_Map____construct');
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Dependency_Map ) {
+		if ( ! self::$_instance instanceof EE_Dependency_Map) {
 			self::$_instance = new EE_Dependency_Map();
 		}
 		return self::$_instance;
@@ -76,9 +76,9 @@ 
 	 * @param array $dependencies
 	 * @return boolean
 	 */
-	public static function register_dependencies( $class, $dependencies ) {
-		if ( ! isset( self::$_dependency_map[ $class ] ) ) {
-			self::$_dependency_map[ $class ] = (array)$dependencies;
+	public static function register_dependencies($class, $dependencies) {
+		if ( ! isset(self::$_dependency_map[$class])) {
+			self::$_dependency_map[$class] = (array) $dependencies;
 			return true;
 		}
 		return false;
@@ -90,8 +90,8 @@ 
 	 * @param string $class_name
 	 * @return array
 	 */
-	public static function class_loader( $class_name ) {
-		return isset( self::$_class_loaders[ $class_name ] ) ? self::$_class_loaders[ $class_name ] : '';
+	public static function class_loader($class_name) {
+		return isset(self::$_class_loaders[$class_name]) ? self::$_class_loaders[$class_name] : '';
 	}
 
 
@@ -102,18 +102,18 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public static function register_class_loader( $class_name, $loader = 'load_core' ) {
+	public static function register_class_loader($class_name, $loader = 'load_core') {
 		// check that loader method starts with "load_" and exists in EE_Registry
-		if ( strpos( $loader, 'load_' ) !== 0 || ! method_exists( EE_Registry::instance(), $loader ) ) {
+		if (strpos($loader, 'load_') !== 0 || ! method_exists(EE_Registry::instance(), $loader)) {
 			throw new EE_Error(
 				sprintf(
-					__( '"%1$s" is not a valid loader method on EE_Registry.', 'event_espresso' ),
+					__('"%1$s" is not a valid loader method on EE_Registry.', 'event_espresso'),
 					$loader
 				)
 			);
 		}
-		if ( ! isset( self::$_class_loaders[ $class_name ] ) ) {
-			self::$_class_loaders[ $class_name ] = $loader;
+		if ( ! isset(self::$_class_loaders[$class_name])) {
+			self::$_class_loaders[$class_name] = $loader;
 			return true;
 		}
 		return false;

core/db_classes/EE_Message.class.php

Spacing +101 added lines, -101 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * EE_Message class
@@ -48,14 +48,14 @@ 
 	 * @param array $date_formats incoming date formats in an array.  First value is the date_format, second is time format.
 	 * @return EE_Message
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
 		//if object doesn't exist, let's generate a unique token on instantiation so that its available even before saving to db.
-		if ( ! $has_object ) {
-			EE_Registry::instance()->load_helper( 'URL' );
+		if ( ! $has_object) {
+			EE_Registry::instance()->load_helper('URL');
 			$props_n_values['MSG_token'] = EEH_URL::generate_unique_token();
 		}
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -66,8 +66,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Message
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, true, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, true, $timezone);
 	}
 
 
@@ -78,7 +78,7 @@ 
 	 * @return int
 	 */
 	public function MSG_token() {
-		return $this->get( 'MSG_token' );
+		return $this->get('MSG_token');
 	}
 
 
@@ -88,8 +88,8 @@ 
 	 *
 	 * @param int $MSG_token
 	 */
-	public function set_MSG_token( $MSG_token) {
-		$this->set( 'MSG_token', $MSG_token );
+	public function set_MSG_token($MSG_token) {
+		$this->set('MSG_token', $MSG_token);
 	}
 
 
@@ -101,7 +101,7 @@ 
 	 * @return int
 	 */
 	public function GRP_ID() {
-		return $this->get( 'GRP_ID' );
+		return $this->get('GRP_ID');
 	}
 
 
@@ -111,8 +111,8 @@ 
 	 *
 	 * @param int $GRP_ID
 	 */
-	public function set_GRP_ID( $GRP_ID ) {
-		$this->set( 'GRP_ID', $GRP_ID );
+	public function set_GRP_ID($GRP_ID) {
+		$this->set('GRP_ID', $GRP_ID);
 	}
 
 
@@ -124,7 +124,7 @@ 
 	 * @return int
 	 */
 	public function TXN_ID() {
-		return $this->get( 'TXN_ID' );
+		return $this->get('TXN_ID');
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 *
 	 * @param int $TXN_ID
 	 */
-	public function set_TXN_ID( $TXN_ID) {
-		$this->set( 'TXN_ID', $TXN_ID );
+	public function set_TXN_ID($TXN_ID) {
+		$this->set('TXN_ID', $TXN_ID);
 	}
 
 
@@ -147,7 +147,7 @@ 
 	 * @return string
 	 */
 	public function messenger() {
-		return $this->get( 'MSG_messenger' );
+		return $this->get('MSG_messenger');
 	}
 
 
@@ -157,8 +157,8 @@ 
 	 *
 	 * @param string $messenger
 	 */
-	public function set_messenger( $messenger ) {
-		$this->set( 'MSG_messenger', $messenger );
+	public function set_messenger($messenger) {
+		$this->set('MSG_messenger', $messenger);
 	}
 
 
@@ -179,7 +179,7 @@ 
 	 *
 	 * @param EE_Messenger $messenger
 	 */
-	public function set_messenger_object( EE_Messenger $messenger ) {
+	public function set_messenger_object(EE_Messenger $messenger) {
 		$this->_messenger = $messenger;
 	}
 
@@ -192,11 +192,11 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function valid_messenger( $throw_exceptions = false ) {
-		if ( $this->_messenger instanceof EE_Messenger ) {
+	public function valid_messenger($throw_exceptions = false) {
+		if ($this->_messenger instanceof EE_Messenger) {
 			return true;
 		}
-		if ( $throw_exceptions ) {
+		if ($throw_exceptions) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -220,10 +220,10 @@ 
 	 * @param   bool    $plural whether to return the plural label or not.
 	 * @return string
 	 */
-	public function messenger_label( $plural = false ) {
+	public function messenger_label($plural = false) {
 		$label_type = $plural ? 'plural' : 'singular';
 		$messenger = $this->messenger_object();
-		return $messenger instanceof EE_Messenger ? $messenger->label[ $label_type ] : $this->messenger();
+		return $messenger instanceof EE_Messenger ? $messenger->label[$label_type] : $this->messenger();
 	}
 
 
@@ -234,7 +234,7 @@ 
 	 * @return string
 	 */
 	public function message_type() {
-		return $this->get( 'MSG_message_type' );
+		return $this->get('MSG_message_type');
 	}
 
 
@@ -244,8 +244,8 @@ 
 	 *
 	 * @param string $message_type
 	 */
-	public function set_message_type( $message_type ) {
-		$this->set( 'MSG_message_type', $message_type );
+	public function set_message_type($message_type) {
+		$this->set('MSG_message_type', $message_type);
 	}
 
 
@@ -266,7 +266,7 @@ 
 	 *
 	 * @param EE_Message_Type $message_type
 	 */
-	public function set_message_type_object( EE_Message_Type $message_type ) {
+	public function set_message_type_object(EE_Message_Type $message_type) {
 		$this->_message_type = $message_type;
 	}
 
@@ -279,11 +279,11 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function valid_message_type( $throw_exceptions = false ) {
-		if ( $this->_message_type instanceof EE_Message_Type ) {
+	public function valid_message_type($throw_exceptions = false) {
+		if ($this->_message_type instanceof EE_Message_Type) {
 			return true;
 		}
-		if ( $throw_exceptions ) {
+		if ($throw_exceptions) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -306,8 +306,8 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function is_valid( $throw_exceptions = false ) {
-		if ( $this->valid_messenger( $throw_exceptions ) && $this->valid_message_type( $throw_exceptions ) ) {
+	public function is_valid($throw_exceptions = false) {
+		if ($this->valid_messenger($throw_exceptions) && $this->valid_message_type($throw_exceptions)) {
 			return true;
 		}
 		return false;
@@ -323,10 +323,10 @@ 
 	 * @param   bool    $plural whether to return the plural label or not.
 	 * @return string
 	 */
-	public function message_type_label( $plural = false ) {
+	public function message_type_label($plural = false) {
 		$label_type = $plural ? 'plural' : 'singular';
 		$message_type = $this->message_type_object();
-		return $message_type instanceof EE_message_type ? $message_type->label[ $label_type ] : $this->message_type();
+		return $message_type instanceof EE_message_type ? $message_type->label[$label_type] : $this->message_type();
 	}
 
 
@@ -337,7 +337,7 @@ 
 	 * @return string
 	 */
 	public function context() {
-		return $this->get( 'MSG_context' );
+		return $this->get('MSG_context');
 	}
 
 
@@ -351,9 +351,9 @@ 
 	 */
 	public function context_label() {
 		/** @type EE_Messages $messages_controller */
-		$messages_controller = EE_Registry::instance()->load_lib( 'messages' );
+		$messages_controller = EE_Registry::instance()->load_lib('messages');
 		$contexts = $messages_controller->get_all_contexts();
-		return isset( $contexts[ $this->context() ] ) ? $contexts[ $this->context() ] : $this->context();
+		return isset($contexts[$this->context()]) ? $contexts[$this->context()] : $this->context();
 	}
 
 
@@ -363,8 +363,8 @@ 
 	 *
 	 * @param string $context
 	 */
-	public function set_context( $context ) {
-		$this->set( 'MSG_context', $context );
+	public function set_context($context) {
+		$this->set('MSG_context', $context);
 	}
 
 
@@ -375,7 +375,7 @@ 
 	 * @return int
 	 */
 	public function recipient_ID() {
-		return $this->get( 'MSG_recipient_ID' );
+		return $this->get('MSG_recipient_ID');
 	}
 
 
@@ -385,8 +385,8 @@ 
 	 *
 	 * @param string $recipient_ID
 	 */
-	public function set_recipient_ID( $recipient_ID ) {
-		$this->set( 'MSG_recipient_ID', $recipient_ID );
+	public function set_recipient_ID($recipient_ID) {
+		$this->set('MSG_recipient_ID', $recipient_ID);
 	}
 
 
@@ -397,7 +397,7 @@ 
 	 * @return string
 	 */
 	public function recipient_type() {
-		return $this->get( 'MSG_recipient_type' );
+		return $this->get('MSG_recipient_type');
 	}
 
 
@@ -409,11 +409,11 @@ 
 	 * @return EE_Base_Class | null
 	 */
 	public function recipient_object() {
-		if ( ! $this->recipient_type() || ! $this->recipient_ID() ) {
+		if ( ! $this->recipient_type() || ! $this->recipient_ID()) {
 			return null;
 		}
 
-		return $this->get_first_related( $this->recipient_type() );
+		return $this->get_first_related($this->recipient_type());
 	}
 
 
@@ -423,8 +423,8 @@ 
 	 *
 	 * @param string $recipient_type
 	 */
-	public function set_recipient_type( $recipient_type ) {
-		$this->set( 'MSG_recipient_type', $recipient_type );
+	public function set_recipient_type($recipient_type) {
+		$this->set('MSG_recipient_type', $recipient_type);
 	}
 
 
@@ -435,7 +435,7 @@ 
 	 * @return string
 	 */
 	public function content() {
-		return $this->get( 'MSG_content' );
+		return $this->get('MSG_content');
 	}
 
 
@@ -445,8 +445,8 @@ 
 	 *
 	 * @param string $content
 	 */
-	public function set_content( $content ) {
-		$this->set( 'MSG_content', $content );
+	public function set_content($content) {
+		$this->set('MSG_content', $content);
 	}
 
 
@@ -457,7 +457,7 @@ 
 	 * @return string
 	 */
 	public function subject() {
-		return $this->get( 'MSG_subject' );
+		return $this->get('MSG_subject');
 	}
 
 
@@ -467,8 +467,8 @@ 
 	 *
 	 * @param string $subject
 	 */
-	public function set_subject( $subject ) {
-		$this->set( 'MSG_subject', $subject );
+	public function set_subject($subject) {
+		$this->set('MSG_subject', $subject);
 	}
 
 
@@ -479,8 +479,8 @@ 
 	 * @return string
 	 */
 	public function to() {
-		$to = $this->get( 'MSG_to' );
-		return empty( $to ) ? __( 'No recipient', 'event_espresso' ) : $to;
+		$to = $this->get('MSG_to');
+		return empty($to) ? __('No recipient', 'event_espresso') : $to;
 	}
 
 
@@ -490,8 +490,8 @@ 
 	 *
 	 * @param string $to
 	 */
-	public function set_to( $to ) {
-		$this->set( 'MSG_to', $to );
+	public function set_to($to) {
+		$this->set('MSG_to', $to);
 	}
 
 
@@ -502,7 +502,7 @@ 
 	 * @return string
 	 */
 	public function from() {
-		return $this->get( 'MSG_from' );
+		return $this->get('MSG_from');
 	}
 
 
@@ -512,8 +512,8 @@ 
 	 *
 	 * @param string $from
 	 */
-	public function set_from( $from ) {
-		$this->set( 'MSG_from', $from );
+	public function set_from($from) {
+		$this->set('MSG_from', $from);
 	}
 
 
@@ -526,7 +526,7 @@ 
 	 * @return int
 	 */
 	public function priority() {
-		return $this->get( 'MSG_priority' );
+		return $this->get('MSG_priority');
 	}
 
 
@@ -536,8 +536,8 @@ 
 	 *
 	 * @param int $priority
 	 */
-	public function set_priority( $priority ) {
-		$this->set( 'MSG_priority', $priority );
+	public function set_priority($priority) {
+		$this->set('MSG_priority', $priority);
 	}
 
 
@@ -548,7 +548,7 @@ 
 	 * @return string
 	 */
 	public function STS_ID() {
-		return $this->get( 'STS_ID' );
+		return $this->get('STS_ID');
 	}
 
 
@@ -558,8 +558,8 @@ 
 	 *
 	 * @param string $STS_ID
 	 */
-	public function set_STS_ID( $STS_ID ) {
-		$this->set( 'STS_ID', $STS_ID );
+	public function set_STS_ID($STS_ID) {
+		$this->set('STS_ID', $STS_ID);
 	}
 
 
@@ -570,7 +570,7 @@ 
 	 * @return string
 	 */
 	public function created() {
-		return $this->get( 'MSG_created' );
+		return $this->get('MSG_created');
 	}
 
 
@@ -580,8 +580,8 @@ 
 	 *
 	 * @param string $created
 	 */
-	public function set_created( $created ) {
-		$this->set( 'MSG_created', $created );
+	public function set_created($created) {
+		$this->set('MSG_created', $created);
 	}
 
 
@@ -592,7 +592,7 @@ 
 	 * @return string
 	 */
 	public function modified() {
-		return $this->get( 'MSG_modified' );
+		return $this->get('MSG_modified');
 	}
 
 
@@ -602,8 +602,8 @@ 
 	 *
 	 * @param string $modified
 	 */
-	public function set_modified( $modified ) {
-		$this->set( 'MSG_modified', $modified );
+	public function set_modified($modified) {
+		$this->set('MSG_modified', $modified);
 	}
 
 
@@ -613,8 +613,8 @@ 
 	 * Sets generation data for this message.
 	 * @param mixed $data
 	 */
-	public function set_generation_data( $data ) {
-		$this->set_field_or_extra_meta( 'MSG_generation_data', $data );
+	public function set_generation_data($data) {
+		$this->set_field_or_extra_meta('MSG_generation_data', $data);
 	}
 
 
@@ -626,7 +626,7 @@ 
 	 * @return mixed|null
 	 */
 	public function get_generation_data() {
-		return $this->get_field_or_extra_meta( 'MSG_generation_data' );
+		return $this->get_field_or_extra_meta('MSG_generation_data');
 	}
 
 
@@ -637,7 +637,7 @@ 
 	 * @return mixed|null
 	 */
 	public function error_message() {
-		return $this->get_field_or_extra_meta( 'MSG_error' );
+		return $this->get_field_or_extra_meta('MSG_error');
 	}
 
 
@@ -646,8 +646,8 @@ 
 	 * @param $message
 	 * @return bool|int
 	 */
-	public function set_error_message( $message ) {
-		return $this->set_field_or_extra_meta( 'MSG_error', $message );
+	public function set_error_message($message) {
+		return $this->set_field_or_extra_meta('MSG_error', $message);
 	}
 
 
@@ -661,18 +661,18 @@ 
 		/**
 		 * This is deprecated functionality that will be removed eventually but included here now for backward compat.
 		 */
-		if ( ! empty( $this->template_pack ) ) {
+		if ( ! empty($this->template_pack)) {
 			return $this->template_pack;
 		}
 		/** @type EE_Message_Template_Group $grp */
-		$grp = $this->get_first_related( 'Message_Template_Group' );
+		$grp = $this->get_first_related('Message_Template_Group');
 		//if no group then let's try to get the first related group by internal messenger and message type (will use global grp).
-		if ( ! $grp instanceof EE_Message_Template_Group ) {
-			$grp = EEM_Message_Template_Group::instance()->get_one( array( array(
+		if ( ! $grp instanceof EE_Message_Template_Group) {
+			$grp = EEM_Message_Template_Group::instance()->get_one(array(array(
 				'MTP_messenger' => $this->messenger(),
 				'MTP_message_type' => $this->message_type(),
 				'MTP_is_global' => true
-			) ) );
+			)));
 		}
 
 		return $grp instanceof EE_Message_Template_Group ? $grp->get_template_pack() : null;
@@ -689,20 +689,20 @@ 
 		/**
 		 * This is deprecated functionality that will be removed eventually but included here now for backward compat.
 		 */
-		if ( ! empty( $this->template_variation ) ) {
+		if ( ! empty($this->template_variation)) {
 			return $this->template_variation;
 		}
 
 		/** @type EE_Message_Template_Group $grp */
-		$grp = $this->get_first_related( 'Message_Template_Group' );
+		$grp = $this->get_first_related('Message_Template_Group');
 
 		//if no group then let's try to get the first related group by internal messenger and message type (will use global grp).
-		if ( ! $grp instanceof EE_Message_Template_Group ) {
-			$grp = EEM_Message_Template_Group::instance()->get_one( array( array(
+		if ( ! $grp instanceof EE_Message_Template_Group) {
+			$grp = EEM_Message_Template_Group::instance()->get_one(array(array(
 				'MTP_messenger' => $this->messenger(),
 				'MTP_message_type' => $this->message_type(),
 				'MTP_is_global' => true
-			) ) );
+			)));
 		}
 
 		return $grp instanceof EE_Message_Template_Group ? $grp->get_template_pack_variation() : '';
@@ -713,15 +713,15 @@ 
 	 * @return string
 	 */
 	public function get_admin_details_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		switch ( $this->STS_ID() ) {
+		EE_Registry::instance()->load_helper('URL');
+		EE_Registry::instance()->load_helper('MSG_Template');
+		switch ($this->STS_ID()) {
 			case EEM_Message::status_failed :
-				return EEH_MSG_Template::generate_error_display_trigger( $this );
+				return EEH_MSG_Template::generate_error_display_trigger($this);
 				break;
 
 			case EEM_Message::status_sent :
-				return EEH_MSG_Template::generate_browser_trigger( $this );
+				return EEH_MSG_Template::generate_browser_trigger($this);
 				break;
 
 			default :
@@ -742,13 +742,13 @@ 
 	 * @return string
 	 */
 	public function get_admin_settings_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 		return EEH_URL::add_query_args_and_nonce(
 			array(
 				'page' => 'espresso_messages',
 				'action' => 'settings',
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 
@@ -757,13 +757,13 @@ 
 	 * @return string
 	 */
 	public function get_admin_overview_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 		return EEH_URL::add_query_args_and_nonce(
 			array(
 				'page' => 'espresso_messages',
 				'action' => 'default',
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 

core/EE_Load_Espresso_Core.core.php

Spacing +18 added lines, -18 removed lines

@@ -50,7 +50,7 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->request = $request;
 		$this->response = $response;
 		// info about how to load classes required by other classes
@@ -60,14 +60,14 @@ 
 		// workarounds for PHP < 5.3
 		$this->_load_class_tools();
 		// PSR4 Autoloaders
-		EE_Registry::instance()->load_core( 'EE_Psr4AutoloaderInit' );
+		EE_Registry::instance()->load_core('EE_Psr4AutoloaderInit');
 		// deprecated functions
-		espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' );
+		espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
 		// load interfaces
-		espresso_load_required( 'EEI_Payment_Method_Interfaces', EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php' );
+		espresso_load_required('EEI_Payment_Method_Interfaces', EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php');
 		//// WP cron jobs
-		EE_Registry::instance()->load_core( 'Cron_Tasks' );
-		EE_Registry::instance()->load_core( 'EE_System' );
+		EE_Registry::instance()->load_core('Cron_Tasks');
+		EE_Registry::instance()->load_core('EE_System');
 
 		return $this->response;
 	}
@@ -81,15 +81,15 @@ 
 	 * 	@return void
 	 */
 	private function _load_dependency_map() {
-		if ( is_readable( EE_CORE . 'EE_Dependency_Map.core.php' ) ) {
-			require_once( EE_CORE . 'EE_Dependency_Map.core.php' );
+		if (is_readable(EE_CORE.'EE_Dependency_Map.core.php')) {
+			require_once(EE_CORE.'EE_Dependency_Map.core.php');
 			EE_Dependency_Map::instance();
 		} else {
 			EE_Error::add_error(
-				__( 'The EE_Dependency_Map core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Dependency_Map core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
 	}
 
@@ -102,15 +102,15 @@ 
 	 * 	@return void
 	 */
 	private function _load_registry() {
-		if ( is_readable( EE_CORE . 'EE_Registry.core.php' )) {
-			require_once( EE_CORE . 'EE_Registry.core.php' );
+		if (is_readable(EE_CORE.'EE_Registry.core.php')) {
+			require_once(EE_CORE.'EE_Registry.core.php');
 			EE_Registry::instance();
 		} else {
 			EE_Error::add_error(
-				__( 'The EE_Registry core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Registry core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
 	}
 
@@ -122,11 +122,11 @@ 
 	 * 	@return void
 	 */
 	private function _load_class_tools() {
-		if ( is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) {
-			require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' );
+		if (is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) {
+			require_once(EE_HELPERS.'EEH_Class_Tools.helper.php');
 		} else {
 			EE_Error::add_error(
-				__( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' ),
+				__('The EEH_Class_Tools helper could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -143,7 +143,7 @@ 
 	 * @param \EE_Request $request
 	 * @param \EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response ) {
+	public function handle_response(EE_Request $request, EE_Response $response) {
 		//EEH_Debug_Tools::printr( $request, '$request', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $response, '$response', __FILE__, __LINE__ );
 		//die();

core/db_models/EEM_Message.model.php

Spacing +55 added lines, -55 removed lines

@@ -92,42 +92,42 @@ 
 	 *
 	 * @return EEM_Message
 	 */
-	protected function __construct( $timezone = null ) {
-		$this->singular_item = __('Message','event_espresso');
-		$this->plural_item = __('Messages','event_espresso');
+	protected function __construct($timezone = null) {
+		$this->singular_item = __('Message', 'event_espresso');
+		$this->plural_item = __('Messages', 'event_espresso');
 
 		//used for token generator
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 
 		$this->_tables = array(
-			'Message'=>new EE_Primary_Table('esp_message','MSG_ID')
+			'Message'=>new EE_Primary_Table('esp_message', 'MSG_ID')
 		);
 
 		$allowed_priority = array(
-			self::priority_high => __( 'high', 'event_espresso' ),
-			self::priority_medium => __( 'medium', 'event_espresso' ),
-			self::priority_low => __( 'low', 'event_espresso' )
+			self::priority_high => __('high', 'event_espresso'),
+			self::priority_medium => __('medium', 'event_espresso'),
+			self::priority_low => __('low', 'event_espresso')
 		);
 
 		$this->_fields = array(
 			'Message'=>array(
-				'MSG_ID'=>new EE_Primary_Key_Int_Field('MSG_ID', __('Message ID','event_espresso')),
-				'MSG_token' => new EE_Plain_Text_Field( 'MSG_token', __('Unique Token used to represent this row in publicly viewable contexts (eg. a url).', 'event_espresso' ), false, EEH_URL::generate_unique_token() ),
-				'GRP_ID'=>new EE_Foreign_Key_Int_Field( 'GRP_ID', __('Foreign key to the EEM_Message_Template_Group table.', 'event_espresso' ), true, 0, 'Message_Template_Group' ),
-				'TXN_ID' => new EE_Foreign_Key_Int_Field( 'TXN_ID', __( 'Foreign key to the related EE_Transaction.  This is required to give context for regenerating the specific message', 'event_espresso' ), true, 0, 'Transaction' ),
-				'MSG_messenger' => new EE_Plain_Text_Field('MSG_messenger', __( 'Corresponds to the EE_Messenger::name used to send this message. This will also be used to attempt any resending of the message.', 'event_espresso' ), false, 'email' ),
-				'MSG_message_type' => new EE_Plain_Text_Field( 'MSG_message_type', __( 'Corresponds to the EE_message_type::name used to generate this message.', 'event_espresso' ), false, 'receipt' ),
-				'MSG_context' => new EE_Plain_Text_Field( 'MSG_context', __( 'Context', 'event_espresso' ), false ),
-				'MSG_recipient_ID' => new EE_Foreign_Key_Int_Field( 'MSG_recipient_ID', __( 'Recipient ID', 'event_espresso' ), true, null, array( 'Registration', 'Attendee', 'WP_User' ) ),
-				'MSG_recipient_type' => new EE_Any_Foreign_Model_Name_Field( 'MSG_recipient_type', __( 'Recipient Type', 'event_espresso' ), true, null, array( 'Registration', 'Attendee', 'WP_User' ) ),
-				'MSG_content' => new EE_Maybe_Serialized_Text_Field( 'MSG_content', __( 'Content', 'event_espresso' ), true, '' ),
-				'MSG_to' => new EE_Maybe_Serialized_Text_Field( 'MSG_to', __( 'Address To', 'event_espresso' ), true ),
-				'MSG_from' => new EE_Maybe_Serialized_Text_Field( 'MSG_from', __( 'Address From', 'event_espresso' ), true ),
-				'MSG_subject' => new EE_Maybe_Serialized_Text_Field( 'MSG_subject', __( 'Subject', 'event_espresso' ), true, '' ),
-				'MSG_priority' => new EE_Enum_Integer_Field( 'MSG_priority', __( 'Priority', 'event_espresso' ), false, self::priority_low, $allowed_priority ),
-				'STS_ID' => new EE_Foreign_Key_String_Field( 'STS_ID', __( 'Status', 'event_espresso' ), false, self::status_incomplete, 'Status' ),
-				'MSG_created' => new EE_Datetime_Field( 'MSG_created', __( 'Created', 'event_espresso' ), false, time() ),
-				'MSG_modified' => new EE_Datetime_Field( 'MSG_modified', __( 'Modified', 'event_espresso' ), true, time() )
+				'MSG_ID'=>new EE_Primary_Key_Int_Field('MSG_ID', __('Message ID', 'event_espresso')),
+				'MSG_token' => new EE_Plain_Text_Field('MSG_token', __('Unique Token used to represent this row in publicly viewable contexts (eg. a url).', 'event_espresso'), false, EEH_URL::generate_unique_token()),
+				'GRP_ID'=>new EE_Foreign_Key_Int_Field('GRP_ID', __('Foreign key to the EEM_Message_Template_Group table.', 'event_espresso'), true, 0, 'Message_Template_Group'),
+				'TXN_ID' => new EE_Foreign_Key_Int_Field('TXN_ID', __('Foreign key to the related EE_Transaction.  This is required to give context for regenerating the specific message', 'event_espresso'), true, 0, 'Transaction'),
+				'MSG_messenger' => new EE_Plain_Text_Field('MSG_messenger', __('Corresponds to the EE_Messenger::name used to send this message. This will also be used to attempt any resending of the message.', 'event_espresso'), false, 'email'),
+				'MSG_message_type' => new EE_Plain_Text_Field('MSG_message_type', __('Corresponds to the EE_message_type::name used to generate this message.', 'event_espresso'), false, 'receipt'),
+				'MSG_context' => new EE_Plain_Text_Field('MSG_context', __('Context', 'event_espresso'), false),
+				'MSG_recipient_ID' => new EE_Foreign_Key_Int_Field('MSG_recipient_ID', __('Recipient ID', 'event_espresso'), true, null, array('Registration', 'Attendee', 'WP_User')),
+				'MSG_recipient_type' => new EE_Any_Foreign_Model_Name_Field('MSG_recipient_type', __('Recipient Type', 'event_espresso'), true, null, array('Registration', 'Attendee', 'WP_User')),
+				'MSG_content' => new EE_Maybe_Serialized_Text_Field('MSG_content', __('Content', 'event_espresso'), true, ''),
+				'MSG_to' => new EE_Maybe_Serialized_Text_Field('MSG_to', __('Address To', 'event_espresso'), true),
+				'MSG_from' => new EE_Maybe_Serialized_Text_Field('MSG_from', __('Address From', 'event_espresso'), true),
+				'MSG_subject' => new EE_Maybe_Serialized_Text_Field('MSG_subject', __('Subject', 'event_espresso'), true, ''),
+				'MSG_priority' => new EE_Enum_Integer_Field('MSG_priority', __('Priority', 'event_espresso'), false, self::priority_low, $allowed_priority),
+				'STS_ID' => new EE_Foreign_Key_String_Field('STS_ID', __('Status', 'event_espresso'), false, self::status_incomplete, 'Status'),
+				'MSG_created' => new EE_Datetime_Field('MSG_created', __('Created', 'event_espresso'), false, time()),
+				'MSG_modified' => new EE_Datetime_Field('MSG_modified', __('Modified', 'event_espresso'), true, time())
 			)
 		);
 		$this->_model_relations = array(
@@ -137,7 +137,7 @@ 
 			'Message_Template_Group' => new EE_Belongs_To_Relation(),
 			'Transaction' => new EE_Belongs_To_Relation()
 		);
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -148,8 +148,8 @@ 
 	public function create_default_object() {
 		/** @type EE_Message $message */
 		$message = parent::create_default_object();
-		if ( $message instanceof EE_Message ) {
-			return EE_Message_Factory::set_messenger_and_message_type( $message );
+		if ($message instanceof EE_Message) {
+			return EE_Message_Factory::set_messenger_and_message_type($message);
 		}
 		return null;
 	}
@@ -160,11 +160,11 @@ 
 	 * @param mixed $cols_n_values
 	 * @return \EE_Message
 	 */
-	public function instantiate_class_from_array_or_object( $cols_n_values ) {
+	public function instantiate_class_from_array_or_object($cols_n_values) {
 		/** @type EE_Message $message */
-		$message = parent::instantiate_class_from_array_or_object( $cols_n_values );
-		if ( $message instanceof EE_Message ) {
-			return EE_Message_Factory::set_messenger_and_message_type( $message );
+		$message = parent::instantiate_class_from_array_or_object($cols_n_values);
+		if ($message instanceof EE_Message) {
+			return EE_Message_Factory::set_messenger_and_message_type($message);
 		}
 		return null;
 	}
@@ -177,13 +177,13 @@ 
 	 * @param string $message_type the message type slug
 	 * @return boolean
 	 */
-	public function message_sent_for_attendee( $attendee, $message_type ) {
-		$attendee_ID = EEM_Attendee::instance()->ensure_is_ID( $attendee );
-		return $this->exists( array( array(
+	public function message_sent_for_attendee($attendee, $message_type) {
+		$attendee_ID = EEM_Attendee::instance()->ensure_is_ID($attendee);
+		return $this->exists(array(array(
 			'Attendee.ATT_ID' => $attendee_ID,
 			'MSG_message_type' => $message_type,
-			'STS_ID' => array( 'IN', $this->stati_indicating_sent() )
-		) ) );
+			'STS_ID' => array('IN', $this->stati_indicating_sent())
+		)));
 	}
 
 
@@ -195,13 +195,13 @@ 
 	 * @param string $message_type the message type slug
 	 * @return boolean
 	 */
-	public function message_sent_for_registration( $registration, $message_type ) {
-		$registrationID = EEM_Registration::instance()->ensure_is_ID( $registration );
-		return $this->exists( array( array(
+	public function message_sent_for_registration($registration, $message_type) {
+		$registrationID = EEM_Registration::instance()->ensure_is_ID($registration);
+		return $this->exists(array(array(
 			'Registration.REG_ID' => $registrationID,
 			'MSG_message_type' => $message_type,
-			'STS_ID' => array( 'IN', $this->stati_indicating_sent() )
-		) ) );
+			'STS_ID' => array('IN', $this->stati_indicating_sent())
+		)));
 	}
 
 
@@ -212,10 +212,10 @@ 
 	 * @param string $token
 	 * @return EE_Message | null
 	 */
-	public function get_one_by_token( $token ) {
-		return $this->get_one( array( array(
+	public function get_one_by_token($token) {
+		return $this->get_one(array(array(
 			'MSG_token' => $token
-		) ) );
+		)));
 	}
 
 
@@ -223,8 +223,8 @@ 
 	 * Returns stati that indicate the message HAS been sent
 	 * @return array of strings for possible stati
 	 */
-	public function stati_indicating_sent(){
-		return apply_filters( 'FHEE__EEM_Message__stati_indicating_sent', array( self::status_sent ) );
+	public function stati_indicating_sent() {
+		return apply_filters('FHEE__EEM_Message__stati_indicating_sent', array(self::status_sent));
 	}
 
 
@@ -235,13 +235,13 @@ 
 	 * @return array of strings for possible stati.
 	 */
 	public function stati_indicating_to_send() {
-		return apply_filters( 'FHEE__EEM_Message__stati_indicating_to_send', array( self::status_idle, self::status_resend ) );
+		return apply_filters('FHEE__EEM_Message__stati_indicating_to_send', array(self::status_idle, self::status_resend));
 	}
 
 
 
 	public function stati_indicating_failed_sending() {
-		return apply_filters( 'FHEE__EEM_Message__stati_indicating_failed_sending', array( self::status_failed, self::status_retry ) );
+		return apply_filters('FHEE__EEM_Message__stati_indicating_failed_sending', array(self::status_failed, self::status_retry));
 	}
 
 
@@ -281,25 +281,25 @@ 
 			'EVT_ID' => 'Event',
 		);
 		$query_params[0] = array();
-		EE_Registry::instance()->load_class( 'Request_Handler' );
-		foreach ( $expected_vars as $request_key => $model_name ) {
-			if ( $request_value = EE_Registry::instance()->REQ->get( $request_key ) ) {
+		EE_Registry::instance()->load_class('Request_Handler');
+		foreach ($expected_vars as $request_key => $model_name) {
+			if ($request_value = EE_Registry::instance()->REQ->get($request_key)) {
 				//special case
-				if ( $request_key === '_REG_ID' ) {
+				if ($request_key === '_REG_ID') {
 					$query_params[0]['AND**filter_by']['OR**filter_by'] = array(
 						'Registration.REG_ID' => $request_value,
 						'Attendee.Registration.REG_ID' => $request_value,
 					);
 					continue;
 				}
-				if ( $request_key === 'EVT_ID' ) {
+				if ($request_key === 'EVT_ID') {
 					$query_params[0]['AND**filter_by']['OR**filter_by'] = array(
 						'Registration.EVT_ID' => $request_value,
 						'Attendee.Registration.EVT_ID' => $request_value,
 					);
 					continue;
 				}
-				$query_params[0][ $model_name . '.' . $request_key ] = EE_Registry::instance()->REQ->get( $request_key );
+				$query_params[0][$model_name.'.'.$request_key] = EE_Registry::instance()->REQ->get($request_key);
 			}
 		}
 		return $query_params;

core/libraries/messages/EE_Message_Type_Collection_Loader.lib.php

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -31,8 +31,8 @@ 
 	 *
 	 * @param EE_Message_Type_Collection $message_types
 	 */
-	public function __construct( EE_Message_Type_Collection $message_types ) {
-		$this->set_message_type_collection( $message_types );
+	public function __construct(EE_Message_Type_Collection $message_types) {
+		$this->set_message_type_collection($message_types);
 	}
 
 
@@ -49,7 +49,7 @@ 
 	/**
 	 * @param mixed $message_types
 	 */
-	public function set_message_type_collection( EE_Message_Type_Collection $message_types ) {
+	public function set_message_type_collection(EE_Message_Type_Collection $message_types) {
 		$this->_message_type_collection = $message_types;
 	}
 
@@ -62,26 +62,26 @@ 
 	 * @param  string $folder
 	 * @return void
 	 */
-	public function load_message_types_from_folder( $folder = '' ) {
+	public function load_message_types_from_folder($folder = '') {
 		//make sure autoloaders are set (fail-safe)
 		EED_Messages::set_autoloaders();
-		$folder = ! empty( $folder ) ? $folder : EE_LIBRARIES . 'messages' . DS . 'message_type';
-		$folder .= $folder[ strlen( $folder ) - 1 ] != DS ? DS : '';
+		$folder = ! empty($folder) ? $folder : EE_LIBRARIES.'messages'.DS.'message_type';
+		$folder .= $folder[strlen($folder) - 1] != DS ? DS : '';
 		// get all the files in that folder that end in ".class.php
 		$filepaths = apply_filters(
 			'FHEE__EE_messages__get_installed__messagetype_files',
-			glob( $folder . '*.class.php' )
+			glob($folder.'*.class.php')
 		);
-		if ( empty( $filepaths ) ) {
+		if (empty($filepaths)) {
 			return;
 		}
-		foreach ( (array) $filepaths as $file_path ) {
+		foreach ((array) $filepaths as $file_path) {
 			// extract filename from path
-			$file_path = basename( $file_path );
+			$file_path = basename($file_path);
 			// now remove any file extensions
-			$message_type_class_name = substr( $file_path, 0, strpos( $file_path, '.' ) );
+			$message_type_class_name = substr($file_path, 0, strpos($file_path, '.'));
 			$message_type = new $message_type_class_name();
-			if ( $this->message_type_collection()->has_by_name( $message_type->name ) ) {
+			if ($this->message_type_collection()->has_by_name($message_type->name)) {
 				continue;
 			}
 			$this->message_type_collection()->add(

core/libraries/messages/EE_Message_Type_Collection.lib.php

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -39,9 +39,9 @@ 
 	 * @param mixed  $info
 	 * @return bool
 	 */
-	public function add( $object, $info = null ) {
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
-		return parent::add( $object, $info );
+	public function add($object, $info = null) {
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::add($object, $info);
 	}
 
 
@@ -57,9 +57,9 @@ 
 	 * @param mixed  $info
 	 * @return bool
 	 */
-	public function set_info( $object, $info = null ) {
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
-		return parent::set_info( $object, $info );
+	public function set_info($object, $info = null) {
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::set_info($object, $info);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @param mixed
 	 * @return null | object
 	 */
-	public function get_by_info( $info ) {
-		return parent::get_by_info( $info );
+	public function get_by_info($info) {
+		return parent::get_by_info($info);
 	}
 
 
@@ -89,8 +89,8 @@ 
 	 * @param object $object
 	 * @return bool
 	 */
-	public function has( $object ) {
-		return parent::has( $object );
+	public function has($object) {
+		return parent::has($object);
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param string $message_type_name
 	 * @return bool
 	 */
-	public function has_by_name( $message_type_name ) {
-		return $this->get_by_info( $message_type_name ) instanceof $this->interface ? true : false;
+	public function has_by_name($message_type_name) {
+		return $this->get_by_info($message_type_name) instanceof $this->interface ? true : false;
 	}
 
 
@@ -119,8 +119,8 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object ) {
-		return parent::remove( $object );
+	public function remove($object) {
+		return parent::remove($object);
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function set_current( $object ) {
-		parent::set_current( $object );
+	public function set_current($object) {
+		parent::set_current($object);
 	}
 
 
@@ -149,8 +149,8 @@ 
 	 * @param $info
 	 * @return void
 	 */
-	public function set_current_by_info( $info ) {
-		parent::set_current_by_info( $info );
+	public function set_current_by_info($info) {
+		parent::set_current_by_info($info);
 	}
 
 
@@ -164,10 +164,10 @@ 
 	 * @return void
 	 */
 	public function show_collection_classes() {
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$this->rewind();
-			while ( $this->valid() ) {
-				echo '<h5 style="color:#2EA2CC;">collection class : <span style="color:#E76700">' . $this->getInfo()
+			while ($this->valid()) {
+				echo '<h5 style="color:#2EA2CC;">collection class : <span style="color:#E76700">'.$this->getInfo()
 					 . '</span></h5>';
 				$this->next();
 			}

core/libraries/messages/EE_Message_Resource_Manager.lib.php

Spacing +29 added lines, -29 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -112,8 +112,8 @@ 
 	 * @param string $messenger_name
 	 * @return \EE_Messenger
 	 */
-	public function get_messenger( $messenger_name ) {
-		return $this->messenger_collection()->get_by_info( $messenger_name );
+	public function get_messenger($messenger_name) {
+		return $this->messenger_collection()->get_by_info($messenger_name);
 	}
 
 
@@ -122,8 +122,8 @@ 
 	 * @param string $message_type_name
 	 * @return \EE_Message_Type
 	 */
-	public function get_message_type( $message_type_name ) {
-		return $this->message_type_collection()->get_by_info( $message_type_name );
+	public function get_message_type($message_type_name) {
+		return $this->message_type_collection()->get_by_info($message_type_name);
 	}
 
 
@@ -137,7 +137,7 @@ 
 	public function get_active_messengers_option() {
 		return apply_filters(
 			'FHEE__EE_Message_Resource_Manager__get_active_messengers_option',
-			get_option( 'ee_active_messengers', array() )
+			get_option('ee_active_messengers', array())
 		);
 	}
 
@@ -149,8 +149,8 @@ 
 	 * @param array $active_messengers Incoming data to save.
 	 * @return bool FALSE if not updated, TRUE if updated.
 	 */
-	public function update_active_messengers_option( $active_messengers ) {
-		return update_option( 'ee_active_messengers', $active_messengers );
+	public function update_active_messengers_option($active_messengers) {
+		return update_option('ee_active_messengers', $active_messengers);
 	}
 
 
@@ -162,26 +162,26 @@ 
 	protected function _set_active_messengers_and_message_types() {
 
 		$active_messengers = $this->get_active_messengers_option();
-		$active_messengers = is_array( $active_messengers ) ? $active_messengers : array( $active_messengers );
+		$active_messengers = is_array($active_messengers) ? $active_messengers : array($active_messengers);
 		$not_installed = array();
-		foreach ( $active_messengers as $active_messenger => $data ) {
-			if ( $this->messenger_collection()->has_by_name( $active_messenger ) ) {
-				$this->_active_messengers[ $active_messenger ] = $this->messenger_collection()->get_by_info(
+		foreach ($active_messengers as $active_messenger => $data) {
+			if ($this->messenger_collection()->has_by_name($active_messenger)) {
+				$this->_active_messengers[$active_messenger] = $this->messenger_collection()->get_by_info(
 					$active_messenger
 				);
-				$this->_active_message_types[ $active_messenger ] = ! empty( $data[ 'settings' ][ $active_messenger . '-message_types' ] )
-					? $data[ 'settings' ][ $active_messenger . '-message_types' ]
+				$this->_active_message_types[$active_messenger] = ! empty($data['settings'][$active_messenger.'-message_types'])
+					? $data['settings'][$active_messenger.'-message_types']
 					: array();
 			} else {
 				$not_installed[] = $active_messenger;
 			}
 		}
-		if ( ! empty( $not_installed ) ) {
+		if ( ! empty($not_installed)) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The following messengers are either not installed or are invalid:%1$s %2$s', 'event_espresso' ),
+					__('The following messengers are either not installed or are invalid:%1$s %2$s', 'event_espresso'),
 					'<br />',
-					implode( ', ', $not_installed )
+					implode(', ', $not_installed)
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -197,11 +197,11 @@ 
 	 * @param  string $messenger name of messenger
 	 * @return void
 	 */
-	protected function _deactivate_messenger( $messenger ) {
-		unset( $this->_active_messengers[ $messenger ] );
-		unset( $this->_active_message_types[ $messenger ] );
-		$this->_message_template_group_model->deactivate_message_template_groups_for( $messenger );
-		$this->update_active_messengers_option( $this->_active_messengers );
+	protected function _deactivate_messenger($messenger) {
+		unset($this->_active_messengers[$messenger]);
+		unset($this->_active_message_types[$messenger]);
+		$this->_message_template_group_model->deactivate_message_template_groups_for($messenger);
+		$this->update_active_messengers_option($this->_active_messengers);
 	}
 
 
@@ -213,15 +213,15 @@ 
 	 * @param  string $message_type name of message type
 	 * @return void
 	 */
-	protected function _deactivate_message_type( $message_type ) {
-		foreach ( $this->_active_messengers as $messenger => $settings ) {
+	protected function _deactivate_message_type($message_type) {
+		foreach ($this->_active_messengers as $messenger => $settings) {
 			unset(
-				$this->_active_messengers[ $messenger ][ 'settings' ][ $messenger . '-message_types' ][ $message_type ]
+				$this->_active_messengers[$messenger]['settings'][$messenger.'-message_types'][$message_type]
 			);
 		}
-		$this->_message_template_group_model->deactivate_message_template_groups_for( '', $message_type );
-		unset( $this->_active_message_types[ $message_type ] );
-		$this->update_active_messengers_option( $this->_active_messengers );
+		$this->_message_template_group_model->deactivate_message_template_groups_for('', $message_type);
+		unset($this->_active_message_types[$message_type]);
+		$this->update_active_messengers_option($this->_active_messengers);
 	}