eventespresso / event-espresso-core

core/db_models/EEM_Ticket_Price.model.php

Spacing +4 added lines, -4 removed lines

@@ -42,11 +42,11 @@
             'Price' => new EE_Belongs_To_Relation()
         );
         $this->_model_chain_to_wp_user = 'Ticket';
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
         // account for default tickets in the caps
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+        $this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+        $this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
         // follow the caps of the ticket
         $this->_caps_slug = 'tickets';
         parent::__construct($timezone);

Indentation +37 added lines, -37 removed lines

@@ -11,43 +11,43 @@
  */
 class EEM_Ticket_Price extends EEM_Base
 {
-    // private instance of the EEM_Ticket_Price object
-    protected static $_instance = null;
+	// private instance of the EEM_Ticket_Price object
+	protected static $_instance = null;
 
-    /**
-     *      private constructor to prevent direct creation
-     *      @Constructor
-     *      @access protected
-     *      @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
-     *      @return void
-     */
-    protected function __construct($timezone)
-    {
-        $this->singular_item = esc_html__('Ticket Price', 'event_espresso');
-        $this->plural_item = esc_html__('Ticket Prices', 'event_espresso');
+	/**
+	 *      private constructor to prevent direct creation
+	 *      @Constructor
+	 *      @access protected
+	 *      @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
+	 *      @return void
+	 */
+	protected function __construct($timezone)
+	{
+		$this->singular_item = esc_html__('Ticket Price', 'event_espresso');
+		$this->plural_item = esc_html__('Ticket Prices', 'event_espresso');
 
-        $this->_tables = array(
-            'Ticket_Price' => new EE_Primary_Table('esp_ticket_price', 'TKP_ID')
-        );
-        $this->_fields = array(
-            'Ticket_Price' => array(
-                'TKP_ID' => new EE_Primary_Key_Int_Field('TKP_ID', 'Ticket Price ID'),
-                'TKT_ID' => new EE_Foreign_Key_Int_Field('TKT_ID', 'Ticket Id', false, 0, 'Ticket'),
-                'PRC_ID' => new EE_Foreign_Key_Int_Field('PRC_ID', 'Price ID', false, 0, 'Price'),
-            )
-        );
-        $this->_model_relations = array(
-            'Ticket' => new EE_Belongs_To_Relation(),
-            'Price' => new EE_Belongs_To_Relation()
-        );
-        $this->_model_chain_to_wp_user = 'Ticket';
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        // account for default tickets in the caps
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        // follow the caps of the ticket
-        $this->_caps_slug = 'tickets';
-        parent::__construct($timezone);
-    }
+		$this->_tables = array(
+			'Ticket_Price' => new EE_Primary_Table('esp_ticket_price', 'TKP_ID')
+		);
+		$this->_fields = array(
+			'Ticket_Price' => array(
+				'TKP_ID' => new EE_Primary_Key_Int_Field('TKP_ID', 'Ticket Price ID'),
+				'TKT_ID' => new EE_Foreign_Key_Int_Field('TKT_ID', 'Ticket Id', false, 0, 'Ticket'),
+				'PRC_ID' => new EE_Foreign_Key_Int_Field('PRC_ID', 'Price ID', false, 0, 'Price'),
+			)
+		);
+		$this->_model_relations = array(
+			'Ticket' => new EE_Belongs_To_Relation(),
+			'Price' => new EE_Belongs_To_Relation()
+		);
+		$this->_model_chain_to_wp_user = 'Ticket';
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+		// account for default tickets in the caps
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+		// follow the caps of the ticket
+		$this->_caps_slug = 'tickets';
+		parent::__construct($timezone);
+	}
 }

core/db_models/EEM_Currency_Payment_Method.model.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
             'Payment_Method' => new EE_Belongs_To_Relation()
         );
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
         $this->_caps_slug = 'payment_methods';
         parent::__construct($timezone);
     }

Indentation +25 added lines, -25 removed lines

@@ -11,31 +11,31 @@
  */
 class EEM_Currency_Payment_Method extends EEM_Base
 {
-    // private instance of the Attendee object
-    protected static $_instance = null;
+	// private instance of the Attendee object
+	protected static $_instance = null;
 
 
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = esc_html__('Currency Usable by Payment Method', 'event_espresso');
-        $this->plural_item = esc_html__('Currencies Usable by Payment Methods', 'event_espresso');
-        $this->_tables = array(
-            'Currency_Payment_Method' => new EE_Primary_Table('esp_currency_payment_method', 'CPM_ID')
-        );
-        $this->_fields = array(
-            'Currency_Payment_Method' => array(
-                'CPM_ID' => new EE_Primary_Key_Int_Field('CPM_ID', esc_html__('Currency to Payment Method LInk ID', 'event_espresso')),
-                'CUR_code' => new EE_Foreign_Key_String_Field('CUR_code', esc_html__('Currency Code', 'event_espresso'), false, '', 'Currency'),
-                'PMD_ID' => new EE_Foreign_Key_Int_Field('PMD_ID', esc_html__('Paymetn Method ID', 'event_espresso'), false, 0, 'Payment_Method')
-            )
-        );
-        $this->_model_relations = array(
-            'Currency' => new EE_Belongs_To_Relation(),
-            'Payment_Method' => new EE_Belongs_To_Relation()
-        );
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_caps_slug = 'payment_methods';
-        parent::__construct($timezone);
-    }
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = esc_html__('Currency Usable by Payment Method', 'event_espresso');
+		$this->plural_item = esc_html__('Currencies Usable by Payment Methods', 'event_espresso');
+		$this->_tables = array(
+			'Currency_Payment_Method' => new EE_Primary_Table('esp_currency_payment_method', 'CPM_ID')
+		);
+		$this->_fields = array(
+			'Currency_Payment_Method' => array(
+				'CPM_ID' => new EE_Primary_Key_Int_Field('CPM_ID', esc_html__('Currency to Payment Method LInk ID', 'event_espresso')),
+				'CUR_code' => new EE_Foreign_Key_String_Field('CUR_code', esc_html__('Currency Code', 'event_espresso'), false, '', 'Currency'),
+				'PMD_ID' => new EE_Foreign_Key_Int_Field('PMD_ID', esc_html__('Paymetn Method ID', 'event_espresso'), false, 0, 'Payment_Method')
+			)
+		);
+		$this->_model_relations = array(
+			'Currency' => new EE_Belongs_To_Relation(),
+			'Payment_Method' => new EE_Belongs_To_Relation()
+		);
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_caps_slug = 'payment_methods';
+		parent::__construct($timezone);
+	}
 }

core/db_models/helpers/EE_Model_Parser.php

Indentation +144 added lines, -144 removed lines

