eventespresso / event-espresso-core

core/db_classes/EE_Ticket_Price.class.php

Spacing +7 added lines, -7 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');
 }
 /**
  * Event Espresso
@@ -35,9 +35,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Price|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '', $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = '', $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone, $date_formats);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Price
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 

core/libraries/qtips/EE_Qtip_Config.lib.php

Braces +6 added lines, -4 removed lines

@@ -177,8 +177,9 @@ 
 	protected function _construct_tips() {
 		foreach ( $this->_qtipsa as $qt ) {
 			//make sure we have what we need.
-			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) )
-				throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
+			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) ) {
+							throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
+			}
 
 			//make sure the options include defaults and just override via set config.
 			$options_override = isset( $qt['options'] ) ? (array) $qt['options'] : array();
@@ -266,8 +267,9 @@ 
 
 	public function __construct( $setup_array ) {
 		foreach ( $setup_array as $prop => $value ) {
-			if ( EEH_Class_Tools::has_property( $this, $prop ) )
-				$this->{$prop} = $value;
+			if ( EEH_Class_Tools::has_property( $this, $prop ) ) {
+							$this->{$prop} = $value;
+			}
 		}
 	}
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -142,7 +142,7 @@ 
 				'event' => 'mouseleave', //similar as what you do for show.event.
 				'target' => false, //Options jQuery::#selector. which html element will trigger hide event. When false, the element the .qtip() method was called upon is used.
 				'delay' => 0, //set time in milliseconds for delaying the hide of the tooltip
-				'inactive' => false,  //if integer, time in millisecons in which the tooltip should be hidden if remains inactive (not interacted with)
+				'inactive' => false, //if integer, time in millisecons in which the tooltip should be hidden if remains inactive (not interacted with)
 				'fixed' => false, //when set to true, the tooltip will not hide if moused over.
 				'leave' => 'window', //specify whether the tooltip will hide when leaving the window it's conained within.
 				'distance' => false, //if integer, distance in pixels that the tooltip hides when the mouse is moved from the point it triggered the tooltip.
@@ -175,21 +175,21 @@ 
 	 * @return void
 	 */
 	protected function _construct_tips() {
-		foreach ( $this->_qtipsa as $qt ) {
+		foreach ($this->_qtipsa as $qt) {
 			//make sure we have what we need.
-			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) )
-				throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
+			if ( ! isset($qt['content_id']) || ! isset($qt['target']) || ! isset($qt['content']))
+				throw new EE_Error(sprintf(__('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true)));
 
 			//make sure the options include defaults and just override via set config.
-			$options_override = isset( $qt['options'] ) ? (array) $qt['options'] : array();
-			$options = array_merge( $this->_default_options, $options_override );
+			$options_override = isset($qt['options']) ? (array) $qt['options'] : array();
+			$options = array_merge($this->_default_options, $options_override);
 			$setup = array(
 				'content_id' => $qt['content_id'],
 				'options' => $options,
 				'target' => $qt['target'],
 				'content' => $qt['content']
 				);
-			$this->_qtips[] = new EE_Qtip( $setup );
+			$this->_qtips[] = new EE_Qtip($setup);
 		}
 	}
 
@@ -264,9 +264,9 @@ 
 	public $target;
 	public $content;
 
-	public function __construct( $setup_array ) {
-		foreach ( $setup_array as $prop => $value ) {
-			if ( EEH_Class_Tools::has_property( $this, $prop ) )
+	public function __construct($setup_array) {
+		foreach ($setup_array as $prop => $value) {
+			if (EEH_Class_Tools::has_property($this, $prop))
 				$this->{$prop} = $value;
 		}
 	}

core/db_models/strategies/EE_Default_Where_Conditions.strategy.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');
 }
 /**
  *
@@ -15,7 +15,7 @@ 
  * @since		 	    4.6.0
  *
  */
-class EE_Default_Where_Conditions{
+class EE_Default_Where_Conditions {
 
 	/**
 	 * This const can be used in EE_Default_Where_Conditions values, and at the time of querying it will be
@@ -48,7 +48,7 @@ 
 	 * onto any field names
 	 * @param array $custom_where_conditions
 	 */
-	public function __construct( $custom_where_conditions = array() ) {
+	public function __construct($custom_where_conditions = array()) {
 		$this->_where_conditions_provided = $custom_where_conditions;
 	}
 
@@ -59,7 +59,7 @@ 
 	 * for querying of the model.
 	 * @param EEM_Base $model
 	 */
-	function _finalize_construct(EEM_Base $model){
+	function _finalize_construct(EEM_Base $model) {
 		$this->_model = $model;
 	}
 
@@ -80,8 +80,8 @@ 
 	 * @param string $model_relation_chain
 	 * @return array like what's expected in EEM_Base::get_all()'s $query_params[0]
 	 */
-	function get_default_where_conditions( $model_relation_chain = '' ){
-		return $this->prepare_where_conditions_for_querying( array_merge( $this->_get_default_where_conditions(), $this->get_where_conditions_provided() ), $model_relation_chain );
+	function get_default_where_conditions($model_relation_chain = '') {
+		return $this->prepare_where_conditions_for_querying(array_merge($this->_get_default_where_conditions(), $this->get_where_conditions_provided()), $model_relation_chain);
 	}
 
 
@@ -91,7 +91,7 @@ 
 	 * Adding model relation chains is handled by the public method get_default_where_conditions
 	 * @return array
 	 */
-	protected function _get_default_where_conditions(){
+	protected function _get_default_where_conditions() {
 		return array();
 	}
 
@@ -105,36 +105,36 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function prepare_where_conditions_for_querying( $where_conditions, $model_relation_chain ) {
+	public function prepare_where_conditions_for_querying($where_conditions, $model_relation_chain) {
 		$where_conditions_with_model_relation_chain_prefixes = array();
-		if ( ! is_array( $where_conditions ) ) {
+		if ( ! is_array($where_conditions)) {
 			$where_conditions = array();
 		}
-		foreach ( $where_conditions as $key => $value ) {
+		foreach ($where_conditions as $key => $value) {
 			if (
-				in_array( $key, array( 'OR', 'AND', 'NOT' ) )
-				|| strpos( $key, 'OR*' ) !== false
-				|| strpos( $key, 'AND*' ) !== false
-				|| strpos( $key, 'NOT*' ) !== false
+				in_array($key, array('OR', 'AND', 'NOT'))
+				|| strpos($key, 'OR*') !== false
+				|| strpos($key, 'AND*') !== false
+				|| strpos($key, 'NOT*') !== false
 			) {
-				$where_conditions_with_model_relation_chain_prefixes[ $key ] = $this->prepare_where_conditions_for_querying(
+				$where_conditions_with_model_relation_chain_prefixes[$key] = $this->prepare_where_conditions_for_querying(
 					$value,
 					$model_relation_chain
 				);
 			} else {
 				if (
 					$model_relation_chain != ''
-					&& $model_relation_chain[ strlen( $model_relation_chain ) - 1 ] != '.'
+					&& $model_relation_chain[strlen($model_relation_chain) - 1] != '.'
 				) {
-					$model_relation_chain = $model_relation_chain . ".";
+					$model_relation_chain = $model_relation_chain.".";
 				}
 				//check for the current user id place holder, and if present change it
-				if ( $value === self::current_user_placeholder ) {
+				if ($value === self::current_user_placeholder) {
 					$value = get_current_user_id();
 				}
 				//check for user field placeholder
-				if ( $key == self::user_field_name_placeholder ) {
-					if ( ! $this->_model->wp_user_field_name() ) {
+				if ($key == self::user_field_name_placeholder) {
+					if ( ! $this->_model->wp_user_field_name()) {
 						throw new EE_Error(
 							sprintf(
 								__(
@@ -147,7 +147,7 @@ 
 					}
 					$key = $this->_model->wp_user_field_name();
 				}
-				$where_conditions_with_model_relation_chain_prefixes[ $model_relation_chain . $key ] = $value;
+				$where_conditions_with_model_relation_chain_prefixes[$model_relation_chain.$key] = $value;
 			}
 		}
 		return $where_conditions_with_model_relation_chain_prefixes;

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 /**
  *
  * Class EE_Default_Where_Conditions
-  *
+ *
  * Strategy to be used for getting default where conditions for EEM_Base children.
  * Should be initialized and set on construction of model
  *

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_To_Generate.php

Spacing +18 added lines, -18 removed lines

@@ -105,14 +105,14 @@ 
 	public function __construct(
 		$messenger_name,
 		$message_type_name,
-		$data 	 = array(),
+		$data = array(),
 		$context = '',
 		$preview = false,
 		$status  = EEM_Message::status_incomplete
 	) {
-		$this->_messenger_name 		= $messenger_name;
-		$this->_message_type_name 	= $message_type_name;
-		$this->_data 				= is_array( $data ) ? $data : array( $data );
+		$this->_messenger_name = $messenger_name;
+		$this->_message_type_name = $message_type_name;
+		$this->_data = is_array($data) ? $data : array($data);
 		$this->_context 			= $context;
 		$this->_preview 			= $preview;
 		$this->_status 				= $status;
@@ -170,8 +170,8 @@ 
 	/**
 	 * @param boolean $preview
 	 */
-	public function set_preview( $preview ) {
-		$this->_preview = filter_var( $preview, FILTER_VALIDATE_BOOLEAN );
+	public function set_preview($preview) {
+		$this->_preview = filter_var($preview, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -202,7 +202,7 @@ 
 	 * @param array $properties
 	 * @return string
 	 */
-	protected function _generate_message( $properties = array() ) {
+	protected function _generate_message($properties = array()) {
 		$message = EE_Message_Factory::create(
 			array_merge(
 				array(
@@ -216,12 +216,12 @@ 
 		);
 		// validate the message, and if it's good, set some properties
 		try {
-			$message->is_valid_for_sending_or_generation( true );
+			$message->is_valid_for_sending_or_generation(true);
 			$this->_valid = true;
 			$this->_messenger = $message->messenger_object();
 			$this->_message_type = $message->message_type_object();
 			$this->_send_now = $message->send_now();
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$this->_valid = false;
 			$this->_error_msg[] = $e->getMessage();
 		}
@@ -237,7 +237,7 @@ 
 	 */
 	public function get_EE_Message() {
 		// already set ?
-		if ( $this->_message instanceof EE_Message ) {
+		if ($this->_message instanceof EE_Message) {
 			return $this->_message;
 		}
 		// no? then let's create one
@@ -255,15 +255,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;
 			}
 		}
@@ -279,9 +279,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_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;
 		}

Braces +2 added lines, -1 removed lines

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

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();

Braces +2 added lines, -1 removed lines

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

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(