eventespresso / event-espresso-core

core/db_classes/EE_Question.class.php

Spacing +112 added lines, -112 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
@@ -37,9 +37,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Question
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $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 = null, $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);
 	}
 
 
@@ -50,8 +50,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Question
 	 */
-	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);
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * @access        public
 	 * @param string $QST_display_text
 	 */
-	public function set_display_text( $QST_display_text = '' ) {
-		$this->set( 'QST_display_text', $QST_display_text );
+	public function set_display_text($QST_display_text = '') {
+		$this->set('QST_display_text', $QST_display_text);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @access        public
 	 * @param        string $QST_admin_label
 	 */
-	public function set_admin_label( $QST_admin_label = '' ) {
-		$this->set( 'QST_admin_label', $QST_admin_label );
+	public function set_admin_label($QST_admin_label = '') {
+		$this->set('QST_admin_label', $QST_admin_label);
 	}
 
 
@@ -86,8 +86,8 @@ 
 	 * @access        public
 	 * @param        mixed $QST_system
 	 */
-	public function set_system_ID( $QST_system = '' ) {
-		$this->set( 'QST_system', $QST_system );
+	public function set_system_ID($QST_system = '') {
+		$this->set('QST_system', $QST_system);
 	}
 
 
@@ -98,8 +98,8 @@ 
 	 * @access        public
 	 * @param        string $QST_type
 	 */
-	public function set_question_type( $QST_type = '' ) {
-		$this->set( 'QST_type', $QST_type );
+	public function set_question_type($QST_type = '') {
+		$this->set('QST_type', $QST_type);
 	}
 
 
@@ -110,8 +110,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_required
 	 */
-	public function set_required( $QST_required = FALSE ) {
-		$this->set( 'QST_required', $QST_required );
+	public function set_required($QST_required = FALSE) {
+		$this->set('QST_required', $QST_required);
 	}
 
 
@@ -122,8 +122,8 @@ 
 	 * @access        public
 	 * @param        string $QST_required_text
 	 */
-	public function set_required_text( $QST_required_text = '' ) {
-		$this->set( 'QST_required_text', $QST_required_text );
+	public function set_required_text($QST_required_text = '') {
+		$this->set('QST_required_text', $QST_required_text);
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 * @access        public
 	 * @param        int $QST_order
 	 */
-	public function set_order( $QST_order = 0 ) {
-		$this->set( 'QST_order', $QST_order );
+	public function set_order($QST_order = 0) {
+		$this->set('QST_order', $QST_order);
 	}
 
 
@@ -146,8 +146,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_admin_only
 	 */
-	public function set_admin_only( $QST_admin_only = FALSE ) {
-		$this->set( 'QST_admin_only', $QST_admin_only );
+	public function set_admin_only($QST_admin_only = FALSE) {
+		$this->set('QST_admin_only', $QST_admin_only);
 	}
 
 
@@ -158,8 +158,8 @@ 
 	 * @access        public
 	 * @param        int $QST_wp_user
 	 */
-	public function set_wp_user( $QST_wp_user = 1 ) {
-		$this->set( 'QST_wp_user', $QST_wp_user );
+	public function set_wp_user($QST_wp_user = 1) {
+		$this->set('QST_wp_user', $QST_wp_user);
 	}
 
 
@@ -175,8 +175,8 @@ 
 	 * @access        public
 	 * @param 	bool $QST_deleted
 	 */
-	public function set_deleted( $QST_deleted = FALSE ) {
-		$this->set( 'QST_deleted', $QST_deleted );
+	public function set_deleted($QST_deleted = FALSE) {
+		$this->set('QST_deleted', $QST_deleted);
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return string
 	 */
 	public function display_text() {
-		return $this->get( 'QST_display_text' );
+		return $this->get('QST_display_text');
 	}
 
 
@@ -198,7 +198,7 @@ 
 	 * @return string
 	 */
 	public function admin_label() {
-		return $this->get( 'QST_admin_label' );
+		return $this->get('QST_admin_label');
 	}
 
 
@@ -209,7 +209,7 @@ 
 	 * @return string
 	 */
 	public function system_ID() {
-		return $this->get( 'QST_system' );
+		return $this->get('QST_system');
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'QST_required' );
+		return $this->get('QST_required');
 	}
 
 
@@ -232,7 +232,7 @@ 
 	 * @return string
 	 */
 	public function required_text() {
-		return $this->get( 'QST_required_text' );
+		return $this->get('QST_required_text');
 	}
 
 
@@ -243,7 +243,7 @@ 
 	 * @return string
 	 */
 	public function type() {
-		return $this->get( 'QST_type' );
+		return $this->get('QST_type');
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'QST_order' );
+		return $this->get('QST_order');
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return boolean
 	 */
 	public function admin_only() {
-		return $this->get( 'QST_admin_only' );
+		return $this->get('QST_admin_only');
 	}
 
 
@@ -278,7 +278,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'QST_wp_user' );
+		return $this->get('QST_wp_user');
 	}
 
 
@@ -289,7 +289,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -299,7 +299,7 @@ 
 	 * @return EE_Answer[]
 	 */
 	public function answers() {
-		return $this->get_many_related( 'Answer' );
+		return $this->get_many_related('Answer');
 	}
 
 
@@ -309,7 +309,7 @@ 
 	 * @return boolean true = has answers, false = no answers.
 	 */
 	public function has_answers() {
-		return $this->count_related( 'Answer' ) > 0 ? TRUE : FALSE;
+		return $this->count_related('Answer') > 0 ? TRUE : FALSE;
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return EE_Question_Group[]
 	 */
 	public function question_groups() {
-		return $this->get_many_related( 'Question_Group' );
+		return $this->get_many_related('Question_Group');
 	}
 
 
@@ -333,24 +333,24 @@ 
 	 *                                                       whether it was trashed or not.
 	 * @return EE_Question_Option[]
 	 */
-	public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) {
-		if ( ! $this->ID() ) {
+	public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) {
+		if ( ! $this->ID()) {
 			return array();
 		}
 		$query_params = array();
-		if ( $selected_value_to_always_include ) {
-			if ( is_array( $selected_value_to_always_include ) ) {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = array( 'IN', $selected_value_to_always_include );
+		if ($selected_value_to_always_include) {
+			if (is_array($selected_value_to_always_include)) {
+				$query_params[0]['OR*options-query']['QSO_value'] = array('IN', $selected_value_to_always_include);
 			} else {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = $selected_value_to_always_include;
+				$query_params[0]['OR*options-query']['QSO_value'] = $selected_value_to_always_include;
 			}
 		}
-		if ( $notDeletedOptionsOnly ) {
-			$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_deleted' ] = FALSE;
+		if ($notDeletedOptionsOnly) {
+			$query_params[0]['OR*options-query']['QSO_deleted'] = FALSE;
 		}
 		//order by QSO_order
-		$query_params[ 'order_by' ] = array( 'QSO_order' => 'ASC' );
-		return $this->get_many_related( 'Question_Option', $query_params );
+		$query_params['order_by'] = array('QSO_order' => 'ASC');
+		return $this->get_many_related('Question_Option', $query_params);
 	}
 
 
@@ -360,7 +360,7 @@ 
 	 * @return \EE_Question_Option[]
 	 */
 	public function temp_options() {
-		return $this->_model_relations[ 'Question_Option' ];
+		return $this->_model_relations['Question_Option'];
 	}
 
 
@@ -371,8 +371,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_option( EE_Question_Option $option ) {
-		return $this->_add_relation_to( $option, 'Question_Option' );
+	public function add_option(EE_Question_Option $option) {
+		return $this->_add_relation_to($option, 'Question_Option');
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_temp_option( EE_Question_Option $option ) {
-		$this->_model_relations[ 'Question_Option' ][ ] = $option;
+	public function add_temp_option(EE_Question_Option $option) {
+		$this->_model_relations['Question_Option'][] = $option;
 		return TRUE;
 	}
 
@@ -394,8 +394,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function remove_option( EE_Question_Option $option ) {
-		return $this->_remove_relation_to( $option, 'Question_Option' );
+	public function remove_option(EE_Question_Option $option) {
+		return $this->_remove_relation_to($option, 'Question_Option');
 	}
 
 
@@ -404,8 +404,8 @@ 
 	 * @return bool
 	 */
 	public function is_system_question() {
-		$system_ID = $this->get( 'QST_system' );
-		return ! empty( $system_ID ) ? TRUE : FALSE;
+		$system_ID = $this->get('QST_system');
+		return ! empty($system_ID) ? TRUE : FALSE;
 	}
 
 
@@ -418,8 +418,8 @@ 
 	 */
 	public function set_order_to_latest() {
 		$latest_order = $this->get_model()->get_latest_question_order();
-		$latest_order ++;
-		$this->set( 'QST_order', $latest_order );
+		$latest_order++;
+		$this->set('QST_order', $latest_order);
 	}
 
 
@@ -438,20 +438,20 @@ 
 	 * Duplicates this question and its question options
 	 * @return \EE_Question
 	 */
-	public function duplicate( $options = array() ) {
+	public function duplicate($options = array()) {
 		$new_question = clone $this;
-		$new_question->set( 'QST_ID', null );
-		$new_question->set_display_text( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->display_text() ) );
-		$new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) );
-		$new_question->set_system_ID( null );
-		$new_question->set_wp_user( get_current_user_id() );
+		$new_question->set('QST_ID', null);
+		$new_question->set_display_text(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->display_text()));
+		$new_question->set_admin_label(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->admin_label()));
+		$new_question->set_system_ID(null);
+		$new_question->set_wp_user(get_current_user_id());
                 //if we're duplicating a trashed question, assume we don't want the new one to be trashed
-                $new_question->set_deleted( false );
+                $new_question->set_deleted(false);
 		$success = $new_question->save();
-		if( $success ) {
+		if ($success) {
 			//we don't totally want to duplicate the question options, because we want them to be for the NEW question
-			foreach( $this->options() as $question_option ) {
-				$question_option->duplicate( array( 'QST_ID' => $new_question->ID() ) );
+			foreach ($this->options() as $question_option) {
+				$question_option->duplicate(array('QST_ID' => $new_question->ID()));
 			}
 			return $new_question;
 		} else {
@@ -464,7 +464,7 @@ 
 	 * @return int|float
 	 */
 	public function max() {
-		return $this->get( 'QST_max' );
+		return $this->get('QST_max');
 	}
 
 	/**
@@ -472,8 +472,8 @@ 
 	 * @param int|float $new_max
 	 * @return void
 	 */
-	public function set_max( $new_max ) {
-		$this->set( 'QST_max', $new_max );
+	public function set_max($new_max) {
+		$this->set('QST_max', $new_max);
 	}
 
 
@@ -485,7 +485,7 @@ 
 	 * @param array $input_constructor_args
 	 * @return EE_Form_Input_Base
 	 */
-	public function generate_form_input( $registration = null, $answer = null, $input_constructor_args = array() ) {
+	public function generate_form_input($registration = null, $answer = null, $input_constructor_args = array()) {
 		$identifier = $this->is_system_question() ? $this->system_ID() : $this->ID();
 
 		$input_constructor_args = array_merge( 
@@ -496,27 +496,27 @@ 
 				),
 				$input_constructor_args
 			);
-		if( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration ) {
-			$answer = EEM_Answer::instance()->get_registration_question_answer_object( $registration, $this->ID() );
+		if ( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration) {
+			$answer = EEM_Answer::instance()->get_registration_question_answer_object($registration, $this->ID());
 		}
 		// has this question been answered ?
-		if ( $answer instanceof EE_Answer ) {
+		if ($answer instanceof EE_Answer) {
 			//answer gets htmlspecialchars called on it, undo that please
 			//beceause the form input's display strategy may call esc_attr too
 			//which also does html special characters
 			$values_with_html_special_chars = $answer->value();
-			if( is_array( $values_with_html_special_chars ) ) {
-				$default_value = array_map( 'htmlspecialchars_decode', $values_with_html_special_chars );
+			if (is_array($values_with_html_special_chars)) {
+				$default_value = array_map('htmlspecialchars_decode', $values_with_html_special_chars);
 			} else {
-				$default_value = htmlspecialchars_decode( $values_with_html_special_chars );
+				$default_value = htmlspecialchars_decode($values_with_html_special_chars);
 			}
 			$input_constructor_args['default'] = $default_value;
 		}
-		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question( $this->system_ID() );
-		if( EEM_Question::instance()->question_type_is_in_category(  $this->type(), 'text' ) ) {
-			$input_constructor_args[ 'validation_strategies' ][] = new EE_Max_Length_Validation_Strategy(
+		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question($this->system_ID());
+		if (EEM_Question::instance()->question_type_is_in_category($this->type(), 'text')) {
+			$input_constructor_args['validation_strategies'][] = new EE_Max_Length_Validation_Strategy(
 				null,
-				min( $max_max_for_question, $this->max() )
+				min($max_max_for_question, $this->max())
 			);
 		}
 		$input_constructor_args = apply_filters(
@@ -528,22 +528,22 @@ 
 		);
 
 		$result = null;
-		switch ( $this->type() ) {
+		switch ($this->type()) {
 			// Text
 			case EEM_Question::QST_type_text :
-				$result = new EE_Text_Input( $input_constructor_args );
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			// Textarea
 			case EEM_Question::QST_type_textarea :
-				$result = new EE_Text_Area_Input( $input_constructor_args );
+				$result = new EE_Text_Area_Input($input_constructor_args);
 				break;
 			// Radio Buttons
 			case EEM_Question::QST_type_radio :
-				$result = new EE_Radio_Button_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Radio_Button_Input($this->options(), $input_constructor_args);
 				break;
 			// Dropdown
 			case EEM_Question::QST_type_dropdown :
-				$result = new EE_Select_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Input($this->options(), $input_constructor_args);
 				break;
 			// State Dropdown
 			case EEM_Question::QST_type_state :
@@ -554,7 +554,7 @@ 
 					$registration,
 					$answer
 				);				
-				$result = new EE_State_Select_Input( $state_options, $input_constructor_args );
+				$result = new EE_State_Select_Input($state_options, $input_constructor_args);
 				break;
 			// Country Dropdown
 			case EEM_Question::QST_type_country :
@@ -565,49 +565,49 @@ 
 					$registration,
 					$answer
 				);
-				$result = new EE_Country_Select_Input( $country_options, $input_constructor_args );
+				$result = new EE_Country_Select_Input($country_options, $input_constructor_args);
 				break;
 			// Checkboxes
 			case EEM_Question::QST_type_checkbox :
-				$result = new EE_Checkbox_Multi_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Checkbox_Multi_Input($this->options(), $input_constructor_args);
 				break;
 			// Date
 			case EEM_Question::QST_type_date :
-				$result = new EE_Datepicker_Input( $input_constructor_args );
+				$result = new EE_Datepicker_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_html_textarea :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Simple_HTML_Validation_Strategy();
-				$result =  new EE_Text_Area_Input( $input_constructor_args );
-				$result->remove_validation_strategy( 'EE_Plaintext_Validation_Strategy' );
+				$input_constructor_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy();
+				$result = new EE_Text_Area_Input($input_constructor_args);
+				$result->remove_validation_strategy('EE_Plaintext_Validation_Strategy');
 				break;
 			case EEM_Question::QST_type_email :
-				$result = new EE_Email_Input( $input_constructor_args );
+				$result = new EE_Email_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_us_phone :
-				$result = new EE_Phone_Input( $input_constructor_args );
+				$result = new EE_Phone_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_int :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Int_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_Int_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_decimal :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Float_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_Float_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_url :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_URL_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_URL_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_year :
 				$result = new EE_Year_Input(
 						$input_constructor_args,
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this )
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this)
 						);
 				break;
 			case EEM_Question::QST_type_multi_select :
-				$result = new EE_Select_Multiple_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Multiple_Input($this->options(), $input_constructor_args);
 				break;
 			// fallback
 			default :
@@ -618,12 +618,12 @@ 
 					$this,
 					$input_constructor_args
 				);
-				if( ! $default_input ){
-					$default_input = new EE_Text_Input( $input_constructor_args );
+				if ( ! $default_input) {
+					$default_input = new EE_Text_Input($input_constructor_args);
 				}
 				$result = $default_input;
 		}
-		return apply_filters( 'FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer );
+		return apply_filters('FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer);
 	}
 
 

Doc Comments +2 added lines, -2 removed lines

@@ -369,7 +369,7 @@ 
 	 * Adds an option for this question. Note: if the option were previously associated with a different
 	 * Question, that relationship will be overwritten.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function add_option( EE_Question_Option $option ) {
 		return $this->_add_relation_to( $option, 'Question_Option' );
@@ -392,7 +392,7 @@ 
 	/**
 	 * Marks the option as deleted.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function remove_option( EE_Question_Option $option ) {
 		return $this->_remove_relation_to( $option, 'Question_Option' );

core/libraries/messages/EE_Message_Resource_Manager.lib.php

Spacing +162 added lines, -162 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');
 }
 
 
@@ -134,14 +134,14 @@ 
 	 * @return EE_Messenger_Collection
 	 */
 	protected function _initialize_collections() {
-		if ( $this->_initialized ) {
+		if ($this->_initialized) {
 			return;
 		}
 		$this->_initialized = true;
 		$this->_messenger_collection_loader->load_messengers_from_folder();
 		$this->_message_type_collection_loader->load_message_types_from_folder();
 		$this->_set_active_messengers_and_message_types();
-		$this->get_has_activated_messengers_option( true );
+		$this->get_has_activated_messengers_option(true);
 	}
 
 
@@ -170,8 +170,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);
 	}
 
 
@@ -182,9 +182,9 @@ 
 	 * @param string $messenger
 	 * @return EE_messenger | null
 	 */
-	public function get_active_messenger( $messenger ) {
+	public function get_active_messenger($messenger) {
 		$this->_initialize_collections();
-		return ! empty( $this->_active_messengers[ $messenger ] ) ? $this->_active_messengers[ $messenger ] : null;
+		return ! empty($this->_active_messengers[$messenger]) ? $this->_active_messengers[$messenger] : null;
 	}
 
 
@@ -193,11 +193,11 @@ 
 	 * @return \EE_messenger[]
 	 */
 	public function installed_messengers() {
-		if ( empty( $this->_installed_messengers ) ) {
+		if (empty($this->_installed_messengers)) {
 			$this->_installed_messengers = array();
 			$this->messenger_collection()->rewind();
-			while ( $this->messenger_collection()->valid() ) {
-				$this->_installed_messengers[ $this->messenger_collection()->current()->name ] = $this->messenger_collection()->current();
+			while ($this->messenger_collection()->valid()) {
+				$this->_installed_messengers[$this->messenger_collection()->current()->name] = $this->messenger_collection()->current();
 				$this->messenger_collection()->next();
 			}
 		}
@@ -211,14 +211,14 @@ 
 	 * @return \EE_messenger
 	 * @throws \EE_Error
 	 */
-	public function valid_messenger( $messenger_name ) {
-		$messenger = $this->get_messenger( $messenger_name );
-		if ( $messenger instanceof EE_messenger ) {
+	public function valid_messenger($messenger_name) {
+		$messenger = $this->get_messenger($messenger_name);
+		if ($messenger instanceof EE_messenger) {
 			return $messenger;
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'The "%1$s" messenger is either invalid or not installed', 'event_espresso' ),
+				__('The "%1$s" messenger is either invalid or not installed', 'event_espresso'),
 				$messenger_name
 			)
 		);
@@ -250,8 +250,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);
 	}
 
 
@@ -263,9 +263,9 @@ 
 	 * @param string $message_type_name
 	 * @return \EE_message_type|null
 	 */
-	public function get_active_message_type_for_messenger( $messenger_name, $message_type_name ) {
-		return $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name )
-			? $this->get_message_type( $message_type_name )
+	public function get_active_message_type_for_messenger($messenger_name, $message_type_name) {
+		return $this->is_message_type_active_for_messenger($messenger_name, $message_type_name)
+			? $this->get_message_type($message_type_name)
 			: null;
 	}
 
@@ -279,9 +279,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public function is_message_type_active_for_messenger( $messenger_name, $message_type_name ) {
+	public function is_message_type_active_for_messenger($messenger_name, $message_type_name) {
 		$this->_initialize_collections();
-		return ! empty( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ] );
+		return ! empty($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]);
 	}
 
 
@@ -292,9 +292,9 @@ 
 	 * @param string $messenger_name  the name of the messenger to check if active.
 	 * @return bool
 	 */
-	public function is_messenger_active( $messenger_name ) {
+	public function is_messenger_active($messenger_name) {
 		$this->_initialize_collections();
-		return ! empty( $this->_active_message_types[ $messenger_name ] );
+		return ! empty($this->_active_message_types[$messenger_name]);
 	}
 
 
@@ -305,11 +305,11 @@ 
 	 * @param string $message_type_name  The slug of the message type getting the settings for.
 	 * @return array
 	 */
-	public function get_message_type_settings_for_messenger( $messenger_name, $message_type_name ) {
+	public function get_message_type_settings_for_messenger($messenger_name, $message_type_name) {
 		$settings = array();
-		if ( $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
-			$settings =  isset( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ]['settings'] )
-				? $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ]['settings']
+		if ($this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
+			$settings = isset($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]['settings'])
+				? $this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]['settings']
 				: array();
 		}
 		return $settings;
@@ -324,11 +324,11 @@ 
 	 * @param string $messenger_name
 	 * @return bool
 	 */
-	public function messenger_has_active_message_types( $messenger_name ) {
+	public function messenger_has_active_message_types($messenger_name) {
 		$this->_initialize_collections();
 		return
-			! empty( $this->_active_message_types[ $messenger_name ] )
-			&& ! empty( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ] );
+			! empty($this->_active_message_types[$messenger_name])
+			&& ! empty($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types']);
 	}
 
 
@@ -341,15 +341,15 @@ 
 	 * @param string $messenger_name The messenger being checked
 	 * @return EE_message_type[]    (or empty array if none present)
 	 */
-	public function get_active_message_types_for_messenger( $messenger_name ) {
+	public function get_active_message_types_for_messenger($messenger_name) {
 		$message_types = array();
-		if ( ! $this->messenger_has_active_message_types( $messenger_name ) ) {
+		if ( ! $this->messenger_has_active_message_types($messenger_name)) {
 			return $message_types;
 		}
 		$installed_message_types = $this->installed_message_types();
-		foreach ( $installed_message_types as $message_type_name => $message_type ) {
-			if ( $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
-				$message_types[ $message_type_name ] = $message_type;
+		foreach ($installed_message_types as $message_type_name => $message_type) {
+			if ($this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
+				$message_types[$message_type_name] = $message_type;
 			}
 		}
 		return $message_types;
@@ -367,12 +367,12 @@ 
 	public function list_of_active_message_types() {
 		$active_message_type_names = array();
 		$this->_initialize_collections();
-		foreach ( $this->_active_message_types as $messenger => $messenger_settings ) {
-			if ( ! isset( $messenger_settings['settings'][ $messenger . '-message_types' ] ) ) {
+		foreach ($this->_active_message_types as $messenger => $messenger_settings) {
+			if ( ! isset($messenger_settings['settings'][$messenger.'-message_types'])) {
 				continue;
 			}
-			foreach ( $messenger_settings['settings'][ $messenger . '-message_types' ] as $message_type_name => $message_type_config ) {
-				if ( ! in_array( $message_type_name, $active_message_type_names ) ) {
+			foreach ($messenger_settings['settings'][$messenger.'-message_types'] as $message_type_name => $message_type_config) {
+				if ( ! in_array($message_type_name, $active_message_type_names)) {
 					$active_message_type_names[] = $message_type_name;
 				}
 			}
@@ -392,9 +392,9 @@ 
 		$active_message_types = array();
 		$installed_message_types = $this->installed_message_types();
 		$active_message_type_names = $this->list_of_active_message_types();
-		foreach ( $active_message_type_names as $active_message_type_name ) {
-			if ( isset( $installed_message_types[ $active_message_type_name ] ) ) {
-				$active_message_types[ $active_message_type_name ] = $installed_message_types[ $active_message_type_name ];
+		foreach ($active_message_type_names as $active_message_type_name) {
+			if (isset($installed_message_types[$active_message_type_name])) {
+				$active_message_types[$active_message_type_name] = $installed_message_types[$active_message_type_name];
 			}
 		}
 		return $active_message_types;
@@ -406,10 +406,10 @@ 
 	 * @return \EE_message_type[]
 	 */
 	public function installed_message_types() {
-		if ( empty( $this->_installed_message_types ) ) {
+		if (empty($this->_installed_message_types)) {
 			$this->message_type_collection()->rewind();
-			while ( $this->message_type_collection()->valid() ) {
-				$this->_installed_message_types[ $this->message_type_collection()->current()->name ] = $this->message_type_collection()->current();
+			while ($this->message_type_collection()->valid()) {
+				$this->_installed_message_types[$this->message_type_collection()->current()->name] = $this->message_type_collection()->current();
 				$this->message_type_collection()->next();
 			}
 		}
@@ -422,14 +422,14 @@ 
 	 * @return \EE_message_type
 	 * @throws \EE_Error
 	 */
-	public function valid_message_type( $message_type_name ) {
-		$message_type = $this->get_message_type( $message_type_name );
-		if ( $message_type instanceof EE_message_type ) {
+	public function valid_message_type($message_type_name) {
+		$message_type = $this->get_message_type($message_type_name);
+		if ($message_type instanceof EE_message_type) {
 			return $message_type;
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'The "%1$s" message type is either invalid or not installed', 'event_espresso' ),
+				__('The "%1$s" message type is either invalid or not installed', 'event_espresso'),
 				$message_type_name
 			)
 		);
@@ -445,9 +445,9 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function valid_message_type_for_messenger( EE_messenger $messenger, $message_type_name ) {
+	public function valid_message_type_for_messenger(EE_messenger $messenger, $message_type_name) {
 		$valid_message_types = $messenger->get_valid_message_types();
-		if ( ! in_array( $message_type_name, $valid_message_types ) ) {
+		if ( ! in_array($message_type_name, $valid_message_types)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -474,9 +474,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_active_messengers_option( $reset = false) {
-		if ( $reset ) {
-			$this->_active_message_types = get_option( 'ee_active_messengers', array() );
+	public function get_active_messengers_option($reset = false) {
+		if ($reset) {
+			$this->_active_message_types = get_option('ee_active_messengers', array());
 		}
 		return $this->_active_message_types;
 	}
@@ -490,11 +490,11 @@ 
 	 *                                 representing this data is used.
 	 * @return bool FALSE if not updated, TRUE if updated.
 	 */
-	public function update_active_messengers_option( $active_messenger_settings = array() ) {
-		$active_messenger_settings = empty( $active_messenger_settings ) ? $this->_active_message_types : $active_messenger_settings;
+	public function update_active_messengers_option($active_messenger_settings = array()) {
+		$active_messenger_settings = empty($active_messenger_settings) ? $this->_active_message_types : $active_messenger_settings;
 		//make sure _active_message_types is updated (this is the internal cache for the settings).
 		$this->_active_message_types = $active_messenger_settings;
-		return update_option( 'ee_active_messengers', $active_messenger_settings );
+		return update_option('ee_active_messengers', $active_messenger_settings);
 	}
 
 
@@ -509,9 +509,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_has_activated_messengers_option( $reset = false ) {
-		if ( $reset ) {
-			$this->_has_activated_messengers_and_message_types = get_option( 'ee_has_activated_messenger', array() );
+	public function get_has_activated_messengers_option($reset = false) {
+		if ($reset) {
+			$this->_has_activated_messengers_and_message_types = get_option('ee_has_activated_messenger', array());
 		}
 		return $this->_has_activated_messengers_and_message_types;
 	}
@@ -526,11 +526,11 @@ 
 	 *
 	 * @return bool FALSE if not updated, TRUE if updated.
 	 */
-	public function update_has_activated_messengers_option( $has_activated_messengers = array() ) {
-		$has_activated_messengers = empty( $has_activated_messengers )
+	public function update_has_activated_messengers_option($has_activated_messengers = array()) {
+		$has_activated_messengers = empty($has_activated_messengers)
 			? $this->_has_activated_messengers_and_message_types
 			: $has_activated_messengers;
-		return update_option( 'ee_has_activated_messenger', $has_activated_messengers );
+		return update_option('ee_has_activated_messenger', $has_activated_messengers);
 	}
 
 
@@ -552,8 +552,8 @@ 
 		//echo "\n\n " . __LINE__ . ") " . __METHOD__ . "() \n";
 		// list of activated messengers as set via the admin
 		// note calling `get_active_messengers_options` also initializes the _active_message_types property.
-		$this->get_active_messengers_option( true );
-		$this->ensure_messengers_are_active( array(), false, true );
+		$this->get_active_messengers_option(true);
+		$this->ensure_messengers_are_active(array(), false, true);
 		$this->update_active_messengers_option();
 		$this->update_has_activated_messengers_option();
 	}
@@ -571,11 +571,11 @@ 
 	 * @param bool   $update_option  Whether to update the option in the db or not.
 	 * @return boolean true if either already active or successfully activated.
 	 */
-	public function ensure_messenger_is_active( $messenger_name, $update_option = true ) {
-		if ( ! isset( $this->_active_messengers[ $messenger_name ] ) ) {
+	public function ensure_messenger_is_active($messenger_name, $update_option = true) {
+		if ( ! isset($this->_active_messengers[$messenger_name])) {
 			try {
-				$this->activate_messenger( $messenger_name, array(), $update_option );
-			} catch( EE_Error $e ) {
+				$this->activate_messenger($messenger_name, array(), $update_option);
+			} catch (EE_Error $e) {
 				EE_Error::add_error(
 					$e->getMessage(),
 					__FILE__,
@@ -602,25 +602,25 @@ 
 	 *                                and a messenger is indicated as active, but is NOT installed, then it will automatically be
 	 *                                deactivated.
 	 */
-	public function ensure_messengers_are_active( $messenger_names = array(), $update_option = true, $verify = false ) {
-		$messenger_names = empty( $messenger_names ) ? array_keys( $this->_active_message_types ) : $messenger_names;
+	public function ensure_messengers_are_active($messenger_names = array(), $update_option = true, $verify = false) {
+		$messenger_names = empty($messenger_names) ? array_keys($this->_active_message_types) : $messenger_names;
 
 		$not_installed = array();
-		foreach( $messenger_names as $messenger_name ) {
-			if ( $verify && ! $this->messenger_collection()->has_by_name( $messenger_name ) ) {
+		foreach ($messenger_names as $messenger_name) {
+			if ($verify && ! $this->messenger_collection()->has_by_name($messenger_name)) {
 				$not_installed[] = $messenger_name;
-				$this->deactivate_messenger( $messenger_name );
+				$this->deactivate_messenger($messenger_name);
 				continue;
 			}
-			$this->ensure_messenger_is_active( $messenger_name, $update_option );
+			$this->ensure_messenger_is_active($messenger_name, $update_option);
 		}
 
-		if ( ! empty( $not_installed_messenger ) ) {
+		if ( ! empty($not_installed_messenger)) {
 			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_messenger )
+					implode(', ', $not_installed_messenger)
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -639,18 +639,18 @@ 
 	 * @return bool  Returns true if already is active or if was activated successfully.
 	 * @throws \EE_Error
 	 */
-	public function ensure_message_type_is_active( $message_type_name, $messenger_name, $update_option = true ) {
+	public function ensure_message_type_is_active($message_type_name, $messenger_name, $update_option = true) {
 		// grab the messenger to work with.
-		$messenger = $this->valid_messenger( $messenger_name );
-		if ( $this->valid_message_type_for_messenger( $messenger, $message_type_name ) ) {
+		$messenger = $this->valid_messenger($messenger_name);
+		if ($this->valid_message_type_for_messenger($messenger, $message_type_name)) {
 			//ensure messenger is active (that's an inherent coupling between active message types and the
 			//messenger they are being activated for.
 			try {
-				if ( ! $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
+				if ( ! $this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
 					//all is good so let's just get it active
-					$this->activate_messenger( $messenger_name, array( $message_type_name ), $update_option );
+					$this->activate_messenger($messenger_name, array($message_type_name), $update_option);
 				}
-			} catch( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				EE_Error::add_error(
 					$e->getMessage(),
 					__FILE__,
@@ -674,14 +674,14 @@ 
 	 * @param string $messenger_name      The name of the messenger that the message types are to be activated on.
 	 * @param bool   $update_option       Whether to persist the activation to the database or not (default true).
 	 */
-	public function ensure_message_types_are_active( $message_type_names, $messenger_name, $update_option = true ) {
+	public function ensure_message_types_are_active($message_type_names, $messenger_name, $update_option = true) {
 		$message_type_names = (array) $message_type_names;
-		foreach ( $message_type_names as $message_type_name ) {
+		foreach ($message_type_names as $message_type_name) {
 			// note, intentionally not updating option here because we're in a loop.
 			// We'll follow the instructions of the incoming $update_option argument after the loop.
-			$this->ensure_message_type_is_active( $message_type_name, $messenger_name, false );
+			$this->ensure_message_type_is_active($message_type_name, $messenger_name, false);
 		}
-		if ( $update_option ) {
+		if ($update_option) {
 			$this->update_active_messengers_option();
 			$this->update_has_activated_messengers_option();
 		}
@@ -708,24 +708,24 @@ 
 	) {
 		$templates = array();
 		// grab the messenger to work with.
-		$messenger = $this->messenger_collection()->get_by_info( $messenger_name );
+		$messenger = $this->messenger_collection()->get_by_info($messenger_name);
 		// it's inactive. Activate it.
-		if ( $messenger instanceof EE_messenger ) {
-			$this->_active_messengers[ $messenger->name ] = $messenger;
+		if ($messenger instanceof EE_messenger) {
+			$this->_active_messengers[$messenger->name] = $messenger;
 			//activate incoming message types set to be activated with messenger.
-			$message_type_names = $this->_activate_message_types( $messenger, $message_type_names );
+			$message_type_names = $this->_activate_message_types($messenger, $message_type_names);
 			// setup any initial settings for the messenger if necessary.
-			$this->add_settings_for_messenger( $messenger->name );
-			if ( $update_active_messengers_option ) {
+			$this->add_settings_for_messenger($messenger->name);
+			if ($update_active_messengers_option) {
 				$this->update_active_messengers_option();
 				$this->update_has_activated_messengers_option();
 			}
 			//generate new templates if necessary and ensure all related templates that are already in the database are
 			//marked active.  Note, this will also deactivate a message type for a messenger if the template
 			//cannot be successfully created during its attempt (only happens for global template attempts).
-			if ( ! empty( $message_type_names ) ) {
-				$templates = EEH_MSG_Template::generate_new_templates( $messenger->name, $message_type_names, 0, true );
-				EEH_MSG_Template::update_to_active( array( $messenger->name ), $message_type_names );
+			if ( ! empty($message_type_names)) {
+				$templates = EEH_MSG_Template::generate_new_templates($messenger->name, $message_type_names, 0, true);
+				EEH_MSG_Template::update_to_active(array($messenger->name), $message_type_names);
 			}
 		}
 		return $templates;
@@ -744,29 +744,29 @@ 
 	 *
 	 * @return array
 	 */
-	protected function _activate_message_types( EE_messenger $messenger, $message_type_names = array() ) {
+	protected function _activate_message_types(EE_messenger $messenger, $message_type_names = array()) {
 		//If $message_type_names is empty, AND $this->_active_message_types is empty, then that means
 		//things have never been initialized (which should happen on EEH_Activation::generate_message_templates).
 		//So ONLY then do we need to actually grab defaults and cycle through them.  Otherwise we
 		//only override _active_message_types when an explicit array of $message_type_names has been provided.
-		$message_type_names = empty( $message_type_names ) && ! isset( $this->_active_message_types[ $messenger->name ] )
+		$message_type_names = empty($message_type_names) && ! isset($this->_active_message_types[$messenger->name])
 			? $messenger->get_default_message_types()
 			: (array) $message_type_names;
 
 		//now we ALWAYS need to make sure that the messenger is active for the message types we're activating!
-		if ( ! isset( $this->_active_message_types[ $messenger->name ] ) ) {
-			$this->_active_message_types[ $messenger->name ]['settings'] = array();
+		if ( ! isset($this->_active_message_types[$messenger->name])) {
+			$this->_active_message_types[$messenger->name]['settings'] = array();
 		}
 
-		if ( $message_type_names ) {
+		if ($message_type_names) {
 			// cycle thru message types
-			foreach ( $message_type_names as $message_type_name ) {
+			foreach ($message_type_names as $message_type_name) {
 				//only register the message type as active IF it isn't already active!
 				//and if its actually installed.
 				if (
-					! $this->is_message_type_active_for_messenger( $messenger->name, $message_type_name )
+					! $this->is_message_type_active_for_messenger($messenger->name, $message_type_name)
 				) {
-					$this->add_settings_for_message_type( $messenger->name, $message_type_name );
+					$this->add_settings_for_message_type($messenger->name, $message_type_name);
 					$this->_set_messenger_has_activated_message_type(
 						$messenger,
 						$message_type_name
@@ -789,24 +789,24 @@ 
 	 * @param  string       $message_type_name The name of the message type adding the settings for
 	 * @param  array        $new_settings     Any new settings being set for the message type and messenger
 	 */
-	public function add_settings_for_message_type( $messenger_name, $message_type_name, $new_settings = array() ) {
+	public function add_settings_for_message_type($messenger_name, $message_type_name, $new_settings = array()) {
 		// get installed message type from collection
-		$message_type = $this->message_type_collection()->get_by_info( $message_type_name );
-		$existing_settings = $this->get_message_type_settings_for_messenger( $messenger_name, $message_type_name );
+		$message_type = $this->message_type_collection()->get_by_info($message_type_name);
+		$existing_settings = $this->get_message_type_settings_for_messenger($messenger_name, $message_type_name);
 		//we need to setup any initial settings for message types
-		if ( $message_type instanceof EE_message_type ) {
+		if ($message_type instanceof EE_message_type) {
 			$default_settings = $message_type->get_admin_settings_fields();
-			foreach ( $default_settings as $field => $values ) {
-				if ( isset( $new_settings[ $field ] ) ) {
-					$existing_settings[ $field ] = $new_settings[ $field ];
+			foreach ($default_settings as $field => $values) {
+				if (isset($new_settings[$field])) {
+					$existing_settings[$field] = $new_settings[$field];
 					continue;
 				}
-				if ( ! isset( $existing_settings[ $field ] ) ) {
-					$existing_settings[ $field ] = $values['default'];
+				if ( ! isset($existing_settings[$field])) {
+					$existing_settings[$field] = $values['default'];
 				}
 			}
 		}
-		$this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ]['settings'] = $existing_settings;
+		$this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]['settings'] = $existing_settings;
 	}
 
 
@@ -819,14 +819,14 @@ 
 	 * @param \EE_messenger $messenger
 	 * @param string        $message_type_name
 	 */
-	protected function _set_messenger_has_activated_message_type( EE_messenger $messenger, $message_type_name ) {
+	protected function _set_messenger_has_activated_message_type(EE_messenger $messenger, $message_type_name) {
 		// make sure this messenger has a record in the has_activated array
-		if ( ! isset( $this->_has_activated_messengers_and_message_types[ $messenger->name ] ) ) {
-			$this->_has_activated_messengers_and_message_types[ $messenger->name ] = array();
+		if ( ! isset($this->_has_activated_messengers_and_message_types[$messenger->name])) {
+			$this->_has_activated_messengers_and_message_types[$messenger->name] = array();
 		}
 		// check if message type has already been added
-		if ( ! in_array( $message_type_name, $this->_has_activated_messengers_and_message_types[ $messenger->name ] ) ) {
-			$this->_has_activated_messengers_and_message_types[ $messenger->name ][] = $message_type_name;
+		if ( ! in_array($message_type_name, $this->_has_activated_messengers_and_message_types[$messenger->name])) {
+			$this->_has_activated_messengers_and_message_types[$messenger->name][] = $message_type_name;
 		}
 	}
 
@@ -841,20 +841,20 @@ 
 	 * @param string        $messenger_name The name of the messenger the settings is being added for.
 	 * @param array         $new_settings   An array of settings to update the existing settings.
 	 */
-	public function add_settings_for_messenger( $messenger_name, $new_settings = array() ) {
-		$messenger = $this->get_messenger( $messenger_name );
-		if ( $messenger instanceof EE_messenger ) {
+	public function add_settings_for_messenger($messenger_name, $new_settings = array()) {
+		$messenger = $this->get_messenger($messenger_name);
+		if ($messenger instanceof EE_messenger) {
 			$msgr_settings = $messenger->get_admin_settings_fields();
-			if ( ! empty( $msgr_settings ) ) {
-				foreach ( $msgr_settings as $field => $value ) {
+			if ( ! empty($msgr_settings)) {
+				foreach ($msgr_settings as $field => $value) {
 					//is there a new setting for this?
-					if ( isset( $new_settings[ $field ] ) ) {
-						$this->_active_message_types[ $messenger->name ]['settings'][ $field ] = $new_settings[ $field ];
+					if (isset($new_settings[$field])) {
+						$this->_active_message_types[$messenger->name]['settings'][$field] = $new_settings[$field];
 						continue;
 					}
 					//only set the default if it isn't already set.
-					if ( ! isset( $this->_active_message_types[ $messenger->name ]['settings'][ $field ] ) ) {
-						$this->_active_message_types[ $messenger->name ]['settings'][ $field ] = $value;
+					if ( ! isset($this->_active_message_types[$messenger->name]['settings'][$field])) {
+						$this->_active_message_types[$messenger->name]['settings'][$field] = $value;
 					}
 				}
 			}
@@ -869,13 +869,13 @@ 
 	 * @param  string|EE_messenger $messenger_name name of messenger
 	 * @return void
 	 */
-	public function deactivate_messenger( $messenger_name ) {
-		if ( $messenger_name instanceof EE_messenger ) {
+	public function deactivate_messenger($messenger_name) {
+		if ($messenger_name instanceof EE_messenger) {
 			$messenger_name = $messenger_name->name;
 		}
-		unset( $this->_active_messengers[ $messenger_name ] );
-		unset( $this->_active_message_types[ $messenger_name ] );
-		$this->_message_template_group_model->deactivate_message_template_groups_for( $messenger_name );
+		unset($this->_active_messengers[$messenger_name]);
+		unset($this->_active_message_types[$messenger_name]);
+		$this->_message_template_group_model->deactivate_message_template_groups_for($messenger_name);
 		$this->update_active_messengers_option();
 	}
 
@@ -885,16 +885,16 @@ 
 	 *
 	 * @param  string $message_type_name name of message type being deactivated
 	 */
-	public function deactivate_message_type( $message_type_name ) {
-		if ( $message_type_name instanceof EE_message_type ) {
+	public function deactivate_message_type($message_type_name) {
+		if ($message_type_name instanceof EE_message_type) {
 			$message_type_name = $message_type_name->name;
 		}
-		foreach ( $this->_active_message_types as $messenger => $settings ) {
+		foreach ($this->_active_message_types as $messenger => $settings) {
 			unset(
-				$this->_active_message_types[ $messenger ]['settings'][ $messenger . '-message_types' ][ $message_type_name ]
+				$this->_active_message_types[$messenger]['settings'][$messenger.'-message_types'][$message_type_name]
 			);
 		}
-		$this->_message_template_group_model->deactivate_message_template_groups_for( '', $message_type_name );
+		$this->_message_template_group_model->deactivate_message_template_groups_for('', $message_type_name);
 		$this->update_active_messengers_option();
 	}
 
@@ -908,11 +908,11 @@ 
 	 * @param string $message_type_name  Name of message type being deactivated.
 	 * @param string $messenger_name     Name of messenger the message type is being deactivated for.
 	 */
-	public function deactivate_message_type_for_messenger( $message_type_name, $messenger_name ) {
-		if ( $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
-			unset( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ] );
+	public function deactivate_message_type_for_messenger($message_type_name, $messenger_name) {
+		if ($this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
+			unset($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]);
 		}
-		$this->_message_template_group_model->deactivate_message_template_groups_for( array( $messenger_name ), array( $message_type_name ) );
+		$this->_message_template_group_model->deactivate_message_template_groups_for(array($messenger_name), array($message_type_name));
 		$this->update_active_messengers_option();
 	}
 
@@ -929,12 +929,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.
-		foreach ( $message_type->with_messengers() as $generating_messenger => $secondary_messengers ) {
+		foreach ($message_type->with_messengers() as $generating_messenger => $secondary_messengers) {
 			if (
 				$messenger->name === $generating_messenger
-				&& $this->is_message_type_active_for_messenger( $messenger->name, $message_type->name )
+				&& $this->is_message_type_active_for_messenger($messenger->name, $message_type->name)
 			) {
 				return true;
 			}
@@ -971,25 +971,25 @@ 
 	 *                           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';
 		// check if contexts has been setup yet.
-		if ( empty( $this->_contexts[ $key ] ) ) {
+		if (empty($this->_contexts[$key])) {
 			// So let's get all active message type objects and loop through to get all unique contexts
-			foreach ( $this->get_active_message_type_objects() as $message_type ) {
-				if ( $message_type instanceof EE_message_type ) {
+			foreach ($this->get_active_message_type_objects() as $message_type) {
+				if ($message_type instanceof EE_message_type) {
 					$message_type_contexts = $message_type->get_contexts();
-					if ( $slugs_only ) {
-						foreach ( $message_type_contexts as $context => $context_details ) {
-							$this->_contexts[ $key ][ $context ] = $context_details[ 'label' ];
+					if ($slugs_only) {
+						foreach ($message_type_contexts as $context => $context_details) {
+							$this->_contexts[$key][$context] = $context_details['label'];
 						}
 					} else {
-						$this->_contexts[ $key ][ $message_type->name ] = $message_type_contexts;
+						$this->_contexts[$key][$message_type->name] = $message_type_contexts;
 					}
 				}
 			}
 		}
-		return ! empty( $this->_contexts[ $key ] ) ? $this->_contexts[ $key ] : array();
+		return ! empty($this->_contexts[$key]) ? $this->_contexts[$key] : array();
 	}
 
 
@@ -1008,9 +1008,9 @@ 
 		$installed_message_types = $this->installed_message_types();
 		$all_message_types_valid = true;
 		//loop through list of active message types and verify they are installed.
-		foreach( $list_of_active_message_type_names as $message_type_name ) {
-			if ( ! isset( $installed_message_types[$message_type_name] ) ) {
-				$this->deactivate_message_type( $message_type_name );
+		foreach ($list_of_active_message_type_names as $message_type_name) {
+			if ( ! isset($installed_message_types[$message_type_name])) {
+				$this->deactivate_message_type($message_type_name);
 				$all_message_types_valid = false;
 			}
 		}
@@ -1029,10 +1029,10 @@ 
 	 * @param $messenger_name
 	 * @return bool
 	 */
-	public function has_message_type_been_activated_for_messenger( $message_type_name, $messenger_name ) {
+	public function has_message_type_been_activated_for_messenger($message_type_name, $messenger_name) {
 		$has_activated = $this->get_has_activated_messengers_option();
-		return isset( $has_activated[ $messenger_name ] )
-			&& in_array( $message_type_name, $has_activated[ $messenger_name ] );
+		return isset($has_activated[$messenger_name])
+			&& in_array($message_type_name, $has_activated[$messenger_name]);
 	}
 }
 // End of file EE_Message_Resource_Manager.lib.php

core/libraries/plugin_api/EE_Register_Message_Type.lib.php

Spacing +51 added lines, -51 removed lines

@@ -50,79 +50,79 @@ 
 	 * @throws \EE_Error
 	 * }
 	 */
-	public static function register( $mt_name = NULL, $setup_args = array() ) {
+	public static function register($mt_name = NULL, $setup_args = array()) {
 		//required fields MUST be present, so let's make sure they are.
 		if (
-			! isset( $mt_name )
-			|| ! is_array( $setup_args )
-			|| empty( $setup_args['mtfilename'] ) || empty( $setup_args['autoloadpaths'] )
-		){
+			! isset($mt_name)
+			|| ! is_array($setup_args)
+			|| empty($setup_args['mtfilename']) || empty($setup_args['autoloadpaths'])
+		) {
 			throw new EE_Error(
-				__( 'In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso' )
+				__('In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso')
 			);
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_message_type_registry[ $mt_name ] ) ){
+		if (isset(self::$_ee_message_type_registry[$mt_name])) {
 			return;
 		}
 
 		//make sure this was called in the right place!
 		if (
-			! did_action( 'EE_Brewing_Regular___messages_caf' )
-			|| did_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' )
+			! did_action('EE_Brewing_Regular___messages_caf')
+			|| did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
 		) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
-					__('A message type named "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.','event_espresso'),
+					__('A message type named "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.', 'event_espresso'),
 					$mt_name
 				),
 				'4.3.0'
 			);
 		}
 		//setup $__ee_message_type_registry array from incoming values.
-		self::$_ee_message_type_registry[ $mt_name ] = array(
+		self::$_ee_message_type_registry[$mt_name] = array(
 			'mtfilename' => (string) $setup_args['mtfilename'],
 			'autoloadpaths' => (array) $setup_args['autoloadpaths'],
-			'messengers_to_activate_with' => ! empty( $setup_args['messengers_to_activate_with'] )
+			'messengers_to_activate_with' => ! empty($setup_args['messengers_to_activate_with'])
 				? (array) $setup_args['messengers_to_activate_with']
 				: array(),
-			'messengers_to_validate_with' => ! empty( $setup_args['messengers_to_validate_with'] )
+			'messengers_to_validate_with' => ! empty($setup_args['messengers_to_validate_with'])
 				? (array) $setup_args['messengers_to_validate_with']
 				: array(),
-			'force_activation' => ! empty( $setup_args['force_activation'] )
+			'force_activation' => ! empty($setup_args['force_activation'])
 				? (bool) $setup_args['force_activation']
 				: array()
 		);
 		//add filters
 		add_filter(
 			'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
-			array( 'EE_Register_Message_Type', 'register_msgs_autoload_paths' ),
+			array('EE_Register_Message_Type', 'register_msgs_autoload_paths'),
 			10
 		);
 		add_filter(
 			'FHEE__EE_messages__get_installed__messagetype_files',
-			array( 'EE_Register_Message_Type', 'register_messagetype_files' ),
+			array('EE_Register_Message_Type', 'register_messagetype_files'),
 			10,
 			1
 		);
 		add_filter(
 			'FHEE__EE_messenger__get_default_message_types__default_types',
-			array( 'EE_Register_Message_Type', 'register_messengers_to_activate_mt_with' ),
+			array('EE_Register_Message_Type', 'register_messengers_to_activate_mt_with'),
 			10,
 			2
 		);
 		add_filter(
 			'FHEE__EE_messenger__get_valid_message_types__valid_types',
-			array( 'EE_Register_Message_Type', 'register_messengers_to_validate_mt_with' ),
+			array('EE_Register_Message_Type', 'register_messengers_to_validate_mt_with'),
 			10,
 			2
 		);
 		//actions
 		add_action(
 			'AHEE__EE_Addon__initialize_default_data__begin',
-			array( 'EE_Register_Message_Type', 'set_defaults' )
+			array('EE_Register_Message_Type', 'set_defaults')
 		);
 	}
 
@@ -133,15 +133,15 @@ 
 	 */
 	public static function set_defaults() {
 		/** @type 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');
 
 		//for any message types with force activation, let's ensure they are activated
-		foreach ( self::$_ee_message_type_registry as $message_type_name => $settings ) {
-			if ( $settings['force_activation'] ) {
-				foreach ( $settings['messengers_to_activate_with'] as $messenger ) {
+		foreach (self::$_ee_message_type_registry as $message_type_name => $settings) {
+			if ($settings['force_activation']) {
+				foreach ($settings['messengers_to_activate_with'] as $messenger) {
 					//DO not force activation if this message type has already been activated in the system
-					if ( ! $message_resource_manager->has_message_type_been_activated_for_messenger( $message_type_name, $messenger ) ) {
-						$message_resource_manager->ensure_message_type_is_active( $message_type_name, $messenger );
+					if ( ! $message_resource_manager->has_message_type_been_activated_for_messenger($message_type_name, $messenger)) {
+						$message_resource_manager->ensure_message_type_is_active($message_type_name, $messenger);
 					}
 				}
 			}
@@ -158,13 +158,13 @@ 
 	 * @param string  $message_type_name the name for the message type that was previously registered
 	 * @return void
 	 */
-	public static function deregister( $message_type_name = null ) {
-		if ( ! empty( self::$_ee_message_type_registry[ $message_type_name ] ) ) {
+	public static function deregister($message_type_name = null) {
+		if ( ! empty(self::$_ee_message_type_registry[$message_type_name])) {
 			//let's make sure that we remove any place this message type was made active
 			/** @var EE_Message_Resource_Manager $Message_Resource_Manager */
-			$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-			$Message_Resource_Manager->deactivate_message_type( $message_type_name );
-			unset( self::$_ee_message_type_registry[ $message_type_name ] );
+			$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+			$Message_Resource_Manager->deactivate_message_type($message_type_name);
+			unset(self::$_ee_message_type_registry[$message_type_name]);
 		}
 	}
 
@@ -178,12 +178,12 @@ 
 	 * @param  array  $messagetype_files The current array of message type file names
 	 * @return  array                                 Array of message type file names
 	 */
-	public static function register_messagetype_files( $messagetype_files ) {
-		if ( empty( self::$_ee_message_type_registry ) ) {
+	public static function register_messagetype_files($messagetype_files) {
+		if (empty(self::$_ee_message_type_registry)) {
 			return $messagetype_files;
 		}
-		foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-			if ( empty( $mt_reg['mtfilename' ] ) ) {
+		foreach (self::$_ee_message_type_registry as $mt_reg) {
+			if (empty($mt_reg['mtfilename'])) {
 				continue;
 			}
 			$messagetype_files[] = $mt_reg['mtfilename'];
@@ -203,13 +203,13 @@ 
 	 * @param array $paths array of paths to be checked by EE_messages autoloader.
 	 * @return array
 	 */
-	public static function register_msgs_autoload_paths( $paths  ) {
-		if ( ! empty( self::$_ee_message_type_registry ) ) {
-			foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-				if ( empty( $mt_reg['autoloadpaths'] ) ) {
+	public static function register_msgs_autoload_paths($paths) {
+		if ( ! empty(self::$_ee_message_type_registry)) {
+			foreach (self::$_ee_message_type_registry as $mt_reg) {
+				if (empty($mt_reg['autoloadpaths'])) {
 					continue;
 				}
-				$paths = array_merge( $paths, $mt_reg['autoloadpaths'] );
+				$paths = array_merge($paths, $mt_reg['autoloadpaths']);
 			}
 		}
 		return $paths;
@@ -228,18 +228,18 @@ 
 	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
 	 * @return array
 	 */
-	public static function register_messengers_to_activate_mt_with( $default_types, EE_messenger $messenger ) {
-		if ( empty( self::$_ee_message_type_registry ) ) {
+	public static function register_messengers_to_activate_mt_with($default_types, EE_messenger $messenger) {
+		if (empty(self::$_ee_message_type_registry)) {
 			return $default_types;
 		}
-		foreach ( self::$_ee_message_type_registry as $message_type_name => $mt_reg ) {
-			if ( empty( $mt_reg['messengers_to_activate_with'] ) || empty( $mt_reg['mtfilename'] ) ) {
+		foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
+			if (empty($mt_reg['messengers_to_activate_with']) || empty($mt_reg['mtfilename'])) {
 				continue;
 			}
 			// loop through each of the messengers and if it matches the loaded class
 			// then we add this message type to the
-			foreach ( $mt_reg['messengers_to_activate_with'] as $msgr ) {
-				if ( $messenger->name == $msgr ) {
+			foreach ($mt_reg['messengers_to_activate_with'] as $msgr) {
+				if ($messenger->name == $msgr) {
 					$default_types[] = $message_type_name;
 				}
 			}
@@ -259,18 +259,18 @@ 
 	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
 	 * @return  array
 	 */
-	public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) {
-		if ( empty( self::$_ee_message_type_registry ) ) {
+	public static function register_messengers_to_validate_mt_with($valid_types, EE_messenger $messenger) {
+		if (empty(self::$_ee_message_type_registry)) {
 			return $valid_types;
 		}
-		foreach ( self::$_ee_message_type_registry as $message_type_name => $mt_reg ) {
-			if ( empty( $mt_reg['messengers_to_validate_with'] ) || empty( $mt_reg['mtfilename'] ) ) {
+		foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
+			if (empty($mt_reg['messengers_to_validate_with']) || empty($mt_reg['mtfilename'])) {
 				continue;
 			}
 			// loop through each of the messengers and if it matches the loaded class
 			// then we add this message type to the
-			foreach ( $mt_reg['messengers_to_validate_with'] as $msgr ) {
-				if ( $messenger->name == $msgr ) {
+			foreach ($mt_reg['messengers_to_validate_with'] as $msgr) {
+				if ($messenger->name == $msgr) {
 					$valid_types[] = $message_type_name;
 				}
 			}

Indentation +8 added lines, -8 removed lines

@@ -251,14 +251,14 @@
 
 
 	 /**
-	 * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter.
-	 *
-	 * @since   4.3.0
-	 * @param  array        $valid_types 	array of message types valid with messenger (
-	 *                                      corresponds to the $name property of message type)
-	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
-	 * @return  array
-	 */
+	  * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter.
+	  *
+	  * @since   4.3.0
+	  * @param  array        $valid_types 	array of message types valid with messenger (
+	  *                                      corresponds to the $name property of message type)
+	  * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
+	  * @return  array
+	  */
 	public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) {
 		if ( empty( self::$_ee_message_type_registry ) ) {
 			return $valid_types;

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( str_replace( ' ', '_', strtolower( $info ) ) );
+	public function get_by_info($info) {
+		return parent::get_by_info(str_replace(' ', '_', strtolower($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;">' . __CLASS__ . ' class : <span style="color:#E76700">' . $this->getInfo() . '</span></h5>';
+			while ($this->valid()) {
+				echo '<h5 style="color:#2EA2CC;">'.__CLASS__.' class : <span style="color:#E76700">'.$this->getInfo().'</span></h5>';
 				$this->next();
 			}
 		}

Doc Comments +3 added lines, -2 removed lines

@@ -35,8 +35,8 @@ 
 	 * by calling EE_Object_Collection::set_info()
 	 *
 	 * @access public
-	 * @param object $object
-	 * @param mixed  $info
+	 * @param EE_message_type $object
+	 * @param string  $info
 	 * @return bool
 	 */
 	public function add( $object, $info = null ) {
@@ -72,6 +72,7 @@ 
 	 *
 	 * @access public
 	 * @param mixed
+	 * @param string $info
 	 * @return null | object
 	 */
 	public function get_by_info( $info ) {

core/libraries/messages/EE_Messenger_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( str_replace( ' ', '_', strtolower( $info ) ) );
+	public function get_by_info($info) {
+		return parent::get_by_info(str_replace(' ', '_', strtolower($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 $messenger_name
 	 * @return bool
 	 */
-	public function has_by_name( $messenger_name ) {
-		return $this->get_by_info( $messenger_name ) instanceof $this->interface ? true : false;
+	public function has_by_name($messenger_name) {
+		return $this->get_by_info($messenger_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);
 	}
 
 
@@ -148,8 +148,8 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function set_current( $object ) {
-		parent::set_current( $object );
+	public function set_current($object) {
+		parent::set_current($object);
 	}
 
 
@@ -163,8 +163,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);
 	}
 
 
@@ -178,10 +178,10 @@ 
 	 * @return void
 	 */
 	public function show_collection_classes() {
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$this->rewind();
-			while ( $this->valid() ) {
-				echo '<h5 style="color:#2EA2CC;">' . __CLASS__ . ' class : . <span style="color:#E76700">' . $this->getInfo() . '</span></h5>';
+			while ($this->valid()) {
+				echo '<h5 style="color:#2EA2CC;">'.__CLASS__.' class : . <span style="color:#E76700">'.$this->getInfo().'</span></h5>';
 				$this->next();
 			}
 		}

Doc Comments +3 added lines, -2 removed lines

@@ -35,8 +35,8 @@ 
 	 * by calling EE_Object_Collection::set_info()
 	 *
 	 * @access public
-	 * @param object $object
-	 * @param mixed  $info
+	 * @param EE_messenger $object
+	 * @param string  $info
 	 * @return bool
 	 */
 	public function add( $object, $info = null ) {
@@ -72,6 +72,7 @@ 
 	 *
 	 * @access public
 	 * @param mixed
+	 * @param string $info
 	 * @return null | object
 	 */
 	public function get_by_info( $info ) {

core/libraries/messages/data_class/EE_Messages_incoming_data.core.php

Spacing +65 added lines, -65 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -266,7 +266,7 @@ 
 	 * @param mixed $data incoming data object|array.  Suggested that child classes use type hinting for expected
 	 * data object.  But here parent will be generic because we don't know what's coming in.
 	 */
-	public function __construct( $data ) {
+	public function __construct($data) {
 		$this->_data = $data;
 		$this->_setup_data();
 	}
@@ -288,7 +288,7 @@ 
 	 *
 	 * @return mixed   The prepped data for db
 	 */
-	static public function convert_data_for_persistent_storage( $data ) {
+	static public function convert_data_for_persistent_storage($data) {
 		return $data;
 	}
 
@@ -304,7 +304,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		return $data;
 	}
 
@@ -331,8 +331,8 @@ 
 	protected function _assemble_data() {
 		//verify that reg_objs is set
 		if (
-			! is_array( $this->reg_objs )
-			&& ! reset( $this->reg_objs ) instanceof EE_Registration
+			! is_array($this->reg_objs)
+			&& ! reset($this->reg_objs) instanceof EE_Registration
 		) {
 			throw new EE_Error(
 				__(
@@ -347,82 +347,82 @@ 
 		$answers = $questions = $attendees = $line_items = $registrations = array();
 		$total_ticket_count = 0;
 
-		if ( ! empty( $this->reg_objs ) ) {
+		if ( ! empty($this->reg_objs)) {
 			$event_attendee_count = array();
-			foreach ( $this->reg_objs as $reg ) {
+			foreach ($this->reg_objs as $reg) {
 				//account for filtered registrations by status.
-				if ( ! empty( $this->filtered_reg_status ) && $this->filtered_reg_status !== $reg->status_ID() ) {
+				if ( ! empty($this->filtered_reg_status) && $this->filtered_reg_status !== $reg->status_ID()) {
 					continue;
 				}
 
 				$evt_id = $reg->event_ID();
 				/** @type EE_Ticket $ticket */
-				$ticket = $reg->get_first_related( 'Ticket' );
+				$ticket = $reg->get_first_related('Ticket');
 				$relateddatetime = $ticket->datetimes();
 				$total_ticket_count++;
-				$tickets[ $ticket->ID() ]['ticket'] = $ticket;
-				$tickets[ $ticket->ID() ]['count'] = is_array( $tickets[ $ticket->ID() ] )
-				                                     && isset( $tickets[ $ticket->ID() ]['count'] )
-					? $tickets[ $ticket->ID() ]['count'] + 1
+				$tickets[$ticket->ID()]['ticket'] = $ticket;
+				$tickets[$ticket->ID()]['count'] = is_array($tickets[$ticket->ID()])
+				                                     && isset($tickets[$ticket->ID()]['count'])
+					? $tickets[$ticket->ID()]['count'] + 1
 					: 1;
-				$tickets[ $ticket->ID() ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee();
-				$tickets[ $ticket->ID() ]['dtt_objs'] = $relateddatetime;
-				$tickets[ $ticket->ID() ]['reg_objs'][ $reg->ID() ] = $reg;
+				$tickets[$ticket->ID()]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
+				$tickets[$ticket->ID()]['dtt_objs'] = $relateddatetime;
+				$tickets[$ticket->ID()]['reg_objs'][$reg->ID()] = $reg;
 				$event = $reg->event();
-				$tickets[ $ticket->ID() ]['EE_Event'] = $event;
-				$evtcache[ $evt_id ] = $event;
-				$eventsetup[ $evt_id ]['reg_objs'][ $reg->ID() ] = $reg;
-				$eventsetup[ $evt_id ]['tkt_objs'][ $ticket->ID() ] = $ticket;
-				$eventsetup[ $evt_id ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee();
-				$event_attendee_count[ $evt_id ] = isset( $event_attendee_count[ $evt_id ] )
-					? $event_attendee_count[ $evt_id ] + 1
+				$tickets[$ticket->ID()]['EE_Event'] = $event;
+				$evtcache[$evt_id] = $event;
+				$eventsetup[$evt_id]['reg_objs'][$reg->ID()] = $reg;
+				$eventsetup[$evt_id]['tkt_objs'][$ticket->ID()] = $ticket;
+				$eventsetup[$evt_id]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
+				$event_attendee_count[$evt_id] = isset($event_attendee_count[$evt_id])
+					? $event_attendee_count[$evt_id] + 1
 					: 0;
-				$attendees[ $reg->attendee_ID() ]['line_ref'][] = $evt_id;
-				$attendees[ $reg->attendee_ID() ]['att_obj'] = $reg->attendee();
-				$attendees[ $reg->attendee_ID() ]['reg_objs'][ $reg->ID() ] = $reg;
+				$attendees[$reg->attendee_ID()]['line_ref'][] = $evt_id;
+				$attendees[$reg->attendee_ID()]['att_obj'] = $reg->attendee();
+				$attendees[$reg->attendee_ID()]['reg_objs'][$reg->ID()] = $reg;
 				//$attendees[ $reg->attendee_ID() ]['registration_id'] = $reg->ID();
-				$attendees[ $reg->attendee_ID() ]['attendee_email'] = $reg->attendee() instanceof EE_Attendee
+				$attendees[$reg->attendee_ID()]['attendee_email'] = $reg->attendee() instanceof EE_Attendee
 					? $reg->attendee()->email()
 					: '';
-				$attendees[ $reg->attendee_ID() ]['tkt_objs'][ $ticket->ID() ] = $ticket;
-				$attendees[ $reg->attendee_ID() ]['evt_objs'][ $evt_id ] = $event;
+				$attendees[$reg->attendee_ID()]['tkt_objs'][$ticket->ID()] = $ticket;
+				$attendees[$reg->attendee_ID()]['evt_objs'][$evt_id] = $event;
 
 				//registrations
-				$registrations[ $reg->ID() ]['tkt_obj'] = $ticket;
-				$registrations[ $reg->ID() ]['evt_obj'] = $event;
-				$registrations[ $reg->ID() ]['reg_obj'] = $reg;
-				$registrations[ $reg->ID() ]['att_obj'] = $reg->attendee();
+				$registrations[$reg->ID()]['tkt_obj'] = $ticket;
+				$registrations[$reg->ID()]['evt_obj'] = $event;
+				$registrations[$reg->ID()]['reg_obj'] = $reg;
+				$registrations[$reg->ID()]['att_obj'] = $reg->attendee();
 
 				//set up answer objects
-				$rel_ans = $reg->get_many_related( 'Answer' );
-				foreach ( $rel_ans as $ansid => $answer ) {
-					if ( ! isset( $questions[ $ansid ] ) ) {
-						$questions[ $ansid ] = $answer->get_first_related( 'Question' );
+				$rel_ans = $reg->get_many_related('Answer');
+				foreach ($rel_ans as $ansid => $answer) {
+					if ( ! isset($questions[$ansid])) {
+						$questions[$ansid] = $answer->get_first_related('Question');
 					}
-					$answers[ $ansid ] = $answer;
-					$registrations[ $reg->ID() ]['ans_objs'][ $ansid ] = $answer;
+					$answers[$ansid] = $answer;
+					$registrations[$reg->ID()]['ans_objs'][$ansid] = $answer;
 				}
 
-				foreach ( $relateddatetime as $dtt_id => $datetime ) {
-					$eventsetup[ $evt_id ]['dtt_objs'][ $dtt_id ] = $datetime;
-					$registrations[ $reg->ID() ]['dtt_objs'][ $dtt_id ] = $datetime;
+				foreach ($relateddatetime as $dtt_id => $datetime) {
+					$eventsetup[$evt_id]['dtt_objs'][$dtt_id] = $datetime;
+					$registrations[$reg->ID()]['dtt_objs'][$dtt_id] = $datetime;
 
-					if ( isset( $datetimes[ $dtt_id ] ) ) {
+					if (isset($datetimes[$dtt_id])) {
 						continue; //already have this info in the datetimes array.
 					}
 
-					$datetimes[ $dtt_id ]['tkt_objs'][] = $ticket;
-					$datetimes[ $dtt_id ]['datetime'] = $datetime;
-					$datetimes[ $dtt_id ]['evt_objs'][ $evt_id ] = $event;
-					$datetimes[ $dtt_id ]['reg_objs'][ $reg->ID() ] = $reg;
+					$datetimes[$dtt_id]['tkt_objs'][] = $ticket;
+					$datetimes[$dtt_id]['datetime'] = $datetime;
+					$datetimes[$dtt_id]['evt_objs'][$evt_id] = $event;
+					$datetimes[$dtt_id]['reg_objs'][$reg->ID()] = $reg;
 				}
 			}
 
 			//let's loop through the unique event=>reg items and setup data on them
 
-			if ( ! empty( $eventsetup ) ) {
-				foreach ( $eventsetup as $evt_id => $items ) {
-					if ( $this->txn instanceof EE_Transaction ) {
+			if ( ! empty($eventsetup)) {
+				foreach ($eventsetup as $evt_id => $items) {
+					if ($this->txn instanceof EE_Transaction) {
 						$ticket_line_items_for_event = EEM_Line_Item::instance()->get_all(
 							array(
 								array(
@@ -435,25 +435,25 @@ 
 					} else {
 						$ticket_line_items_for_event = array();
 					}
-					$events[ $evt_id ] = array(
+					$events[$evt_id] = array(
 						'ID' => $evt_id,
-						'event' => $evtcache[ $evt_id ],
-						'name' => $evtcache[ $evt_id ] instanceof EE_Event ? $evtcache[ $evt_id ]->name() : '',
-						'total_attendees' => $event_attendee_count[ $evt_id ],
+						'event' => $evtcache[$evt_id],
+						'name' => $evtcache[$evt_id] instanceof EE_Event ? $evtcache[$evt_id]->name() : '',
+						'total_attendees' => $event_attendee_count[$evt_id],
 						'reg_objs' => $items['reg_objs'],
 						'tkt_objs' => $items['tkt_objs'],
 						'att_objs' => $items['att_objs'],
-						'dtt_objs' => isset( $items['dtt_objs'] ) ? $items['dtt_objs'] : array(),
+						'dtt_objs' => isset($items['dtt_objs']) ? $items['dtt_objs'] : array(),
 						'line_items' => $ticket_line_items_for_event,
 					);
 
 					//make sure the tickets have the line items setup for them.
-					foreach ( $ticket_line_items_for_event as $line_id => $line_item ) {
-						if ( $line_item instanceof EE_Line_Item ) {
-							$tickets[ $line_item->ticket()->ID() ]['line_item'] = $line_item;
-							$tickets[ $line_item->ticket()->ID() ]['sub_line_items'] = $line_item->children();
-							$line_items[ $line_item->ID() ]['children'] = $line_item->children();
-							$line_items[ $line_item->ID() ]['EE_Ticket'] = $line_item->ticket();
+					foreach ($ticket_line_items_for_event as $line_id => $line_item) {
+						if ($line_item instanceof EE_Line_Item) {
+							$tickets[$line_item->ticket()->ID()]['line_item'] = $line_item;
+							$tickets[$line_item->ticket()->ID()]['sub_line_items'] = $line_item->children();
+							$line_items[$line_item->ID()]['children'] = $line_item->children();
+							$line_items[$line_item->ID()]['EE_Ticket'] = $line_item->ticket();
 						}
 					}
 				}
@@ -475,7 +475,7 @@ 
 		$this->total_ticket_count = $total_ticket_count;
 		$this->registrations = $registrations;
 
-		if ( $this->txn instanceof EE_Transaction ) {
+		if ($this->txn instanceof EE_Transaction) {
 			$this->tax_line_items        = $this->txn->tax_items();
 			$this->additional_line_items = $this->txn->non_ticket_line_items();
 			$this->payments              = $this->txn->payments();
@@ -485,10 +485,10 @@ 
 			//let's get just the primary_attendee_data!  First we get the primary registration object.
 			$primary_reg = $this->txn->primary_registration();
 			// verify
-			if ( $primary_reg instanceof EE_Registration ) {
+			if ($primary_reg instanceof EE_Registration) {
 
 				// get attendee object
-				if ( $primary_reg->attendee() instanceof EE_Attendee ) {
+				if ($primary_reg->attendee() instanceof EE_Attendee) {
 
 					//now we can setup the primary_attendee_data array
 					$this->primary_attendee_data = array(

core/EE_Dependency_Map.core.php

Spacing +29 added lines, -29 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');
 }
 
 
@@ -70,11 +70,11 @@ 
 	 * @param  \EE_Request  $request
 	 * @param  \EE_Response $response
 	 */
-	protected function __construct( EE_Request $request, EE_Response $response ) {
+	protected function __construct(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
-		add_action( 'EE_Load_Espresso_Core__handle_request__initialize_core_loading', array( $this, 'initialize' ) );
-		do_action( 'EE_Dependency_Map____construct' );
+		add_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading', array($this, 'initialize'));
+		do_action('EE_Dependency_Map____construct');
 	}
 
 
@@ -95,10 +95,10 @@ 
 	 * @param  \EE_Response $response
 	 * @return \EE_Dependency_Map instance
 	 */
-	public static function instance( EE_Request $request = null, EE_Response $response = null ) {
+	public static function instance(EE_Request $request = null, EE_Response $response = null) {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Dependency_Map ) {
-			self::$_instance = new EE_Dependency_Map( $request, $response );
+		if ( ! self::$_instance instanceof EE_Dependency_Map) {
+			self::$_instance = new EE_Dependency_Map($request, $response);
 		}
 		return self::$_instance;
 	}
@@ -110,9 +110,9 @@ 
 	 * @param array  $dependencies
 	 * @return boolean
 	 */
-	public static function register_dependencies( $class, $dependencies ) {
-		if ( ! isset( self::$_instance->_dependency_map[ $class ] ) ) {
-			self::$_instance->_dependency_map[ $class ] = (array)$dependencies;
+	public static function register_dependencies($class, $dependencies) {
+		if ( ! isset(self::$_instance->_dependency_map[$class])) {
+			self::$_instance->_dependency_map[$class] = (array) $dependencies;
 			return true;
 		}
 		return false;
@@ -126,18 +126,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', $loader ) ) {
+		if (strpos($loader, 'load_') !== 0 || ! method_exists('EE_Registry', $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::$_instance->_class_loaders[ $class_name ] ) ) {
-			self::$_instance->_class_loaders[ $class_name ] = $loader;
+		if ( ! isset(self::$_instance->_class_loaders[$class_name])) {
+			self::$_instance->_class_loaders[$class_name] = $loader;
 			return true;
 		}
 		return false;
@@ -160,8 +160,8 @@ 
 	 * @param string $class_name
 	 * @return boolean
 	 */
-	public function has( $class_name = '' ) {
-		return isset( $this->_dependency_map[ $class_name ] ) ? true : false;
+	public function has($class_name = '') {
+		return isset($this->_dependency_map[$class_name]) ? true : false;
 	}
 
 
@@ -173,8 +173,8 @@ 
 	 * @param string $dependency
 	 * @return bool
 	 */
-	public function has_dependency_for_class( $class_name = '', $dependency = '' ) {
-		return isset( $this->_dependency_map[ $class_name ], $this->_dependency_map[ $class_name ][ $dependency ] )
+	public function has_dependency_for_class($class_name = '', $dependency = '') {
+		return isset($this->_dependency_map[$class_name], $this->_dependency_map[$class_name][$dependency])
 			? true
 			: false;
 	}
@@ -188,9 +188,9 @@ 
 	 * @param string $dependency
 	 * @return int
 	 */
-	public function loading_strategy_for_class_dependency( $class_name = '', $dependency = '' ) {
-		return $this->has_dependency_for_class( $class_name, $dependency )
-			? $this->_dependency_map[ $class_name ][ $dependency ]
+	public function loading_strategy_for_class_dependency($class_name = '', $dependency = '') {
+		return $this->has_dependency_for_class($class_name, $dependency)
+			? $this->_dependency_map[$class_name][$dependency]
 			: EE_Dependency_Map::not_registered;
 	}
 
@@ -200,8 +200,8 @@ 
 	 * @param string $class_name
 	 * @return string | Closure
 	 */
-	public function class_loader( $class_name ) {
-		return isset( $this->_class_loaders[ $class_name ] ) ? $this->_class_loaders[ $class_name ] : '';
+	public function class_loader($class_name) {
+		return isset($this->_class_loaders[$class_name]) ? $this->_class_loaders[$class_name] : '';
 	}
 
 
@@ -339,17 +339,17 @@ 
 			'EE_Messages_Data_Handler_Collection'  => 'load_lib',
 			'EE_Message_Template_Group_Collection' => 'load_lib',
 			'EE_Messages_Generator' => function() {
-				return EE_Registry::instance()->load_lib( 'Messages_Generator', array(), false, false );
+				return EE_Registry::instance()->load_lib('Messages_Generator', array(), false, false);
 			},
-			'EE_Messages_Template_Defaults' => function( $arguments = array() ) {
-				return EE_Registry::instance()->load_lib( 'Messages_Template_Defaults', $arguments, false, false );
+			'EE_Messages_Template_Defaults' => function($arguments = array()) {
+				return EE_Registry::instance()->load_lib('Messages_Template_Defaults', $arguments, false, false);
 			},
 			//load_model
 			'EEM_Message_Template_Group'           => 'load_model',
 			'EEM_Message_Template'                 => 'load_model',
 			//load_helper
 			'EEH_Parse_Shortcodes'                 => function() {
-				if ( EE_Registry::instance()->load_helper( 'Parse_Shortcodes' ) ) {
+				if (EE_Registry::instance()->load_helper('Parse_Shortcodes')) {
 					return new EEH_Parse_Shortcodes();
 				}
 				return null;

core/libraries/form_sections/inputs/EE_Year_Input.input.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -24,18 +24,18 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Year_Input extends EE_Select_Input{
+class EE_Year_Input extends EE_Select_Input {
 
-	function __construct( $input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0 ){
-		if($four_digit_year){
+	function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0) {
+		if ($four_digit_year) {
 			$current_year_int = intval(date('Y'));
-		}else{
+		} else {
 			$current_year_int = intval(date('y'));
 		}
 		$answer_options = array();
-		for( $start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++){
+		for ($start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++) {
 			$answer_options[$start] = $start;
 		}
-		parent::__construct( $answer_options, $input_settings );
+		parent::__construct($answer_options, $input_settings);
 	}
 }

core/libraries/form_sections/strategies/validation/EE_Full_HTML_Validation_Strategy.strategy.php

Spacing +12 added lines, -12 removed lines

@@ -10,21 +10,21 @@ 
  * @since 				4.6
  *
  */
-class EE_Full_HTML_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Full_HTML_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	/**
 	 * @param null $validation_error_message
 	 */
-	public function __construct( $validation_error_message = NULL ) {
-		if ( ! $validation_error_message ) {
+	public function __construct($validation_error_message = NULL) {
+		if ( ! $validation_error_message) {
 			global $allowedposttags;
 			$validation_error_message = sprintf(
-				__( 'Only the following HTML tags are allowed:%1$s%2$s', "event_espresso" ),
+				__('Only the following HTML tags are allowed:%1$s%2$s', "event_espresso"),
 				'<br />',
-				implode( ",", array_keys( $allowedposttags ) )
+				implode(",", array_keys($allowedposttags))
 			);
 		}
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 
@@ -38,8 +38,8 @@ 
 	 */
 	public function get_list_of_allowed_tags() {
 		global $allowedposttags;
-		ksort( $allowedposttags );
-		return implode( ', ', array_keys( $allowedposttags ) );
+		ksort($allowedposttags);
+		return implode(', ', array_keys($allowedposttags));
 	}
 
 
@@ -50,10 +50,10 @@ 
 	 */
 	public function validate($normalized_value) {
 		global $allowedposttags;
-		parent::validate( $normalized_value );
-		$normalized_value_sans_tags =  wp_kses( "$normalized_value", $allowedposttags );
-		if ( strlen( $normalized_value ) > strlen( $normalized_value_sans_tags ) ) {
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'complex_html_tags' );
+		parent::validate($normalized_value);
+		$normalized_value_sans_tags = wp_kses("$normalized_value", $allowedposttags);
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
 		}
 	}
 }
\ No newline at end of file