@@ -9,153 +9,153 @@
  */
 class EE_Model_Parser
 {
-    const table_alias_model_relation_chain_separator = '__';
-    const table_alias_model_relation_chain_prefix_end = '___';
-    /**
-     * Adds a period onto the front and end of the string. This often helps in searching.
-     * For example, if we want to find the model name "Event", it can be tricky when the following are possible
-     * "","Event.EVT_ID","Event","Event_Venue.Venue.VNU_ID",etc. It's easier to look for ".Event." in
-     * "..",".Event.EVT_ID.", ".Event.", and ".Event_Venue.Venue.VNU_ID", especially when the last example should NOT
-     * be found because the "Event" model isn't mentioned- it's just a string that has a model name that coincidentally
-     * has it as a substring
-     * @param string $string_to_pad
-     * @return string
-     */
-    public static function pad_with_periods($string_to_pad)
-    {
-        return "." . $string_to_pad . ".";
-    }
-    /**
-     * Basically undoes _pad_with_periods
-     * @param string $string_to_trim
-     * @return string
-     */
-    public static function trim_periods($string_to_trim)
-    {
-        return trim($string_to_trim, '.');
-    }
+	const table_alias_model_relation_chain_separator = '__';
+	const table_alias_model_relation_chain_prefix_end = '___';
+	/**
+	 * Adds a period onto the front and end of the string. This often helps in searching.
+	 * For example, if we want to find the model name "Event", it can be tricky when the following are possible
+	 * "","Event.EVT_ID","Event","Event_Venue.Venue.VNU_ID",etc. It's easier to look for ".Event." in
+	 * "..",".Event.EVT_ID.", ".Event.", and ".Event_Venue.Venue.VNU_ID", especially when the last example should NOT
+	 * be found because the "Event" model isn't mentioned- it's just a string that has a model name that coincidentally
+	 * has it as a substring
+	 * @param string $string_to_pad
+	 * @return string
+	 */
+	public static function pad_with_periods($string_to_pad)
+	{
+		return "." . $string_to_pad . ".";
+	}
+	/**
+	 * Basically undoes _pad_with_periods
+	 * @param string $string_to_trim
+	 * @return string
+	 */
+	public static function trim_periods($string_to_trim)
+	{
+		return trim($string_to_trim, '.');
+	}
 
 
 
-    /**
-     * Gets the calculated table's alias
-     * @param string $model_relation_chain or query param
-     * @param        $this_model_name
-     * @return string which can be added onto table aliases to make them unique
-     */
-    public static function extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this_model_name)
-    {
-        // eg $model_relation_chain = 'Venue.Event_Venue.Event.Registration", and $this_model_name = 'Event'
-        $model_relation_chain = self::pad_with_periods($model_relation_chain);
-        $this_model_name = self::pad_with_periods($this_model_name);
-        // eg '.Venue.Event_Venue.Event.Registration." and '.Event.'
-        // remove this model name and everything afterwards
-        $pos_of_model_name = strpos($model_relation_chain, $this_model_name);
-        $model_relation_chain = substr($model_relation_chain, 0, $pos_of_model_name);
-        // eg '.Venue.Event_Venue.'
-        // trim periods
-        $model_relation_chain = self::trim_periods($model_relation_chain);
-        // eg 'Venue.Event_Venue'
-        // replace periods with double-underscores
-        $model_relation_chain = str_replace(".", self::table_alias_model_relation_chain_separator, $model_relation_chain);
-        // eg 'Venue__Event_Venue'
-        if ($model_relation_chain != '') {
-            $model_relation_chain = $model_relation_chain . self::table_alias_model_relation_chain_prefix_end;
-        }
-        // eg 'Venue_Event_Venue___'
-        return $model_relation_chain;
-    }
-    /**
-     * Gets the table's alias (without prefix or anything)
-     * @param string $table_alias_with_model_relation_chain_prefix which CAN have a table alias model relation chain prefix (or not)
-     * @return string
-     */
-    public static function remove_table_alias_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix)
-    {
-        // does this actually have a table alias model relation chain prefix?
-        $pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end);
-        if ($pos !== false) {
-            // yes
-            // find that triple underscore and remove it and everything before it
-            $table_alias = substr($table_alias_with_model_relation_chain_prefix, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
-        } else {
-            $table_alias = $table_alias_with_model_relation_chain_prefix;
-        }
-        return $table_alias;
-    }
-    /**
-     * Gets the table alias model relation chain prefix from the table alias already containing it
-     * @param string $table_alias_with_model_relation_chain_prefix
-     * @return string
-     */
-    public static function get_prefix_from_table_alias_with_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix)
-    {
-        // does this actually have a table alias model relation chain prefix?
-        $pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end);
-        if ($pos !== false) {
-            // yes
-            // find that triple underscore and remove it and everything before it
-            $prefix = substr($table_alias_with_model_relation_chain_prefix, 0, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
-        } else {
-            $prefix = '';
-        }
-        return $prefix;
-    }
+	/**
+	 * Gets the calculated table's alias
+	 * @param string $model_relation_chain or query param
+	 * @param        $this_model_name
+	 * @return string which can be added onto table aliases to make them unique
+	 */
+	public static function extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this_model_name)
+	{
+		// eg $model_relation_chain = 'Venue.Event_Venue.Event.Registration", and $this_model_name = 'Event'
+		$model_relation_chain = self::pad_with_periods($model_relation_chain);
+		$this_model_name = self::pad_with_periods($this_model_name);
+		// eg '.Venue.Event_Venue.Event.Registration." and '.Event.'
+		// remove this model name and everything afterwards
+		$pos_of_model_name = strpos($model_relation_chain, $this_model_name);
+		$model_relation_chain = substr($model_relation_chain, 0, $pos_of_model_name);
+		// eg '.Venue.Event_Venue.'
+		// trim periods
+		$model_relation_chain = self::trim_periods($model_relation_chain);
+		// eg 'Venue.Event_Venue'
+		// replace periods with double-underscores
+		$model_relation_chain = str_replace(".", self::table_alias_model_relation_chain_separator, $model_relation_chain);
+		// eg 'Venue__Event_Venue'
+		if ($model_relation_chain != '') {
+			$model_relation_chain = $model_relation_chain . self::table_alias_model_relation_chain_prefix_end;
+		}
+		// eg 'Venue_Event_Venue___'
+		return $model_relation_chain;
+	}
+	/**
+	 * Gets the table's alias (without prefix or anything)
+	 * @param string $table_alias_with_model_relation_chain_prefix which CAN have a table alias model relation chain prefix (or not)
+	 * @return string
+	 */
+	public static function remove_table_alias_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix)
+	{
+		// does this actually have a table alias model relation chain prefix?
+		$pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end);
+		if ($pos !== false) {
+			// yes
+			// find that triple underscore and remove it and everything before it
+			$table_alias = substr($table_alias_with_model_relation_chain_prefix, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
+		} else {
+			$table_alias = $table_alias_with_model_relation_chain_prefix;
+		}
+		return $table_alias;
+	}
+	/**
+	 * Gets the table alias model relation chain prefix from the table alias already containing it
+	 * @param string $table_alias_with_model_relation_chain_prefix
+	 * @return string
+	 */
+	public static function get_prefix_from_table_alias_with_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix)
+	{
+		// does this actually have a table alias model relation chain prefix?
+		$pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end);
+		if ($pos !== false) {
+			// yes
+			// find that triple underscore and remove it and everything before it
+			$prefix = substr($table_alias_with_model_relation_chain_prefix, 0, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
+		} else {
+			$prefix = '';
+		}
+		return $prefix;
+	}
 
-    /**
-     * Gets the table alias model relation chain prefix (ie, what can be prepended onto
-     * EE_Model_Field::get_qualified_column() to get the proper column name for that field
-     * in a specific query) from teh query param (eg 'Registration.Event.EVT_ID').
-     *
-     * @param string $model_name of the model on which the related query param was found to be belong
-     * @param string $original_query_param
-     * @return string
-     */
-    public static function extract_table_alias_model_relation_chain_from_query_param($model_name, $original_query_param)
-    {
-        $relation_chain = self::extract_model_relation_chain($model_name, $original_query_param);
-        $table_alias_with_model_relation_chain_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($relation_chain, $model_name);
-        return $table_alias_with_model_relation_chain_prefix;
-    }
-    /**
-     * Gets the model relation chain to $model_name from the $original_query_param.
-     * Eg, if $model_name were 'Payment', and $original_query_param were 'Registration.Transaction.Payment.PAY_ID',
-     * this would return 'Registration.Transaction.Payment'. Also if the query param were 'Registration.Transaction.Payment'
-     * and $model_name were 'Payment', it should return 'Registration.Transaction.Payment'
-     * @param string $model_name
-     * @param string $original_query_param
-     * @return string
-     */
-    public static function extract_model_relation_chain($model_name, $original_query_param)
-    {
-        // prefix and postfix both with a period, as this facilitates searching
-        $model_name = EE_Model_Parser::pad_with_periods($model_name);
-        $original_query_param = EE_Model_Parser::pad_with_periods($original_query_param);
-        $pos_of_model_string = strpos($original_query_param, $model_name);
-        // eg, if we're looking for the model relation chain from Event to Payment, the original query param is probably something like
-        // "Registration.Transaction.Payment.PAY_ID", $pos_of_model_string points to the 'P' or Payment. We want the string
-        // "Registration.Transaction.Payment"
-        $model_relation_chain = substr($original_query_param, 0, $pos_of_model_string + strlen($model_name));
-        return EE_Model_Parser::trim_periods($model_relation_chain);
-    }
+	/**
+	 * Gets the table alias model relation chain prefix (ie, what can be prepended onto
+	 * EE_Model_Field::get_qualified_column() to get the proper column name for that field
+	 * in a specific query) from teh query param (eg 'Registration.Event.EVT_ID').
+	 *
+	 * @param string $model_name of the model on which the related query param was found to be belong
+	 * @param string $original_query_param
+	 * @return string
+	 */
+	public static function extract_table_alias_model_relation_chain_from_query_param($model_name, $original_query_param)
+	{
+		$relation_chain = self::extract_model_relation_chain($model_name, $original_query_param);
+		$table_alias_with_model_relation_chain_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($relation_chain, $model_name);
+		return $table_alias_with_model_relation_chain_prefix;
+	}
+	/**
+	 * Gets the model relation chain to $model_name from the $original_query_param.
+	 * Eg, if $model_name were 'Payment', and $original_query_param were 'Registration.Transaction.Payment.PAY_ID',
+	 * this would return 'Registration.Transaction.Payment'. Also if the query param were 'Registration.Transaction.Payment'
+	 * and $model_name were 'Payment', it should return 'Registration.Transaction.Payment'
+	 * @param string $model_name
+	 * @param string $original_query_param
+	 * @return string
+	 */
+	public static function extract_model_relation_chain($model_name, $original_query_param)
+	{
+		// prefix and postfix both with a period, as this facilitates searching
+		$model_name = EE_Model_Parser::pad_with_periods($model_name);
+		$original_query_param = EE_Model_Parser::pad_with_periods($original_query_param);
+		$pos_of_model_string = strpos($original_query_param, $model_name);
+		// eg, if we're looking for the model relation chain from Event to Payment, the original query param is probably something like
+		// "Registration.Transaction.Payment.PAY_ID", $pos_of_model_string points to the 'P' or Payment. We want the string
+		// "Registration.Transaction.Payment"
+		$model_relation_chain = substr($original_query_param, 0, $pos_of_model_string + strlen($model_name));
+		return EE_Model_Parser::trim_periods($model_relation_chain);
+	}
 
