eventespresso / event-espresso-core

core/libraries/messages/EE_Message_Factory.lib.php

Spacing +37 added lines, -37 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 $Messenger_And_Message_Type_Manager
 	 * @return \EE_Message_Factory instance
 	 */
-	public static function instance( EE_Message_Resource_Manager $Messenger_And_Message_Type_Manager = null ) {
+	public static function instance(EE_Message_Resource_Manager $Messenger_And_Message_Type_Manager = null) {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Message_Factory ) {
-			self::$_instance = new EE_Message_Factory( $Messenger_And_Message_Type_Manager );
+		if ( ! self::$_instance instanceof EE_Message_Factory) {
+			self::$_instance = new EE_Message_Factory($Messenger_And_Message_Type_Manager);
 		}
 		return self::$_instance;
 	}
@@ -69,9 +69,9 @@ 
 	 * @param  bool  $validate - whether or not to throw exceptions if resources are invalid
 	 * @return mixed
 	 */
-	public static function create( $props_n_values = array(), $validate = true ) {
-		$Message_Factory = EE_Registry::instance()->load_lib( 'Message_Factory' );
-		return $Message_Factory->_create( $props_n_values, $validate );
+	public static function create($props_n_values = array(), $validate = true) {
+		$Message_Factory = EE_Registry::instance()->load_lib('Message_Factory');
+		return $Message_Factory->_create($props_n_values, $validate);
 	}
 
 
@@ -83,9 +83,9 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	public static function set_messenger_and_message_type( EE_Message $message, $validate = true ) {
-		$Message_Factory = EE_Registry::instance()->load_lib( 'Message_Factory' );
-		return $Message_Factory->_set_messenger_and_message_type( $message, $validate );
+	public static function set_messenger_and_message_type(EE_Message $message, $validate = true) {
+		$Message_Factory = EE_Registry::instance()->load_lib('Message_Factory');
+		return $Message_Factory->_set_messenger_and_message_type($message, $validate);
 	}
 
 
@@ -97,9 +97,9 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	public static function set_messenger( EE_Message $message, $validate = true ) {
-		$Message_Factory = EE_Registry::instance()->load_lib( 'Message_Factory' );
-		return $Message_Factory->_set_messenger( $message, $validate );
+	public static function set_messenger(EE_Message $message, $validate = true) {
+		$Message_Factory = EE_Registry::instance()->load_lib('Message_Factory');
+		return $Message_Factory->_set_messenger($message, $validate);
 	}
 
 
@@ -111,9 +111,9 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	public static function set_message_type( EE_Message $message, $validate = true ) {
-		$Message_Factory = EE_Registry::instance()->load_lib( 'Message_Factory' );
-		return $Message_Factory->_set_message_type( $message, $validate );
+	public static function set_message_type(EE_Message $message, $validate = true) {
+		$Message_Factory = EE_Registry::instance()->load_lib('Message_Factory');
+		return $Message_Factory->_set_message_type($message, $validate);
 	}
 
 
@@ -125,13 +125,13 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	protected function _create( $props_n_values = array(), $validate = true ) {
-		if ( ! empty( $props_n_values['MSG_ID'] ) ) {
-			$message = EE_Message::new_instance_from_db( $props_n_values );
+	protected function _create($props_n_values = array(), $validate = true) {
+		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);
 		}
-		return $this->_set_messenger_and_message_type( $message, $validate );
+		return $this->_set_messenger_and_message_type($message, $validate);
 	}
 
 
@@ -143,9 +143,9 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	protected function _set_messenger_and_message_type( EE_Message $message, $validate = true ) {
-		$message = $this->_set_messenger( $message, $validate );
-		$message = $this->_set_message_type( $message, $validate );
+	protected function _set_messenger_and_message_type(EE_Message $message, $validate = true) {
+		$message = $this->_set_messenger($message, $validate);
+		$message = $this->_set_message_type($message, $validate);
 		return $message;
 	}
 
@@ -158,14 +158,14 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	protected function _set_messenger( EE_Message $message, $validate = true ) {
-		$messenger = $this->_messenger_and_message_type_manager->get_messenger( $message->messenger() );
-		if ( $messenger instanceof EE_Messenger ) {
-			$message->set_messenger_object( $messenger );
-		} else if ( $validate ) {
+	protected function _set_messenger(EE_Message $message, $validate = true) {
+		$messenger = $this->_messenger_and_message_type_manager->get_messenger($message->messenger());
+		if ($messenger instanceof EE_Messenger) {
+			$message->set_messenger_object($messenger);
+		} else if ($validate) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The "%1$s" messenger set for this message is missing or invalid. Please double-check the spelling and verify that the correct files exist.', 'event_espresso' ),
+					__('The "%1$s" messenger set for this message is missing or invalid. Please double-check the spelling and verify that the correct files exist.', 'event_espresso'),
 					$message->messenger()
 				)
 			);
@@ -182,14 +182,14 @@ 
 	 * @return \EE_Message
 	 * @throws \EE_Error
 	 */
-	protected function _set_message_type( EE_Message $message, $validate = true ) {
-		$message_type = $this->_messenger_and_message_type_manager->get_message_type( $message->message_type() );
-		if ( $message_type instanceof EE_Message_Type ) {
-			$message->set_message_type_object( $message_type );
-		} else if ( $validate ) {
+	protected function _set_message_type(EE_Message $message, $validate = true) {
+		$message_type = $this->_messenger_and_message_type_manager->get_message_type($message->message_type());
+		if ($message_type instanceof EE_Message_Type) {
+			$message->set_message_type_object($message_type);
+		} else if ($validate) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The %1$s message type set for this message is missing or invalid. Please double-check the spelling and verify that the correct files exist.', 'event_espresso' ),
+					__('The %1$s message type set for this message is missing or invalid. Please double-check the spelling and verify that the correct files exist.', 'event_espresso'),
 					$message->message_type()
 				)
 			);

core/libraries/messages/EE_Message_To_Generate.php

Spacing +17 added lines, -17 removed lines

@@ -101,13 +101,13 @@ 
 		$context = '',
 		$preview = false
 	) {
-		$this->data = is_array( $data ) ? $data : array( $data );
+		$this->data = is_array($data) ? $data : array($data);
 		$this->context = $context;
 		$this->preview = $preview;
 		$this->_EEMSG = $ee_msg;
 		//this immediately validates whether the given messenger/messagetype are active or not
 		//and sets the valid flag.
-		$this->_set_valid( $messenger, $message_type );
+		$this->_set_valid($messenger, $message_type);
 	}
 
 
@@ -116,7 +116,7 @@ 
 	 * @param string $messenger_slug
 	 * @param string $message_type_slug
 	 */
-	protected function _set_valid( $messenger_slug , $message_type_slug ) {
+	protected function _set_valid($messenger_slug, $message_type_slug) {
 		$this->_valid = true;
 		$validated_for_use = $this->_EEMSG->validate_for_use(
 			EE_Message_Factory::create(
@@ -127,17 +127,17 @@ 
 			)
 		);
 
-		if ( ! isset( $validated_for_use['messenger'] ) || ! $validated_for_use['messenger'] instanceof EE_Messenger ) {
-			$this->_error_msg[] = sprintf( __( 'The %s Messenger is not active.', 'event_espresso' ), $messenger_slug );
+		if ( ! isset($validated_for_use['messenger']) || ! $validated_for_use['messenger'] instanceof EE_Messenger) {
+			$this->_error_msg[] = sprintf(__('The %s Messenger is not active.', 'event_espresso'), $messenger_slug);
 			$this->_valid = false;
 		} else {
 			$this->messenger = $validated_for_use['messenger'];
 			$this->_send_now = $this->messenger->send_now();
 		}
 
-		if ( ! isset( $validated_for_use['message_type'] ) || ! $validated_for_use['message_type'] instanceof EE_message_type ) {
+		if ( ! isset($validated_for_use['message_type']) || ! $validated_for_use['message_type'] instanceof EE_message_type) {
 			$this->_valid = false;
-			$this->_error_msg[] = sprintf( __( 'The %s Message Type is not active.', 'event_espresso' ), $message_type_slug );
+			$this->_error_msg[] = sprintf(__('The %s Message Type is not active.', 'event_espresso'), $message_type_slug);
 		} else {
 			$this->message_type = $validated_for_use['message_type'];
 		}
@@ -164,10 +164,10 @@ 
 	 *  Returns an instantiated EE_Message object from the internal data.
 	 */
 	public function get_EE_Message() {
-		if ( ! $this->valid() ) {
+		if ( ! $this->valid()) {
 			return null;
 		}
-		if ( $this->_EE_Message instanceof EE_Message ) {
+		if ($this->_EE_Message instanceof EE_Message) {
 			return $this->_EE_Message;
 		}
 		$this->_EE_Message = EE_Message_Factory::create(
@@ -192,15 +192,15 @@ 
 	 * @param   bool    $preview    Used to indicate that the preview data handler is to be returned.
 	 * @return  string
 	 */
-	public function get_data_handler_class_name( $preview = false ) {
-		if ( $this->_data_handler_class_name === '' && $this->valid() ) {
-			$ref = $preview ? 'Preview' : $this->message_type->get_data_handler( $this->data );
+	public function get_data_handler_class_name($preview = false) {
+		if ($this->_data_handler_class_name === '' && $this->valid()) {
+			$ref = $preview ? 'Preview' : $this->message_type->get_data_handler($this->data);
 			//make sure internal data is updated.
 			$this->data = $this->message_type->get_data();
 
 			//verify
-			$this->_data_handler_class_name = EE_Message_To_Generate::verify_and_retrieve_class_name_for_data_handler_reference( $ref );
-			if ( $this->_data_handler_class_name === '' ) {
+			$this->_data_handler_class_name = EE_Message_To_Generate::verify_and_retrieve_class_name_for_data_handler_reference($ref);
+			if ($this->_data_handler_class_name === '') {
 				$this->_valid = false;
 			}
 		}
@@ -216,9 +216,9 @@ 
 	 * @param string $data_handler_reference
 	 * @return string
 	 */
-	public static function verify_and_retrieve_class_name_for_data_handler_reference( $data_handler_reference ) {
-		$class_name = 'EE_Messages_' . $data_handler_reference . '_incoming_data';
-		if ( ! class_exists( $class_name ) ) {
+	public static function verify_and_retrieve_class_name_for_data_handler_reference($data_handler_reference) {
+		$class_name = 'EE_Messages_'.$data_handler_reference.'_incoming_data';
+		if ( ! class_exists($class_name)) {
 			EE_Error::add_error(
 				sprintf(
 					__(

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 EE_Message_Type ? $object->name : $info;
-		return parent::add( $object, $info ); // TODO: Change the autogenerated stub
+	public function add($object, $info = null) {
+		$info = empty($info) && $object instanceof EE_Message_Type ? $object->name : $info;
+		return parent::add($object, $info); // TODO: Change the autogenerated stub
 	}
 
 
@@ -57,9 +57,9 @@ 
 	 * @param mixed  $info
 	 * @return bool
 	 */
-	public function set_info( $object, $info = null ) {
-		$info = empty( $info ) && $object instanceof EE_Message_Type ? $object->name : $info;
-		return parent::set_info( $object, $info );
+	public function set_info($object, $info = null) {
+		$info = empty($info) && $object instanceof EE_Message_Type ? $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 ); // TODO: Change the autogenerated stub
+	public function get_by_info($info) {
+		return parent::get_by_info($info); // TODO: Change the autogenerated stub
 	}
 
 
@@ -89,8 +89,8 @@ 
 	 * @param object $object
 	 * @return bool
 	 */
-	public function has( $object ) {
-		return parent::has( $object ); // TODO: Change the autogenerated stub
+	public function has($object) {
+		return parent::has($object); // TODO: Change the autogenerated stub
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param string $message_type_classname
 	 * @return bool
 	 */
-	public function has_by_classname( $message_type_classname ) {
-		return $this->get_by_info( $message_type_classname ) instanceof $message_type_classname ? true :false;
+	public function has_by_classname($message_type_classname) {
+		return $this->get_by_info($message_type_classname) instanceof $message_type_classname ? true : false;
 	}
 
 
@@ -119,8 +119,8 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object ) {
-		return parent::remove( $object ); // TODO: Change the autogenerated stub
+	public function remove($object) {
+		return parent::remove($object); // TODO: Change the autogenerated stub
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function set_current( $object ) {
-		parent::set_current( $object ); // TODO: Change the autogenerated stub
+	public function set_current($object) {
+		parent::set_current($object); // TODO: Change the autogenerated stub
 	}
 
 
@@ -149,8 +149,8 @@ 
 	 * @param $info
 	 * @return void
 	 */
-	public function set_current_by_info( $info ) {
-		parent::set_current_by_info( $info ); // TODO: Change the autogenerated stub
+	public function set_current_by_info($info) {
+		parent::set_current_by_info($info); // TODO: Change the autogenerated stub
 	}
 
 
@@ -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_Messenger_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');
 }
 
 
@@ -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,25 +63,25 @@ 
 	 * @param  string $folder
 	 * @return void
 	 */
-	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, '.' ) );
-			$this->_load_messenger( new $messenger_class_name() );
+			$messenger_class_name = substr($file_path, 0, strpos($file_path, '.'));
+			$this->_load_messenger(new $messenger_class_name());
 		}
 	}
 
@@ -97,10 +97,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);
 		}
 	}
 
@@ -112,8 +112,8 @@ 
 	 * @param \EE_Messenger $messenger
 	 * @return bool
 	 */
-	protected function _load_messenger( EE_Messenger $messenger ) {
-		if ( $this->messenger_collection()->has_by_classname( $messenger->name ) ) {
+	protected function _load_messenger(EE_Messenger $messenger) {
+		if ($this->messenger_collection()->has_by_classname($messenger->name)) {
 			return true;
 		}
 		return $this->messenger_collection()->add(