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

Indentation +2 added lines, -2 removed lines

@@ -445,8 +445,8 @@
 		$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 );
+				//if we're duplicating a trashed question, assume we don't want the new one to be trashed
+				$new_question->set_deleted( false );
 		$success = $new_question->save();
 		if( $success ) {
 			//we don't totally want to duplicate the question options, because we want them to be for the NEW question

caffeinated/modules/recaptcha/ReCaptcha/RequestMethod/Socket.php

Indentation +63 added lines, -63 removed lines

@@ -32,73 +32,73 @@
  */
 class Socket
 {
-    private $handle = null;
+	private $handle = null;
 
-    /**
-     * fsockopen
-     * 
-     * @see http://php.net/fsockopen
-     * @param string $hostname
-     * @param int $port
-     * @param int $errno
-     * @param string $errstr
-     * @param float $timeout
-     * @return resource
-     */
-    public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
-    {
-        $this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
+	/**
+	 * fsockopen
+	 * 
+	 * @see http://php.net/fsockopen
+	 * @param string $hostname
+	 * @param int $port
+	 * @param int $errno
+	 * @param string $errstr
+	 * @param float $timeout
+	 * @return resource
+	 */
+	public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
+	{
+		$this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
 
-        if ($this->handle != false && $errno === 0 && $errstr === '') {
-            return $this->handle;
-        } else {
-            return false;
-        }
-    }
+		if ($this->handle != false && $errno === 0 && $errstr === '') {
+			return $this->handle;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * fwrite
-     * 
-     * @see http://php.net/fwrite
-     * @param string $string
-     * @param int $length
-     * @return int | bool
-     */
-    public function fwrite($string, $length = null)
-    {
-        return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
-    }
+	/**
+	 * fwrite
+	 * 
+	 * @see http://php.net/fwrite
+	 * @param string $string
+	 * @param int $length
+	 * @return int | bool
+	 */
+	public function fwrite($string, $length = null)
+	{
+		return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
+	}
 
-    /**
-     * fgets
-     * 
-     * @see http://php.net/fgets
-     * @param int $length
-     */
-    public function fgets($length = null)
-    {
-        return fgets($this->handle, $length);
-    }
+	/**
+	 * fgets
+	 * 
+	 * @see http://php.net/fgets
+	 * @param int $length
+	 */
+	public function fgets($length = null)
+	{
+		return fgets($this->handle, $length);
+	}
 
-    /**
-     * feof
-     * 
-     * @see http://php.net/feof
-     * @return bool
-     */
-    public function feof()
-    {
-        return feof($this->handle);
-    }
+	/**
+	 * feof
+	 * 
+	 * @see http://php.net/feof
+	 * @return bool
+	 */
+	public function feof()
+	{
+		return feof($this->handle);
+	}
 
-    /**
-     * fclose
-     * 
-     * @see http://php.net/fclose
-     * @return bool
-     */
-    public function fclose()
-    {
-        return fclose($this->handle);
-    }
+	/**
+	 * fclose
+	 * 
+	 * @see http://php.net/fclose
+	 * @return bool
+	 */
+	public function fclose()
+	{
+		return fclose($this->handle);
+	}
 }

core/libraries/rest_api/controllers/model/Read.php

Braces +14 added lines, -14 removed lines

@@ -239,7 +239,7 @@ 
 		){
 			if( $relation instanceof \EE_Belongs_To_Relation ) {
 				$related_model_name_maybe_plural = strtolower( $related_model->get_this_model_name() );
-			}else{
+			} else{
 				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower( $related_model->get_this_model_name() );
 			}
 			return new \WP_Error(
@@ -291,7 +291,7 @@ 
 		}
 		if( $relation instanceof \EE_Belongs_To_Relation ){
 			return array_shift( $nice_results );
-		}else{
+		} else{
 			return $nice_results;
 		}
 	}
@@ -405,14 +405,14 @@ 
 			$field_value = $field_obj->prepare_for_set_from_db( $raw_field_value );
 			if( $this->is_subclass_of_one(  $field_obj, $this->get_model_version_info()->fields_ignored() ) ){
 				unset( $result[ $field_name ] );
-			}elseif(
+			} elseif(
 				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_rendered_format() )
 			){
 				$result[ $field_name ] = array(
 					'raw' => $field_obj->prepare_for_get( $field_value ),
 					'rendered' => $field_obj->prepare_for_pretty_echoing( $field_value )
 				);
-			}elseif(
+			} elseif(
 				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_pretty_format() )
 			){
 				$result[ $field_name ] = array(
@@ -595,7 +595,7 @@ 
 	public static function get_related_entity_name( $relation_name, $relation_obj ){
 		if( $relation_obj instanceof \EE_Belongs_To_Relation ) {
 			return strtolower( $relation_name );
-		}else{
+		} else{
 			return \EEH_Inflector::pluralize_and_lower( $relation_name );
 		}
 	}
@@ -665,7 +665,7 @@ 
 		$valid_contexts = \EEM_Base::valid_cap_contexts();
 		if( in_array( $context, $valid_contexts )  ){
 			return $context;
-		}else{
+		} else{
 			return \EEM_Base::caps_read;
 		}
 	}
@@ -690,7 +690,7 @@ 
 			$order_by = $query_parameters[ 'order_by' ];
 		} elseif ( isset( $query_parameters[ 'orderby' ] ) ) {
 			$order_by = $query_parameters[ 'orderby' ];
-		}else{
+		} else{
 			$order_by = null;
 		}
 		if( $order_by !== null ){
@@ -700,7 +700,7 @@ 
 			$group_by = $query_parameters[ 'group_by' ];
 		} elseif ( isset( $query_parameters[ 'groupby' ] ) ) {
 			$group_by = $query_parameters[ 'groupby' ];
-		}else{
+		} else{
 			$group_by = null;
 		}
 		if( $group_by !== null ){
@@ -723,7 +723,7 @@ 
 			//limit should be either a string like '23' or '23,43', or an array with two items in it
 			if( ! is_array( $query_parameters[ 'limit' ] ) ) {
 				$limit_array = explode(',', (string)$query_parameters['limit']);
-			}else {
+			} else {
 				$limit_array = $query_parameters[ 'limit' ];
 			}
 			$sanitized_limit = array();
@@ -739,12 +739,12 @@ 
 				$sanitized_limit[] = intval( $limit_part );
 			}
 			$model_query_params[ 'limit' ] = implode( ',', $sanitized_limit );
-		}else{
+		} else{
 			$model_query_params[ 'limit' ] = \EED_Core_Rest_Api::get_default_query_limit();
 		}
 		if( isset( $query_parameters[ 'caps' ] ) ) {
 			$model_query_params[ 'caps' ] = $this->validate_context( $query_parameters[ 'caps' ] );
-		}else{
+		} else{
 			$model_query_params[ 'caps' ] = \EEM_Base::caps_read;
 		}
 		return apply_filters( 'FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model );
@@ -764,7 +764,7 @@ 
 		foreach( $query_params as $key => $value ) {
 			if( is_array( $value ) ) {
 				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_key_for_models( $model, $value );
-			}else{
+			} else{
 				$model_ready_query_params[ $key ] = $value;
 			}
 		}
@@ -816,11 +816,11 @@ 
 					//found the model name at the exact start
 					$field_sans_model_name = str_replace( $model_name . '.', '', $field_to_include );
 					$extracted_fields_to_include[] = $field_sans_model_name;
-				}elseif( $field_to_include == $model_name ){
+				} elseif( $field_to_include == $model_name ){
 					$extracted_fields_to_include[] = '*';
 				}
 			}
-		}else{
+		} else{
 			//look for ones with no period
 			foreach( $includes as $field_to_include ) {
 				$field_to_include = trim( $field_to_include );

Doc Comments +1 added lines, -1 removed lines

@@ -577,7 +577,7 @@
 	 * @param \EEM_Base        $model
 	 * @param array            $wpdb_row
 	 * @param \WP_REST_Request $rest_request
-	 * @return array the _calculations item in the entity
+	 * @return \stdClass the _calculations item in the entity
 	 */
 	protected function _get_entity_calculations( $model, $wpdb_row, $rest_request ) {
 		$calculated_fields = $this->explode_and_get_items_prefixed_with(

Spacing +292 added lines, -292 removed lines

@@ -6,8 +6,8 @@ 
 use EventEspresso\core\libraries\rest_api\Rest_Exception;
 use EventEspresso\core\libraries\rest_api\Model_Data_Translator;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -46,22 +46,22 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_all( \WP_REST_Request $request) {
+	public static function handle_request_get_all(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)~',
-				array( 'version', 'model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)~',
+				array('version', 'model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -69,12 +69,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entities_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 					)
 			);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -84,21 +84,21 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_one( \WP_REST_Request $request ) {
+	public static function handle_request_get_one(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)~',
-				array( 'version', 'model', 'id' ) );
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)~',
+				array('version', 'model', 'id') );
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -106,12 +106,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entity_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 						)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -123,40 +123,40 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_related( \WP_REST_Request $request ) {
+	public static function handle_request_get_related(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)/(.*)~',
-				array( 'version', 'model', 'id', 'related_model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)/(.*)~',
+				array('version', 'model', 'id', 'related_model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$main_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $main_model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$main_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($main_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$main_model_name_singular
 						)
 					)
 				);
 			}
-			$main_model = $controller->get_model_version_info()->load_model( $main_model_name_singular );
+			$main_model = $controller->get_model_version_info()->load_model($main_model_name_singular);
 			//assume the related model name is plural and try to find the model's name
-			$related_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'related_model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) {
+			$related_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['related_model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) {
 				//so the word didn't singularize well. Maybe that's just because it's a singular word?
-				$related_model_name_singular = \EEH_Inflector::humanize( $matches[ 'related_model' ] );
+				$related_model_name_singular = \EEH_Inflector::humanize($matches['related_model']);
 			}
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) {
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$related_model_name_singular
 						)
 					)