-    /**
-     * Replaces the specified model in teh model relation chain with teh join model.
-     * Eg EE_Model_Parser::replace_model_name_with_join_model_name_in_model_relation_chain(
-     * "Ticket", "Datetime_Ticket", "Datetime.Ticket" ) will return
-     * "Datetime.Datetime_Ticket" which can be used to find the table alias model relation chain prefix
-     * using EE_Model_Parser::extract_table_alias_model_relation_chain_prefix
-     * @param string $model_name
-     * @param string $join_model_name
-     * @param string $model_relation_chain
-     * @return string
-     */
-    public static function replace_model_name_with_join_model_name_in_model_relation_chain($model_name, $join_model_name, $model_relation_chain)
-    {
-        $model_name = EE_Model_Parser::pad_with_periods($model_name);
-        $join_model_name = EE_Model_Parser::pad_with_periods($join_model_name);
-        $model_relation_chain = EE_Model_Parser::pad_with_periods($model_relation_chain);
-        $replaced_with_periods = str_replace($model_name, $join_model_name, $model_relation_chain);
-        return EE_Model_Parser::trim_periods($replaced_with_periods);
-    }
+	/**
+	 * Replaces the specified model in teh model relation chain with teh join model.
+	 * Eg EE_Model_Parser::replace_model_name_with_join_model_name_in_model_relation_chain(
+	 * "Ticket", "Datetime_Ticket", "Datetime.Ticket" ) will return
+	 * "Datetime.Datetime_Ticket" which can be used to find the table alias model relation chain prefix
+	 * using EE_Model_Parser::extract_table_alias_model_relation_chain_prefix
+	 * @param string $model_name
+	 * @param string $join_model_name
+	 * @param string $model_relation_chain
+	 * @return string
+	 */
+	public static function replace_model_name_with_join_model_name_in_model_relation_chain($model_name, $join_model_name, $model_relation_chain)
+	{
+		$model_name = EE_Model_Parser::pad_with_periods($model_name);
+		$join_model_name = EE_Model_Parser::pad_with_periods($join_model_name);
+		$model_relation_chain = EE_Model_Parser::pad_with_periods($model_relation_chain);
+		$replaced_with_periods = str_replace($model_name, $join_model_name, $model_relation_chain);
+		return EE_Model_Parser::trim_periods($replaced_with_periods);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
      */
     public static function pad_with_periods($string_to_pad)
     {
-        return "." . $string_to_pad . ".";
+        return ".".$string_to_pad.".";
     }
     /**
      * Basically undoes _pad_with_periods
@@ -60,7 +60,7 @@ 
         $model_relation_chain = str_replace(".", self::table_alias_model_relation_chain_separator, $model_relation_chain);
         // eg 'Venue__Event_Venue'
         if ($model_relation_chain != '') {
-            $model_relation_chain = $model_relation_chain . self::table_alias_model_relation_chain_prefix_end;
+            $model_relation_chain = $model_relation_chain.self::table_alias_model_relation_chain_prefix_end;
         }
         // eg 'Venue_Event_Venue___'
         return $model_relation_chain;

core/db_models/helpers/EE_Secondary_Table.php

Indentation +105 added lines, -105 removed lines

@@ -8,118 +8,118 @@
  */
 class EE_Secondary_Table extends EE_Table_Base
 {
-    protected $_extra_join_conditions;
+	protected $_extra_join_conditions;
 
-    /**
-     *
-     * @global type $wpdb
-     * @param string $table_name with or without wpdb prefix
-     * @param string $pk_column name of primary key column on THIS table
-     * @param string $fk_column the name of the COLUMN that is a foreign key to the primary table's primary key
-     * @param string $extra_join_conditions string for additional SQL to add onto the join statement's ON condition
-     * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
-     *                  or whether each site on a multisite install has a copy of this table
-     */
-    public function __construct($table_name, $pk_column, $fk_column = null, $extra_join_conditions = null, $global = false)
-    {
-        $this->_fk_on_table = $fk_column;
-        $this->_extra_join_conditions = $extra_join_conditions;
-        parent::__construct($table_name, $pk_column, $global);
-    }
-    public function get_fk_on_table()
-    {
-        return $this->_fk_on_table;
-    }
-    public function _construct_finalize_set_table_to_join_with(EE_Table_Base $table)
-    {
-        $this->_table_to_join_with = $table;
-    }
-    /**
-     *
-     * @return string of sql like "Event.post_type = 'event'", which gets added to
-     * the end of the join statement with the primary table
-     */
-    public function get_extra_join_conditions()
-    {
-        return $this->_extra_join_conditions;
-    }
-    /**
-     *
-     * @return EE_Primary_Table
-     */
-    public function get_table_to_join_with()
-    {
-        return $this->_table_to_join_with;
-    }
-    /**
-     * creates join statement FROM primary table
-     * gets SQL like "LEFT JOIN table_name AS table_alias ON other_table_alias.pk = table_alias.fk
-     *
-     * @param string $table allows us to set special conditions on the $table_name portion of the join query (i.e. doing a subquery)
-     * @return string of SQL
-     */
-    public function get_join_sql($primary_table_alias_with_model_chain_prefix)
-    {
+	/**
+	 *
+	 * @global type $wpdb
+	 * @param string $table_name with or without wpdb prefix
+	 * @param string $pk_column name of primary key column on THIS table
+	 * @param string $fk_column the name of the COLUMN that is a foreign key to the primary table's primary key
+	 * @param string $extra_join_conditions string for additional SQL to add onto the join statement's ON condition
+	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
+	 *                  or whether each site on a multisite install has a copy of this table
+	 */
+	public function __construct($table_name, $pk_column, $fk_column = null, $extra_join_conditions = null, $global = false)
+	{
+		$this->_fk_on_table = $fk_column;
+		$this->_extra_join_conditions = $extra_join_conditions;
+		parent::__construct($table_name, $pk_column, $global);
+	}
+	public function get_fk_on_table()
+	{
+		return $this->_fk_on_table;
+	}
+	public function _construct_finalize_set_table_to_join_with(EE_Table_Base $table)
+	{
+		$this->_table_to_join_with = $table;
+	}
+	/**
+	 *
+	 * @return string of sql like "Event.post_type = 'event'", which gets added to
+	 * the end of the join statement with the primary table
+	 */
+	public function get_extra_join_conditions()
+	{
+		return $this->_extra_join_conditions;
+	}
+	/**
+	 *
+	 * @return EE_Primary_Table
+	 */
+	public function get_table_to_join_with()
+	{
+		return $this->_table_to_join_with;
+	}
+	/**
+	 * creates join statement FROM primary table
+	 * gets SQL like "LEFT JOIN table_name AS table_alias ON other_table_alias.pk = table_alias.fk
+	 *
+	 * @param string $table allows us to set special conditions on the $table_name portion of the join query (i.e. doing a subquery)
+	 * @return string of SQL
+	 */
+	public function get_join_sql($primary_table_alias_with_model_chain_prefix)
+	{
 
-        $table_name = $this->get_table_name();
-        $secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix) . $this->get_table_alias();
-        $other_table_pk = $this->get_table_to_join_with()->get_pk_column();
-        $fk = $this->get_fk_on_table();
-        $join_sql = " LEFT JOIN $table_name AS $secondary_table_alias ON $primary_table_alias_with_model_chain_prefix.$other_table_pk = $secondary_table_alias.$fk ";
-        if ($this->get_extra_join_conditions()) {
-            $join_sql .= "AND " . $this->get_extra_join_conditions();
-        }
-        return $join_sql;
-    }
+		$table_name = $this->get_table_name();
+		$secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix) . $this->get_table_alias();
+		$other_table_pk = $this->get_table_to_join_with()->get_pk_column();
+		$fk = $this->get_fk_on_table();
+		$join_sql = " LEFT JOIN $table_name AS $secondary_table_alias ON $primary_table_alias_with_model_chain_prefix.$other_table_pk = $secondary_table_alias.$fk ";
+		if ($this->get_extra_join_conditions()) {
+			$join_sql .= "AND " . $this->get_extra_join_conditions();
+		}
+		return $join_sql;
+	}
 
 
-    /**
-     * Produces join SQL like get_join_sql, except instead of joining the primary table to the
-     * secondary table, does the inverse: joins the secondary table to the primary one. (Eg, isntead of
-     * " LEFT JOIN secondary_table_table AS Secondary ON ..." like get_join_sql, this function returns
-     * " LEFT JOIN primary_table AS Primary ON ...".
-     * This is useful if the secondary table is already included in the SQL, but the primary table is not yet.
-     * @return string
-     */
-    public function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix)
-    {
-        $primary_table_name = $this->get_table_to_join_with()->get_table_name();
-        $primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix) . $this->get_table_to_join_with()->get_table_alias();
-        $primary_table_pk = $this->get_table_to_join_with()->get_pk_column();// $this->get_pk_column();
-        $fk = $this->get_fk_on_table();
-        $join_sql = " LEFT JOIN $primary_table_name AS $primary_table_alias ON $primary_table_alias.$primary_table_pk = $secondary_table_alias_with_model_chain_prefix.$fk ";
-        if ($this->get_extra_join_conditions()) {
-            $join_sql .= "AND " . $this->get_extra_join_conditions();
-        }
-        return $join_sql;
-    }
+	/**
+	 * Produces join SQL like get_join_sql, except instead of joining the primary table to the
+	 * secondary table, does the inverse: joins the secondary table to the primary one. (Eg, isntead of
+	 * " LEFT JOIN secondary_table_table AS Secondary ON ..." like get_join_sql, this function returns
+	 * " LEFT JOIN primary_table AS Primary ON ...".
+	 * This is useful if the secondary table is already included in the SQL, but the primary table is not yet.
+	 * @return string
+	 */
+	public function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix)
+	{
+		$primary_table_name = $this->get_table_to_join_with()->get_table_name();
+		$primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix) . $this->get_table_to_join_with()->get_table_alias();
+		$primary_table_pk = $this->get_table_to_join_with()->get_pk_column();// $this->get_pk_column();
+		$fk = $this->get_fk_on_table();
+		$join_sql = " LEFT JOIN $primary_table_name AS $primary_table_alias ON $primary_table_alias.$primary_table_pk = $secondary_table_alias_with_model_chain_prefix.$fk ";
+		if ($this->get_extra_join_conditions()) {
+			$join_sql .= "AND " . $this->get_extra_join_conditions();
+		}
+		return $join_sql;
+	}
 
