eventespresso / event-espresso-core

core/libraries/messages/EE_Message_Factory.lib.php

Spacing +33 added lines, -33 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');
 }
 
 
@@ -53,10 +53,10 @@ 
 	 * @param \EE_Message_Resource_Manager $Message_Resource_Manager
 	 * @return \EE_Message_Factory instance
 	 */
-	public static function instance( EE_Message_Resource_Manager $Message_Resource_Manager ) {
+	public static function instance(EE_Message_Resource_Manager $Message_Resource_Manager) {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Message_Factory ) {
-			self::$_instance = new EE_Message_Factory( $Message_Resource_Manager );
+		if ( ! self::$_instance instanceof EE_Message_Factory) {
+			self::$_instance = new EE_Message_Factory($Message_Resource_Manager);
 		}
 		return self::$_instance;
 	}
@@ -68,10 +68,10 @@ 
 	 * @param  array $props_n_values
 	 * @return mixed
 	 */
-	public static function create( $props_n_values = array() ) {
+	public static function create($props_n_values = array()) {
 		/** @type EE_Message_Factory $Message_Factory */
-		$Message_Factory = EE_Registry::instance()->load_lib( 'Message_Factory' );
-		return $Message_Factory->_create( $props_n_values );
+		$Message_Factory = EE_Registry::instance()->load_lib('Message_Factory');
+		return $Message_Factory->_create($props_n_values);
 	}
 
 
@@ -82,10 +82,10 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	public static function set_messenger_and_message_type( EE_Message $message ) {
+	public static function set_messenger_and_message_type(EE_Message $message) {
 		/** @type EE_Message_Factory $Message_Factory */
-		$Message_Factory = EE_Registry::instance()->load_lib( 'Message_Factory' );
-		return $Message_Factory->_set_messenger_and_message_type( $message );
+		$Message_Factory = EE_Registry::instance()->load_lib('Message_Factory');
+		return $Message_Factory->_set_messenger_and_message_type($message);
 	}
 
 
@@ -96,10 +96,10 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	public static function set_messenger( EE_Message $message ) {
+	public static function set_messenger(EE_Message $message) {
 		/** @type EE_Message_Factory $Message_Factory */
-		$Message_Factory = EE_Registry::instance()->load_lib( 'Message_Factory' );
-		return $Message_Factory->_set_messenger( $message );
+		$Message_Factory = EE_Registry::instance()->load_lib('Message_Factory');
+		return $Message_Factory->_set_messenger($message);
 	}
 
 
@@ -110,10 +110,10 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	public static function set_message_type( EE_Message $message ) {
+	public static function set_message_type(EE_Message $message) {
 		/** @type EE_Message_Factory $Message_Factory */
-		$Message_Factory = EE_Registry::instance()->load_lib( 'Message_Factory' );
-		return $Message_Factory->_set_message_type( $message );
+		$Message_Factory = EE_Registry::instance()->load_lib('Message_Factory');
+		return $Message_Factory->_set_message_type($message);
 	}
 
 
@@ -124,15 +124,15 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	protected function _create( $props_n_values = array() ) {
+	protected function _create($props_n_values = array()) {
 		$new_instance = false;
-		if ( ! empty( $props_n_values['MSG_ID'] ) ) {
-			$message = EE_Message::new_instance_from_db( $props_n_values );
+		if ( ! empty($props_n_values['MSG_ID'])) {
+			$message = EE_Message::new_instance_from_db($props_n_values);
 		} else {
-			$message = EE_Message::new_instance( $props_n_values );
+			$message = EE_Message::new_instance($props_n_values);
 			$new_instance = true;
 		}
-		return $this->_set_messenger_and_message_type( $message, $new_instance );
+		return $this->_set_messenger_and_message_type($message, $new_instance);
 	}
 
 
@@ -144,9 +144,9 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	protected function _set_messenger_and_message_type( EE_Message $message, $new_instance = false ) {
-		$message = $this->_set_messenger( $message );
-		$message = $this->_set_message_type( $message, $new_instance );
+	protected function _set_messenger_and_message_type(EE_Message $message, $new_instance = false) {
+		$message = $this->_set_messenger($message);
+		$message = $this->_set_message_type($message, $new_instance);
 		return $message;
 	}
 
@@ -158,10 +158,10 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	protected function _set_messenger( EE_Message $message ) {
-		$messenger = $this->_message_resource_manager->get_messenger( $message->messenger() );
-		if ( $messenger instanceof EE_messenger ) {
-			$message->set_messenger_object( $messenger );
+	protected function _set_messenger(EE_Message $message) {
+		$messenger = $this->_message_resource_manager->get_messenger($message->messenger());
+		if ($messenger instanceof EE_messenger) {
+			$message->set_messenger_object($messenger);
 		}
 		return $message;
 	}
@@ -175,10 +175,10 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	protected function _set_message_type( EE_Message $message, $new_instance = false ) {
-		$message_type = $this->_message_resource_manager->get_message_type( $message->message_type() );
-		if ( $message_type instanceof EE_message_type ) {
-			$message->set_message_type_object( $message_type, $new_instance );
+	protected function _set_message_type(EE_Message $message, $new_instance = false) {
+		$message_type = $this->_message_resource_manager->get_message_type($message->message_type());
+		if ($message_type instanceof EE_message_type) {
+			$message->set_message_type_object($message_type, $new_instance);
 		}
 		return $message;
 	}

core/libraries/messages/EE_Message_Generated_From_Token.php

Spacing +12 added lines, -12 removed lines

@@ -36,9 +36,9 @@ 
 	 *                                                This is then used to populate the properties in here.
 	 * @param   EE_Message_Resource_Manager $message_resource_manager
 	 */
-	public function __construct( $token, $sending_messenger_slug = 'html', EE_Message_Resource_Manager $message_resource_manager ) {
+	public function __construct($token, $sending_messenger_slug = 'html', EE_Message_Resource_Manager $message_resource_manager) {
 		$this->token = $token;
-		$this->_sending_messenger = $this->_set_sending_messenger( $sending_messenger_slug, $message_resource_manager );
+		$this->_sending_messenger = $this->_set_sending_messenger($sending_messenger_slug, $message_resource_manager);
 		$this->_message = $this->_generate_message();
 		//set params for parent from the message object
 		parent::__construct(
@@ -61,7 +61,7 @@ 
 		$sending_messenger_slug,
 		EE_Message_Resource_Manager $message_resource_manager
 	) {
-		$sending_messenger = $message_resource_manager->get_active_messenger( $sending_messenger_slug );
+		$sending_messenger = $message_resource_manager->get_active_messenger($sending_messenger_slug);
 		return $sending_messenger instanceof EE_messenger ? $sending_messenger : $sending_messenger_slug;
 	}
 
@@ -83,27 +83,27 @@ 
 	 * @return EE_Message
 	 * @throws \EE_Error
 	 */
-	protected function _generate_message( $properties = array() ) {
+	protected function _generate_message($properties = array()) {
 		// a message was generated immediately but the parent class will call this again
-		if ( $this->_message instanceof EE_Message ) {
+		if ($this->_message instanceof EE_Message) {
 			return $this->_message;
 		}
-		$message = EEM_Message::instance()->get_one_by_token( $this->token );
-		if ( ! $message instanceof EE_Message ) {
+		$message = EEM_Message::instance()->get_one_by_token($this->token);
+		if ( ! $message instanceof EE_Message) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Unable to retrieve generated message from DB using given token: "%1$s"', 'event_espresso' ),
+					__('Unable to retrieve generated message from DB using given token: "%1$s"', 'event_espresso'),
 					$this->token
 				)
 			);
 		}
-		$message->set_STS_ID( EEM_Message::status_idle );
+		$message->set_STS_ID(EEM_Message::status_idle);
 
-		if ( ! $this->_sending_messenger instanceof EE_messenger ) {
-			$message->set_STS_ID( EEM_Message::status_failed );
+		if ( ! $this->_sending_messenger instanceof EE_messenger) {
+			$message->set_STS_ID(EEM_Message::status_failed);
 			$message->set_error_message(
 				sprintf(
-					__( 'Unable to send message because the "%1$s" messenger is not active or not installed', 'event_espresso' ),
+					__('Unable to send message because the "%1$s" messenger is not active or not installed', 'event_espresso'),
 					$this->_sending_messenger
 				)
 			);

core/libraries/messages/EE_Message_Template_Group_Collection.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');
 }
 
 
@@ -28,14 +28,14 @@ 
 	 *                       indexing the template by key.
 	 * @return bool
 	 */
-	public function add( $message_template_group, $EVT_ID = null ) {
-		if ( $message_template_group instanceof $this->interface ) {
-			$data[ 'key' ] = $this->get_key(
+	public function add($message_template_group, $EVT_ID = null) {
+		if ($message_template_group instanceof $this->interface) {
+			$data['key'] = $this->get_key(
 				$message_template_group->messenger(),
 				$message_template_group->message_type(),
 				$EVT_ID
 			);
-			return parent::add( $message_template_group, $data );
+			return parent::add($message_template_group, $data);
 		}
 		return false;
 	}
@@ -48,10 +48,10 @@ 
 	 * @param $GRP_ID
 	 * @return EE_Message_Template_Group | null
 	 */
-	public function get_by_ID( $GRP_ID ) {
+	public function get_by_ID($GRP_ID) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $this->current()->ID() === $GRP_ID ) {
+		while ($this->valid()) {
+			if ($this->current()->ID() === $GRP_ID) {
 				$grp = $this->current();
 				$this->rewind();
 				return $grp;
@@ -73,8 +73,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_key( $messenger, $message_type, $EVT_ID = 0 ) {
-		return md5( $messenger.$message_type.$EVT_ID );
+	public function get_key($messenger, $message_type, $EVT_ID = 0) {
+		return md5($messenger.$message_type.$EVT_ID);
 	}
 
 
@@ -86,11 +86,11 @@ 
 	 *
 	 * @return null|EE_Message_Template_Group
 	 */
-	public function get_by_key( $key ) {
+	public function get_by_key($key) {
 		$this->rewind();
-		while ( $this->valid() ) {
+		while ($this->valid()) {
 			$data = $this->getInfo();
-			if ( isset( $data['key'] ) && $data['key'] === $key ) {
+			if (isset($data['key']) && $data['key'] === $key) {
 				$handler = $this->current();
 				$this->rewind();
 				return $handler;

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 	/**
 	 * This retrieves any EE_Message_Template_Group in the repo by its ID.
-	 * @param $GRP_ID
+	 * @param integer $GRP_ID
 	 * @return EE_Message_Template_Group | null
 	 */
 	public function get_by_ID( $GRP_ID ) {

core/libraries/messages/EE_Message_Type_Collection_Loader.lib.php

Spacing +19 added lines, -19 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,41 +62,41 @@ 
 	 * @param  string $folder
 	 * @throws \EE_Error
 	 */
-	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, '.'));
 
 			//if this class name doesn't represent a message type class, then we just skip.
-			if ( strpos( strtolower( $message_type_class_name ), 'message_type' ) === false ) {
+			if (strpos(strtolower($message_type_class_name), 'message_type') === false) {
 				continue;
 			}
 
-			if ( ! class_exists( $message_type_class_name ) ) {
+			if ( ! class_exists($message_type_class_name)) {
 				throw new EE_Error(
 					sprintf(
-						__( 'The "%1$s" message type class can\'t be loaded from %2$s. Likely there is a typo in the class name or the file name.', 'event_espresso' ),
+						__('The "%1$s" message type class can\'t be loaded from %2$s. Likely there is a typo in the class name or the file name.', 'event_espresso'),
 						$message_type_class_name,
 						$file_path
 					)
 				);
 			}
 
-			$this->_load_message_type( new $message_type_class_name );
+			$this->_load_message_type(new $message_type_class_name);
 		}
 	}
 
@@ -106,8 +106,8 @@ 
 	 * @param EE_message_type $message_type
 	 * @return bool
 	 */
-	protected function _load_message_type( EE_message_type $message_type ) {
-		if ( $this->message_type_collection()->has_by_name( $message_type->name ) ) {
+	protected function _load_message_type(EE_message_type $message_type) {
+		if ($this->message_type_collection()->has_by_name($message_type->name)) {
 			return true;
 		}
 		return $this->message_type_collection()->add(

core/libraries/messages/EE_Messages_Base.lib.php

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -184,9 +184,9 @@ 
 	 * @access protected
 	 * @param string $messenger
 	 */
-	protected function _set_existing_admin_settings( $messenger = '' ) {
+	protected function _set_existing_admin_settings($messenger = '') {
 		/** @var EE_Message_Resource_Manager $Message_Resource_Manager */
-		$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		$active_messengers = $Message_Resource_Manager->get_active_messengers_option();
 		$settings_to_use = $active_messengers;
 
@@ -194,14 +194,14 @@ 
 		 * This determines what will be used for the getting the settings.
 		 */
 		if (
-			! empty( $messenger )
-			&& $Message_Resource_Manager->is_message_type_active_for_messenger( $messenger, $this->name )
+			! empty($messenger)
+			&& $Message_Resource_Manager->is_message_type_active_for_messenger($messenger, $this->name)
 		) {
-			$settings_to_use = $active_messengers[ $messenger ]['settings'][ $messenger . '-message_types' ];
+			$settings_to_use = $active_messengers[$messenger]['settings'][$messenger.'-message_types'];
 		}
 
-		$this->_existing_admin_settings = isset( $settings_to_use[ $this->name ]['settings'] )
-			? $settings_to_use[ $this->name ]['settings']
+		$this->_existing_admin_settings = isset($settings_to_use[$this->name]['settings'])
+			? $settings_to_use[$this->name]['settings']
 			: null;
 	}
 
@@ -218,12 +218,12 @@ 
 	 * @param string $messenger
 	 * @return array          settings
 	 */
-	public function get_existing_admin_settings( $messenger = '' ) {
+	public function get_existing_admin_settings($messenger = '') {
 		// if admin_settings property empty lets try setting it.
-		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) ) {
-			$this->_set_existing_admin_settings( $messenger );
+		if (method_exists($this, '_set_existing_admin_settings') && empty($this->_existing_admin_settings)) {
+			$this->_set_existing_admin_settings($messenger);
 		}
-		return property_exists( $this, '_existing_admin_settings' )
+		return property_exists($this, '_existing_admin_settings')
 			? $this->_existing_admin_settings
 			: null;
 	}
@@ -239,12 +239,12 @@ 
 	 */
 	public function get_valid_shortcodes() {
 		$valid_shortcodes = apply_filters(
-			'FHEE__' . get_class( $this ) . '__get_valid_shortcodes',
+			'FHEE__'.get_class($this).'__get_valid_shortcodes',
 			$this->_valid_shortcodes,
 			$this
 		);
 		//The below filter applies to ALL messengers and message types so use with care!
-		$valid_shortcodes = apply_filters( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this );
+		$valid_shortcodes = apply_filters('FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this);
 		return $valid_shortcodes;
 	}
 
@@ -278,23 +278,23 @@ 
 	 * @access protected
 	 * @return string $content for page.
 	 */
-	protected function _get_admin_page_content( $page, $action, $extra, $actives ) {
+	protected function _get_admin_page_content($page, $action, $extra, $actives) {
 		//we can also further refine the context by action (if present).
-		if ( !empty($action) ) {
-			$page = $page . '_' . $action;
+		if ( ! empty($action)) {
+			$page = $page.'_'.$action;
 		}
 
-		if ( !isset( $this->admin_registered_pages[$page]) ){
+		if ( ! isset($this->admin_registered_pages[$page])) {
 			// todo: a place to throw an exception?
 			// We need to indicate there is no registered page so this function is not being called correctly.
 			return false;
 		}
 		//k made it here so let's call the method
 		$content = call_user_func_array(
-			array( $this, '_get_admin_content_' . $page ),
-			array( $actives, $extra )
+			array($this, '_get_admin_content_'.$page),
+			array($actives, $extra)
 		);
-		if ( $content === false ) {
+		if ($content === false) {
 			// todo this needs to be an exception once we've got exceptions in place.
 			return false;
 		}

core/libraries/messages/EE_Messages_Data_Handler_Collection.lib.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 
@@ -26,10 +26,10 @@ 
 	 *                                                   classname to create an alternative index for retrieving data_handlers.
 	 * @return bool
 	 */
-	public function add( $data_handler, $data = null) {
+	public function add($data_handler, $data = null) {
 		$data = $data === null ? array() : (array) $data;
-		$info['key'] = $this->get_key( get_class( $data_handler ), $data );
-		return parent::add( $data_handler, $info );
+		$info['key'] = $this->get_key(get_class($data_handler), $data);
+		return parent::add($data_handler, $info);
 	}
 	
 
@@ -44,8 +44,8 @@ 
 	 *
 	 * @return  string      md5 hash using provided info.
 	 */
-	public function get_key( $classname, $data ) {
-		return md5( $classname . print_r( $data, true ) );
+	public function get_key($classname, $data) {
+		return md5($classname.print_r($data, true));
 	}
 
 
@@ -61,11 +61,11 @@ 
 	 *
 	 * @return null|EE_Messages_incoming_data
 	 */
-	public function get_by_key( $key ) {
+	public function get_by_key($key) {
 		$this->rewind();
-		while( $this->valid() ) {
+		while ($this->valid()) {
 			$data = $this->getInfo();
-			if ( isset( $data['key'] ) && $data['key'] === $key ) {
+			if (isset($data['key']) && $data['key'] === $key) {
 				$handler = $this->current();
 				$this->rewind();
 				return $handler;

core/libraries/messages/EE_Messages_Template_Pack_Collection.lib.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 
@@ -17,10 +17,10 @@ 
 		$this->interface = 'EE_Messages_Template_Pack';
 	}
 
-	public function get_by_name( $template_pack_name ) {
+	public function get_by_name($template_pack_name) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $this->current()->dbref == $template_pack_name ) {
+		while ($this->valid()) {
+			if ($this->current()->dbref == $template_pack_name) {
 				return $this->current();
 			}
 			$this->next();

core/libraries/messages/EE_Messenger_Collection_Loader.lib.php

Spacing +22 added lines, -22 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');
 }
 
 
@@ -32,8 +32,8 @@ 
 	 *
 	 * @param EE_Messenger_Collection $messengers
 	 */
-	public function __construct( EE_Messenger_Collection $messengers ) {
-		$this->set_messenger_collection( $messengers );
+	public function __construct(EE_Messenger_Collection $messengers) {
+		$this->set_messenger_collection($messengers);
 	}
 
 
@@ -50,7 +50,7 @@ 
 	/**
 	 * @param mixed $messengers
 	 */
-	public function set_messenger_collection( EE_Messenger_Collection $messengers ) {
+	public function set_messenger_collection(EE_Messenger_Collection $messengers) {
 		$this->_messenger_collection = $messengers;
 	}
 
@@ -63,41 +63,41 @@ 
 	 * @param  string $folder
 	 * @throws \EE_Error
 	 */
-	public function load_messengers_from_folder( $folder = '' ) {
+	public function load_messengers_from_folder($folder = '') {
 		//make sure autoloaders are set (fail-safe)
 		EED_Messages::set_autoloaders();
-		$folder = ! empty( $folder ) ? $folder : EE_LIBRARIES . 'messages' . DS . 'messenger';
-		$folder .= $folder[ strlen( $folder ) - 1 ] != DS ? DS : '';
+		$folder = ! empty($folder) ? $folder : EE_LIBRARIES.'messages'.DS.'messenger';
+		$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__messenger_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
-			$messenger_class_name = substr( $file_path, 0, strpos( $file_path, '.' ) );
+			$messenger_class_name = substr($file_path, 0, strpos($file_path, '.'));
 
 			//first check to see if the class name represents an actual messenger class.
-			if ( strpos( strtolower( $messenger_class_name ), 'messenger' ) === false ) {
+			if (strpos(strtolower($messenger_class_name), 'messenger') === false) {
 				continue;
 			}
 
-			if ( ! class_exists( $messenger_class_name ) ) {
+			if ( ! class_exists($messenger_class_name)) {
 				throw new EE_Error(
 					sprintf(
-						__( 'The "%1$s" messenger class can\'t be loaded from %2$s.  Likely there is a typo in the class name or the file name.', 'event_espresso' ),
+						__('The "%1$s" messenger class can\'t be loaded from %2$s.  Likely there is a typo in the class name or the file name.', 'event_espresso'),
 						$messenger_class_name,
 						$file_path
 					)
 				);
 			}
 
-			$this->_load_messenger( new $messenger_class_name() );
+			$this->_load_messenger(new $messenger_class_name());
 		}
 	}
 
@@ -113,10 +113,10 @@ 
 		EED_Messages::set_autoloaders();
 		$active_messengers = apply_filters(
 			'FHEE__EEH_MSG_Template__get_active_messengers_in_db',
-			get_option( 'ee_active_messengers', array() )
+			get_option('ee_active_messengers', array())
 		);
-		foreach ( (array) $active_messengers as $active_messenger_classname => $active_messenger ) {
-			$this->_load_messenger( $active_messenger );
+		foreach ((array) $active_messengers as $active_messenger_classname => $active_messenger) {
+			$this->_load_messenger($active_messenger);
 		}
 	}
 
@@ -128,8 +128,8 @@ 
 	 * @param \EE_messenger $messenger
 	 * @return bool
 	 */
-	protected function _load_messenger( EE_messenger $messenger ) {
-		if ( $this->messenger_collection()->has_by_name( $messenger->name ) ) {
+	protected function _load_messenger(EE_messenger $messenger) {
+		if ($this->messenger_collection()->has_by_name($messenger->name)) {
 			return true;
 		}
 		return $this->messenger_collection()->add(

core/libraries/messages/EE_Payment_Base_message_type.lib.php

Spacing +7 added lines, -7 removed lines

@@ -51,26 +51,26 @@
 
 
 
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
 
 		//use the registration to get the transaction.
 		$transaction = $registration->transaction();
 
 		//bail early if no transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			throw new EE_Error( __('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso' ) );
+		if ( ! $transaction instanceof EE_Transaction) {
+			throw new EE_Error(__('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso'));
 		}
 
-		$payment = ! empty( $id ) ? EEM_Payment::instance()->get_one( array( array( 'PAY_ID' => $id, 'TXN_ID' => $transaction->ID() ) ) ) : 0;
+		$payment = ! empty($id) ? EEM_Payment::instance()->get_one(array(array('PAY_ID' => $id, 'TXN_ID' => $transaction->ID()))) : 0;
 
-		return array( $transaction, $payment );
+		return array($transaction, $payment);
 	}
 
 
 
-	protected function _get_admin_content_events_edit_for_messenger( EE_messenger $messenger ) {
+	protected function _get_admin_content_events_edit_for_messenger(EE_messenger $messenger) {
 		//this is just a test
-		return $this->name . ' Message Type for ' . $messenger->name . ' Messenger ';
+		return $this->name.' Message Type for '.$messenger->name.' Messenger ';
 	}
 
 	/**