@@ -165,13 +165,13 @@ 
 
 			return $controller->send_response(
 					$controller->get_entities_from_relation(
-						$request->get_param( 'id' ),
-						$main_model->related_settings_for( $related_model_name_singular ) ,
+						$request->get_param('id'),
+						$main_model->related_settings_for($related_model_name_singular),
 						$request
 					)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -184,28 +184,28 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entities_from_model( $model, $request) {
-		$query_params = $this->create_model_query_params( $model, $request->get_params() );
-		if( ! Capabilities::current_user_has_partial_access_to( $model, $query_params[ 'caps' ] ) ) {
-			$model_name_plural = \EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() );
+	public function get_entities_from_model($model, $request) {
+		$query_params = $this->create_model_query_params($model, $request->get_params());
+		if ( ! Capabilities::current_user_has_partial_access_to($model, $query_params['caps'])) {
+			$model_name_plural = \EEH_Inflector::pluralize_and_lower($model->get_this_model_name());
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $model_name_plural ),
+				sprintf('rest_%s_cannot_list', $model_name_plural),
 				sprintf(
-					__( 'Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso'),
 					$model_name_plural,
-					Capabilities::get_missing_permissions_string( $model, $query_params[ 'caps' ] )
+					Capabilities::get_missing_permissions_string($model, $query_params['caps'])
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
-		if( ! $request->get_header( 'no_rest_headers' ) ) {
-			$this->_set_headers_from_query_params( $model, $query_params );
+		if ( ! $request->get_header('no_rest_headers')) {
+			$this->_set_headers_from_query_params($model, $query_params);
 		}
 		/** @type array $results */
-		$results = $model->get_all_wpdb_results( $query_params );
+		$results = $model->get_all_wpdb_results($query_params);
 		$nice_results = array( );
-		foreach ( $results as $result ) {
-			$nice_results[ ] = $this->create_entity_from_wpdb_result(
+		foreach ($results as $result) {
+			$nice_results[] = $this->create_entity_from_wpdb_result(
 					$model,
 					$result,
 					$request
@@ -226,64 +226,64 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entities_from_relation( $id,  $relation, $request ) {
-		$context = $this->validate_context( $request->get_param( 'caps' ));
+	public function get_entities_from_relation($id, $relation, $request) {
+		$context = $this->validate_context($request->get_param('caps'));
 		$model = $relation->get_this_model();
 		$related_model = $relation->get_other_model();
 		//check if they can access the 1st model object
-		$query_params = array( array( $model->primary_key_name() => $id ),'limit' => 1 );
-		if( $model instanceof \EEM_Soft_Delete_Base ){
+		$query_params = array(array($model->primary_key_name() => $id), 'limit' => 1);
+		if ($model instanceof \EEM_Soft_Delete_Base) {
 			$query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		}
 		$restricted_query_params = $query_params;
-		$restricted_query_params[ 'caps' ] = $context;
-		$this->_set_debug_info( 'main model query params', $restricted_query_params );
-		$this->_set_debug_info( 'missing caps', Capabilities::get_missing_permissions_string( $related_model, $context ) );
+		$restricted_query_params['caps'] = $context;
+		$this->_set_debug_info('main model query params', $restricted_query_params);
+		$this->_set_debug_info('missing caps', Capabilities::get_missing_permissions_string($related_model, $context));
 
-		if(
+		if (
 			! (
-				Capabilities::current_user_has_partial_access_to( $related_model, $context )
-				&& $model->exists( $restricted_query_params )
+				Capabilities::current_user_has_partial_access_to($related_model, $context)
+				&& $model->exists($restricted_query_params)
 			)
-		){
-			if( $relation instanceof \EE_Belongs_To_Relation ) {
-				$related_model_name_maybe_plural = strtolower( $related_model->get_this_model_name() );
-			}else{
-				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower( $related_model->get_this_model_name() );
+		) {
+			if ($relation instanceof \EE_Belongs_To_Relation) {
+				$related_model_name_maybe_plural = strtolower($related_model->get_this_model_name());
+			} else {
+				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower($related_model->get_this_model_name());
 			}
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $related_model_name_maybe_plural ),
+				sprintf('rest_%s_cannot_list', $related_model_name_maybe_plural),
 				sprintf(
-					__(	'Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso'),
 					$related_model_name_maybe_plural,
 					$relation->get_this_model()->get_this_model_name(),
 					implode(
 						',',
 						array_keys(
-							Capabilities::get_missing_permissions( $related_model, $context )
+							Capabilities::get_missing_permissions($related_model, $context)
 						)
 					)
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
-		$query_params = $this->create_model_query_params( $relation->get_other_model(), $request->get_params() );
-		$query_params[0][ $relation->get_this_model()->get_this_model_name() . '.' . $relation->get_this_model()->primary_key_name() ] = $id;
-		$query_params[ 'default_where_conditions' ] = 'none';
-		$query_params[ 'caps' ] = $context;
-		if( ! $request->get_header( 'no_rest_headers' ) ) {
-			$this->_set_headers_from_query_params( $relation->get_other_model(), $query_params );
+		$query_params = $this->create_model_query_params($relation->get_other_model(), $request->get_params());
+		$query_params[0][$relation->get_this_model()->get_this_model_name().'.'.$relation->get_this_model()->primary_key_name()] = $id;
+		$query_params['default_where_conditions'] = 'none';
+		$query_params['caps'] = $context;
+		if ( ! $request->get_header('no_rest_headers')) {
+			$this->_set_headers_from_query_params($relation->get_other_model(), $query_params);
 		}
 		/** @type array $results */
-		$results = $relation->get_other_model()->get_all_wpdb_results( $query_params );
+		$results = $relation->get_other_model()->get_all_wpdb_results($query_params);
 		$nice_results = array();
-		foreach( $results as $result ) {
+		foreach ($results as $result) {
 			$nice_result = $this->create_entity_from_wpdb_result(
 				$relation->get_other_model(),
 				$result,
 				$request
 			);
-			if( $relation instanceof \EE_HABTM_Relation ) {
+			if ($relation instanceof \EE_HABTM_Relation) {
 				//put the unusual stuff (properties from the HABTM relation) first, and make sure
 				//if there are conflicts we prefer the properties from the main model
 				$join_model_result = $this->create_entity_from_wpdb_result(
@@ -291,18 +291,18 @@ 
 					$result,
 					$request
 				);
-				$joined_result = array_merge( $nice_result, $join_model_result );
+				$joined_result = array_merge($nice_result, $join_model_result);
 				//but keep the meta stuff from the main model
-				if( isset( $nice_result['meta'] ) ){
+				if (isset($nice_result['meta'])) {
 					$joined_result['meta'] = $nice_result['meta'];
 				}
 				$nice_result = $joined_result;
 			}
 			$nice_results[] = $nice_result;
 		}
-		if( $relation instanceof \EE_Belongs_To_Relation ){
-			return array_shift( $nice_results );
-		}else{
+		if ($relation instanceof \EE_Belongs_To_Relation) {
+			return array_shift($nice_results);
+		} else {
 			return $nice_results;
 		}
 	}
@@ -315,30 +315,30 @@ 
 	 * @param array $query_params
 	 * @return void
 	 */
-	protected function _set_headers_from_query_params( $model, $query_params ) {
-		$this->_set_debug_info( 'model query params', $query_params );
-		$this->_set_debug_info( 'missing caps', Capabilities::get_missing_permissions_string( $model, $query_params[ 'caps' ] ) );
+	protected function _set_headers_from_query_params($model, $query_params) {
+		$this->_set_debug_info('model query params', $query_params);
+		$this->_set_debug_info('missing caps', Capabilities::get_missing_permissions_string($model, $query_params['caps']));
 		//normally the limit to a 2-part array, where the 2nd item is the limit
-		if( ! isset( $query_params[ 'limit' ] ) ) {
-			$query_params[ 'limit' ] = \EED_Core_Rest_Api::get_default_query_limit();
+		if ( ! isset($query_params['limit'])) {
+			$query_params['limit'] = \EED_Core_Rest_Api::get_default_query_limit();
 		}
-		if( is_array( $query_params[ 'limit' ] )  ) {
-			$limit_parts = $query_params[ 'limit' ];
+		if (is_array($query_params['limit'])) {
+			$limit_parts = $query_params['limit'];
 		} else {
-			$limit_parts = explode(',', $query_params[ 'limit' ] );
-			if( count( $limit_parts ) == 1 ){
-				$limit_parts = array(0, $limit_parts[ 0 ] );
+			$limit_parts = explode(',', $query_params['limit']);
+			if (count($limit_parts) == 1) {
+				$limit_parts = array(0, $limit_parts[0]);
 			}
 		}
 		//remove the group by and having parts of the query, as those will
 		//make the sql query return an array of values, instead of just a single value
-		unset( $query_params[ 'group_by' ], $query_params[ 'having' ], $query_params[ 'limit' ] );
-		$count = $model->count( $query_params, null, true );
+		unset($query_params['group_by'], $query_params['having'], $query_params['limit']);
+		$count = $model->count($query_params, null, true);
 
-		$pages = $count / $limit_parts[ 1 ];
-		$this->_set_response_header( 'Total', $count, false );
-		$this->_set_response_header( 'PageSize', $limit_parts[ 1 ], false );
-		$this->_set_response_header( 'TotalPages', ceil( $pages ), false );
+		$pages = $count / $limit_parts[1];
+		$this->_set_response_header('Total', $count, false);
+		$this->_set_response_header('PageSize', $limit_parts[1], false);
+		$this->_set_response_header('TotalPages', ceil($pages), false);
 	}
 
 
@@ -351,47 +351,47 @@ 
 	 * @param string $deprecated no longer used
 	 * @return array ready for being converted into json for sending to client
 	 */
-	public function create_entity_from_wpdb_result( $model, $db_row, $rest_request, $deprecated = null ) {
-		if( ! $rest_request instanceof \WP_REST_Request ) {
+	public function create_entity_from_wpdb_result($model, $db_row, $rest_request, $deprecated = null) {
+		if ( ! $rest_request instanceof \WP_REST_Request) {
 			//ok so this was called in the old style, where the 3rd arg was
 			//$include, and the 4th arg was $context
 			//now setup the request just to avoid fatal errors, although we won't be able
 			//to truly make use of it because it's kinda devoid of info
 			$rest_request = new \WP_REST_Request();
-			$rest_request->set_param( 'include', $rest_request );
-			$rest_request->set_param( 'caps', $deprecated );
+			$rest_request->set_param('include', $rest_request);
+			$rest_request->set_param('caps', $deprecated);
 		}
-		if( $rest_request->get_param( 'caps' ) == null ) {
-			$rest_request->set_param( 'caps', \EEM_Base::caps_read );
+		if ($rest_request->get_param('caps') == null) {
+			$rest_request->set_param('caps', \EEM_Base::caps_read);
 		}
-		$entity_array = $this->_create_bare_entity_from_wpdb_results( $model, $db_row );
-		$entity_array = $this->_add_extra_fields( $model, $db_row, $entity_array );
-		$entity_array[ '_links' ] = $this->_get_entity_links( $model, $db_row, $entity_array );
-		$entity_array[ '_calculated_fields'] = $this->_get_entity_calculations( $model, $db_row, $rest_request );
-		$entity_array = $this->_include_requested_models( $model, $rest_request, $entity_array );
+		$entity_array = $this->_create_bare_entity_from_wpdb_results($model, $db_row);
+		$entity_array = $this->_add_extra_fields($model, $db_row, $entity_array);
+		$entity_array['_links'] = $this->_get_entity_links($model, $db_row, $entity_array);
+		$entity_array['_calculated_fields'] = $this->_get_entity_calculations($model, $db_row, $rest_request);
+		$entity_array = $this->_include_requested_models($model, $rest_request, $entity_array);
 		$entity_array = apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_before_inaccessible_field_removal',
 			$entity_array,
 			$model,
-			$rest_request->get_param( 'caps' ),
+			$rest_request->get_param('caps'),
 			$rest_request,
 			$this
 		);
 		$result_without_inaccessible_fields = Capabilities::filter_out_inaccessible_entity_fields(
 			$entity_array,
 			$model,
-			$rest_request->get_param( 'caps' ),
+			$rest_request->get_param('caps'),
 			$this->get_model_version_info()
 		);
 		$this->_set_debug_info(
 			'inaccessible fields',
-			array_keys( array_diff_key( $entity_array, $result_without_inaccessible_fields ) )
+			array_keys(array_diff_key($entity_array, $result_without_inaccessible_fields))
 		);
 		return apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_return',
 			$result_without_inaccessible_fields,
 			$model,
-			$rest_request->get_param( 'caps' )
+			$rest_request->get_param('caps')
 		);
 	}
 
@@ -403,38 +403,38 @@ 
 	 * @param array $db_row
 	 * @return array entity mostly ready for converting to JSON and sending in the response
 	 */
-	protected function _create_bare_entity_from_wpdb_results( \EEM_Base $model, $db_row ) {
-		$result = $model->deduce_fields_n_values_from_cols_n_values( $db_row );
-		$result = array_intersect_key( $result, $this->get_model_version_info()->fields_on_model_in_this_version( $model ) );
-		foreach( $result as $field_name => $raw_field_value ) {
+	protected function _create_bare_entity_from_wpdb_results(\EEM_Base $model, $db_row) {
+		$result = $model->deduce_fields_n_values_from_cols_n_values($db_row);
+		$result = array_intersect_key($result, $this->get_model_version_info()->fields_on_model_in_this_version($model));
+		foreach ($result as $field_name => $raw_field_value) {
 			$field_obj = $model->field_settings_for($field_name);
-			$field_value = $field_obj->prepare_for_set_from_db( $raw_field_value );
-			if( $this->is_subclass_of_one(  $field_obj, $this->get_model_version_info()->fields_ignored() ) ){
-				unset( $result[ $field_name ] );
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_rendered_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'rendered' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			$field_value = $field_obj->prepare_for_set_from_db($raw_field_value);
+			if ($this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_ignored())) {
+				unset($result[$field_name]);
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_rendered_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'rendered' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_pretty_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'pretty' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_pretty_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'pretty' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			} elseif ( $field_obj instanceof \EE_Datetime_Field ) {
-				$result[ $field_name ] = Model_Data_Translator::prepare_field_value_for_json(
+			} elseif ($field_obj instanceof \EE_Datetime_Field) {
+				$result[$field_name] = Model_Data_Translator::prepare_field_value_for_json(
 					$field_obj,
 					$field_value,
 					$this->get_model_version_info()->requested_version()
 				);
 			} else {
-				$result[ $field_name ] = Model_Data_Translator::prepare_field_value_for_json(
+				$result[$field_name] = Model_Data_Translator::prepare_field_value_for_json(
 					$field_obj,
-					$field_obj->prepare_for_get( $field_value ),
+					$field_obj->prepare_for_get($field_value),
 					$this->get_model_version_info()->requested_version()
 				);
 			}
@@ -449,9 +449,9 @@ 
 	 * @param array $entity_array
 	 * @return array modified entity
 	 */
-	protected function _add_extra_fields( \EEM_Base $model, $db_row, $entity_array ) {
-		if( $model instanceof \EEM_CPT_Base ) {
-			$entity_array[ 'link' ] = get_permalink( $db_row[ $model->get_primary_key_field()->get_qualified_column() ] );
+	protected function _add_extra_fields(\EEM_Base $model, $db_row, $entity_array) {
+		if ($model instanceof \EEM_CPT_Base) {
+			$entity_array['link'] = get_permalink($db_row[$model->get_primary_key_field()->get_qualified_column()]);
 		}
 		return $entity_array;
 	}
@@ -465,20 +465,20 @@ 
 	 * @param array $entity_array
 	 * @return array the _links item in the entity
 	 */
-	protected function _get_entity_links( $model, $db_row, $entity_array ) {
+	protected function _get_entity_links($model, $db_row, $entity_array) {
 		//add basic links
 		$links = array(
 			'self' => array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $entity_array[ $model->primary_key_name() ]
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$entity_array[$model->primary_key_name()]
 					)
 				)
 			),
 			'collection' => array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() )
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name())
 					)
 				)
 			),
@@ -486,24 +486,24 @@ 
 
 		//add link to the wp core endpoint, if wp api is active
 		global $wp_rest_server;
-		if( $model instanceof \EEM_CPT_Base &&
+		if ($model instanceof \EEM_CPT_Base &&
 			$wp_rest_server instanceof \WP_REST_Server &&
-			$wp_rest_server->get_route_options( '/wp/v2/posts' ) ) {
-			$links[ \EED_Core_Rest_Api::ee_api_link_namespace . 'self_wp_post' ] = array(
+			$wp_rest_server->get_route_options('/wp/v2/posts')) {
+			$links[\EED_Core_Rest_Api::ee_api_link_namespace.'self_wp_post'] = array(
 				array(
-					'href' => rest_url( '/wp/v2/posts/' . $db_row[ $model->get_primary_key_field()->get_qualified_column() ] ),
+					'href' => rest_url('/wp/v2/posts/'.$db_row[$model->get_primary_key_field()->get_qualified_column()]),
 					'single' => true
 				)
 			);
 		}
 
 		//add links to related models
-		foreach( $this->get_model_version_info()->relation_settings( $model ) as $relation_name => $relation_obj ) {
-			$related_model_part = Read::get_related_entity_name( $relation_name, $relation_obj );
-			$links[ \EED_Core_Rest_Api::ee_api_link_namespace . $related_model_part ] = array(
+		foreach ($this->get_model_version_info()->relation_settings($model) as $relation_name => $relation_obj) {
+			$related_model_part = Read::get_related_entity_name($relation_name, $relation_obj);
+			$links[\EED_Core_Rest_Api::ee_api_link_namespace.$related_model_part] = array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $entity_array[ $model->primary_key_name() ] . '/' . $related_model_part
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$entity_array[$model->primary_key_name()].'/'.$related_model_part
 					),
 					'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false
 				)
@@ -519,51 +519,51 @@ 
 	 * @param array $entity_array
 	 * @return array the modified entity
 	 */
-	protected function _include_requested_models( \EEM_Base $model, \WP_REST_Request $rest_request, $entity_array ) {
-		$includes_for_this_model = $this->explode_and_get_items_prefixed_with( $rest_request->get_param( 'include' ), '' );
-		$includes_for_this_model = $this->_remove_model_names_from_array( $includes_for_this_model );
+	protected function _include_requested_models(\EEM_Base $model, \WP_REST_Request $rest_request, $entity_array) {
+		$includes_for_this_model = $this->explode_and_get_items_prefixed_with($rest_request->get_param('include'), '');
+		$includes_for_this_model = $this->_remove_model_names_from_array($includes_for_this_model);
 		//if they passed in * or didn't specify any includes, return everything
-		if( ! in_array( '*', $includes_for_this_model )
-			&& ! empty( $includes_for_this_model ) ) {
-			if( $model->has_primary_key_field() ) {
+		if ( ! in_array('*', $includes_for_this_model)
+			&& ! empty($includes_for_this_model)) {
+			if ($model->has_primary_key_field()) {
 				//always include the primary key. ya just gotta know that at least
 				$includes_for_this_model[] = $model->primary_key_name();
 			}
-			if( $this->explode_and_get_items_prefixed_with( $rest_request->get_param( 'calculate' ), '' ) ) {
+			if ($this->explode_and_get_items_prefixed_with($rest_request->get_param('calculate'), '')) {
 				$includes_for_this_model[] = '_calculated_fields';
 			}
-			$entity_array = array_intersect_key( $entity_array, array_flip( $includes_for_this_model ) );
+			$entity_array = array_intersect_key($entity_array, array_flip($includes_for_this_model));
 		}
-		$relation_settings = $this->get_model_version_info()->relation_settings( $model );
-		foreach( $relation_settings as $relation_name => $relation_obj ) {
+		$relation_settings = $this->get_model_version_info()->relation_settings($model);
+		foreach ($relation_settings as $relation_name => $relation_obj) {
 			$related_fields_to_include = $this->explode_and_get_items_prefixed_with(
-				$rest_request->get_param( 'include' ),
+				$rest_request->get_param('include'),
 				$relation_name
 			);
 			$related_fields_to_calculate = $this->explode_and_get_items_prefixed_with(
-				$rest_request->get_param( 'calculate' ),
+				$rest_request->get_param('calculate'),
 				$relation_name
 			);
 			//did they specify they wanted to include a related model, or
 			//specific fields from a related model?
 			//or did they specify to calculate a field from a related model?
-			if( $related_fields_to_include || $related_fields_to_calculate ) {
+			if ($related_fields_to_include || $related_fields_to_calculate) {
 				//if so, we should include at least some part of the related model
 				$pretend_related_request = new \WP_REST_Request();
 				$pretend_related_request->set_query_params(
 					array(
-						'caps' => $rest_request->get_param( 'caps' ),
+						'caps' => $rest_request->get_param('caps'),
 						'include' => $related_fields_to_include,
 						'calculate' => $related_fields_to_calculate,
 					)
 				);
-				$pretend_related_request->add_header( 'no_rest_headers', true );
+				$pretend_related_request->add_header('no_rest_headers', true);
 				$related_results = $this->get_entities_from_relation(
-					$entity_array[ $model->primary_key_name() ],
+					$entity_array[$model->primary_key_name()],
 					$relation_obj,
 					$pretend_related_request
 				);
-				$entity_array[ Read::get_related_entity_name( $relation_name, $relation_obj ) ] = $related_results instanceof \WP_Error
+				$entity_array[Read::get_related_entity_name($relation_name, $relation_obj)] = $related_results instanceof \WP_Error
 					? null
 					: $related_results;
 			}
@@ -577,8 +577,8 @@ 
 	 * @param array $arr
 	 * @return array
 	 */
-	private function _remove_model_names_from_array( $arr ) {
-		return array_diff( $arr, array_keys( \EE_Registry::instance()->non_abstract_db_models ) );
+	private function _remove_model_names_from_array($arr) {
+		return array_diff($arr, array_keys(\EE_Registry::instance()->non_abstract_db_models));
 	}
 	/**
 	 * Gets the calculated fields for the response
@@ -588,15 +588,15 @@ 
 	 * @param \WP_REST_Request $rest_request
 	 * @return array the _calculations item in the entity
 	 */
-	protected function _get_entity_calculations( $model, $wpdb_row, $rest_request ) {
+	protected function _get_entity_calculations($model, $wpdb_row, $rest_request) {
 		$calculated_fields = $this->explode_and_get_items_prefixed_with(
-			$rest_request->get_param( 'calculate' ),
+			$rest_request->get_param('calculate'),
 			''
 		);
 		//note: setting calculate=* doesn't do anything
 		$calculated_fields_to_return = new \stdClass();
-		foreach( $calculated_fields as $field_to_calculate ) {
-			try{
+		foreach ($calculated_fields as $field_to_calculate) {
+			try {
 				$calculated_fields_to_return->$field_to_calculate = Model_Data_Translator::prepare_field_value_for_json(
 					null,
 					$this->_fields_calculator->retrieve_calculated_field_value(
@@ -608,10 +608,10 @@ 
 					),
 					$this->get_model_version_info()->requested_version()
 				);
-			} catch( Rest_Exception $e ) {
+			} catch (Rest_Exception $e) {
 				//if we don't have permission to read it, just leave it out. but let devs know about the problem
 				$this->_set_response_header(
-					'Notices-Field-Calculation-Errors[' . $e->get_string_code() . '][' . $model->get_this_model_name() . '][' . $field_to_calculate . ']',
+					'Notices-Field-Calculation-Errors['.$e->get_string_code().']['.$model->get_this_model_name().']['.$field_to_calculate.']',
 					$e->getMessage(),
 					true
 				);
@@ -625,7 +625,7 @@ 
 	 * @param string $link_part_after_version_and_slash eg "events/10/datetimes"
 	 * @return string url eg "http://mysite.com/wp-json/ee/v4.6/events/10/datetimes"
 	 */
-	public function get_versioned_link_to( $link_part_after_version_and_slash ) {
+	public function get_versioned_link_to($link_part_after_version_and_slash) {
 		return rest_url(
 			\EED_Core_Rest_Api::ee_api_namespace
 			. $this->get_model_version_info()->requested_version()
@@ -641,11 +641,11 @@ 
 	 * @param \EE_Model_Relation_Base $relation_obj
 	 * @return string
 	 */
-	public static function get_related_entity_name( $relation_name, $relation_obj ){
-		if( $relation_obj instanceof \EE_Belongs_To_Relation ) {
-			return strtolower( $relation_name );
-		}else{
-			return \EEH_Inflector::pluralize_and_lower( $relation_name );
+	public static function get_related_entity_name($relation_name, $relation_obj) {
+		if ($relation_obj instanceof \EE_Belongs_To_Relation) {
+			return strtolower($relation_name);
+		} else {
+			return \EEH_Inflector::pluralize_and_lower($relation_name);
 		}
 	}
 
@@ -658,43 +658,43 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entity_from_model( $model, $request ) {
-		$query_params = array( array( $model->primary_key_name() => $request->get_param( 'id' ) ),'limit' => 1);
-		if( $model instanceof \EEM_Soft_Delete_Base ){
+	public function get_entity_from_model($model, $request) {
+		$query_params = array(array($model->primary_key_name() => $request->get_param('id')), 'limit' => 1);
+		if ($model instanceof \EEM_Soft_Delete_Base) {
 			$query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		}
 		$restricted_query_params = $query_params;
-		$restricted_query_params[ 'caps' ] =  $this->validate_context(  $request->get_param( 'caps' ) );
-		$this->_set_debug_info( 'model query params', $restricted_query_params );
-		$model_rows = $model->get_all_wpdb_results( $restricted_query_params );
-		if ( ! empty ( $model_rows ) ) {
+		$restricted_query_params['caps'] = $this->validate_context($request->get_param('caps'));
+		$this->_set_debug_info('model query params', $restricted_query_params);
+		$model_rows = $model->get_all_wpdb_results($restricted_query_params);
+		if ( ! empty ($model_rows)) {
 			return $this->create_entity_from_wpdb_result(
 				$model,
-				array_shift( $model_rows ),
+				array_shift($model_rows),
 				$request );
 		} else {
 			//ok let's test to see if we WOULD have found it, had we not had restrictions from missing capabilities
-			$lowercase_model_name = strtolower( $model->get_this_model_name() );
-			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results( $query_params );
-			if( ! empty( $model_rows_found_sans_restrictions ) ) {
+			$lowercase_model_name = strtolower($model->get_this_model_name());
+			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results($query_params);
+			if ( ! empty($model_rows_found_sans_restrictions)) {
 				//you got shafted- it existed but we didn't want to tell you!
 				return new \WP_Error(
 					'rest_user_cannot_read',
 					sprintf(
-						__( 'Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso' ),
-						strtolower( $model->get_this_model_name() ),
+						__('Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso'),
+						strtolower($model->get_this_model_name()),
 						Capabilities::get_missing_permissions_string(
 							$model,
-							$this->validate_context( $request->get_param( 'caps' ) ) )
+							$this->validate_context($request->get_param('caps')) )
 					),
-					array( 'status' => 403 )
+					array('status' => 403)
 				);
 			} else {
 				//it's not you. It just doesn't exist
 				return new \WP_Error(
-					sprintf( 'rest_%s_invalid_id', $lowercase_model_name ),
-					sprintf( __( 'Invalid %s ID.', 'event_espresso' ), $lowercase_model_name ),
-					array( 'status' => 404 )
+					sprintf('rest_%s_invalid_id', $lowercase_model_name),
+					sprintf(__('Invalid %s ID.', 'event_espresso'), $lowercase_model_name),
+					array('status' => 404)
 				);
 			}
 		}
@@ -707,14 +707,14 @@ 
 	 * @param string $context
 	 * @return string array key of EEM_Base::cap_contexts_to_cap_action_map()
 	 */
-	public function validate_context( $context ) {
-		if( ! $context ) {
+	public function validate_context($context) {
+		if ( ! $context) {
 			$context = \EEM_Base::caps_read;
 		}
 		$valid_contexts = \EEM_Base::valid_cap_contexts();
-		if( in_array( $context, $valid_contexts )  ){
+		if (in_array($context, $valid_contexts)) {
 			return $context;
-		}else{
+		} else {
 			return \EEM_Base::caps_read;
 		}
 	}
@@ -733,77 +733,77 @@ 
 	 *                          that absolutely no results should be returned
 	 * @throws \EE_Error
 	 */
-	public function create_model_query_params( $model, $query_parameters ) {
+	public function create_model_query_params($model, $query_parameters) {
 		$model_query_params = array( );
-		if ( isset( $query_parameters[ 'where' ] ) ) {
-			$model_query_params[ 0 ] = Model_Data_Translator::prepare_conditions_query_params_for_models(
-				$query_parameters[ 'where' ],
+		if (isset($query_parameters['where'])) {
+			$model_query_params[0] = Model_Data_Translator::prepare_conditions_query_params_for_models(
+				$query_parameters['where'],
 				$model,
 				$this->get_model_version_info()->requested_version()
 			);
 		}
-		if ( isset( $query_parameters[ 'order_by' ] ) ) {
-			$order_by = $query_parameters[ 'order_by' ];
-		} elseif ( isset( $query_parameters[ 'orderby' ] ) ) {
-			$order_by = $query_parameters[ 'orderby' ];
-		}else{
+		if (isset($query_parameters['order_by'])) {
+			$order_by = $query_parameters['order_by'];
+		} elseif (isset($query_parameters['orderby'])) {
+			$order_by = $query_parameters['orderby'];
+		} else {
 			$order_by = null;
 		}
-		if( $order_by !== null ){
-			$model_query_params[ 'order_by' ] =  $order_by;
+		if ($order_by !== null) {
+			$model_query_params['order_by'] = $order_by;
 		}
-		if ( isset( $query_parameters[ 'group_by' ] ) ) {
-			$group_by = $query_parameters[ 'group_by' ];
-		} elseif ( isset( $query_parameters[ 'groupby' ] ) ) {
-			$group_by = $query_parameters[ 'groupby' ];
-		}else{
-			$group_by = array_keys( $model->get_combined_primary_key_fields() );
+		if (isset($query_parameters['group_by'])) {
+			$group_by = $query_parameters['group_by'];
+		} elseif (isset($query_parameters['groupby'])) {
+			$group_by = $query_parameters['groupby'];
+		} else {
+			$group_by = array_keys($model->get_combined_primary_key_fields());
 		}
-		if( $group_by !== null ){
-			$model_query_params[ 'group_by' ] = $group_by;
+		if ($group_by !== null) {
+			$model_query_params['group_by'] = $group_by;
 		}
-		if ( isset( $query_parameters[ 'having' ] ) ) {
-			$model_query_params[ 'having' ] = Model_Data_Translator::prepare_conditions_query_params_for_models(
-				$query_parameters[ 'having' ],
+		if (isset($query_parameters['having'])) {
+			$model_query_params['having'] = Model_Data_Translator::prepare_conditions_query_params_for_models(
+				$query_parameters['having'],
 				$model,
 				$this->get_model_version_info()->requested_version()
 			);
 		}
-		if ( isset( $query_parameters[ 'order' ] ) ) {
-			$model_query_params[ 'order' ] = $query_parameters[ 'order' ];
+		if (isset($query_parameters['order'])) {
+			$model_query_params['order'] = $query_parameters['order'];
 		}
-		if ( isset( $query_parameters[ 'mine' ] ) ){
-			$model_query_params = $model->alter_query_params_to_only_include_mine( $model_query_params );
+		if (isset($query_parameters['mine'])) {
+			$model_query_params = $model->alter_query_params_to_only_include_mine($model_query_params);
 		}
-		if( isset( $query_parameters[ 'limit' ] ) ) {
+		if (isset($query_parameters['limit'])) {
 			//limit should be either a string like '23' or '23,43', or an array with two items in it
-			if( ! is_array( $query_parameters[ 'limit' ] ) ) {
-				$limit_array = explode(',', (string)$query_parameters['limit']);
-			}else {
-				$limit_array = $query_parameters[ 'limit' ];
+			if ( ! is_array($query_parameters['limit'])) {
+				$limit_array = explode(',', (string) $query_parameters['limit']);
+			} else {
+				$limit_array = $query_parameters['limit'];
 			}
 			$sanitized_limit = array();
-			foreach( $limit_array as $key => $limit_part ) {
-				if( $this->_debug_mode && ( ! is_numeric( $limit_part ) || count( $sanitized_limit ) > 2 ) ) {
+			foreach ($limit_array as $key => $limit_part) {
+				if ($this->_debug_mode && ( ! is_numeric($limit_part) || count($sanitized_limit) > 2)) {
 					throw new \EE_Error(
 						sprintf(
-							__( 'An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso' ),
-							json_encode( $query_parameters[ 'limit' ] )
+							__('An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso'),
+							json_encode($query_parameters['limit'])
 						)
 					);
 				}
-				$sanitized_limit[] = (int)$limit_part;
+				$sanitized_limit[] = (int) $limit_part;
 			}
-			$model_query_params[ 'limit' ] = implode( ',', $sanitized_limit );
-		}else{
-			$model_query_params[ 'limit' ] = \EED_Core_Rest_Api::get_default_query_limit();
+			$model_query_params['limit'] = implode(',', $sanitized_limit);
+		} else {
+			$model_query_params['limit'] = \EED_Core_Rest_Api::get_default_query_limit();
 		}
-		if( isset( $query_parameters[ 'caps' ] ) ) {
-			$model_query_params[ 'caps' ] = $this->validate_context( $query_parameters[ 'caps' ] );
-		}else{
-			$model_query_params[ 'caps' ] = \EEM_Base::caps_read;
+		if (isset($query_parameters['caps'])) {
+			$model_query_params['caps'] = $this->validate_context($query_parameters['caps']);
+		} else {
+			$model_query_params['caps'] = \EEM_Base::caps_read;
 		}
-		return apply_filters( 'FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model );
+		return apply_filters('FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model);
 	}
 
 
@@ -815,13 +815,13 @@ 
 	 * @param array     $query_params sub-array from @see EEM_Base::get_all()
 	 * @return array
 	 */
-	public function prepare_rest_query_params_key_for_models( $model,  $query_params ) {
+	public function prepare_rest_query_params_key_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_key_for_models( $model, $value );
-			}else{
-				$model_ready_query_params[ $key ] = $value;
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_key_for_models($model, $value);
+			} else {
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
@@ -835,13 +835,13 @@ 
 	 * @param $query_params
 	 * @return array
 	 */
-	public function prepare_rest_query_params_values_for_models( $model, $query_params ) {
+	public function prepare_rest_query_params_values_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_values_for_models( $model, $value );
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_values_for_models($model, $value);
 			} else {
-				$model_ready_query_params[ $key ] = $value;
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
@@ -856,33 +856,33 @@ 
 	 * we only return strings starting with that and a period; if no prefix was specified
 	 * we return all items containing NO periods
 	 */
-	public function explode_and_get_items_prefixed_with( $string_to_explode, $prefix ) {
-		if( is_string( $string_to_explode ) ) {
-			$exploded_contents = explode( ',', $string_to_explode );
-		} else if( is_array( $string_to_explode ) ) {
+	public function explode_and_get_items_prefixed_with($string_to_explode, $prefix) {
+		if (is_string($string_to_explode)) {
+			$exploded_contents = explode(',', $string_to_explode);
+		} else if (is_array($string_to_explode)) {
 			$exploded_contents = $string_to_explode;
 		} else {
 			$exploded_contents = array();
 		}
 		//if the string was empty, we want an empty array
-		$exploded_contents = array_filter( $exploded_contents );
+		$exploded_contents = array_filter($exploded_contents);
 		$contents_with_prefix = array();
-		foreach( $exploded_contents as $item ) {
-			$item = trim( $item );
+		foreach ($exploded_contents as $item) {
+			$item = trim($item);
 			//if no prefix was provided, so we look for items with no "." in them
-			if( ! $prefix ) {
+			if ( ! $prefix) {
 				//does this item have a period?
-				if( strpos( $item, '.' ) === false ) {
+				if (strpos($item, '.') === false) {
 					//if not, then its what we're looking for
 					$contents_with_prefix[] = $item;
 				}
-			} else if( strpos( $item, $prefix . '.' ) === 0 ) {
+			} else if (strpos($item, $prefix.'.') === 0) {
 				//this item has the prefix and a period, grab it
 				$contents_with_prefix[] = substr(
 					$item,
-					strpos( $item, $prefix . '.' ) + strlen( $prefix . '.' )
+					strpos($item, $prefix.'.') + strlen($prefix.'.')
 					);
-			} else if( $item === $prefix ) {
+			} else if ($item === $prefix) {
 				//this item is JUST the prefix
 				//so let's grab everything after, which is a blank string
 				$contents_with_prefix[] = '';
@@ -905,33 +905,33 @@ 
 	 * the fields for that model, with the model's name removed from each.
 	 * If $include_string was blank or '*' returns an empty array
 	 */
-	public function extract_includes_for_this_model( $include_string, $model_name = null ) {
-		if( is_array( $include_string ) ) {
-			$include_string = implode( ',', $include_string );
+	public function extract_includes_for_this_model($include_string, $model_name = null) {
+		if (is_array($include_string)) {
+			$include_string = implode(',', $include_string);
 		}
-		if( $include_string === '*' || $include_string === '' ) {
+		if ($include_string === '*' || $include_string === '') {
 			return array();
 		}
-		$includes = explode( ',', $include_string );
+		$includes = explode(',', $include_string);
 		$extracted_fields_to_include = array();
-		if( $model_name ){
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
-				if( strpos( $field_to_include, $model_name . '.' ) === 0 ) {
+		if ($model_name) {
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
+				if (strpos($field_to_include, $model_name.'.') === 0) {
 					//found the model name at the exact start
-					$field_sans_model_name = str_replace( $model_name . '.', '', $field_to_include );
+					$field_sans_model_name = str_replace($model_name.'.', '', $field_to_include);
 					$extracted_fields_to_include[] = $field_sans_model_name;
-				}elseif( $field_to_include == $model_name ){
+				}elseif ($field_to_include == $model_name) {
 					$extracted_fields_to_include[] = '*';
 				}
 			}
-		}else{
+		} else {
 			//look for ones with no period
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
 				if (
-					strpos( $field_to_include, '.' ) === false
-					&& ! $this->get_model_version_info()->is_model_name_in_this_version( $field_to_include )
+					strpos($field_to_include, '.') === false
+					&& ! $this->get_model_version_info()->is_model_name_in_this_version($field_to_include)
 				) {
 					$extracted_fields_to_include[] = $field_to_include;
 				}

caffeinated/core/libraries/messages/message_type/newsletter/EE_Newsletter_message_type.class.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

Spacing +28 added lines, -28 removed lines

@@ -22,10 +22,10 @@ 
 
 	public function __construct() {
 		$this->name = 'newsletter';
-		$this->description = __( 'Newsletter message types are triggered manually by the admin for sending mass email to select groups of registrants.', 'event_espresso' );
+		$this->description = __('Newsletter message types are triggered manually by the admin for sending mass email to select groups of registrants.', 'event_espresso');
 		$this->label = array(
-			'singular' => __( 'newsletter', 'event_espresso' ),
-			'plural' => __( 'newsletters', 'event_espresso' )
+			'singular' => __('newsletter', 'event_espresso'),
+			'plural' => __('newsletters', 'event_espresso')
 			);
 		$this->_master_templates = array(
 			'email' => 'registration',
@@ -49,9 +49,9 @@ 
 
 
 
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
 		//newsletter message type data handler is 'Registrations' and it expects an array of EE_Registration objects.
-		return array( $registration );
+		return array($registration);
 	}
 
 
@@ -64,15 +64,15 @@ 
 
 	protected function _set_contexts() {
 		$this->_context_label = array(
-			'label' => __( 'recipient', 'event_espresso' ),
-			'plural' => __( 'recipients', 'event_espresso' ),
-			'description' => __( 'Recipient\'s are who will receive the message.', 'event_espresso' )
+			'label' => __('recipient', 'event_espresso'),
+			'plural' => __('recipients', 'event_espresso'),
+			'description' => __('Recipient\'s are who will receive the message.', 'event_espresso')
 			);
 
 		$this->_contexts = array(
 			'attendee' => array(
-				'label' => __( 'Registrant', 'event_espresso' ),
-				'description' => __( 'This template goes to selected registrants.', 'event_espresso' )
+				'label' => __('Registrant', 'event_espresso'),
+				'description' => __('This template goes to selected registrants.', 'event_espresso')
 				)
 			);
 	}
@@ -98,13 +98,13 @@ 
 			'newsletter',
 			);
 
-		foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
-			foreach ( $shortcodes as $key => $shortcode ) {
-				if ( ! in_array( $shortcode, $included_shortcodes ) ) {
-					unset( $this->_valid_shortcodes[ $context ][ $key ] );
+		foreach ($this->_valid_shortcodes as $context => $shortcodes) {
+			foreach ($shortcodes as $key => $shortcode) {
+				if ( ! in_array($shortcode, $included_shortcodes)) {
+					unset($this->_valid_shortcodes[$context][$key]);
 				}
 			}
-			$this->_valid_shortcodes[ $context ][] = 'newsletter';
+			$this->_valid_shortcodes[$context][] = 'newsletter';
 		}
 
 	}
@@ -118,44 +118,44 @@ 
 		$addressee = array();
 
 		//looping through registrations
-		foreach ( $this->_data->registrations as $reg_id => $details ) {
+		foreach ($this->_data->registrations as $reg_id => $details) {
 			//set $attendee array to blank on each loop
 			$aee = array();
 
 			//need to get the attendee from this registration.
-			$attendee = isset( $details['att_obj'] ) && $details['att_obj'] instanceof EE_Attendee
+			$attendee = isset($details['att_obj']) && $details['att_obj'] instanceof EE_Attendee
 				? $details['att_obj']
 				: null;
 
-			if ( ! $attendee instanceof EE_Attendee ) {
+			if ( ! $attendee instanceof EE_Attendee) {
 				continue;
 			}
 
 			//set $aee from attendee object
 			$aee['att_obj'] = $attendee;
-			$aee['reg_objs'] = isset( $this->_data->attendees[ $attendee->ID() ]['reg_objs'] )
-				? $this->_data->attendees[ $attendee->ID() ]['reg_objs']
+			$aee['reg_objs'] = isset($this->_data->attendees[$attendee->ID()]['reg_objs'])
+				? $this->_data->attendees[$attendee->ID()]['reg_objs']
 				: array();
 			$aee['attendee_email'] = $attendee->email();
-			$aee['tkt_objs'] = isset( $this->_data->attendees[ $attendee->ID() ]['tkt_objs'] )
-				? $this->_data->attendees[ $attendee->ID() ]['tkt_objs']
+			$aee['tkt_objs'] = isset($this->_data->attendees[$attendee->ID()]['tkt_objs'])
+				? $this->_data->attendees[$attendee->ID()]['tkt_objs']
 				: array();
 
-			if ( isset( $this->_data->attendees[ $attendee->ID() ]['evt_objs'] ) ) {
-				$aee['evt_objs'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
-				$aee['events'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
+			if (isset($this->_data->attendees[$attendee->ID()]['evt_objs'])) {
+				$aee['evt_objs'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
+				$aee['events'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
 			} else {
 				$aee['evt_objs'] = $aee['events'] = array();
 			}
 
-			$aee['reg_obj'] = isset( $details['reg_obj'] )
+			$aee['reg_obj'] = isset($details['reg_obj'])
 				? $details['reg_obj']
 				: null;
 			$aee['attendees'] = $this->_data->attendees;
 
 			//merge in the primary attendee data
-			$aee = array_merge( $this->_default_addressee_data, $aee );
-			$addressee[] = new EE_Messages_Addressee( $aee );
+			$aee = array_merge($this->_default_addressee_data, $aee);
+			$addressee[] = new EE_Messages_Addressee($aee);
 		}
 		return $addressee;
 	}

core/libraries/messages/data_class/EE_Messages_Registrations_incoming_data.class.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 
 /**
  * This prepares data for message types that send messages for multiple registrations (that could span multiple transactions)
@@ -20,13 +20,13 @@ 
 	 * @throws EE_Error
 	 * @access protected
 	 */
-	public function __construct( $data = array() ) {
+	public function __construct($data = array()) {
 
 		//validate that the first element in the array is an EE_Registration object.
-		if ( ! reset( $data ) instanceof EE_Registration ) {
-			throw new EE_Error( __( 'The EE_Message_Registrations_incoming_data class expects an array of EE_Registration objects.', 'event_espresso' ) );
+		if ( ! reset($data) instanceof EE_Registration) {
+			throw new EE_Error(__('The EE_Message_Registrations_incoming_data class expects an array of EE_Registration objects.', 'event_espresso'));
 		}
-		parent::__construct( $data );
+		parent::__construct($data);
 	}
 
 

Braces +3 added lines, -1 removed lines

@@ -1,5 +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' );
+}
 
 /**
  * This prepares data for message types that send messages for multiple registrations (that could span multiple transactions)

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

Indentation +1 added lines, -1 removed lines

@@ -347,7 +347,7 @@
 				$total_ticket_count++;
 				$tickets[ $ticket->ID() ]['ticket'] = $ticket;
 				$tickets[ $ticket->ID() ]['count'] = is_array( $tickets[ $ticket->ID() ] )
-				                                     && isset( $tickets[ $ticket->ID() ]['count'] )
+													 && isset( $tickets[ $ticket->ID() ]['count'] )
 					? $tickets[ $ticket->ID() ]['count'] + 1
 					: 1;
 				$tickets[ $ticket->ID() ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee();

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

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/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/rest_api/calculations/Event.php

Doc Comments +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
 	 * @param array $wpdb_row
 	 * @param \WP_REST_Request $request
 	 * @param Base $controller
-	 * @return int|null if permission denied
+	 * @return integer if permission denied
 	 */
 	public static function registrations_checked_in_count( $wpdb_row, $request, $controller ){
 		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {

Spacing +69 added lines, -69 removed lines

@@ -15,8 +15,8 @@ 
  * @since		 	   $VID:$
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Event extends Calculations_Base {
@@ -32,20 +32,20 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	public static function optimum_sales_at_start( $wpdb_row, $request, $controller ){
-		if( is_array( $wpdb_row ) && isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
-			$event_obj = \EEM_Event::instance()->get_one_by_ID( $wpdb_row[ 'Event_CPT.ID' ] );
+	public static function optimum_sales_at_start($wpdb_row, $request, $controller) {
+		if (is_array($wpdb_row) && isset($wpdb_row['Event_CPT.ID'])) {
+			$event_obj = \EEM_Event::instance()->get_one_by_ID($wpdb_row['Event_CPT.ID']);
 		} else {
 			$event_obj = null;
 		}
-		if( $event_obj instanceof \EE_Event ) {
-			return $event_obj->total_available_spaces( true );
+		if ($event_obj instanceof \EE_Event) {
+			return $event_obj->total_available_spaces(true);
 		} else {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate optimum_sales_at_start because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso' ),
-					$wpdb_row[ 'Event_CPT.ID' ],
-					print_r( $wpdb_row, true )
+					__('Cannot calculate optimum_sales_at_start because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso'),
+					$wpdb_row['Event_CPT.ID'],
+					print_r($wpdb_row, true)
 				)
 			);
 		}
@@ -64,20 +64,20 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	public static function optimum_sales_now( $wpdb_row, $request, $controller ){
-		if( is_array( $wpdb_row ) && isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
-			$event_obj = \EEM_Event::instance()->get_one_by_ID( $wpdb_row[ 'Event_CPT.ID' ] );
+	public static function optimum_sales_now($wpdb_row, $request, $controller) {
+		if (is_array($wpdb_row) && isset($wpdb_row['Event_CPT.ID'])) {
+			$event_obj = \EEM_Event::instance()->get_one_by_ID($wpdb_row['Event_CPT.ID']);
 		} else {
 			$event_obj = null;
 		}
-		if( $event_obj instanceof \EE_Event ) {
-			return $event_obj->total_available_spaces( false );
+		if ($event_obj instanceof \EE_Event) {
+			return $event_obj->total_available_spaces(false);
 		} else {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate optimum_sales_now because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso' ),
-					$wpdb_row[ 'Event_CPT.ID' ],
-					print_r( $wpdb_row, true )
+					__('Cannot calculate optimum_sales_now because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso'),
+					$wpdb_row['Event_CPT.ID'],
+					print_r($wpdb_row, true)
 				)
 			);
 		}
@@ -95,20 +95,20 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	public static function spaces_remaining( $wpdb_row, $request, $controller ){
-		if( is_array( $wpdb_row ) && isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
-			$event_obj = \EEM_Event::instance()->get_one_by_ID( $wpdb_row[ 'Event_CPT.ID' ] );
+	public static function spaces_remaining($wpdb_row, $request, $controller) {
+		if (is_array($wpdb_row) && isset($wpdb_row['Event_CPT.ID'])) {
+			$event_obj = \EEM_Event::instance()->get_one_by_ID($wpdb_row['Event_CPT.ID']);
 		} else {
 			$event_obj = null;
 		}
-		if( $event_obj instanceof \EE_Event ) {
+		if ($event_obj instanceof \EE_Event) {
 			return $event_obj->spaces_remaining_for_sale();
 		} else {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate spaces_remaining because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso' ),
-					$wpdb_row[ 'Event_CPT.ID' ],
-					print_r( $wpdb_row, true )
+					__('Cannot calculate spaces_remaining because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso'),
+					$wpdb_row['Event_CPT.ID'],
+					print_r($wpdb_row, true)
 				)
 			);
 		}
@@ -126,19 +126,19 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	public static function spots_taken( $wpdb_row, $request, $controller ){
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
+	public static function spots_taken($wpdb_row, $request, $controller) {
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Event_CPT.ID'])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate spots_taken because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso' ),
-					print_r( $wpdb_row, true )
+					__('Cannot calculate spots_taken because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso'),
+					print_r($wpdb_row, true)
 				)
 			);
 		}
 		return \EEM_Registration::instance()->count(
 			array(
 				array(
-					'EVT_ID' => $wpdb_row[ 'Event_CPT.ID' ],
+					'EVT_ID' => $wpdb_row['Event_CPT.ID'],
 					'STS_ID' => \EEM_Registration::status_id_approved
 				)
 			),
@@ -160,20 +160,20 @@ 
 	 * @throws \EE_Error
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
 	 */
-	public static function spots_taken_pending_payment( $wpdb_row, $request, $controller ){
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
+	public static function spots_taken_pending_payment($wpdb_row, $request, $controller) {
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Event_CPT.ID'])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate spots_taken_pending_payment because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso' ),
-					print_r( $wpdb_row, true )
+					__('Cannot calculate spots_taken_pending_payment because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso'),
+					print_r($wpdb_row, true)
 				)
 			);
 		}
-		self::_verify_current_user_can( 'ee_read_registrations', 'spots_taken_pending_payment' );
+		self::_verify_current_user_can('ee_read_registrations', 'spots_taken_pending_payment');
 		return \EEM_Registration::instance()->count(
 			array(
 				array(
-					'EVT_ID' => $wpdb_row[ 'Event_CPT.ID' ],
+					'EVT_ID' => $wpdb_row['Event_CPT.ID'],
 					'STS_ID' => \EEM_Registration::status_id_pending_payment
 				)
 			),
@@ -195,17 +195,17 @@ 
 	 * @throws \EE_Error
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
 	 */
-	public static function registrations_checked_in_count( $wpdb_row, $request, $controller ){
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
+	public static function registrations_checked_in_count($wpdb_row, $request, $controller) {
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Event_CPT.ID'])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate registrations_checked_in_count because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso' ),
-					print_r( $wpdb_row, true )
+					__('Cannot calculate registrations_checked_in_count because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso'),
+					print_r($wpdb_row, true)
 				)
 			);
 		}
-		self::_verify_current_user_can( 'ee_read_checkins', 'registrations_checked_in_count' );
-		return \EEM_Registration::instance()->count_registrations_checked_into_event( $wpdb_row[ 'Event_CPT.ID' ], true );
+		self::_verify_current_user_can('ee_read_checkins', 'registrations_checked_in_count');
+		return \EEM_Registration::instance()->count_registrations_checked_into_event($wpdb_row['Event_CPT.ID'], true);
 	}
 
 
@@ -221,17 +221,17 @@ 
 	 * @throws \EE_Error
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
 	 */
-	public static function registrations_checked_out_count( $wpdb_row, $request, $controller ){
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
+	public static function registrations_checked_out_count($wpdb_row, $request, $controller) {
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Event_CPT.ID'])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate registrations_checked_out_count because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso' ),
-					print_r( $wpdb_row, true )
+					__('Cannot calculate registrations_checked_out_count because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso'),
+					print_r($wpdb_row, true)
 				)
 			);
 		}
-		self::_verify_current_user_can( 'ee_read_checkins', 'registrations_checked_out_count' );
-		return \EEM_Registration::instance()->count_registrations_checked_into_event( $wpdb_row[ 'Event_CPT.ID' ], false );
+		self::_verify_current_user_can('ee_read_checkins', 'registrations_checked_out_count');
+		return \EEM_Registration::instance()->count_registrations_checked_into_event($wpdb_row['Event_CPT.ID'], false);
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_thumbnail( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'thumbnail' );
+	public static function image_thumbnail($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'thumbnail');
 	}
 
 	/**
@@ -252,8 +252,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_medium( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'medium' );
+	public static function image_medium($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'medium');
 	}
 
 	/**
@@ -263,8 +263,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_medium_large( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'medium_large' );
+	public static function image_medium_large($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'medium_large');
 	}
 
 	/**
@@ -274,8 +274,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_large( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'large' );
+	public static function image_large($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'large');
 	}
 
 	/**
@@ -285,8 +285,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_post_thumbnail( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'post-thumbnail' );
+	public static function image_post_thumbnail($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'post-thumbnail');
 	}
 
 	/**
@@ -296,8 +296,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_full( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'full' );
+	public static function image_full($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'full');
 	}
 
 	/**
@@ -307,21 +307,21 @@ 
 	 * @param string $image_size one of these: thumbnail, medium, medium_large, large, post-thumbnail, full
 	 * @return array|false if no such image exists. If array it will have keys 'url', 'width', 'height' and 'original'
 	 */
-	protected static function _calculate_image_data( $EVT_ID, $image_size ) {
-		$attachment_id = get_post_thumbnail_id( $EVT_ID );
-		$data = wp_get_attachment_image_src( $attachment_id, $image_size );
-		if( ! $data ) {
+	protected static function _calculate_image_data($EVT_ID, $image_size) {
+		$attachment_id = get_post_thumbnail_id($EVT_ID);
+		$data = wp_get_attachment_image_src($attachment_id, $image_size);
+		if ( ! $data) {
 			return false;
 		}
-		if( isset( $data[ 3] ) ) {
-			$generated = $data[ 3 ];
+		if (isset($data[3])) {
+			$generated = $data[3];
 		} else {
 			$generated = true;
 		}
 		return array(
-			'url' => $data[ 0 ],
-			'width' => $data[ 1 ],
-			'height' => $data[ 2 ],
+			'url' => $data[0],
+			'width' => $data[1],
+			'height' => $data[2],
 			'generated' => $generated
 		);
 	}

core/libraries/rest_api/Model_Data_Translator.php

Doc Comments +5 added lines, -1 removed lines

@@ -55,7 +55,7 @@ 
 	/**
 	 * Prepares incoming data from the json or $_REQUEST parameters for the models'
 	 * "$query_params". 
-	 * @param EE_Model_Field_Base $field_obj
+	 * @param \EE_Model_Field_Base $field_obj
 	 * @param mixed $original_value
 	 * @param string $requested_version
 	 * @return mixed
@@ -77,6 +77,7 @@ 
 	* Prepares a field's value for display in the API
 	* @param \EE_Model_Field_Base $field_obj
 	* @param mixed $original_value
+	* @param string $requested_version
 	* @return mixed
 	*/
    public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {
@@ -131,6 +132,9 @@ 
 		return $query_param_for_models;
 	}
 	
+	/**
+	 * @return string
+	 */
 	public static function remove_stars_and_anything_after_from_condition_query_param_key( $condition_query_param_key ) {
 		$pos_of_star = strpos($condition_query_param_key, '*');
 		if($pos_of_star === FALSE){

Indentation +6 added lines, -6 removed lines

@@ -74,11 +74,11 @@ 
 	}
 	
 	/**
-	* Prepares a field's value for display in the API
-	* @param \EE_Model_Field_Base $field_obj
-	* @param mixed $original_value
-	* @return mixed
-	*/
+	 * Prepares a field's value for display in the API
+	 * @param \EE_Model_Field_Base $field_obj
+	 * @param mixed $original_value
+	 * @return mixed
+	 */
    public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {
 		if( $original_value === EE_INF ) {
 			$new_value = self::ee_inf_in_rest;
@@ -95,7 +95,7 @@ 
 			$original_value,
 			$requested_version
 		);
-    }
+	}
 	
 	/**
 	 * Prepares condition-query-parameters (like what's in where and having) from

Braces +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
 		$pos_of_star = strpos($condition_query_param_key, '*');
 		if($pos_of_star === FALSE){
 			return $condition_query_param_key;
-		}else{
+		} else{
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -159,14 +159,14 @@ 
 		$last_query_param_part = $query_param_parts[ count($query_param_parts) - 1 ];
 		if($number_of_parts == 1){
 			$field_name = $last_query_param_part;
-		}else{// $number_of_parts >= 2
+		} else{// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
 			$model = \EE_Registry::instance()->load_model( $query_param_parts[ $number_of_parts - 2 ]);
 		}
 		try{
 			return $model->field_settings_for($field_name);
-		}catch(\EE_Error $e){
+		} catch(\EE_Error $e){
 			return null;
 		}
 	}

Spacing +45 added lines, -45 removed lines

@@ -21,8 +21,8 @@ 
  */
 	
 	
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Model_Data_Translator {
@@ -40,14 +40,14 @@ 
 	 * @param string  $requested_version
 	 * @return mixed
 	 */
-	public static function prepare_field_values_from_json( $field_obj, $original_value_maybe_array, $requested_version ) {
-		if( is_array( $original_value_maybe_array ) ) {
+	public static function prepare_field_values_from_json($field_obj, $original_value_maybe_array, $requested_version) {
+		if (is_array($original_value_maybe_array)) {
 			$new_value_maybe_array = array();
-			foreach( $original_value_maybe_array as $array_key => $array_item ) {
-				$new_value_maybe_array[ $array_key ] = self::prepare_field_value_from_json( $field_obj, $array_item, $requested_version );
+			foreach ($original_value_maybe_array as $array_key => $array_item) {
+				$new_value_maybe_array[$array_key] = self::prepare_field_value_from_json($field_obj, $array_item, $requested_version);
 			}
 		} else {
-			$new_value_maybe_array = self::prepare_field_value_from_json( $field_obj, $original_value_maybe_array, $requested_version );
+			$new_value_maybe_array = self::prepare_field_value_from_json($field_obj, $original_value_maybe_array, $requested_version);
 		}
 		return $new_value_maybe_array;
 	}
@@ -60,13 +60,13 @@ 
 	 * @param string $requested_version
 	 * @return mixed
 	 */
-	public static function prepare_field_value_from_json( $field_obj, $original_value, $requested_version ) {
+	public static function prepare_field_value_from_json($field_obj, $original_value, $requested_version) {
 		$new_value = null;
-		if( $field_obj instanceof \EE_Infinite_Integer_Field 
-			&& in_array( $original_value, array( null, '' ), true ) ) {
+		if ($field_obj instanceof \EE_Infinite_Integer_Field 
+			&& in_array($original_value, array(null, ''), true)) {
 			$new_value = EE_INF;
-		} elseif( $field_obj instanceof \EE_Datetime_Field ) {
-			$new_value = rest_parse_date( $original_value );
+		} elseif ($field_obj instanceof \EE_Datetime_Field) {
+			$new_value = rest_parse_date($original_value);
 		} else {
 			$new_value = $original_value;
 		}
@@ -79,17 +79,17 @@ 
 	* @param mixed $original_value
 	* @return mixed
 	*/
-   public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {
-		if( $original_value === EE_INF ) {
+   public static function prepare_field_value_for_json($field_obj, $original_value, $requested_version) {
+		if ($original_value === EE_INF) {
 			$new_value = self::ee_inf_in_rest;
-		} elseif( $field_obj instanceof \EE_Datetime_Field &&
-			$original_value instanceof \DateTime ) {
-			$new_value = $original_value->format( 'c' );
-			$new_value = mysql_to_rfc3339( $new_value );
+		} elseif ($field_obj instanceof \EE_Datetime_Field &&
+			$original_value instanceof \DateTime) {
+			$new_value = $original_value->format('c');
+			$new_value = mysql_to_rfc3339($new_value);
 		} else {
 			$new_value = $original_value;
 		}
-		return apply_filters( 'FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api', 
+		return apply_filters('FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api', 
 			$new_value,
 			$field_obj,
 			$original_value,
@@ -105,39 +105,39 @@ 
 	 * @param string $requested_version
 	 * @return array
 	 */
-	public static function prepare_conditions_query_params_for_models( $inputted_query_params_of_this_type, \EEM_Base $model, $requested_version ) {
+	public static function prepare_conditions_query_params_for_models($inputted_query_params_of_this_type, \EEM_Base $model, $requested_version) {
 		$query_param_for_models = array();
-		foreach( $inputted_query_params_of_this_type as $query_param_key => $query_param_value ) {
+		foreach ($inputted_query_params_of_this_type as $query_param_key => $query_param_value) {
 			$field = self::deduce_field_from_query_param( 
-				self::remove_stars_and_anything_after_from_condition_query_param_key( $query_param_key ), 
+				self::remove_stars_and_anything_after_from_condition_query_param_key($query_param_key), 
 				$model
 			);
-			if( $field instanceof \EE_Model_Field_Base ) {
+			if ($field instanceof \EE_Model_Field_Base) {
 				//did they specify an operator?
-				if( is_array( $query_param_value ) ) {
-					$op = $query_param_value[ 0 ];
-					$translated_value = array( $op );
-					if( isset( $query_param_value[ 1 ] ) ) {
-						$value = $query_param_value[ 1 ];
-						$translated_value[1] = self::prepare_field_values_from_json( $field, $value, $requested_version );
+				if (is_array($query_param_value)) {
+					$op = $query_param_value[0];
+					$translated_value = array($op);
+					if (isset($query_param_value[1])) {
+						$value = $query_param_value[1];
+						$translated_value[1] = self::prepare_field_values_from_json($field, $value, $requested_version);
 					}
 				} else {
-					$translated_value  = self::prepare_field_value_from_json( $field, $query_param_value, $requested_version );
+					$translated_value = self::prepare_field_value_from_json($field, $query_param_value, $requested_version);
 				}
-				$query_param_for_models[ $query_param_key ] = $translated_value;
+				$query_param_for_models[$query_param_key] = $translated_value;
 			} else {
 				//so it's not for a field, assume it's a logic query param key
-				$query_param_for_models[ $query_param_key ] = self::prepare_conditions_query_params_for_models( $query_param_value, $model, $requested_version );
+				$query_param_for_models[$query_param_key] = self::prepare_conditions_query_params_for_models($query_param_value, $model, $requested_version);
 			}
 		}
 		return $query_param_for_models;
 	}
 	
-	public static function remove_stars_and_anything_after_from_condition_query_param_key( $condition_query_param_key ) {
+	public static function remove_stars_and_anything_after_from_condition_query_param_key($condition_query_param_key) {
 		$pos_of_star = strpos($condition_query_param_key, '*');
-		if($pos_of_star === FALSE){
+		if ($pos_of_star === FALSE) {
 			return $condition_query_param_key;
-		}else{
+		} else {
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -149,26 +149,26 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Field_Base
 	 */
-	public static function deduce_field_from_query_param($query_param_name, \EEM_Base $model){
+	public static function deduce_field_from_query_param($query_param_name, \EEM_Base $model) {
 		//ok, now proceed with deducing which part is the model's name, and which is the field's name
 		//which will help us find the database table and column
 
-		$query_param_parts = explode(".",$query_param_name);
-		if(empty($query_param_parts)){
-			throw new \EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s",'event_espresso'),$query_param_name));
+		$query_param_parts = explode(".", $query_param_name);
+		if (empty($query_param_parts)) {
+			throw new \EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s", 'event_espresso'), $query_param_name));
 		}
 		$number_of_parts = count($query_param_parts);
-		$last_query_param_part = $query_param_parts[ count($query_param_parts) - 1 ];
-		if($number_of_parts == 1){
+		$last_query_param_part = $query_param_parts[count($query_param_parts) - 1];
+		if ($number_of_parts == 1) {
 			$field_name = $last_query_param_part;
-		}else{// $number_of_parts >= 2
+		} else {// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
-			$model = \EE_Registry::instance()->load_model( $query_param_parts[ $number_of_parts - 2 ]);
+			$model = \EE_Registry::instance()->load_model($query_param_parts[$number_of_parts - 2]);
 		}
-		try{
+		try {
 			return $model->field_settings_for($field_name);
-		}catch(\EE_Error $e){
+		} catch (\EE_Error $e) {
 			return null;
 		}
 	}