-    /**
-     * This prepares the join on the other table using a select with a internal limit.
-     * @param  mixed (array|string) $limit limit
-     * @return string                       SQL to return
-     */
-    public function get_select_join_limit_join($limit)
-    {
-        // first get the select
-        $select = $this->get_select_join_limit($limit);
-        $join_sql = $this->get_join_sql($select);
-        return $join_sql;
-    }
+	/**
+	 * This prepares the join on the other table using a select with a internal limit.
+	 * @param  mixed (array|string) $limit limit
+	 * @return string                       SQL to return
+	 */
+	public function get_select_join_limit_join($limit)
+	{
+		// first get the select
+		$select = $this->get_select_join_limit($limit);
+		$join_sql = $this->get_join_sql($select);
+		return $join_sql;
+	}
 
 
 
-    public function get_fully_qualified_fk_column()
-    {
-        $table_alias = $this->get_table_alias();
-        $fk = $this->get_fk_on_table();
-        return $table_alias . '.' . $fk;
-    }
+	public function get_fully_qualified_fk_column()
+	{
+		$table_alias = $this->get_table_alias();
+		$fk = $this->get_fk_on_table();
+		return $table_alias . '.' . $fk;
+	}
 
-    public function get_fully_qualified_pk_on_fk_table()
-    {
-        $table_alias = $this->get_table_to_join_with()->get_table_alias();
-        $pk = $this->get_table_to_join_with()->get_pk_column();
-        return $table_alias . '.' . $pk;
-    }
+	public function get_fully_qualified_pk_on_fk_table()
+	{
+		$table_alias = $this->get_table_to_join_with()->get_table_alias();
+		$pk = $this->get_table_to_join_with()->get_pk_column();
+		return $table_alias . '.' . $pk;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -62,12 +62,12 @@ 
     {
 
         $table_name = $this->get_table_name();
-        $secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix) . $this->get_table_alias();
+        $secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix).$this->get_table_alias();
         $other_table_pk = $this->get_table_to_join_with()->get_pk_column();
         $fk = $this->get_fk_on_table();
         $join_sql = " LEFT JOIN $table_name AS $secondary_table_alias ON $primary_table_alias_with_model_chain_prefix.$other_table_pk = $secondary_table_alias.$fk ";
         if ($this->get_extra_join_conditions()) {
-            $join_sql .= "AND " . $this->get_extra_join_conditions();
+            $join_sql .= "AND ".$this->get_extra_join_conditions();
         }
         return $join_sql;
     }
@@ -84,12 +84,12 @@ 
     public function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix)
     {
         $primary_table_name = $this->get_table_to_join_with()->get_table_name();
-        $primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix) . $this->get_table_to_join_with()->get_table_alias();
-        $primary_table_pk = $this->get_table_to_join_with()->get_pk_column();// $this->get_pk_column();
+        $primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix).$this->get_table_to_join_with()->get_table_alias();
+        $primary_table_pk = $this->get_table_to_join_with()->get_pk_column(); // $this->get_pk_column();
         $fk = $this->get_fk_on_table();
         $join_sql = " LEFT JOIN $primary_table_name AS $primary_table_alias ON $primary_table_alias.$primary_table_pk = $secondary_table_alias_with_model_chain_prefix.$fk ";
         if ($this->get_extra_join_conditions()) {
-            $join_sql .= "AND " . $this->get_extra_join_conditions();
+            $join_sql .= "AND ".$this->get_extra_join_conditions();
         }
         return $join_sql;
     }
@@ -113,13 +113,13 @@ 
     {
         $table_alias = $this->get_table_alias();
         $fk = $this->get_fk_on_table();
-        return $table_alias . '.' . $fk;
+        return $table_alias.'.'.$fk;
     }
 
     public function get_fully_qualified_pk_on_fk_table()
     {
         $table_alias = $this->get_table_to_join_with()->get_table_alias();
         $pk = $this->get_table_to_join_with()->get_pk_column();
-        return $table_alias . '.' . $pk;
+        return $table_alias.'.'.$pk;
     }
 }

core/db_models/helpers/EE_Index.php

Indentation +41 added lines, -41 removed lines

@@ -6,45 +6,45 @@
  */
 class EE_Index
 {
-    protected $_name;
-    protected $_field_names;
-    protected $_model_name;
-    public function __construct($fields)
-    {
-        $this->_field_names = $fields;
-    }
-    public function _construct_finalize($name, $model_name)
-    {
-        $this->_name = $name;
-        $this->_model_name = $model_name;
-    }
-    public function field_names()
-    {
-        return $this->_field_names;
-    }
-    /**
-     * Internally used by get_this_model() and get_other_model()
-     * @param string $model_name like Event, Question_Group, etc. omit the EEM_
-     * @return EEM_Base
-     */
-    protected function _get_model($model_name)
-    {
-        $modelInstance = call_user_func("EEM_" . $model_name . "::instance");
-        return $modelInstance;
-    }
-    /**
-     * Gets all the fields for this index
-     * @return EE_Model_Field_Base[]
-     */
-    public function fields()
-    {
-        $fields = array();
-        $model = $this->_get_model($this->_model_name);
-        foreach ($model->field_settings() as $field_name => $field_obj) {
-            if (in_array($field_name, $this->field_names())) {
-                $fields[ $field_name ] = $field_obj;
-            }
-        }
-        return $fields;
-    }
+	protected $_name;
+	protected $_field_names;
+	protected $_model_name;
+	public function __construct($fields)
+	{
+		$this->_field_names = $fields;
+	}
+	public function _construct_finalize($name, $model_name)
+	{
+		$this->_name = $name;
+		$this->_model_name = $model_name;
+	}
+	public function field_names()
+	{
+		return $this->_field_names;
+	}
+	/**
+	 * Internally used by get_this_model() and get_other_model()
+	 * @param string $model_name like Event, Question_Group, etc. omit the EEM_
+	 * @return EEM_Base
+	 */
+	protected function _get_model($model_name)
+	{
+		$modelInstance = call_user_func("EEM_" . $model_name . "::instance");
+		return $modelInstance;
+	}
+	/**
+	 * Gets all the fields for this index
+	 * @return EE_Model_Field_Base[]
+	 */
+	public function fields()
+	{
+		$fields = array();
+		$model = $this->_get_model($this->_model_name);
+		foreach ($model->field_settings() as $field_name => $field_obj) {
+			if (in_array($field_name, $this->field_names())) {
+				$fields[ $field_name ] = $field_obj;
+			}
+		}
+		return $fields;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
      */
     protected function _get_model($model_name)
     {
-        $modelInstance = call_user_func("EEM_" . $model_name . "::instance");
+        $modelInstance = call_user_func("EEM_".$model_name."::instance");
         return $modelInstance;
     }
     /**
@@ -42,7 +42,7 @@ 
         $model = $this->_get_model($this->_model_name);
         foreach ($model->field_settings() as $field_name => $field_obj) {
             if (in_array($field_name, $this->field_names())) {
-                $fields[ $field_name ] = $field_obj;
+                $fields[$field_name] = $field_obj;
             }
         }
         return $fields;

core/db_models/helpers/EE_Primary_Table.php

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
      */
     public function get_table_sql()
     {
-        return " " . $this->get_table_name() . " AS " . $this->get_table_alias() . " ";
+        return " ".$this->get_table_name()." AS ".$this->get_table_alias()." ";
     }
 }

Indentation +20 added lines, -20 removed lines

@@ -6,24 +6,24 @@
  */
 class EE_Primary_Table extends EE_Table_Base
 {
-    /**
-     *
-     * @global type $wpdb
-     * @param string $table_name with or without wpdb prefix
-     * @param string $pk_column name of primary key column
-     * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
-     *                  or whether each site on a multisite install has a copy of this table
-     */
-    public function __construct($table_name, $pk_column = null, $global = false)
-    {
-        parent::__construct($table_name, $pk_column, $global);
-    }
-    /**
-     * Gets SQL for this table and assigning it an alias. Eg " wp_esp_attendee AS Attendee "
-     * @return string
-     */
-    public function get_table_sql()
-    {
-        return " " . $this->get_table_name() . " AS " . $this->get_table_alias() . " ";
-    }
+	/**
+	 *
+	 * @global type $wpdb
+	 * @param string $table_name with or without wpdb prefix
+	 * @param string $pk_column name of primary key column
+	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
+	 *                  or whether each site on a multisite install has a copy of this table
+	 */
+	public function __construct($table_name, $pk_column = null, $global = false)
+	{
+		parent::__construct($table_name, $pk_column, $global);
+	}
+	/**
+	 * Gets SQL for this table and assigning it an alias. Eg " wp_esp_attendee AS Attendee "
+	 * @return string
+	 */
+	public function get_table_sql()
+	{
+		return " " . $this->get_table_name() . " AS " . $this->get_table_alias() . " ";
+	}
 }

core/db_models/EEM_State.model.php

Spacing +18 added lines, -18 removed lines

@@ -42,7 +42,7 @@ 
             'Venue' => new EE_Has_Many_Relation(),
         );
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
         // @todo: only show STA_active
         parent::__construct($timezone);
     }
@@ -73,8 +73,8 @@ 
     */
     public function get_all_states()
     {
-        if (! self::$_all_states) {
-            self::$_all_states = $this->get_all(array( 'order_by' => array( 'STA_name' => 'ASC' ), 'limit' => array( 0, 99999 )));
+        if ( ! self::$_all_states) {
+            self::$_all_states = $this->get_all(array('order_by' => array('STA_name' => 'ASC'), 'limit' => array(0, 99999)));
         }
         return self::$_all_states;
     }
@@ -91,13 +91,13 @@ 
      */
     public function get_all_active_states($countries = array(), $flush_cache = false)
     {
-        if (! self::$_active_states || $flush_cache) {
+        if ( ! self::$_active_states || $flush_cache) {
             $countries = is_array($countries) && ! empty($countries) ? $countries : EEM_Country::instance()->get_all_active_countries();
-            self::$_active_states =  $this->get_all(array(
-                array( 'STA_active' => true, 'CNT_ISO' => array( 'IN', array_keys($countries))),
-                'order_by' => array( 'STA_name' => 'ASC' ),
-                'limit' => array( 0, 99999 ),
-                'force_join' => array( 'Country' )
+            self::$_active_states = $this->get_all(array(
+                array('STA_active' => true, 'CNT_ISO' => array('IN', array_keys($countries))),
+                'order_by' => array('STA_name' => 'ASC'),
+                'limit' => array(0, 99999),
+                'force_join' => array('Country')
             ));
         }
         return self::$_active_states;
@@ -111,7 +111,7 @@ 
      */
     public function get_all_states_of_active_countries()
     {
-        if ($states = $this->get_all(array( array( 'Country.CNT_active' => true, 'STA_active' => true ),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+        if ($states = $this->get_all(array(array('Country.CNT_active' => true, 'STA_active' => true), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) {
             return $states;
         }
         return false;
@@ -125,10 +125,10 @@ 
      */
     public function get_all_active_states_for_these_countries($countries)
     {
-        if (! $countries) {
+        if ( ! $countries) {
             return false;
         }
-        if ($states = $this->get_all(array(  array( 'Country.CNT_ISO' => array( 'IN', array_keys($countries)), 'STA_active' => true ),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+        if ($states = $this->get_all(array(array('Country.CNT_ISO' => array('IN', array_keys($countries)), 'STA_active' => true), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) {
             return $states;
         }
         return false;
@@ -142,10 +142,10 @@ 
      */
     public function get_all_states_for_these_countries($countries)
     {
-        if (! $countries) {
+        if ( ! $countries) {
             return false;
         }
-        if ($states = $this->get_all(array( array( 'Country.CNT_ISO' => array( 'IN', array_keys($countries))),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+        if ($states = $this->get_all(array(array('Country.CNT_ISO' => array('IN', array_keys($countries))), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) {
             return $states;
         }
         return false;
@@ -159,12 +159,12 @@ 
     public function get_state_name_by_ID($state_ID)
     {
         if (
-            isset(self::$_all_states[ $state_ID ]) &&
-                self::$_all_states[ $state_ID ] instanceof EE_State
+            isset(self::$_all_states[$state_ID]) &&
+                self::$_all_states[$state_ID] instanceof EE_State
         ) {
-            return self::$_all_states[ $state_ID ]->name();
+            return self::$_all_states[$state_ID]->name();
         }
-        $names = $this->get_col(array( array( 'STA_ID' => $state_ID ), 'limit' => 1), 'STA_name');
+        $names = $this->get_col(array(array('STA_ID' => $state_ID), 'limit' => 1), 'STA_name');
         if (is_array($names) && ! empty($names)) {
             return reset($names);
         } else {

Indentation +159 added lines, -159 removed lines

@@ -11,163 +11,163 @@
  */
 class EEM_State extends EEM_Base
 {
-    // private instance of the Attendee object
-    protected static $_instance = null;
-    // array of all states
-    private static $_all_states = false;
-    // array of all active states
-    private static $_active_states = false;
-
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = esc_html__('State/Province', 'event_espresso');
-        $this->plural_item = esc_html__('States/Provinces', 'event_espresso');
-
-        $this->_tables = array(
-            'State' => new EE_Primary_Table('esp_state', 'STA_ID')
-        );
-
-        $this->_fields = array(
-            'State' => array(
-                'STA_ID' => new EE_Primary_Key_Int_Field('STA_ID', esc_html__('State ID', 'event_espresso')),
-                'CNT_ISO' => new EE_Foreign_Key_String_Field('CNT_ISO', esc_html__('Country ISO Code', 'event_espresso'), false, null, 'Country'),
-                'STA_abbrev' => new EE_Plain_Text_Field('STA_abbrev', esc_html__('State Abbreviation', 'event_espresso'), false, ''),
-                'STA_name' => new EE_Plain_Text_Field('STA_name', esc_html__('State Name', 'event_espresso'), false, ''),
-                'STA_active' => new EE_Boolean_Field('STA_active', esc_html__('State Active Flag', 'event_espresso'), false, false)
-                ));
-        $this->_model_relations = array(
-            'Attendee' => new EE_Has_Many_Relation(),
-            'Country' => new EE_Belongs_To_Relation(),
-            'Venue' => new EE_Has_Many_Relation(),
-        );
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        // @todo: only show STA_active
-        parent::__construct($timezone);
-    }
-
-
-
-
-    /**
-    *   reset_cached_states
-    *
-    *   @access     private
-    *   @return         void
-    */
-    public function reset_cached_states()
-    {
-        EEM_State::$_active_states = array();
-        EEM_State::$_all_states = array();
-    }
-
-
-
-
-    /**
-    *       _get_states
-    *
-    *       @access     private
-    *       @return         array
-    */
-    public function get_all_states()
-    {
-        if (! self::$_all_states) {
-            self::$_all_states = $this->get_all(array( 'order_by' => array( 'STA_name' => 'ASC' ), 'limit' => array( 0, 99999 )));
-        }
-        return self::$_all_states;
-    }
-
-
-
-    /**
-     *        _get_states
-     *
-     * @access        public
-     * @param array $countries
-     * @param bool  $flush_cache
-     * @return        array
-     */
-    public function get_all_active_states($countries = array(), $flush_cache = false)
-    {
-        if (! self::$_active_states || $flush_cache) {
-            $countries = is_array($countries) && ! empty($countries) ? $countries : EEM_Country::instance()->get_all_active_countries();
-            self::$_active_states =  $this->get_all(array(
-                array( 'STA_active' => true, 'CNT_ISO' => array( 'IN', array_keys($countries))),
-                'order_by' => array( 'STA_name' => 'ASC' ),
-                'limit' => array( 0, 99999 ),
-                'force_join' => array( 'Country' )
-            ));
-        }
-        return self::$_active_states;
-    }
-
-
-
-    /**
-     *  get_all_states_of_active_countries
-     * @return array
-     */
-    public function get_all_states_of_active_countries()
-    {
-        if ($states = $this->get_all(array( array( 'Country.CNT_active' => true, 'STA_active' => true ),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
-            return $states;
-        }
-        return false;
-    }
-
-
-
-    /**
-     *  get_all_states_of_active_countries
-     * @return array
-     */
-    public function get_all_active_states_for_these_countries($countries)
-    {
-        if (! $countries) {
-            return false;
-        }
-        if ($states = $this->get_all(array(  array( 'Country.CNT_ISO' => array( 'IN', array_keys($countries)), 'STA_active' => true ),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
-            return $states;
-        }
-        return false;
-    }
-
-
-
-    /**
-     *  get_all_states_of_active_countries
-     * @return array
-     */
-    public function get_all_states_for_these_countries($countries)
-    {
-        if (! $countries) {
-            return false;
-        }
-        if ($states = $this->get_all(array( array( 'Country.CNT_ISO' => array( 'IN', array_keys($countries))),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
-            return $states;
-        }
-        return false;
-    }
-
-    /**
-     * Gets the state's name by its ID
-     * @param string $state_ID
-     * @return string
-     */
-    public function get_state_name_by_ID($state_ID)
-    {
-        if (
-            isset(self::$_all_states[ $state_ID ]) &&
-                self::$_all_states[ $state_ID ] instanceof EE_State
-        ) {
-            return self::$_all_states[ $state_ID ]->name();
-        }
-        $names = $this->get_col(array( array( 'STA_ID' => $state_ID ), 'limit' => 1), 'STA_name');
-        if (is_array($names) && ! empty($names)) {
-            return reset($names);
-        } else {
-            return '';
-        }
-    }
+	// private instance of the Attendee object
+	protected static $_instance = null;
+	// array of all states
+	private static $_all_states = false;
+	// array of all active states
+	private static $_active_states = false;
+
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = esc_html__('State/Province', 'event_espresso');
+		$this->plural_item = esc_html__('States/Provinces', 'event_espresso');
+
+		$this->_tables = array(
+			'State' => new EE_Primary_Table('esp_state', 'STA_ID')
+		);
+
+		$this->_fields = array(
+			'State' => array(
+				'STA_ID' => new EE_Primary_Key_Int_Field('STA_ID', esc_html__('State ID', 'event_espresso')),
+				'CNT_ISO' => new EE_Foreign_Key_String_Field('CNT_ISO', esc_html__('Country ISO Code', 'event_espresso'), false, null, 'Country'),
+				'STA_abbrev' => new EE_Plain_Text_Field('STA_abbrev', esc_html__('State Abbreviation', 'event_espresso'), false, ''),
+				'STA_name' => new EE_Plain_Text_Field('STA_name', esc_html__('State Name', 'event_espresso'), false, ''),
+				'STA_active' => new EE_Boolean_Field('STA_active', esc_html__('State Active Flag', 'event_espresso'), false, false)
+				));
+		$this->_model_relations = array(
+			'Attendee' => new EE_Has_Many_Relation(),
+			'Country' => new EE_Belongs_To_Relation(),
+			'Venue' => new EE_Has_Many_Relation(),
+		);
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		// @todo: only show STA_active
+		parent::__construct($timezone);
+	}
+
+
+
+
+	/**
+	 *   reset_cached_states
+	 *
+	 *   @access     private
+	 *   @return         void
+	 */
+	public function reset_cached_states()
+	{
+		EEM_State::$_active_states = array();
+		EEM_State::$_all_states = array();
+	}
+
+
+
+
+	/**
+	 *       _get_states
+	 *
+	 *       @access     private
+	 *       @return         array
+	 */
+	public function get_all_states()
+	{
+		if (! self::$_all_states) {
+			self::$_all_states = $this->get_all(array( 'order_by' => array( 'STA_name' => 'ASC' ), 'limit' => array( 0, 99999 )));
+		}
+		return self::$_all_states;
+	}
+
+
+
+	/**
+	 *        _get_states
+	 *
+	 * @access        public
+	 * @param array $countries
+	 * @param bool  $flush_cache
+	 * @return        array
+	 */
+	public function get_all_active_states($countries = array(), $flush_cache = false)
+	{
+		if (! self::$_active_states || $flush_cache) {
+			$countries = is_array($countries) && ! empty($countries) ? $countries : EEM_Country::instance()->get_all_active_countries();
+			self::$_active_states =  $this->get_all(array(
+				array( 'STA_active' => true, 'CNT_ISO' => array( 'IN', array_keys($countries))),
+				'order_by' => array( 'STA_name' => 'ASC' ),
+				'limit' => array( 0, 99999 ),
+				'force_join' => array( 'Country' )
+			));
+		}
+		return self::$_active_states;
+	}
+
+
+
+	/**
+	 *  get_all_states_of_active_countries
+	 * @return array
+	 */
+	public function get_all_states_of_active_countries()
+	{
+		if ($states = $this->get_all(array( array( 'Country.CNT_active' => true, 'STA_active' => true ),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+			return $states;
+		}
+		return false;
+	}
+
+
+
+	/**
+	 *  get_all_states_of_active_countries
+	 * @return array
+	 */
+	public function get_all_active_states_for_these_countries($countries)
+	{
+		if (! $countries) {
+			return false;
+		}
+		if ($states = $this->get_all(array(  array( 'Country.CNT_ISO' => array( 'IN', array_keys($countries)), 'STA_active' => true ),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+			return $states;
+		}
+		return false;
+	}
+
+
+
+	/**
+	 *  get_all_states_of_active_countries
+	 * @return array
+	 */
+	public function get_all_states_for_these_countries($countries)
+	{
+		if (! $countries) {
+			return false;
+		}
+		if ($states = $this->get_all(array( array( 'Country.CNT_ISO' => array( 'IN', array_keys($countries))),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+			return $states;
+		}
+		return false;
+	}
+
+	/**
+	 * Gets the state's name by its ID
+	 * @param string $state_ID
+	 * @return string
+	 */
+	public function get_state_name_by_ID($state_ID)
+	{
+		if (
+			isset(self::$_all_states[ $state_ID ]) &&
+				self::$_all_states[ $state_ID ] instanceof EE_State
+		) {
+			return self::$_all_states[ $state_ID ]->name();
+		}
+		$names = $this->get_col(array( array( 'STA_ID' => $state_ID ), 'limit' => 1), 'STA_name');
+		if (is_array($names) && ! empty($names)) {
+			return reset($names);
+		} else {
+			return '';
+		}
+	}
 }

core/db_models/EEM_Ticket_Template.model.php

Spacing +4 added lines, -4 removed lines

@@ -43,11 +43,11 @@
             'Ticket' => new EE_Has_Many_Relation()
         );
         $this->_model_chain_to_wp_user = 'Ticket';
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
         // account for default tickets in the caps
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+        $this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+        $this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
         parent::__construct($timezone);
     }
 }

Indentation +34 added lines, -34 removed lines

@@ -11,40 +11,40 @@
  */
 class EEM_Ticket_Template extends EEM_Base
 {
-    // private instance of the EEM_Ticket_Template object
-    protected static $_instance = null;
+	// private instance of the EEM_Ticket_Template object
+	protected static $_instance = null;
 
-    /**
-     *      private constructor to prevent direct creation
-     *      @Constructor
-     *      @access private
-     *      @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
-     *      @return void
-     */
-    protected function __construct($timezone)
-    {
-        $this->singular_item = esc_html__('Ticket Template', 'event_espresso');
-        $this->plural_item = esc_html__('Ticket Templates', 'event_espresso');
+	/**
+	 *      private constructor to prevent direct creation
+	 *      @Constructor
+	 *      @access private
+	 *      @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
+	 *      @return void
+	 */
+	protected function __construct($timezone)
+	{
+		$this->singular_item = esc_html__('Ticket Template', 'event_espresso');
+		$this->plural_item = esc_html__('Ticket Templates', 'event_espresso');
 
-        $this->_tables = array(
-            'Ticket_Template' => new EE_Primary_Table('esp_ticket_template', 'TTM_ID')
-        );
-        $this->_fields = array(
-            'Ticket_Template' => array(
-                'TTM_ID' => new EE_Primary_Key_Int_Field('TTM_ID', esc_html__('Ticket Template ID', 'event_espresso')),
-                'TTM_name' => new EE_Plain_Text_Field('TTM_name', esc_html__('The name of the ticket template', 'event_espresso'), false, ''),
-                'TTM_description' => new EE_Plain_Text_Field('TTM_description', esc_html__('The description for the ticket template', 'event_espresso'), true, ''),
-                'TTM_file' => new EE_Plain_Text_Field('TTM_file', esc_html__('The file name for the actual template file saved on disk', 'event_espresso'), true, ''),
-            ));
-        $this->_model_relations = array(
-            'Ticket' => new EE_Has_Many_Relation()
-        );
-        $this->_model_chain_to_wp_user = 'Ticket';
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        // account for default tickets in the caps
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-        parent::__construct($timezone);
-    }
+		$this->_tables = array(
+			'Ticket_Template' => new EE_Primary_Table('esp_ticket_template', 'TTM_ID')
+		);
+		$this->_fields = array(
+			'Ticket_Template' => array(
+				'TTM_ID' => new EE_Primary_Key_Int_Field('TTM_ID', esc_html__('Ticket Template ID', 'event_espresso')),
+				'TTM_name' => new EE_Plain_Text_Field('TTM_name', esc_html__('The name of the ticket template', 'event_espresso'), false, ''),
+				'TTM_description' => new EE_Plain_Text_Field('TTM_description', esc_html__('The description for the ticket template', 'event_espresso'), true, ''),
+				'TTM_file' => new EE_Plain_Text_Field('TTM_file', esc_html__('The file name for the actual template file saved on disk', 'event_espresso'), true, ''),
+			));
+		$this->_model_relations = array(
+			'Ticket' => new EE_Has_Many_Relation()
+		);
+		$this->_model_chain_to_wp_user = 'Ticket';
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+		// account for default tickets in the caps
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+		parent::__construct($timezone);
+	}
 }

core/db_models/EEM_Answer.model.php

Spacing +3 added lines, -3 removed lines

@@ -98,7 +98,7 @@ 
      */
     public function get_registration_question_answer_object(EE_Registration $registration, $question_id = null)
     {
-        $answer_obj = $this->get_one(array( array( 'QST_ID' => $question_id, 'REG_ID' => $registration->ID() )));
+        $answer_obj = $this->get_one(array(array('QST_ID' => $question_id, 'REG_ID' => $registration->ID())));
         return apply_filters('FHEE__EEM_Answer__get_registration_question_answer_object__answer_obj', $answer_obj, $registration, $question_id);
     }
 
@@ -121,9 +121,9 @@ 
         if (is_numeric($question_system_id)) {
             // find this question's QST_system value
             $question_id = $question_system_id;
-            $question_system_id = EEM_Question::instance()->get_var(array( array( 'QST_ID' => $question_system_id ) ), 'QST_system');
+            $question_system_id = EEM_Question::instance()->get_var(array(array('QST_ID' => $question_system_id)), 'QST_system');
         } else {
-            $question_id = (int) EEM_Question::instance()->get_var(array( array( 'QST_system' => $question_system_id ) ), 'QST_ID');
+            $question_id = (int) EEM_Question::instance()->get_var(array(array('QST_system' => $question_system_id)), 'QST_ID');
         }
         // only bother checking if the registration has an attendee
         if ($registration->attendee() instanceof EE_Attendee) {

Indentation +129 added lines, -129 removed lines

@@ -9,145 +9,145 @@
  */
 class EEM_Answer extends EEM_Base
 {
-    /**
-     * private instance of the EEM_Answer object
-     * @type EEM_Answer
-     */
-    protected static $_instance = null;
+	/**
+	 * private instance of the EEM_Answer object
+	 * @type EEM_Answer
+	 */
+	protected static $_instance = null;
 
-    /**
-     * Mapping from system question ids to attendee field names
-     * @type array
-     * @deprecated since version 4.8.8
-     */
-    protected $_question_id_to_att_field_map = array(
-        EEM_Attendee::fname_question_id => 'ATT_fname',
-        EEM_Attendee::lname_question_id => 'ATT_lname',
-        EEM_Attendee::email_question_id => 'ATT_email',
-        EEM_Attendee::address_question_id => 'ATT_address',
-        EEM_Attendee::address2_question_id => 'ATT_address2',
-        EEM_Attendee::city_question_id => 'ATT_city',
-        EEM_Attendee::state_question_id => 'STA_ID',
-        EEM_Attendee::country_question_id => 'CNT_ISO',
-        EEM_Attendee::zip_question_id => 'ATT_zip',
-        EEM_Attendee::phone_question_id => 'ATT_phone'
-    );
+	/**
+	 * Mapping from system question ids to attendee field names
+	 * @type array
+	 * @deprecated since version 4.8.8
+	 */
+	protected $_question_id_to_att_field_map = array(
+		EEM_Attendee::fname_question_id => 'ATT_fname',
+		EEM_Attendee::lname_question_id => 'ATT_lname',
+		EEM_Attendee::email_question_id => 'ATT_email',
+		EEM_Attendee::address_question_id => 'ATT_address',
+		EEM_Attendee::address2_question_id => 'ATT_address2',
+		EEM_Attendee::city_question_id => 'ATT_city',
+		EEM_Attendee::state_question_id => 'STA_ID',
+		EEM_Attendee::country_question_id => 'CNT_ISO',
+		EEM_Attendee::zip_question_id => 'ATT_zip',
+		EEM_Attendee::phone_question_id => 'ATT_phone'
+	);
 
 
 
-    /**
-     *  constructor
-     */
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = esc_html__('Answer', 'event_espresso');
-        $this->plural_item = esc_html__('Answers', 'event_espresso');
-        $this->_tables = array(
-            'Answer' => new EE_Primary_Table('esp_answer', 'ANS_ID')
-        );
-        $this->_fields = array(
-            'Answer' => array(
-                'ANS_ID' => new EE_Primary_Key_Int_Field('ANS_ID', esc_html__('Answer ID', 'event_espresso')),
-                'REG_ID' => new EE_Foreign_Key_Int_Field('REG_ID', esc_html__('Registration ID', 'event_espresso'), false, 0, 'Registration'),
-                'QST_ID' => new EE_Foreign_Key_Int_Field('QST_ID', esc_html__('Question ID', 'event_espresso'), false, 0, 'Question'),
-                'ANS_value' => new EE_Maybe_Serialized_Simple_HTML_Field('ANS_value', esc_html__('Answer Value', 'event_espresso'), false, '')
-            ));
-        $this->_model_relations = array(
-            'Registration' => new EE_Belongs_To_Relation(),
-            'Question' => new EE_Belongs_To_Relation()
-        );
-        $this->_model_chain_to_wp_user = 'Registration.Event';
-        $this->_caps_slug = 'registrations';
-        parent::__construct($timezone);
-    }
+	/**
+	 *  constructor
+	 */
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = esc_html__('Answer', 'event_espresso');
+		$this->plural_item = esc_html__('Answers', 'event_espresso');
+		$this->_tables = array(
+			'Answer' => new EE_Primary_Table('esp_answer', 'ANS_ID')
+		);
+		$this->_fields = array(
+			'Answer' => array(
+				'ANS_ID' => new EE_Primary_Key_Int_Field('ANS_ID', esc_html__('Answer ID', 'event_espresso')),
+				'REG_ID' => new EE_Foreign_Key_Int_Field('REG_ID', esc_html__('Registration ID', 'event_espresso'), false, 0, 'Registration'),
+				'QST_ID' => new EE_Foreign_Key_Int_Field('QST_ID', esc_html__('Question ID', 'event_espresso'), false, 0, 'Question'),
+				'ANS_value' => new EE_Maybe_Serialized_Simple_HTML_Field('ANS_value', esc_html__('Answer Value', 'event_espresso'), false, '')
+			));
+		$this->_model_relations = array(
+			'Registration' => new EE_Belongs_To_Relation(),
+			'Question' => new EE_Belongs_To_Relation()
+		);
+		$this->_model_chain_to_wp_user = 'Registration.Event';
+		$this->_caps_slug = 'registrations';
+		parent::__construct($timezone);
+	}
 
 
 
-    /**
-     * Gets the string answer to the question for this registration (it could either be stored
-     * on the attendee or in the answer table. This function finds its value regardless)
-     * @param EE_Registration $registration
-     * @param int $question_id
-     * @param boolean $pretty_answer whether to call 'pretty_value' or just 'value'
-     * @return string
-     */
-    public function get_answer_value_to_question(EE_Registration $registration, $question_id = null, $pretty_answer = false)
-    {
-        $value = $this->get_attendee_property_answer_value($registration, $question_id, $pretty_answer);
-        if ($value === null) {
-            $answer_obj = $this->get_registration_question_answer_object($registration, $question_id);
-            if ($answer_obj instanceof EE_Answer) {
-                if ($pretty_answer) {
-                    $value = $answer_obj->pretty_value();
-                } else {
-                    $value = $answer_obj->value();
-                }
-            }
-        }
-        return apply_filters('FHEE__EEM_Answer__get_answer_value_to_question__answer_value', $value, $registration, $question_id);
-    }
+	/**
+	 * Gets the string answer to the question for this registration (it could either be stored
+	 * on the attendee or in the answer table. This function finds its value regardless)
+	 * @param EE_Registration $registration
+	 * @param int $question_id
+	 * @param boolean $pretty_answer whether to call 'pretty_value' or just 'value'
+	 * @return string
+	 */
+	public function get_answer_value_to_question(EE_Registration $registration, $question_id = null, $pretty_answer = false)
+	{
+		$value = $this->get_attendee_property_answer_value($registration, $question_id, $pretty_answer);
+		if ($value === null) {
+			$answer_obj = $this->get_registration_question_answer_object($registration, $question_id);
+			if ($answer_obj instanceof EE_Answer) {
+				if ($pretty_answer) {
+					$value = $answer_obj->pretty_value();
+				} else {
+					$value = $answer_obj->value();
+				}
+			}
+		}
+		return apply_filters('FHEE__EEM_Answer__get_answer_value_to_question__answer_value', $value, $registration, $question_id);
+	}
 
 
 
-    /**
-     * Gets the EE_Answer object for the question for this registration (if it exists)
-     * @param EE_Registration $registration
-     * @param int $question_id
-     * @return EE_Answer
-     */
-    public function get_registration_question_answer_object(EE_Registration $registration, $question_id = null)
-    {
-        $answer_obj = $this->get_one(array( array( 'QST_ID' => $question_id, 'REG_ID' => $registration->ID() )));
-        return apply_filters('FHEE__EEM_Answer__get_registration_question_answer_object__answer_obj', $answer_obj, $registration, $question_id);
-    }
+	/**
+	 * Gets the EE_Answer object for the question for this registration (if it exists)
+	 * @param EE_Registration $registration
+	 * @param int $question_id
+	 * @return EE_Answer
+	 */
+	public function get_registration_question_answer_object(EE_Registration $registration, $question_id = null)
+	{
+		$answer_obj = $this->get_one(array( array( 'QST_ID' => $question_id, 'REG_ID' => $registration->ID() )));
+		return apply_filters('FHEE__EEM_Answer__get_registration_question_answer_object__answer_obj', $answer_obj, $registration, $question_id);
+	}
 
 
-    /**
-     * Gets the string answer to the question for this registration's attendee
-     *
-     * @param EE_Registration $registration
-     * @param int|string      $question_system_id if an INT this is understood to be the question's ID; if a string
-     *                                            then it should be its QST_system value. Passing in the QST_system
-     *                                            value is more efficient
-     * @param boolean         $pretty_answer
-     * @return string|null (if the registration has no attendee, or the question_system_id is not a QST_ID or
-     *                                            QST_system for a question corresponding to an attendee field, returns
-     *                                            null)
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_attendee_property_answer_value(EE_Registration $registration, $question_system_id = null, $pretty_answer = false)
-    {
-        $value = null;
-        // backward compat: we still want to find the question's ID
-        if (is_numeric($question_system_id)) {
-            // find this question's QST_system value
-            $question_id = $question_system_id;
-            $question_system_id = EEM_Question::instance()->get_var(array( array( 'QST_ID' => $question_system_id ) ), 'QST_system');
-        } else {
-            $question_id = (int) EEM_Question::instance()->get_var(array( array( 'QST_system' => $question_system_id ) ), 'QST_ID');
-        }
-        // only bother checking if the registration has an attendee
-        if ($registration->attendee() instanceof EE_Attendee) {
-            $field_name = EEM_Attendee::instance()->get_attendee_field_for_system_question($question_system_id);
-            if ($field_name) {
-                if ($pretty_answer) {
-                    if ($field_name === 'STA_ID') {
-                        $state = $registration->attendee()->state_obj();
-                        $value = $state instanceof EE_State ? $state->name() : sprintf(esc_html__('Unknown State (%s)', 'event_espresso'), $registration->attendee()->state_ID());
-                    } elseif ($field_name === 'CNT_ISO') {
-                        $country = $registration->attendee()->country_obj();
-                        $value = $country instanceof EE_Country ? $country->name() : sprintf(esc_html__('Unknown Country (%s)', "event_espresso"), $registration->attendee()->country_ID());
-                    } else {
-                        $value = $registration->attendee()->get_pretty($field_name);
-                    }
-                    // if field name is blank, leave the value as null too
-                } else {
-                    $value = $registration->attendee()->get($field_name);
-                }
-            }
-            // if no field was found, leave value blank
-        }
-        return apply_filters('FHEE__EEM_Answer__get_attendee_question_answer_value__answer_value', $value, $registration, $question_id, $question_system_id);
-    }
+	/**
+	 * Gets the string answer to the question for this registration's attendee
+	 *
+	 * @param EE_Registration $registration
+	 * @param int|string      $question_system_id if an INT this is understood to be the question's ID; if a string
+	 *                                            then it should be its QST_system value. Passing in the QST_system
+	 *                                            value is more efficient
+	 * @param boolean         $pretty_answer
+	 * @return string|null (if the registration has no attendee, or the question_system_id is not a QST_ID or
+	 *                                            QST_system for a question corresponding to an attendee field, returns
+	 *                                            null)
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_attendee_property_answer_value(EE_Registration $registration, $question_system_id = null, $pretty_answer = false)
+	{
+		$value = null;
+		// backward compat: we still want to find the question's ID
+		if (is_numeric($question_system_id)) {
+			// find this question's QST_system value
+			$question_id = $question_system_id;
+			$question_system_id = EEM_Question::instance()->get_var(array( array( 'QST_ID' => $question_system_id ) ), 'QST_system');
+		} else {
+			$question_id = (int) EEM_Question::instance()->get_var(array( array( 'QST_system' => $question_system_id ) ), 'QST_ID');
+		}
+		// only bother checking if the registration has an attendee
+		if ($registration->attendee() instanceof EE_Attendee) {
+			$field_name = EEM_Attendee::instance()->get_attendee_field_for_system_question($question_system_id);
+			if ($field_name) {
+				if ($pretty_answer) {
+					if ($field_name === 'STA_ID') {
+						$state = $registration->attendee()->state_obj();
+						$value = $state instanceof EE_State ? $state->name() : sprintf(esc_html__('Unknown State (%s)', 'event_espresso'), $registration->attendee()->state_ID());
+					} elseif ($field_name === 'CNT_ISO') {
+						$country = $registration->attendee()->country_obj();
+						$value = $country instanceof EE_Country ? $country->name() : sprintf(esc_html__('Unknown Country (%s)', "event_espresso"), $registration->attendee()->country_ID());
+					} else {
+						$value = $registration->attendee()->get_pretty($field_name);
+					}
+					// if field name is blank, leave the value as null too
+				} else {
+					$value = $registration->attendee()->get($field_name);
+				}
+			}
+			// if no field was found, leave value blank
+		}
+		return apply_filters('FHEE__EEM_Answer__get_attendee_question_answer_value__answer_value', $value, $registration, $question_id, $question_system_id);
+	}
 }