eventespresso / event-espresso-core

core/db_models/EEM_Base.model.php

Doc Comments +15 added lines, -15 removed lines

@@ -741,7 +741,7 @@ 
 	 * Returns the name of the field's name that points to the WP_User table
 	 *  on this model (or follows the _model_chain_to_wp_user and uses that model's
 	 * foreign key to the WP_User table)
-	 * @return string|boolean string on success, boolean false when there is no
+	 * @return string|false string on success, boolean false when there is no
 	 * foreign key to the WP_User table
 	 */
 	function wp_user_field_name() {
@@ -837,6 +837,7 @@ 
 	 * If you would like to use these custom selections in WHERE, GROUP_BY, or HAVING clauses, you must instead provide an array.
 	 * Array keys are the aliases used to refer to this selection, and values are to be numerically-indexed arrays, where 0 is the selection
 	 * and 1 is the data type. Eg, array('count'=>array('COUNT(REG_ID)','%d'))
+	 * @param string $columns_to_select
 	 * @return stdClass[] like results of $wpdb->get_results($sql,OBJECT), (ie, output type is OBJECT)
 	 */
 	public function  get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null){
@@ -1139,7 +1140,7 @@ 
 	 * @param bool   $pretty          Whether to return the pretty formats (true) or not (false).
 	 * @throws EE_Error   If the given field_name is not of the EE_Datetime_Field type.
 	 *
-	 * @return array formats in an array with the date format first, and the time format last.
+	 * @return string[] formats in an array with the date format first, and the time format last.
 	 */
 	public function get_formats_for( $field_name, $pretty = false ) {
 		$field_settings = $this->field_settings_for( $field_name );
@@ -1174,7 +1175,7 @@ 
 	 *
 	 * @throws EE_Error   	If the given field_name is not of the EE_Datetime_Field type.
 	 *
-	 * @return int|string  If the given field_name is not of the EE_Datetime_Field type, then an EE_Error
+	 * @return string|null  If the given field_name is not of the EE_Datetime_Field type, then an EE_Error
 	 *                    	     exception is triggered.
 	 */
 	public function current_time_for_query( $field_name, $timestamp = false, $what = 'both' ) {
@@ -1474,7 +1475,7 @@ 
 	 * Deletes a single row from the DB given the model object's primary key value. (eg, EE_Attendee->ID()'s value).
 	 * Wrapper for EEM_Base::delete()
 	 * @param mixed $id
-	 * @return boolean whether the row got deleted or not
+	 * @return integer whether the row got deleted or not
 	 */
 	public function delete_by_ID( $id ){
 		return $this->delete( array(
@@ -1834,7 +1835,7 @@ 
 	/**
 	 * Verifies the EE addons' database is up-to-date and records that we've done it on
 	 * EEM_Base::$_db_verification_level
-	 * @param $wpdb_method
+	 * @param string $wpdb_method
 	 * @param $arguments_to_provide
 	 * @return string
 	 */
@@ -1902,7 +1903,6 @@ 
 	 * 'hasAndBelongsToMany' relationships: checks that there isn't already an entry in the join table, and adds one.
 	 * If one of the model Objects has not yet been saved to the database, it is saved before adding the entry in the join table
 	 *
-	 * @param EE_Base_Class/int $thisModelObject
 	 * @param EE_Base_Class/int $id_or_obj EE_base_Class or ID of other Model Object
 	 * @param string $relationName, key in EEM_Base::_relations
 	 * an attendee to a group, you also want to specify which role they will have in that group. So you would use this parameter to specify array('role-column-name'=>'role-id')
@@ -1924,8 +1924,8 @@ 
 	 *
 	 * 'hasAndBelongsToMany' relationships:removes any existing entry in the join table between the two models.
 	 *
-	 * @param EE_Base_Class/int $id_or_obj
-	 * @param EE_Base_Class/int $other_model_id_or_obj EE_Base_Class or ID of other Model Object
+	 * @param EE_CPT_Base $id_or_obj
+	 * @param EE_Term_Taxonomy $other_model_id_or_obj EE_Base_Class or ID of other Model Object
 	 * @param string $relationName key in EEM_Base::_relations
 	 * @return boolean of success
 	 * @param array   $where_query This allows you to enter further query params for the relation to for relation to methods that allow you to further specify extra columns to join by (such as HABTM).  Keep in mind that the only acceptable query_params is strict "col" => "value" pairs because these will be inserted in any new rows created as well.
@@ -2001,7 +2001,7 @@ 
 	/**
 	 * Instead of getting the related model objects, simply counts them. Ignores default_where_conditions by default,
 	 * unless otherwise specified in the $query_params
-	 * @param int/EE_Base_Class $id_or_obj
+	 * @param EE_Event $id_or_obj
 	 * @param string $model_name like 'Event', or 'Registration'
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @param string $field_to_count name of field to count by. By default, uses primary key
@@ -2390,7 +2390,7 @@ 
 	/**
 	 * Finds all the fields that correspond to the given table
 	 * @param string $table_alias, array key in EEM_Base::_tables
-	 * @return EE_Model_Field_Base[]
+	 * @return EE_Model_Field_Base
 	 */
 	function _get_fields_for_table($table_alias){
 		return $this->_fields[$table_alias];
@@ -3454,8 +3454,8 @@ 
 	/**
 	 * gets the field object of type 'primary_key' from the fieldsSettings attribute.
 	 * Eg, on EE_Answer that would be ANS_ID field object
-	 * @param $field_obj
-	 * @return EE_Model_Field_Base
+	 * @param EE_Model_Field_Base $field_obj
+	 * @return boolean
 	 */
 	public function is_primary_key_field( $field_obj ){
 		return $field_obj instanceof EE_Primary_Key_Field_Base ? TRUE : FALSE;
@@ -3549,7 +3549,7 @@ 
 	 * Gets the actual table for the table alias
 	 * @param string $table_alias eg Event, Event_Meta, Registration, Transaction, but maybe
 	 * a table alias with a model chain prefix, like 'Venue__Event_Venue___Event_Meta'. Either one works
-	 * @return EE_Table_Base
+	 * @return string
 	 */
 	function get_table_for_alias($table_alias){
 		$table_alias_sans_model_relation_chain_prefix = EE_Model_Parser::remove_table_alias_model_relation_chain_prefix($table_alias);
@@ -3676,7 +3676,7 @@ 
 	 * The purpose of this method is to allow us to create a model object that is not in the db that holds default values.
 	 * A typical example of where this is used is when creating a new item and the initial load of a form.  We dont' necessarily want to test for if the object is present but just assume it is BUT load the defaults from the object (as set in the model_field!).
 	 *
-	 * @return EE_Base_Class single EE_Base_Class object with default values for the properties.
+	 * @return boolean single EE_Base_Class object with default values for the properties.
 	 */
 	public function create_default_object() {
 
@@ -4066,7 +4066,7 @@ 
 	}
 	/**
 	 * Read comments for assume_values_already_prepared_by_model_object()
-	 * @return int
+	 * @return boolean
 	 */
 	public function get_assumption_concerning_values_already_prepared_by_model_object(){
 		return $this->_values_already_prepared_by_model_object;

Spacing +944 added lines, -944 removed lines

@@ -23,7 +23,7 @@ 
  * @since 				EE4
  *
  */
-abstract class EEM_Base extends EE_Base{
+abstract class EEM_Base extends EE_Base {
 
 	//admin posty
 	//basic -> grants access to mine -> if they don't have it, select none
@@ -228,7 +228,7 @@ 
 	 * Flag indicating whether this model has a primary key or not
 	 * @var boolean
 	 */
-	protected $_has_primary_key_field=null;
+	protected $_has_primary_key_field = null;
 
 	/**
 	 * Whether or not this model is based off a table in WP core only (CPTs should set
@@ -283,19 +283,19 @@ 
 	 * operators that work like 'BETWEEN'.  Typically used for datetime calculations, i.e. "BETWEEN '12-1-2011' AND '12-31-2012'"
 	 * @var array
 	 */
-	protected $_between_style_operators = array( 'BETWEEN' );
+	protected $_between_style_operators = array('BETWEEN');
 
 	/**
 	 * operators that are used for handling NUll and !NULL queries.  Typically used for when checking if a row exists on a join table.
 	 * @var array
 	 */
-	protected $_null_style_operators = array( 'IS NOT NULL', 'IS NULL');
+	protected $_null_style_operators = array('IS NOT NULL', 'IS NULL');
 
 	/**
 	 * Allowed values for $query_params['order'] for ordering in queries
 	 * @var array
 	 */
-	protected $_allowed_order_values = array('asc','desc','ASC','DESC');
+	protected $_allowed_order_values = array('asc', 'desc', 'ASC', 'DESC');
 
 	/**
 	 * When these are keys in a WHERE or HAVING clause, they are handled much differently
@@ -309,13 +309,13 @@ 
 	 * 'where', but 'where' clauses are so common that we thought we'd omit it
 	 * @var array
 	 */
-	private $_allowed_query_params = array(0, 'limit','order_by','group_by','having','force_join','order','on_join_limit','default_where_conditions', 'caps');
+	private $_allowed_query_params = array(0, 'limit', 'order_by', 'group_by', 'having', 'force_join', 'order', 'on_join_limit', 'default_where_conditions', 'caps');
 
 	/**
 	 * All the data types that can be used in $wpdb->prepare statements.
 	 * @var array
 	 */
-	private $_valid_wpdb_data_types = array('%d','%s','%f');
+	private $_valid_wpdb_data_types = array('%d', '%s', '%f');
 
 	/**
 	 * 	EE_Registry Object
@@ -348,17 +348,17 @@ 
 	/**
 	 * constant used to show EEM_Base has not yet verified the db on this http request
 	 */
-	const db_verified_none 		= 0;
+	const db_verified_none = 0;
 	/**
 	 * constant used to show EEM_Base has verified the EE core db on this http request,
 	 * but not the addons' dbs
 	 */
-	const db_verified_core 		= 1;
+	const db_verified_core = 1;
 	/**
 	 * constant used to show EEM_Base has verified the addons' dbs (and implicitly
 	 * the EE core db too)
 	 */
-	const db_verified_addons 	= 2;
+	const db_verified_addons = 2;
 
 	/**
 	 * indicates whether an EEM_Base child has already re-verified the DB
@@ -389,13 +389,13 @@ 
 	 * @param null $timezone
 	 * @throws \EE_Error
 	 */
-	protected function __construct( $timezone = NULL ){
+	protected function __construct($timezone = NULL) {
 		// check that the model has not been loaded too soon
-		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' )) {
-			throw new EE_Error (
+		if ( ! did_action('AHEE__EE_System__load_espresso_addons')) {
+			throw new EE_Error(
 				sprintf(
-					__( 'The %1$s model can not be loaded before the "AHEE__EE_System__load_espresso_addons" hook has been called. This gives other addons a chance to extend this model.', 'event_espresso' ),
-					get_class( $this )
+					__('The %1$s model can not be loaded before the "AHEE__EE_System__load_espresso_addons" hook has been called. This gives other addons a chance to extend this model.', 'event_espresso'),
+					get_class($this)
 				)
 			);
 		}
@@ -405,11 +405,11 @@ 
 		 * just use EE_Register_Model_Extension
 		 * @var EE_Table_Base[] $_tables
 		 */
-		$this->_tables = apply_filters( 'FHEE__'.get_class($this).'__construct__tables', $this->_tables );
-		foreach($this->_tables as $table_alias => $table_obj){
+		$this->_tables = apply_filters('FHEE__'.get_class($this).'__construct__tables', $this->_tables);
+		foreach ($this->_tables as $table_alias => $table_obj) {
 			/** @var $table_obj EE_Table_Base */
 			$table_obj->_construct_finalize_with_alias($table_alias);
-			if( $table_obj instanceof EE_Secondary_Table ){
+			if ($table_obj instanceof EE_Secondary_Table) {
 				/** @var $table_obj EE_Secondary_Table */
 				$table_obj->_construct_finalize_set_table_to_join_with($this->_get_main_table());
 			}
@@ -419,48 +419,48 @@ 
 		 * EE_Register_Model_Extension
 		 * @param EE_Model_Field_Base[] $_fields
 		 */
-		$this->_fields = apply_filters('FHEE__'.get_class($this).'__construct__fields',$this->_fields);
-		foreach($this->_fields as $table_alias => $fields_for_table){
-			if ( ! array_key_exists( $table_alias, $this->_tables )){
-				throw new EE_Error(sprintf(__("Table alias %s does not exist in EEM_Base child's _tables array. Only tables defined are %s",'event_espresso'),$table_alias,implode(",",$this->_fields)));
+		$this->_fields = apply_filters('FHEE__'.get_class($this).'__construct__fields', $this->_fields);
+		foreach ($this->_fields as $table_alias => $fields_for_table) {
+			if ( ! array_key_exists($table_alias, $this->_tables)) {
+				throw new EE_Error(sprintf(__("Table alias %s does not exist in EEM_Base child's _tables array. Only tables defined are %s", 'event_espresso'), $table_alias, implode(",", $this->_fields)));
 			}
-			foreach($fields_for_table as $field_name => $field_obj){
+			foreach ($fields_for_table as $field_name => $field_obj) {
 				/** @var $field_obj EE_Model_Field_Base | EE_Primary_Key_Field_Base */
 				//primary key field base has a slightly different _construct_finalize
 				/** @var $field_obj EE_Model_Field_Base */
-				$field_obj->_construct_finalize( $table_alias, $field_name, $this->get_this_model_name() );
+				$field_obj->_construct_finalize($table_alias, $field_name, $this->get_this_model_name());
 			}
 		}
 
 		// everything is related to Extra_Meta
-		if( get_class($this) != 'EEM_Extra_Meta'){
+		if (get_class($this) != 'EEM_Extra_Meta') {
 			//make extra meta related to everything, but don't block deleting things just
 			//because they have related extra meta info. For now just orphan those extra meta
 			//in the future we should automatically delete them
-			$this->_model_relations['Extra_Meta'] = new EE_Has_Many_Any_Relation( FALSE );
+			$this->_model_relations['Extra_Meta'] = new EE_Has_Many_Any_Relation(FALSE);
 		}
 		//and change logs
-		if( get_class( $this) !=  'EEM_Change_Log' ) {
-			$this->_model_relations[ 'Change_Log' ] = new EE_Has_Many_Any_Relation( FALSE );
+		if (get_class($this) != 'EEM_Change_Log') {
+			$this->_model_relations['Change_Log'] = new EE_Has_Many_Any_Relation(FALSE);
 		}
 		/**
 		 * Filters the list of relations on a model. It is best to NOT use this directly and instead just use
 		 * EE_Register_Model_Extension
 		 * @param EE_Model_Relation_Base[] $_model_relations
 		 */
-		$this->_model_relations = apply_filters('FHEE__'.get_class($this).'__construct__model_relations',$this->_model_relations);
-		foreach($this->_model_relations as $model_name => $relation_obj){
+		$this->_model_relations = apply_filters('FHEE__'.get_class($this).'__construct__model_relations', $this->_model_relations);
+		foreach ($this->_model_relations as $model_name => $relation_obj) {
 			/** @var $relation_obj EE_Model_Relation_Base */
 			$relation_obj->_construct_finalize_set_models($this->get_this_model_name(), $model_name);
 		}
-		foreach($this->_indexes as $index_name => $index_obj){
+		foreach ($this->_indexes as $index_name => $index_obj) {
 			/** @var $index_obj EE_Index */
 			$index_obj->_construct_finalize($index_name, $this->get_this_model_name());
 		}
 
 		$this->set_timezone($timezone);
 		//finalize default where condition strategy, or set default
-		if( ! $this->_default_where_conditions_strategy){
+		if ( ! $this->_default_where_conditions_strategy) {
 			//nothing was set during child constructor, so set default
 			$this->_default_where_conditions_strategy = new EE_Default_Where_Conditions();
 		}
@@ -468,15 +468,15 @@ 
 
 		//if the cap slug hasn't been set, and we haven't set it to false on purpose
 		//to indicate to NOT set it, set it to the logical default
-		if( $this->_caps_slug === null ) {
-			EE_Registry::instance()->load_helper( 'Inflector' );
-			$this->_caps_slug = EEH_Inflector::pluralize_and_lower( $this->get_this_model_name() );
+		if ($this->_caps_slug === null) {
+			EE_Registry::instance()->load_helper('Inflector');
+			$this->_caps_slug = EEH_Inflector::pluralize_and_lower($this->get_this_model_name());
 		}
 		//initialize the standard cap restriction generators if none were specified by the child constructor
-		if( $this->_cap_restriction_generators !== false ){
-			foreach( $this->cap_contexts_to_cap_action_map() as $cap_context => $action ){
-				if( ! isset( $this->_cap_restriction_generators[ $cap_context ] ) ) {
-					$this->_cap_restriction_generators[ $cap_context ] = apply_filters(
+		if ($this->_cap_restriction_generators !== false) {
+			foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
+				if ( ! isset($this->_cap_restriction_generators[$cap_context])) {
+					$this->_cap_restriction_generators[$cap_context] = apply_filters(
 						'FHEE__EEM_Base___construct__standard_cap_restriction_generator',
 						new EE_Restriction_Generator_Protected(),
 						$cap_context,
@@ -486,23 +486,23 @@ 
 			}
 		}
 		//if there are cap restriction generators, use them to make the default cap restrictions
-		if( $this->_cap_restriction_generators !== false ){
-			foreach( $this->_cap_restriction_generators as $context => $generator_object ) {
-				if( ! $generator_object ){
+		if ($this->_cap_restriction_generators !== false) {
+			foreach ($this->_cap_restriction_generators as $context => $generator_object) {
+				if ( ! $generator_object) {
 					continue;
 				}
-				if( ! $generator_object instanceof EE_Restriction_Generator_Base ){
+				if ( ! $generator_object instanceof EE_Restriction_Generator_Base) {
 					throw new EE_Error(
 						sprintf(
-							__( 'Index "%1$s" in the model %2$s\'s _cap_restriction_generators is not a child of EE_Restriction_Generator_Base. It should be that or NULL.', 'event_espresso' ),
+							__('Index "%1$s" in the model %2$s\'s _cap_restriction_generators is not a child of EE_Restriction_Generator_Base. It should be that or NULL.', 'event_espresso'),
 							$context,
 							$this->get_this_model_name()
 						)
 					);
 				}
-				$action = $this->cap_action_for_context( $context );
-				if( ! $generator_object->construction_finalized() ){
-					$generator_object->_construct_finalize( $this, $action );
+				$action = $this->cap_action_for_context($context);
+				if ( ! $generator_object->construction_finalized()) {
+					$generator_object->_construct_finalize($this, $action);
 				}
 
 			}
@@ -516,11 +516,11 @@ 
 	 * @param string $context one of EEM_Base::valid_cap_contexts()
 	 * @return EE_Default_Where_Conditions[]
 	 */
-	protected function _generate_cap_restrictions( $context ){
-		if( isset( $this->_cap_restriction_generators[ $context ] ) &&
-				$this->_cap_restriction_generators[ $context ] instanceof EE_Restriction_Generator_Base ) {
-			return $this->_cap_restriction_generators[ $context ]->generate_restrictions();
-		}else{
+	protected function _generate_cap_restrictions($context) {
+		if (isset($this->_cap_restriction_generators[$context]) &&
+				$this->_cap_restriction_generators[$context] instanceof EE_Restriction_Generator_Base) {
+			return $this->_cap_restriction_generators[$context]->generate_restrictions();
+		} else {
 			return array();
 		}
 }
@@ -533,16 +533,16 @@ 
 	 *		@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 static (as in the concrete child class)
 	 */
-	public static function instance( $timezone = NULL ){
+	public static function instance($timezone = NULL) {
 
 		// check if instance of Espresso_model already exists
 		if ( ! static::$_instance instanceof static) {
 			// instantiate Espresso_model
-			static::$_instance = new static( $timezone );
+			static::$_instance = new static($timezone);
 		}
 
 		//we might have a timezone set, let set_timezone decide what to do with it
-		static::$_instance->set_timezone( $timezone );
+		static::$_instance->set_timezone($timezone);
 
 		// Espresso_model object
 		return static::$_instance;
@@ -555,11 +555,11 @@ 
 	 * @param null | string $timezone
 	 * @return static
 	 */
-	public static function reset(  $timezone = NULL ){
-		if ( ! is_null( static::$_instance ) ) {
+	public static function reset($timezone = NULL) {
+		if ( ! is_null(static::$_instance)) {
 			static::$_instance = null;
 
-			return self::instance( $timezone );
+			return self::instance($timezone);
 		}
 		return null;
 	}
@@ -570,15 +570,15 @@ 
 	 * @param  boolean $translated return localized strings or JUST the array.
 	 * @return array
 	 */
-	 public function status_array( $translated = FALSE ) {
-	 	if ( !array_key_exists('Status', $this->_model_relations ) )
+	 public function status_array($translated = FALSE) {
+	 	if ( ! array_key_exists('Status', $this->_model_relations))
 	 		return array();
 	 	$model_name = $this->get_this_model_name();
-	 	$status_type = str_replace(' ', '_', strtolower( str_replace('_', ' ', $model_name) ) );
-	 	$stati = EEM_Status::instance()->get_all(array(array('STS_type' => $status_type) ) );
+	 	$status_type = str_replace(' ', '_', strtolower(str_replace('_', ' ', $model_name)));
+	 	$stati = EEM_Status::instance()->get_all(array(array('STS_type' => $status_type)));
 	 	$status_array = array();
-	 	foreach ( $stati as $status ) {
-            $status_array[ $status->ID() ] = $status->get('STS_code');
+	 	foreach ($stati as $status) {
+            $status_array[$status->ID()] = $status->get('STS_code');
         }
         return $translated ? EEM_Status::instance()->localized_status($status_array, FALSE, 'sentence') : $status_array;
     }
@@ -719,7 +719,7 @@ 
 	 *			'order_by'=>array('ANS_value'=>'ASC')
 	 *		));
 	 */
-	function get_all($query_params = array()){
+	function get_all($query_params = array()) {
 		return $this->_create_objects($this->_get_all_wpdb_results($query_params, ARRAY_A, NULL));
 	}
 
@@ -729,10 +729,10 @@ 
 	 * @param array $query_params @see EEM_Base::get_all()
 	 * @return array like EEM_Base::get_all
 	 */
-	function alter_query_params_to_only_include_mine( $query_params = array() ) {
+	function alter_query_params_to_only_include_mine($query_params = array()) {
 		$wp_user_field_name = $this->wp_user_field_name();
-		if( $wp_user_field_name ){
-			$query_params[0][ $wp_user_field_name ] = get_current_user_id();
+		if ($wp_user_field_name) {
+			$query_params[0][$wp_user_field_name] = get_current_user_id();
 		}
 		return $query_params;
 	}
@@ -745,19 +745,19 @@ 
 	 * foreign key to the WP_User table
 	 */
 	function wp_user_field_name() {
-		try{
-			if( ! empty( $this->_model_chain_to_wp_user ) ) {
-				$models_to_follow_to_wp_users = explode( '.', $this->_model_chain_to_wp_user );
-				$last_model_name = end( $models_to_follow_to_wp_users );
-				$model_with_fk_to_wp_users = EE_Registry::instance()->load_model( $last_model_name );
-				$model_chain_to_wp_user = $this->_model_chain_to_wp_user . '.';
-			}else{
+		try {
+			if ( ! empty($this->_model_chain_to_wp_user)) {
+				$models_to_follow_to_wp_users = explode('.', $this->_model_chain_to_wp_user);
+				$last_model_name = end($models_to_follow_to_wp_users);
+				$model_with_fk_to_wp_users = EE_Registry::instance()->load_model($last_model_name);
+				$model_chain_to_wp_user = $this->_model_chain_to_wp_user.'.';
+			} else {
 				$model_with_fk_to_wp_users = $this;
 				$model_chain_to_wp_user = '';
 			}
-			$wp_user_field = $model_with_fk_to_wp_users->get_foreign_key_to( 'WP_User' );
-			return $model_chain_to_wp_user . $wp_user_field->get_name();
-		}catch( EE_Error $e ) {
+			$wp_user_field = $model_with_fk_to_wp_users->get_foreign_key_to('WP_User');
+			return $model_chain_to_wp_user.$wp_user_field->get_name();
+		} catch (EE_Error $e) {
 			return false;
 		}
 	}
@@ -771,7 +771,7 @@ 
 	 * (or transietly-related model)
 	 * @return string
 	 */
-	public function model_chain_to_wp_user(){
+	public function model_chain_to_wp_user() {
 		return $this->_model_chain_to_wp_user;
 	}
 
@@ -783,13 +783,13 @@ 
 	 * @return boolean
 	 */
 	public function is_owned() {
-		if( $this->model_chain_to_wp_user() ){
+		if ($this->model_chain_to_wp_user()) {
 			return true;
-		}else{
-			try{
-				$this->get_foreign_key_to( 'WP_User' );
+		} else {
+			try {
+				$this->get_foreign_key_to('WP_User');
 				return true;
-			}catch( EE_Error $e ){
+			} catch (EE_Error $e) {
 				return false;
 			}
 		}
@@ -808,21 +808,21 @@ 
 	 * and 1 is the data type. Eg, array('count'=>array('COUNT(REG_ID)','%d'))
 	 * @return array|stdClass[] like results of $wpdb->get_results($sql,OBJECT), (ie, output type is OBJECT)
 	 */
-	protected function  _get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null){
+	protected function  _get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null) {
 		//remember the custom selections, if any
-		if(is_array($columns_to_select)){
+		if (is_array($columns_to_select)) {
 			$this->_custom_selections = $columns_to_select;
-		}elseif(is_string($columns_to_select)){
+		}elseif (is_string($columns_to_select)) {
 			$this->_custom_selections = array($this->_custom_selections);
-		}else{
+		} else {
 			$this->_custom_selections = array();
 		}
 
 		$model_query_info = $this->_create_model_query_info_carrier($query_params);
 		$select_expressions = $columns_to_select ? $this->_construct_select_from_input($columns_to_select) : $this->_construct_default_select_sql($model_query_info);
-		$SQL ="SELECT $select_expressions ".$this->_construct_2nd_half_of_select_query($model_query_info);
+		$SQL = "SELECT $select_expressions ".$this->_construct_2nd_half_of_select_query($model_query_info);
 //		echo "sql:$SQL";
-		$results =  $this->_do_wpdb_query( 'get_results', array($SQL, $output ) );// $wpdb->get_results($SQL, $output);
+		$results = $this->_do_wpdb_query('get_results', array($SQL, $output)); // $wpdb->get_results($SQL, $output);
 		return $results;
 	}
 
@@ -839,7 +839,7 @@ 
 	 * and 1 is the data type. Eg, array('count'=>array('COUNT(REG_ID)','%d'))
 	 * @return stdClass[] like results of $wpdb->get_results($sql,OBJECT), (ie, output type is OBJECT)
 	 */
-	public function  get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null){
+	public function  get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null) {
 		return $this->_get_all_wpdb_results($query_params, $output, $columns_to_select);
 	}
 
@@ -851,21 +851,21 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	private function _construct_select_from_input($columns_to_select){
-		if(is_array($columns_to_select)){
+	private function _construct_select_from_input($columns_to_select) {
+		if (is_array($columns_to_select)) {
 			$select_sql_array = array();
 
-			foreach($columns_to_select as $alias => $selection_and_datatype){
-				if( ! is_array($selection_and_datatype) || ! isset($selection_and_datatype[1])){
-					throw new EE_Error(sprintf(__("Custom selection %s (alias %s) needs to be an array like array('COUNT(REG_ID)','%%d')", "event_espresso"),$selection_and_datatype,$alias));
+			foreach ($columns_to_select as $alias => $selection_and_datatype) {
+				if ( ! is_array($selection_and_datatype) || ! isset($selection_and_datatype[1])) {
+					throw new EE_Error(sprintf(__("Custom selection %s (alias %s) needs to be an array like array('COUNT(REG_ID)','%%d')", "event_espresso"), $selection_and_datatype, $alias));
 				}
-				if( ! in_array( $selection_and_datatype[1],$this->_valid_wpdb_data_types)){
-					throw new EE_Error(sprintf(__("Datatype %s (for selection '%s' and alias '%s') is not a valid wpdb datatype (eg %%s)", "event_espresso"),$selection_and_datatype[1],$selection_and_datatype[0],$alias,implode(",",$this->_valid_wpdb_data_types)));
+				if ( ! in_array($selection_and_datatype[1], $this->_valid_wpdb_data_types)) {
+					throw new EE_Error(sprintf(__("Datatype %s (for selection '%s' and alias '%s') is not a valid wpdb datatype (eg %%s)", "event_espresso"), $selection_and_datatype[1], $selection_and_datatype[0], $alias, implode(",", $this->_valid_wpdb_data_types)));
 				}
 				$select_sql_array[] = "{$selection_and_datatype[0]} AS $alias";
 			}
-			$columns_to_select_string = implode(", ",$select_sql_array);
-		}else{
+			$columns_to_select_string = implode(", ", $select_sql_array);
+		} else {
 			$columns_to_select_string = $columns_to_select;
 		}
 		return $columns_to_select_string;
@@ -878,7 +878,7 @@ 
 	 * Convenient wrapper for getting the primary key field's name. Eg, on Registration, this would be 'REG_ID'
 	 * @return string
 	 */
-	function primary_key_name(){
+	function primary_key_name() {
 		return $this->get_primary_key_field()->get_name();
 	}
 
@@ -890,15 +890,15 @@ 
 	 * @param mixed $id int or string, depending on the type of the model's primary key
 	 * @return EE_Base_Class
 	 */
-	function get_one_by_ID($id){
-		if( $this->get_from_entity_map( $id ) ){
-			return $this->get_from_entity_map( $id );
-		}elseif( $this->has_primary_key_field ( ) ) {
+	function get_one_by_ID($id) {
+		if ($this->get_from_entity_map($id)) {
+			return $this->get_from_entity_map($id);
+		}elseif ($this->has_primary_key_field( )) {
 			$primary_key_name = $this->get_primary_key_field()->get_name();
 			return $this->get_one(array(array($primary_key_name => $id)));
-		}else{
+		} else {
 			//no primary key, so the $id must be from the get_index_primary_key_string()
-			return $this->get_one( array( $this->parse_index_primary_key_string( $id ) ) );
+			return $this->get_one(array($this->parse_index_primary_key_string($id)));
 		}
 	}
 
@@ -909,16 +909,16 @@ 
 	 * @param array $query_params like EEM_Base's $query_params variable.
 	 * @return EE_Base_Class | NULL
 	 */
-	function get_one($query_params = array()){
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::get_one', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+	function get_one($query_params = array()) {
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::get_one', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		$query_params['limit'] = 1;
 		$items = $this->get_all($query_params);
-		if(empty($items)){
+		if (empty($items)) {
 			return null;
-		}else{
+		} else {
 			return array_shift($items);
 		}
 	}
@@ -942,8 +942,8 @@ 
 	 *
 	 * @return EE_Base_Class[]|array
 	 */
-	public function next_x( $current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		return $this->_get_consecutive( $current_field_value, '>', $field_to_order_by, $limit, $query_params, $columns_to_select );
+	public function next_x($current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		return $this->_get_consecutive($current_field_value, '>', $field_to_order_by, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -966,8 +966,8 @@ 
 	 *
 	 * @return EE_Base_Class[]|array
 	 */
-	public function previous_x( $current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		return $this->_get_consecutive( $current_field_value, '<', $field_to_order_by, $limit, $query_params, $columns_to_select );
+	public function previous_x($current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		return $this->_get_consecutive($current_field_value, '<', $field_to_order_by, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -989,9 +989,9 @@ 
 	 *
 	 * @return EE_Base_Class|null|array()
 	 */
-	public function next( $current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$results = $this->_get_consecutive( $current_field_value, '>', $field_to_order_by, 1, $query_params, $columns_to_select );
-		return empty( $results ) ? null : reset( $results );
+	public function next($current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$results = $this->_get_consecutive($current_field_value, '>', $field_to_order_by, 1, $query_params, $columns_to_select);
+		return empty($results) ? null : reset($results);
 	}
 
 
@@ -1013,9 +1013,9 @@ 
 	 *
 	 * @return EE_Base_Class|null|array()
 	 */
-	public function previous( $current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$results = $this->_get_consecutive( $current_field_value, '<', $field_to_order_by, 1, $query_params, $columns_to_select );
-		return empty( $results ) ? null : reset( $results );
+	public function previous($current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$results = $this->_get_consecutive($current_field_value, '<', $field_to_order_by, 1, $query_params, $columns_to_select);
+		return empty($results) ? null : reset($results);
 	}
 
 
@@ -1041,40 +1041,40 @@ 
 	 * @return EE_Base_Class[]|array
 	 * @throws EE_Error
 	 */
-	protected function _get_consecutive( $current_field_value, $operand = '>', $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
+	protected function _get_consecutive($current_field_value, $operand = '>', $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
 		//if $field_to_order_by is empty then let's assume we're ordering by the primary key.
-		if ( empty( $field_to_order_by ) ) {
-			if ( $this->has_primary_key_field() ) {
+		if (empty($field_to_order_by)) {
+			if ($this->has_primary_key_field()) {
 				$field_to_order_by = $this->get_primary_key_field()->get_name();
 			} else {
 
-				if ( WP_DEBUG ) {
-					throw new EE_Error( __( 'EEM_Base::_get_consecutive() has been called with no $field_to_order_by argument and there is no primary key on the field.  Please provide the field you would like to use as the base for retrieving the next item(s).', 'event_espresso' ) );
+				if (WP_DEBUG) {
+					throw new EE_Error(__('EEM_Base::_get_consecutive() has been called with no $field_to_order_by argument and there is no primary key on the field.  Please provide the field you would like to use as the base for retrieving the next item(s).', 'event_espresso'));
 				}
-				EE_Error::add_error( __('There was an error with the query.', 'event_espresso') );
+				EE_Error::add_error(__('There was an error with the query.', 'event_espresso'));
 				return array();
 			}
 		}
 
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::_get_consecutive', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::_get_consecutive', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 
 		//let's add the where query param for consecutive look up.
-		$query_params[0][ $field_to_order_by ] = array( $operand, $current_field_value );
+		$query_params[0][$field_to_order_by] = array($operand, $current_field_value);
 		$query_params['limit'] = $limit;
 
 		//set direction
-		$incoming_orderby = isset( $query_params['order_by'] ) ? $query_params['order_by'] : array();
-		$query_params['order_by'] = $operand == '>' ? array( $field_to_order_by => 'ASC' ) + $incoming_orderby : array( $field_to_order_by => 'DESC') + $incoming_orderby;
+		$incoming_orderby = isset($query_params['order_by']) ? $query_params['order_by'] : array();
+		$query_params['order_by'] = $operand == '>' ? array($field_to_order_by => 'ASC') + $incoming_orderby : array($field_to_order_by => 'DESC') + $incoming_orderby;
 
 		//if $columns_to_select is empty then that means we're returning EE_Base_Class objects
-		if ( empty( $columns_to_select ) ) {
-			return $this->get_all( $query_params );
+		if (empty($columns_to_select)) {
+			return $this->get_all($query_params);
 		} else {
 			//getting just the fields
-			return $this->_get_all_wpdb_results( $query_params, ARRAY_A, $columns_to_select );
+			return $this->_get_all_wpdb_results($query_params, ARRAY_A, $columns_to_select);
 		}
 	}
 
@@ -1085,18 +1085,18 @@ 
 	 * This sets the _timezone property after model object has been instantiated.
 	 * @param null | string $timezone valid PHP DateTimeZone timezone string
 	 */
-	public function set_timezone( $timezone ) {
-		if ( $timezone !== null ) {
+	public function set_timezone($timezone) {
+		if ($timezone !== null) {
 			$this->_timezone = $timezone;
 		}
 		//note we need to loop through relations and set the timezone on those objects as well.
-		foreach ( $this->_model_relations as $relation ) {
-			$relation->set_timezone( $timezone );
+		foreach ($this->_model_relations as $relation) {
+			$relation->set_timezone($timezone);
 		}
 		//and finally we do the same for any datetime fields
-		foreach ( $this->_fields as $field ) {
-			if ( $field instanceof EE_Datetime_Field ) {
-				$field->set_timezone( $timezone );
+		foreach ($this->_fields as $field) {
+			if ($field instanceof EE_Datetime_Field) {
+				$field->set_timezone($timezone);
 			}
 		}
 	}
@@ -1111,9 +1111,9 @@ 
 	 */
 	public function get_timezone() {
 		//first validate if timezone is set.  If not, then let's set it be whatever is set on the model fields.
-		if ( empty( $this->_timezone ) ) {
-			foreach( $this->_fields as $field ) {
-				if ( $field instanceof EE_Datetime_Field ) {
+		if (empty($this->_timezone)) {
+			foreach ($this->_fields as $field) {
+				if ($field instanceof EE_Datetime_Field) {
 					$this->set_timezone($field->get_timezone());
 					break;
 				}
@@ -1121,9 +1121,9 @@ 
 		}
 
 		//if timezone STILL empty then return the default timezone for the site.
-		if ( empty( $this->_timezone ) ) {
-			EE_Registry::instance()->load_helper( 'DTT_Helper' );
-			$this->set_timezone( EEH_DTT_Helper::get_timezone() );
+		if (empty($this->_timezone)) {
+			EE_Registry::instance()->load_helper('DTT_Helper');
+			$this->set_timezone(EEH_DTT_Helper::get_timezone());
 		}
 		return $this->_timezone;
 	}
@@ -1141,19 +1141,19 @@ 
 	 *
 	 * @return array formats in an array with the date format first, and the time format last.
 	 */
-	public function get_formats_for( $field_name, $pretty = false ) {
-		$field_settings = $this->field_settings_for( $field_name );
+	public function get_formats_for($field_name, $pretty = false) {
+		$field_settings = $this->field_settings_for($field_name);
 
 		//if not a valid EE_Datetime_Field then throw error
-		if ( ! $field_settings instanceof EE_Datetime_Field ) {
-			throw new EE_Error( sprintf( __('The field sent into EEM_Base::get_formats_for (%s) is not registered as a EE_Datetime_Field. Please check the spelling and make sure you are submitting the right field name to retrieve date_formats for.', 'event_espresso' ), $field_name ) );
+		if ( ! $field_settings instanceof EE_Datetime_Field) {
+			throw new EE_Error(sprintf(__('The field sent into EEM_Base::get_formats_for (%s) is not registered as a EE_Datetime_Field. Please check the spelling and make sure you are submitting the right field name to retrieve date_formats for.', 'event_espresso'), $field_name));
 		}
 
 		//while we are here, let's make sure the timezone internally in EEM_Base matches what is stored on
 		//the field.
 		$this->_timezone = $field_settings->get_timezone();
 
-		return array( $field_settings->get_date_format( $pretty ), $field_settings->get_time_format( $pretty ) );
+		return array($field_settings->get_date_format($pretty), $field_settings->get_time_format($pretty));
 	}
 
 
@@ -1177,25 +1177,25 @@ 
 	 * @return int|string  If the given field_name is not of the EE_Datetime_Field type, then an EE_Error
 	 *                    	     exception is triggered.
 	 */
-	public function current_time_for_query( $field_name, $timestamp = false, $what = 'both' ) {
-		$formats = $this->get_formats_for( $field_name );
+	public function current_time_for_query($field_name, $timestamp = false, $what = 'both') {
+		$formats = $this->get_formats_for($field_name);
 
-		$DateTime = new DateTime( "now", new DateTimeZone( $this->_timezone ) );
+		$DateTime = new DateTime("now", new DateTimeZone($this->_timezone));
 
-		if ( $timestamp ) {
-			return $DateTime->format( 'U' );
+		if ($timestamp) {
+			return $DateTime->format('U');
 		}
 
 		//not returning timestamp, so return formatted string in timezone.
-		switch( $what ) {
+		switch ($what) {
 			case 'time' :
-				return $DateTime->format( $formats[1] );
+				return $DateTime->format($formats[1]);
 				break;
 			case 'date' :
-				return $DateTime->format( $formats[0] );
+				return $DateTime->format($formats[0]);
 				break;
 			default :
-				return $DateTime->format( implode( ' ', $formats ) );
+				return $DateTime->format(implode(' ', $formats));
 				break;
 		}
 	}
@@ -1219,18 +1219,18 @@ 
 	 *                           		'U', this is ignored.
 	 * @return DateTime
 	 */
-	public function convert_datetime_for_query( $field_name, $timestring, $incoming_format, $timezone = '' ) {
+	public function convert_datetime_for_query($field_name, $timestring, $incoming_format, $timezone = '') {
 
 		//just using this to ensure the timezone is set correctly internally
-		$this->get_formats_for( $field_name );
+		$this->get_formats_for($field_name);
 
 		//load EEH_DTT_Helper
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
-		$set_timezone = empty( $timezone ) ? EEH_DTT_Helper::get_timezone() : $timezone;
+		EE_Registry::instance()->load_helper('DTT_Helper');
+		$set_timezone = empty($timezone) ? EEH_DTT_Helper::get_timezone() : $timezone;
 
-		$incomingDateTime = date_create_from_format( $incoming_format, $timestring, new DateTimeZone( $set_timezone ) );
+		$incomingDateTime = date_create_from_format($incoming_format, $timestring, new DateTimeZone($set_timezone));
 
-		return $incomingDateTime->setTimeZone( new DateTimeZone( $this->_timezone ) );
+		return $incomingDateTime->setTimeZone(new DateTimeZone($this->_timezone));
 	}
 
 
@@ -1240,7 +1240,7 @@ 
 	 * Gets all the tables comprising this model. Array keys are the table aliases, and values are EE_Table objects
 	 * @return EE_Table_Base[]
 	 */
-	function get_tables(){
+	function get_tables() {
 		return $this->_tables;
 	}
 
@@ -1274,9 +1274,9 @@ 
 	 * be aware that model objects being used could get out-of-sync with the database
 	 * @return int how many rows got updated or FALSE if something went wrong with the query (wp returns FALSE or num rows affected which *could* include 0 which DOES NOT mean the query was bad)
 	 */
-	function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE){
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::update', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+	function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::update', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		/**
@@ -1286,7 +1286,7 @@ 
 		 * @param array $fields_n_values the updated fields and their new values
 		 * @param array $query_params @see EEM_Base::get_all()
 		 */
-		do_action( 'AHEE__EEM_Base__update__begin',$this, $fields_n_values, $query_params );
+		do_action('AHEE__EEM_Base__update__begin', $this, $fields_n_values, $query_params);
 		/**
 		 * Filters the fields about to be updated given the query parameters. You can provide the
 		 * $query_params to $this->get_all() to find exactly which records will be updated
@@ -1294,10 +1294,10 @@ 
 		 * @param EEM_Base $model the model being queried
 		 * @param array $query_params see EEM_Base::get_all()
 		 */
-		$fields_n_values = apply_filters( 'FHEE__EEM_Base__update__fields_n_values', $fields_n_values, $this, $query_params );
+		$fields_n_values = apply_filters('FHEE__EEM_Base__update__fields_n_values', $fields_n_values, $this, $query_params);
 		//need to verify that, for any entry we want to update, there are entries in each secondary table.
 		//to do that, for each table, verify that it's PK isn't null.
-		$tables= $this->get_tables();
+		$tables = $this->get_tables();
 
 		//and if the other tables don't have a row for each table-to-be-updated, we'll insert one with whatever values available in the current update query
 		//NOTE: we should make this code more efficient by NOT querying twice
@@ -1307,29 +1307,29 @@ 
 			//we want to make sure the default_where strategy is ignored
 			$this->_ignore_where_strategy = TRUE;
 			$wpdb_select_results = $this->_get_all_wpdb_results($query_params);
-			foreach( $wpdb_select_results as $wpdb_result ){
+			foreach ($wpdb_select_results as $wpdb_result) {
 				// type cast stdClass as array
-				$wpdb_result = (array)$wpdb_result;
+				$wpdb_result = (array) $wpdb_result;
 				//get the model object's PK, as we'll want this if we need to insert a row into secondary tables
-				if( $this->has_primary_key_field() ){
-					$main_table_pk_value = $wpdb_result[ $this->get_primary_key_field()->get_qualified_column() ];
-				}else{
+				if ($this->has_primary_key_field()) {
+					$main_table_pk_value = $wpdb_result[$this->get_primary_key_field()->get_qualified_column()];
+				} else {
 					//if there's no primary key, we basically can't support having a 2nd table on the model (we could but it woudl be lots of work)
 					$main_table_pk_value = null;
 				}
 				//if there are more than 1 tables, we'll want to verify that each table for this model has an entry in the other tables
 				//and if the other tables don't have a row for each table-to-be-updated, we'll insert one with whatever values available in the current update query
-				if(count($tables) > 1){
+				if (count($tables) > 1) {
 					//foreach matching row in the DB, ensure that each table's PK isn't null. If so, there must not be an entry
 					//in that table, and so we'll want to insert one
-					foreach($tables as $table_obj){
+					foreach ($tables as $table_obj) {
 						$this_table_pk_column = $table_obj->get_fully_qualified_pk_column();
 						//if there is no private key for this table on the results, it means there's no entry
 						//in this table, right? so insert a row in the current table, using any fields available
-						if( ! ( array_key_exists( $this_table_pk_column, $wpdb_result) && $wpdb_result[ $this_table_pk_column ] )){
+						if ( ! (array_key_exists($this_table_pk_column, $wpdb_result) && $wpdb_result[$this_table_pk_column])) {
 							$success = $this->_insert_into_specific_table($table_obj, $fields_n_values, $main_table_pk_value);
 							//if we died here, report the error
-							if( ! $success ) {
+							if ( ! $success) {
 								return false;
 							}
 						}
@@ -1349,44 +1349,44 @@ 
 		//if this wasn't called from a model object (to update itself)
 		//then we want to make sure we keep all the existing
 		//model objects in sync with the db
-		if( $keep_model_objs_in_sync && ! $this->_values_already_prepared_by_model_object ){
-			if( $this->has_primary_key_field() ){
-				$model_objs_affected_ids = $this->get_col( $query_params );
-			}else{
+		if ($keep_model_objs_in_sync && ! $this->_values_already_prepared_by_model_object) {
+			if ($this->has_primary_key_field()) {
+				$model_objs_affected_ids = $this->get_col($query_params);
+			} else {
 				//we need to select a bunch of columns and then combine them into the the "index primary key string"s
-				$models_affected_key_columns = $this->_get_all_wpdb_results($query_params, ARRAY_A );
+				$models_affected_key_columns = $this->_get_all_wpdb_results($query_params, ARRAY_A);
 				$model_objs_affected_ids = array();
-				foreach( $models_affected_key_columns as $row ){
-					$combined_index_key = $this->get_index_primary_key_string( $row );
-					$model_objs_affected_ids[ $combined_index_key ] = $combined_index_key;
+				foreach ($models_affected_key_columns as $row) {
+					$combined_index_key = $this->get_index_primary_key_string($row);
+					$model_objs_affected_ids[$combined_index_key] = $combined_index_key;
 				}
 
 			}
 
-			if( ! $model_objs_affected_ids ){
+			if ( ! $model_objs_affected_ids) {
 				//wait wait wait- if nothing was affected let's stop here
 				return 0;
 			}
-			foreach( $model_objs_affected_ids as $id ){
-				$model_obj_in_entity_map = $this->get_from_entity_map( $id );
-				if( $model_obj_in_entity_map ){
-					foreach( $fields_n_values as $field => $new_value ){
-						$model_obj_in_entity_map->set( $field, $new_value );
+			foreach ($model_objs_affected_ids as $id) {
+				$model_obj_in_entity_map = $this->get_from_entity_map($id);
+				if ($model_obj_in_entity_map) {
+					foreach ($fields_n_values as $field => $new_value) {
+						$model_obj_in_entity_map->set($field, $new_value);
 					}
 				}
 			}
 			//if there is a primary key on this model, we can now do a slight optimization
-			if( $this->has_primary_key_field() ){
+			if ($this->has_primary_key_field()) {
 				//we already know what we want to update. So let's make the query simpler so it's a little more efficient
 				$query_params = array(
-					array( $this->primary_key_name() => array( 'IN', $model_objs_affected_ids ) ),
-					'limit' => count( $model_objs_affected_ids ), 'default_where_conditions' => 'none' );
+					array($this->primary_key_name() => array('IN', $model_objs_affected_ids)),
+					'limit' => count($model_objs_affected_ids), 'default_where_conditions' => 'none' );
 			}
 		}
 
-		$model_query_info = $this->_create_model_query_info_carrier( $query_params );
-		$SQL = "UPDATE ".$model_query_info->get_full_join_sql()." SET ".$this->_construct_update_sql($fields_n_values).$model_query_info->get_where_sql();//note: doesn't use _construct_2nd_half_of_select_query() because doesn't accept LIMIT, ORDER BY, etc.
-		$rows_affected = $this->_do_wpdb_query('query', array( $SQL ) );
+		$model_query_info = $this->_create_model_query_info_carrier($query_params);
+		$SQL = "UPDATE ".$model_query_info->get_full_join_sql()." SET ".$this->_construct_update_sql($fields_n_values).$model_query_info->get_where_sql(); //note: doesn't use _construct_2nd_half_of_select_query() because doesn't accept LIMIT, ORDER BY, etc.
+		$rows_affected = $this->_do_wpdb_query('query', array($SQL));
 		/**
 		 * Action called after a model update call has been made.
 		 *
@@ -1395,8 +1395,8 @@ 
 		 * @param array $query_params @see EEM_Base::get_all()
 		 * @param int $rows_affected
 		 */
-		do_action( 'AHEE__EEM_Base__update__end',$this, $fields_n_values, $query_params, $rows_affected );
-		return $rows_affected;//how many supposedly got updated
+		do_action('AHEE__EEM_Base__update__end', $this, $fields_n_values, $query_params, $rows_affected);
+		return $rows_affected; //how many supposedly got updated
 	}
 
 	/**
@@ -1408,22 +1408,22 @@ 
 	 * @param string $field_to_select
 	 * @return array just like $wpdb->get_col()
 	 */
-	public function get_col( $query_params  = array(), $field_to_select = NULL ){
+	public function get_col($query_params = array(), $field_to_select = NULL) {
 
-		if( $field_to_select ){
-			$field = $this->field_settings_for( $field_to_select );
-		}elseif( $this->has_primary_key_field ( ) ){
+		if ($field_to_select) {
+			$field = $this->field_settings_for($field_to_select);
+		}elseif ($this->has_primary_key_field( )) {
 			$field = $this->get_primary_key_field();
-		}else{
+		} else {
 			//no primary key, just grab the first column
-			$field = reset( $this->field_settings());
+			$field = reset($this->field_settings());
 		}
 
 
 		$model_query_info = $this->_create_model_query_info_carrier($query_params);
 		$select_expressions = $field->get_qualified_column();
-		$SQL ="SELECT $select_expressions ".$this->_construct_2nd_half_of_select_query($model_query_info);
-		$results =  $this->_do_wpdb_query('get_col', array( $SQL ) );
+		$SQL = "SELECT $select_expressions ".$this->_construct_2nd_half_of_select_query($model_query_info);
+		$results = $this->_do_wpdb_query('get_col', array($SQL));
 		return $results;
 	}
 
@@ -1433,12 +1433,12 @@ 
 	 * @param string $field_to_select @see EEM_Base::get_col()
 	 * @return string
 	 */
-	public function get_var( $query_params = array(), $field_to_select = NULL ) {
-		$query_params[ 'limit' ] = 1;
-		$col = $this->get_col( $query_params, $field_to_select );
-		if( ! empty( $col ) ) {
-			return reset( $col );
-		}else{
+	public function get_var($query_params = array(), $field_to_select = NULL) {
+		$query_params['limit'] = 1;
+		$col = $this->get_col($query_params, $field_to_select);
+		if ( ! empty($col)) {
+			return reset($col);
+		} else {
 			return NULL;
 		}
 	}
@@ -1452,19 +1452,19 @@ 
 	 * @param array $fields_n_values array keys are field names on this model, and values are what those fields should be updated to in the DB
 	 * @return string of SQL
 	 */
-	function _construct_update_sql($fields_n_values){
+	function _construct_update_sql($fields_n_values) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$cols_n_values = array();
-		foreach($fields_n_values as $field_name => $value){
+		foreach ($fields_n_values as $field_name => $value) {
 			$field_obj = $this->field_settings_for($field_name);
 			//if the value is NULL, we want to assign the value to that.
 			//wpdb->prepare doesn't really handle that properly
-			$prepared_value = $this->_prepare_value_or_use_default( $field_obj, $fields_n_values );
-			$value_sql = $prepared_value===NULL ? 'NULL' : $wpdb->prepare( $field_obj->get_wpdb_data_type(), $prepared_value );
+			$prepared_value = $this->_prepare_value_or_use_default($field_obj, $fields_n_values);
+			$value_sql = $prepared_value === NULL ? 'NULL' : $wpdb->prepare($field_obj->get_wpdb_data_type(), $prepared_value);
 			$cols_n_values[] = $field_obj->get_qualified_column()."=".$value_sql;
 		}
-		return implode(",",$cols_n_values);
+		return implode(",", $cols_n_values);
 
 	}
 
@@ -1476,11 +1476,11 @@ 
 	 * @param mixed $id
 	 * @return boolean whether the row got deleted or not
 	 */
-	public function delete_by_ID( $id ){
-		return $this->delete( array(
-			array( $this->get_primary_key_field()->get_name() => $id ),
+	public function delete_by_ID($id) {
+		return $this->delete(array(
+			array($this->get_primary_key_field()->get_name() => $id),
 			'limit' 	=> 1
-		) );
+		));
 	}
 
 
@@ -1495,7 +1495,7 @@ 
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
 	 * @return int how many rows got deleted
 	 */
-	function delete($query_params,$allow_blocking = true){
+	function delete($query_params, $allow_blocking = true) {
 		/**
 		 * Action called just before performing a real deletion query. You can use the
 		 * model and its $query_params to find exactly which items will be deleted
@@ -1504,34 +1504,34 @@ 
 		 * @param boolean $allow_blocking whether or not to allow related model objects
 		 * to block (prevent) this deletion
 		 */
-		do_action( 'AHEE__EEM_Base__delete__begin', $this, $query_params, $allow_blocking );
+		do_action('AHEE__EEM_Base__delete__begin', $this, $query_params, $allow_blocking);
 		//some MySQL databases may be running safe mode, which may restrict
 		//deletion if there is no KEY column used in the WHERE statement of a deletion.
 		//to get around this, we first do a SELECT, get all the IDs, and then run another query
 		//to delete them
 		$items_for_deletion = $this->_get_all_wpdb_results($query_params);
-		$deletion_where = $this->_setup_ids_for_delete( $items_for_deletion, $allow_blocking);
-		if($deletion_where){
+		$deletion_where = $this->_setup_ids_for_delete($items_for_deletion, $allow_blocking);
+		if ($deletion_where) {
 			//echo "objects for deletion:";var_dump($objects_for_deletion);
 			$model_query_info = $this->_create_model_query_info_carrier($query_params);
 			$table_aliases = array();
-			foreach(array_keys($this->_tables) as $table_alias){
+			foreach (array_keys($this->_tables) as $table_alias) {
 				$table_aliases[] = $table_alias;
 			}
-			$SQL = "DELETE ".implode(", ",$table_aliases)." FROM ".$model_query_info->get_full_join_sql()." WHERE ".$deletion_where;
+			$SQL = "DELETE ".implode(", ", $table_aliases)." FROM ".$model_query_info->get_full_join_sql()." WHERE ".$deletion_where;
 
 			//		/echo "delete sql:$SQL";
-			$rows_deleted = $this->_do_wpdb_query( 'query', array( $SQL ) );
-		}else{
+			$rows_deleted = $this->_do_wpdb_query('query', array($SQL));
+		} else {
 			$rows_deleted = 0;
 		}
 
 		//and lastly make sure those items are removed from the entity map; if they could be put into it at all
-		if( $this->has_primary_key_field() ){
-			foreach($items_for_deletion as $item_for_deletion_row ){
-				$pk_value = $item_for_deletion_row[ $this->get_primary_key_field()->get_qualified_column() ];
-				if( isset( $this->_entity_map[ $pk_value ] ) ){
-					unset( $this->_entity_map[ $pk_value ] );
+		if ($this->has_primary_key_field()) {
+			foreach ($items_for_deletion as $item_for_deletion_row) {
+				$pk_value = $item_for_deletion_row[$this->get_primary_key_field()->get_qualified_column()];
+				if (isset($this->_entity_map[$pk_value])) {
+					unset($this->_entity_map[$pk_value]);
 				}
 			}
 		}
@@ -1543,8 +1543,8 @@ 
 		 * @param array $query_params @see EEM_Base::get_all()
 		 * @param int $rows_deleted
 		 */
-		do_action( 'AHEE__EEM_Base__delete__end', $this, $query_params, $rows_deleted );
-		return $rows_deleted;//how many supposedly got deleted
+		do_action('AHEE__EEM_Base__delete__end', $this, $query_params, $rows_deleted);
+		return $rows_deleted; //how many supposedly got deleted
 	}
 
 
@@ -1560,28 +1560,28 @@ 
 	 * blocking its deletion before removing the relation between A and B
 	 * @return boolean
 	 */
-	public function delete_is_blocked_by_related_models($this_model_obj_or_id, $ignore_this_model_obj = null){
+	public function delete_is_blocked_by_related_models($this_model_obj_or_id, $ignore_this_model_obj = null) {
 		//first, if $ignore_this_model_obj was supplied, get its model
-		if($ignore_this_model_obj && $ignore_this_model_obj instanceof EE_Base_Class){
+		if ($ignore_this_model_obj && $ignore_this_model_obj instanceof EE_Base_Class) {
 			$ignored_model = $ignore_this_model_obj->get_model();
-		}else{
+		} else {
 			$ignored_model = null;
 		}
 		//now check all the relations of $this_model_obj_or_id and see if there
 		//are any related model objects blocking it?
 		$is_blocked = false;
-		foreach($this->_model_relations as $relation_name => $relation_obj){
-			if( $relation_obj->block_delete_if_related_models_exist()){
+		foreach ($this->_model_relations as $relation_name => $relation_obj) {
+			if ($relation_obj->block_delete_if_related_models_exist()) {
 				//if $ignore_this_model_obj was supplied, then for the query
 				//on that model needs to be told to ignore $ignore_this_model_obj
-				if($ignored_model && $relation_name == $ignored_model->get_this_model_name()){
-					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id,array(
-					array($ignored_model->get_primary_key_field()->get_name() => array('!=',$ignore_this_model_obj->ID()))));
-				}else{
+				if ($ignored_model && $relation_name == $ignored_model->get_this_model_name()) {
+					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id, array(
+					array($ignored_model->get_primary_key_field()->get_name() => array('!=', $ignore_this_model_obj->ID()))));
+				} else {
 					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id);
 				}
 
-				if($related_model_objects){
+				if ($related_model_objects) {
 					EE_Error::add_error($relation_obj->get_deletion_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					$is_blocked = true;
 				}
@@ -1601,65 +1601,65 @@ 
 	 * @throws EE_Error
 	 * @return string    everything that comes after the WHERE statement.
 	 */
-	protected function _setup_ids_for_delete( $objects_for_deletion, $allow_blocking = true) {
-		if($this->has_primary_key_field()){
+	protected function _setup_ids_for_delete($objects_for_deletion, $allow_blocking = true) {
+		if ($this->has_primary_key_field()) {
 			$primary_table = $this->_get_main_table();
 			$other_tables = $this->_get_other_tables();
 			$deletes = $query = array();
-			foreach ( $objects_for_deletion as $delete_object ) {
+			foreach ($objects_for_deletion as $delete_object) {
 				//before we mark this object for deletion,
 				//make sure there's no related objects blocking its deletion (if we're checking)
-				if( $allow_blocking && $this->delete_is_blocked_by_related_models($delete_object[$primary_table->get_fully_qualified_pk_column()]) ){
+				if ($allow_blocking && $this->delete_is_blocked_by_related_models($delete_object[$primary_table->get_fully_qualified_pk_column()])) {
 					continue;
 				}
 
 				//primary table deletes
-				if ( isset( $delete_object[$primary_table->get_fully_qualified_pk_column()] ) )
+				if (isset($delete_object[$primary_table->get_fully_qualified_pk_column()]))
 					$deletes[$primary_table->get_fully_qualified_pk_column()][] = $delete_object[$primary_table->get_fully_qualified_pk_column()];
 
 				//other tables
-				if ( !empty( $other_tables ) ) {
-					foreach ( $other_tables as $ot ) {
+				if ( ! empty($other_tables)) {
+					foreach ($other_tables as $ot) {
 
 						//first check if we've got the foreign key column here.
-						if ( isset( $delete_object[$ot->get_fully_qualified_fk_column()] ) )
+						if (isset($delete_object[$ot->get_fully_qualified_fk_column()]))
 							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_fk_column()];
 
 						//wait! it's entirely possible that we'll have a the primary key for this table in here if it's a foreign key for one of the other secondary tables
-						if ( isset( $delete_object[$ot->get_fully_qualified_pk_column()] ) )
+						if (isset($delete_object[$ot->get_fully_qualified_pk_column()]))
 							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_pk_column()];
 
 						//finally, it is possible that the fk for this table is found in the fully qualified pk column for the fk table, so let's see if that's there!
-						if ( isset( $delete_object[$ot->get_fully_qualified_pk_on_fk_table()]) )
+						if (isset($delete_object[$ot->get_fully_qualified_pk_on_fk_table()]))
 							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_pk_column()];
 					}
 				}
 			}
 
 			//we should have deletes now, so let's just go through and setup the where statement
-			foreach ( $deletes as $column => $values ) {
+			foreach ($deletes as $column => $values) {
 				//make sure we have unique $values;
 				$values = array_unique($values);
-				$query[] = $column . ' IN(' . implode(",",$values) . ')';
+				$query[] = $column.' IN('.implode(",", $values).')';
 			}
 
-			return !empty($query) ? implode(' AND ', $query ) : '';
-		}elseif(count($this->get_combined_primary_key_fields()) > 1){
+			return ! empty($query) ? implode(' AND ', $query) : '';
+		}elseif (count($this->get_combined_primary_key_fields()) > 1) {
 			$ways_to_identify_a_row = array();
 			$fields = $this->get_combined_primary_key_fields();
 			//note: because there' sno primary key, that means nothing else  can be pointing to this model, right?
-			foreach($objects_for_deletion as  $delete_object){
+			foreach ($objects_for_deletion as  $delete_object) {
 				$values_for_each_cpk_for_a_row = array();
-				foreach($fields as $cpk_field){
+				foreach ($fields as $cpk_field) {
 					$values_for_each_cpk_for_a_row[] = $cpk_field->get_qualified_column()."=".$delete_object[$cpk_field->get_qualified_column()];
 				}
-				$ways_to_identify_a_row[] = "(".implode(" AND ",$values_for_each_cpk_for_a_row).")";
+				$ways_to_identify_a_row[] = "(".implode(" AND ", $values_for_each_cpk_for_a_row).")";
 			}
-			return implode(" OR ",$ways_to_identify_a_row);
-		}else{
+			return implode(" OR ", $ways_to_identify_a_row);
+		} else {
 			//so there's no primary key and no combined key...
 			//sorry, can't help you
-			throw new EE_Error(sprintf(__("Cannot delete objects of type %s because there is no primary key NOR combined key", "event_espresso"),get_class($this)));
+			throw new EE_Error(sprintf(__("Cannot delete objects of type %s because there is no primary key NOR combined key", "event_espresso"), get_class($this)));
 		}
 	}
 
@@ -1673,21 +1673,21 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	function count($query_params =array(),$field_to_count = NULL, $distinct = FALSE){
+	function count($query_params = array(), $field_to_count = NULL, $distinct = FALSE) {
 		$model_query_info = $this->_create_model_query_info_carrier($query_params);
-		if($field_to_count){
+		if ($field_to_count) {
 			$field_obj = $this->field_settings_for($field_to_count);
 			$column_to_count = $field_obj->get_qualified_column();
-		}elseif($this->has_primary_key_field ()){
+		}elseif ($this->has_primary_key_field()) {
 			$pk_field_obj = $this->get_primary_key_field();
 			$column_to_count = $pk_field_obj->get_qualified_column();
-		}else{//there's no primary key
+		} else {//there's no primary key
 			$column_to_count = '*';
 		}
 
-		$column_to_count = $distinct ? "DISTINCT (" . $column_to_count . " )" : $column_to_count;
-		$SQL ="SELECT COUNT(".$column_to_count.")" . $this->_construct_2nd_half_of_select_query($model_query_info);
-		return (int)$this->_do_wpdb_query( 'get_var', array( $SQL) );
+		$column_to_count = $distinct ? "DISTINCT (".$column_to_count." )" : $column_to_count;
+		$SQL = "SELECT COUNT(".$column_to_count.")".$this->_construct_2nd_half_of_select_query($model_query_info);
+		return (int) $this->_do_wpdb_query('get_var', array($SQL));
 	}
 
 	/**
@@ -1697,23 +1697,23 @@ 
 	 * @param string $field_to_sum name of field (array key in $_fields array)
 	 * @return float
 	 */
-	function sum($query_params, $field_to_sum = NULL){
+	function sum($query_params, $field_to_sum = NULL) {
 		$model_query_info = $this->_create_model_query_info_carrier($query_params);
 
-		if($field_to_sum){
+		if ($field_to_sum) {
 			$field_obj = $this->field_settings_for($field_to_sum);
 
-		}else{
+		} else {
 			$field_obj = $this->get_primary_key_field();
 		}
 		$column_to_count = $field_obj->get_qualified_column();
 
-		$SQL ="SELECT SUM(".$column_to_count.")" . $this->_construct_2nd_half_of_select_query($model_query_info);
-		$return_value = $this->_do_wpdb_query('get_var',array( $SQL ) );
-		if($field_obj->get_wpdb_data_type() == '%d' || $field_obj->get_wpdb_data_type() == '%s' ){
-			return (float)$return_value;
-		}else{//must be %f
-			return (float)$return_value;
+		$SQL = "SELECT SUM(".$column_to_count.")".$this->_construct_2nd_half_of_select_query($model_query_info);
+		$return_value = $this->_do_wpdb_query('get_var', array($SQL));
+		if ($field_obj->get_wpdb_data_type() == '%d' || $field_obj->get_wpdb_data_type() == '%s') {
+			return (float) $return_value;
+		} else {//must be %f
+			return (float) $return_value;
 		}
 	}
 
@@ -1728,33 +1728,33 @@ 
 	 * @global wpdb $wpdb
 	 * @return mixed
 	 */
-	protected function _do_wpdb_query( $wpdb_method, $arguments_to_provide ){
+	protected function _do_wpdb_query($wpdb_method, $arguments_to_provide) {
 		//if we're in maintenance mode level 2, DON'T run any queries
 		//because level 2 indicates the database needs updating and
 		//is probably out of sync with the code
-		if( ! EE_Maintenance_Mode::instance()->models_can_query()){
+		if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
 			throw new EE_Error(sprintf(__("Event Espresso Level 2 Maintenance mode is active. That means EE can not run ANY database queries until the necessary migration scripts have run which will take EE out of maintenance mode level 2. Please inform support of this error.", "event_espresso")));
 		}
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		if( ! method_exists( $wpdb, $wpdb_method ) ){
-			throw new EE_Error( sprintf( __( 'There is no method named "%s" on Wordpress\' $wpdb object','event_espresso' ), $wpdb_method ) );
+		if ( ! method_exists($wpdb, $wpdb_method)) {
+			throw new EE_Error(sprintf(__('There is no method named "%s" on Wordpress\' $wpdb object', 'event_espresso'), $wpdb_method));
 		}
-		if( WP_DEBUG ){
+		if (WP_DEBUG) {
 			$old_show_errors_value = $wpdb->show_errors;
-			$wpdb->show_errors( FALSE );
-		}
-		$result = $this->_process_wpdb_query( $wpdb_method, $arguments_to_provide );
-		$this->show_db_query_if_previously_requested( $wpdb->last_query );
-		if( WP_DEBUG ){
-			$wpdb->show_errors( $old_show_errors_value );
-			if( ! empty( $wpdb->last_error ) ){
-				throw new EE_Error( sprintf( __( 'WPDB Error: "%s"', 'event_espresso' ), $wpdb->last_error ) );
-			}elseif( $result === false ){
-				throw new EE_Error( sprintf( __( 'WPDB Error occurred, but no error message was logged by wpdb! The wpdb method called was "%1$s" and the arguments were "%2$s"', 'event_espresso' ), $wpdb_method, var_export( $arguments_to_provide, true ) ) );
+			$wpdb->show_errors(FALSE);
+		}
+		$result = $this->_process_wpdb_query($wpdb_method, $arguments_to_provide);
+		$this->show_db_query_if_previously_requested($wpdb->last_query);
+		if (WP_DEBUG) {
+			$wpdb->show_errors($old_show_errors_value);
+			if ( ! empty($wpdb->last_error)) {
+				throw new EE_Error(sprintf(__('WPDB Error: "%s"', 'event_espresso'), $wpdb->last_error));
+			}elseif ($result === false) {
+				throw new EE_Error(sprintf(__('WPDB Error occurred, but no error message was logged by wpdb! The wpdb method called was "%1$s" and the arguments were "%2$s"', 'event_espresso'), $wpdb_method, var_export($arguments_to_provide, true)));
 			}
-		}elseif( $result === false ) {
-			EE_Error::add_error( sprintf( __( 'A database error has occurred. Turn on WP_DEBUG for more information.', 'event_espresso' )), __FILE__, __FUNCTION__, __LINE__);
+		}elseif ($result === false) {
+			EE_Error::add_error(sprintf(__('A database error has occurred. Turn on WP_DEBUG for more information.', 'event_espresso')), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $result;
 	}
@@ -1770,23 +1770,23 @@ 
 	 * @param array $arguments_to_provide
 	 * @return mixed
 	 */
-	private function _process_wpdb_query( $wpdb_method, $arguments_to_provide ) {
+	private function _process_wpdb_query($wpdb_method, $arguments_to_provide) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$wpdb->last_error = null;
-		$result = call_user_func_array( array( $wpdb, $wpdb_method ), $arguments_to_provide );
+		$result = call_user_func_array(array($wpdb, $wpdb_method), $arguments_to_provide);
 		// was there an error running the query?
-		if ( ( $result === false || ! empty( $wpdb->last_error ) ) ) {
-			switch ( EEM_Base::$_db_verification_level ) {
+		if (($result === false || ! empty($wpdb->last_error))) {
+			switch (EEM_Base::$_db_verification_level) {
 
 				case EEM_Base::db_verified_none :
 					// let's double-check core's DB
-					$error_message = $this->_verify_core_db( $wpdb_method, $arguments_to_provide );
+					$error_message = $this->_verify_core_db($wpdb_method, $arguments_to_provide);
 					break;
 
 				case EEM_Base::db_verified_core :
 					// STILL NO LOVE?? verify all the addons too. Maybe they need to be fixed
-					$error_message = $this->_verify_addons_db( $wpdb_method, $arguments_to_provide );
+					$error_message = $this->_verify_addons_db($wpdb_method, $arguments_to_provide);
 					break;
 
 				case EEM_Base::db_verified_addons :
@@ -1794,11 +1794,11 @@ 
 					return $result;
 					break;
 			}
-			if ( ! empty( $error_message ) ) {
-				EE_Log::instance()->log( __FILE__, __FUNCTION__, $error_message, 'error' );
-				trigger_error( $error_message );
+			if ( ! empty($error_message)) {
+				EE_Log::instance()->log(__FILE__, __FUNCTION__, $error_message, 'error');
+				trigger_error($error_message);
 			}
-			return $this->_process_wpdb_query( $wpdb_method, $arguments_to_provide );
+			return $this->_process_wpdb_query($wpdb_method, $arguments_to_provide);
 
 		}
 
@@ -1814,18 +1814,18 @@ 
 	 * @param array $arguments_to_provide
 	 * @return string
 	 */
-	private function _verify_core_db( $wpdb_method, $arguments_to_provide ){
+	private function _verify_core_db($wpdb_method, $arguments_to_provide) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		//ok remember that we've already attempted fixing the core db, in case the problem persists
 		EEM_Base::$_db_verification_level = EEM_Base::db_verified_core;
 		$error_message = sprintf(
-			__( 'WPDB Error "%1$s" while running wpdb method "%2$s" with arguments %3$s. Automatically attempting to fix EE Core DB', 'event_espresso' ),
+			__('WPDB Error "%1$s" while running wpdb method "%2$s" with arguments %3$s. Automatically attempting to fix EE Core DB', 'event_espresso'),
 			$wpdb->last_error,
 			$wpdb_method,
-			json_encode( $arguments_to_provide )
+			json_encode($arguments_to_provide)
 		);
-		EE_System::instance()->initialize_db_if_no_migrations_required( false, true );
+		EE_System::instance()->initialize_db_if_no_migrations_required(false, true);
 		return $error_message;
 	}
 
@@ -1838,16 +1838,16 @@ 
 	 * @param $arguments_to_provide
 	 * @return string
 	 */
-	private function _verify_addons_db( $wpdb_method, $arguments_to_provide ) {
+	private function _verify_addons_db($wpdb_method, $arguments_to_provide) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		//ok remember that we've already attempted fixing the addons dbs, in case the problem persists
 		EEM_Base::$_db_verification_level = EEM_Base::db_verified_addons;
 		$error_message = sprintf(
-			__( 'WPDB AGAIN: Error "%1$s" while running the same method and arguments as before. Automatically attempting to fix EE Addons DB', 'event_espresso' ),
+			__('WPDB AGAIN: Error "%1$s" while running the same method and arguments as before. Automatically attempting to fix EE Addons DB', 'event_espresso'),
 			$wpdb->last_error,
 			$wpdb_method,
-			json_encode( $arguments_to_provide )
+			json_encode($arguments_to_provide)
 		);
 		EE_System::instance()->initialize_addons();
 		return $error_message;
@@ -1862,7 +1862,7 @@ 
 	 * @param EE_Model_Query_Info_Carrier $model_query_info
 	 * @return string
 	 */
-	private function _construct_2nd_half_of_select_query(EE_Model_Query_Info_Carrier $model_query_info){
+	private function _construct_2nd_half_of_select_query(EE_Model_Query_Info_Carrier $model_query_info) {
 		return " FROM ".$model_query_info->get_full_join_sql().
 				$model_query_info->get_where_sql().
 				$model_query_info->get_group_by_sql().
@@ -1875,7 +1875,7 @@ 
 	 * Set to easily debug the next X queries ran from this model.
 	 * @param int $count
 	 */
-	function show_next_x_db_queries($count = 1){
+	function show_next_x_db_queries($count = 1) {
 		$this->_show_next_x_db_queries = $count;
 	}
 
@@ -1884,8 +1884,8 @@ 
 	/**
 	 * @param $sql_query
 	 */
-	function show_db_query_if_previously_requested($sql_query){
-		if($this->_show_next_x_db_queries > 0){
+	function show_db_query_if_previously_requested($sql_query) {
+		if ($this->_show_next_x_db_queries > 0) {
 			echo $sql_query;
 			$this->_show_next_x_db_queries--;
 		}
@@ -1909,7 +1909,7 @@ 
 	 * @param array   $extra_join_model_fields_n_values This allows you to enter further query params for the relation to for relation to methods that allow you to further specify extra columns to join by (such as HABTM).  Keep in mind that the only acceptable query_params is strict "col" => "value" pairs because these will be inserted in any new rows created as well.
 	 * @return EE_Base_Class which was added as a relation. Object referred to by $other_model_id_or_obj
 	 */
-	public function add_relationship_to($id_or_obj,$other_model_id_or_obj, $relationName, $extra_join_model_fields_n_values = array()){
+	public function add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $extra_join_model_fields_n_values = array()) {
 		$relation_obj = $this->related_settings_for($relationName);
 		return $relation_obj->add_relation_to($id_or_obj, $other_model_id_or_obj, $extra_join_model_fields_n_values);
 	}
@@ -1930,9 +1930,9 @@ 
 	 * @return boolean of success
 	 * @param array   $where_query This allows you to enter further query params for the relation to for relation to methods that allow you to further specify extra columns to join by (such as HABTM).  Keep in mind that the only acceptable query_params is strict "col" => "value" pairs because these will be inserted in any new rows created as well.
 	 */
-	public function remove_relationship_to($id_or_obj,  $other_model_id_or_obj, $relationName, $where_query= array() ){
+	public function remove_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query = array()) {
 		$relation_obj = $this->related_settings_for($relationName);
-		return $relation_obj->remove_relation_to($id_or_obj, $other_model_id_or_obj, $where_query );
+		return $relation_obj->remove_relation_to($id_or_obj, $other_model_id_or_obj, $where_query);
 	}
 
 
@@ -1945,9 +1945,9 @@ 
 	 * @param EE_Base_Class[] objects to which relations were removed
 	 * @return \EE_Base_Class[]
 	 */
-	public function remove_relations($id_or_obj,$relationName,$where_query_params = array()){
+	public function remove_relations($id_or_obj, $relationName, $where_query_params = array()) {
 		$relation_obj = $this->related_settings_for($relationName);
-		return $relation_obj->remove_relations($id_or_obj, $where_query_params );
+		return $relation_obj->remove_relations($id_or_obj, $where_query_params);
 	}
 
 
@@ -1960,10 +1960,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Base_Class[]
 	 */
-	function get_all_related($id_or_obj, $model_name, $query_params = null){
+	function get_all_related($id_or_obj, $model_name, $query_params = null) {
 		$model_obj = $this->ensure_is_obj($id_or_obj);
 		$relation_settings = $this->related_settings_for($model_name);
-		return $relation_settings->get_all_related($model_obj,$query_params);
+		return $relation_settings->get_all_related($model_obj, $query_params);
 	}
 
 	/**
@@ -1976,10 +1976,10 @@ 
 	 * @param array $query_params
 	 * @return int how many deleted
 	 */
-	public function delete_related($id_or_obj,$model_name, $query_params = array()){
+	public function delete_related($id_or_obj, $model_name, $query_params = array()) {
 		$model_obj = $this->ensure_is_obj($id_or_obj);
 		$relation_settings = $this->related_settings_for($model_name);
-		return $relation_settings->delete_all_related($model_obj,$query_params);
+		return $relation_settings->delete_all_related($model_obj, $query_params);
 	}
 
 	/**
@@ -1992,10 +1992,10 @@ 
 	 * @param array $query_params
 	 * @return int how many deleted
 	 */
-	public function delete_related_permanently($id_or_obj,$model_name, $query_params = array()){
+	public function delete_related_permanently($id_or_obj, $model_name, $query_params = array()) {
 		$model_obj = $this->ensure_is_obj($id_or_obj);
 		$relation_settings = $this->related_settings_for($model_name);
-		return $relation_settings->delete_related_permanently($model_obj,$query_params);
+		return $relation_settings->delete_related_permanently($model_obj, $query_params);
 	}
 
 	/**
@@ -2008,17 +2008,17 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	function count_related($id_or_obj,$model_name,$query_params = array(),$field_to_count = null, $distinct = FALSE){
+	function count_related($id_or_obj, $model_name, $query_params = array(), $field_to_count = null, $distinct = FALSE) {
 		$related_model = $this->get_related_model_obj($model_name);
 		//we're just going to use the query params on the related model's normal get_all query,
 		//except add a condition to say to match the current mod
-		if( ! isset($query_params['default_where_conditions'])){
-			$query_params['default_where_conditions']='none';
+		if ( ! isset($query_params['default_where_conditions'])) {
+			$query_params['default_where_conditions'] = 'none';
 		}
 		$this_model_name = $this->get_this_model_name();
 		$this_pk_field_name = $this->get_primary_key_field()->get_name();
-		$query_params[0][$this_model_name.".".$this_pk_field_name]=$id_or_obj;
-		return $related_model->count($query_params,$field_to_count,$distinct);
+		$query_params[0][$this_model_name.".".$this_pk_field_name] = $id_or_obj;
+		return $related_model->count($query_params, $field_to_count, $distinct);
 	}
 
 
@@ -2032,21 +2032,21 @@ 
 	 * @param string $field_to_sum name of field to count by. By default, uses primary key
 	 * @return float
 	 */
-	function sum_related($id_or_obj,$model_name,$query_params,$field_to_sum = null){
+	function sum_related($id_or_obj, $model_name, $query_params, $field_to_sum = null) {
 		$related_model = $this->get_related_model_obj($model_name);
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::sum_related', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::sum_related', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		//we're just going to use the query params on the related model's normal get_all query,
 		//except add a condition to say to match the current mod
-		if( ! isset($query_params['default_where_conditions'])){
-			$query_params['default_where_conditions']='none';
+		if ( ! isset($query_params['default_where_conditions'])) {
+			$query_params['default_where_conditions'] = 'none';
 		}
 		$this_model_name = $this->get_this_model_name();
 		$this_pk_field_name = $this->get_primary_key_field()->get_name();
-		$query_params[0][$this_model_name.".".$this_pk_field_name]=$id_or_obj;
-		return $related_model->sum($query_params,$field_to_sum);
+		$query_params[0][$this_model_name.".".$this_pk_field_name] = $id_or_obj;
+		return $related_model->sum($query_params, $field_to_sum);
 	}
 
 
@@ -2058,12 +2058,12 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return EE_Base_Class
 	 */
-	public function get_first_related( EE_Base_Class $id_or_obj, $other_model_name, $query_params ){
-		$query_params['limit']=1;
-		$results = $this->get_all_related($id_or_obj,$other_model_name,$query_params);
-		if( $results ){
+	public function get_first_related(EE_Base_Class $id_or_obj, $other_model_name, $query_params) {
+		$query_params['limit'] = 1;
+		$results = $this->get_all_related($id_or_obj, $other_model_name, $query_params);
+		if ($results) {
 			return array_shift($results);
-		}else{
+		} else {
 			return null;
 		}
 
@@ -2073,8 +2073,8 @@ 
 	 * Gets the model's name as it's expected in queries. For example, if this is EEM_Event model, that would be Event
 	 * @return string
 	 */
-	function get_this_model_name(){
-		return str_replace("EEM_","",get_class($this));
+	function get_this_model_name() {
+		return str_replace("EEM_", "", get_class($this));
 	}
 
 	/**
@@ -2082,14 +2082,14 @@ 
 	 * @return EE_Any_Foreign_Model_Name_Field
 	 * @throws EE_Error
 	 */
-	public function get_field_containing_related_model_name(){
-		foreach($this->field_settings(true) as $field){
-			if($field instanceof EE_Any_Foreign_Model_Name_Field){
+	public function get_field_containing_related_model_name() {
+		foreach ($this->field_settings(true) as $field) {
+			if ($field instanceof EE_Any_Foreign_Model_Name_Field) {
 				$field_with_model_name = $field;
 			}
 		}
-		if( !isset($field_with_model_name) || !$field_with_model_name ){
-			throw new EE_Error(sprintf(__("There is no EE_Any_Foreign_Model_Name field on model %s", "event_espresso"), $this->get_this_model_name() ));
+		if ( ! isset($field_with_model_name) || ! $field_with_model_name) {
+			throw new EE_Error(sprintf(__("There is no EE_Any_Foreign_Model_Name field on model %s", "event_espresso"), $this->get_this_model_name()));
 		}
 		return $field_with_model_name;
 	}
@@ -2110,19 +2110,19 @@ 
 	 * @return int new primary key on main table that got inserted
 	 * @throws EE_Error
 	 */
-	function insert($field_n_values){
+	function insert($field_n_values) {
 		/**
 		 * Filters the fields and their values before inserting an item using the models
 		 * @param array $fields_n_values keys are the fields and values are their new values
 		 * @param EEM_Base $model the model used
 		 */
-		$field_n_values = apply_filters( 'FHEE__EEM_Base__insert__fields_n_values', $field_n_values, $this );
-		if($this->_satisfies_unique_indexes($field_n_values)){
+		$field_n_values = apply_filters('FHEE__EEM_Base__insert__fields_n_values', $field_n_values, $this);
+		if ($this->_satisfies_unique_indexes($field_n_values)) {
 			$main_table = $this->_get_main_table();
 			$new_id = $this->_insert_into_specific_table($main_table, $field_n_values, false);
-			if( $new_id !== false ) {
-				foreach($this->_get_other_tables() as $other_table){
-					$this->_insert_into_specific_table($other_table, $field_n_values,$new_id);
+			if ($new_id !== false) {
+				foreach ($this->_get_other_tables() as $other_table) {
+					$this->_insert_into_specific_table($other_table, $field_n_values, $new_id);
 				}
 			}
 			/**
@@ -2132,9 +2132,9 @@ 
 			 * @param array $fields_n_values fields and their values
 			 * @param int|string the ID of the newly-inserted model object
 			 */
-			do_action( 'AHEE__EEM_Base__insert__end', $this, $field_n_values, $new_id );
+			do_action('AHEE__EEM_Base__insert__end', $this, $field_n_values, $new_id);
 			return $new_id;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -2147,11 +2147,11 @@ 
 	 * @param string $action
 	 * @return boolean
 	 */
-	protected function _satisfies_unique_indexes($field_n_values,$action = 'insert'){
-		foreach($this->unique_indexes() as $index_name => $index){
+	protected function _satisfies_unique_indexes($field_n_values, $action = 'insert') {
+		foreach ($this->unique_indexes() as $index_name => $index) {
 			$uniqueness_where_params = array_intersect_key($field_n_values, $index->fields());
-			if($this->exists(array($uniqueness_where_params))){
-				EE_Error::add_error(sprintf(__("Could not %s %s. %s uniqueness index failed. Fields %s must form a unique set, but an entry already exists with values %s.", "event_espresso"),$action,$this->_get_class_name(),$index_name,implode(",",$index->field_names()),http_build_query($uniqueness_where_params)), __FILE__, __FUNCTION__, __LINE__ );
+			if ($this->exists(array($uniqueness_where_params))) {
+				EE_Error::add_error(sprintf(__("Could not %s %s. %s uniqueness index failed. Fields %s must form a unique set, but an entry already exists with values %s.", "event_espresso"), $action, $this->_get_class_name(), $index_name, implode(",", $index->field_names()), http_build_query($uniqueness_where_params)), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
@@ -2172,28 +2172,28 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class
 	 */
-	public function get_one_conflicting($obj_or_fields_array, $include_primary_key = true ){
-		if($obj_or_fields_array instanceof EE_Base_Class){
+	public function get_one_conflicting($obj_or_fields_array, $include_primary_key = true) {
+		if ($obj_or_fields_array instanceof EE_Base_Class) {
 			$fields_n_values = $obj_or_fields_array->model_field_array();
-		}elseif( is_array($obj_or_fields_array)){
+		}elseif (is_array($obj_or_fields_array)) {
 			$fields_n_values = $obj_or_fields_array;
-		}else{
-			throw new EE_Error(sprintf(__("%s get_all_conflicting should be called with a model object or an array of field names and values, you provided %d", "event_espresso"),get_class($this),$obj_or_fields_array));
+		} else {
+			throw new EE_Error(sprintf(__("%s get_all_conflicting should be called with a model object or an array of field names and values, you provided %d", "event_espresso"), get_class($this), $obj_or_fields_array));
 		}
 		$query_params = array();
-		if( $this->has_primary_key_field() &&
-				( $include_primary_key || $this->get_primary_key_field() instanceof EE_Primary_Key_String_Field) &&
-				isset($fields_n_values[$this->primary_key_name()])){
+		if ($this->has_primary_key_field() &&
+				($include_primary_key || $this->get_primary_key_field() instanceof EE_Primary_Key_String_Field) &&
+				isset($fields_n_values[$this->primary_key_name()])) {
 			$query_params[0]['OR'][$this->primary_key_name()] = $fields_n_values[$this->primary_key_name()];
 		}
-		foreach($this->unique_indexes() as $unique_index_name=>$unique_index){
+		foreach ($this->unique_indexes() as $unique_index_name=>$unique_index) {
 			$uniqueness_where_params = array_intersect_key($fields_n_values, $unique_index->fields());
 			$query_params[0]['OR']['AND*'.$unique_index_name] = $uniqueness_where_params;
 		}
 		//if there is nothing to base this search on, then we shouldn't find anything
-		if( empty( $query_params ) ){
+		if (empty($query_params)) {
 			return array();
-		}else{
+		} else {
 			return $this->get_one($query_params);
 		}
 	}
@@ -2203,7 +2203,7 @@ 
 	 * @param array $query_params
 	 * @return boolean
 	 */
-	function exists($query_params){
+	function exists($query_params) {
 		$query_params['limit'] = 1;
 		return $this->count($query_params) > 0;
 	}
@@ -2213,7 +2213,7 @@ 
 	 * @param int|string $id
 	 * @return boolean
 	 */
-	function exists_by_ID($id){
+	function exists_by_ID($id) {
 		return $this->exists(array('default_where_conditions'=>'none', array($this->primary_key_name() => $id)));
 	}
 
@@ -2233,45 +2233,45 @@ 
 	 * @global WPDB $wpdb only used to get the $wpdb->insert_id after performing an insert
 	 * @return int ID of new row inserted, or FALSE on failure
 	 */
-	protected function _insert_into_specific_table(EE_Table_Base $table, $fields_n_values, $new_id = 0 ){
+	protected function _insert_into_specific_table(EE_Table_Base $table, $fields_n_values, $new_id = 0) {
 		global $wpdb;
 		$insertion_col_n_values = array();
 		$format_for_insertion = array();
 		$fields_on_table = $this->_get_fields_for_table($table->get_table_alias());
-		foreach($fields_on_table as $field_name => $field_obj){
+		foreach ($fields_on_table as $field_name => $field_obj) {
 			//check if its an auto-incrementing column, in which case we should just leave it to do its autoincrement thing
-			if($field_obj->is_auto_increment()){
+			if ($field_obj->is_auto_increment()) {
 				continue;
 			}
 			$prepared_value = $this->_prepare_value_or_use_default($field_obj, $fields_n_values);
 			//if the value we want to assign it to is NULL, just don't mention it for the insertion
-			if( $prepared_value !== NULL ){
-				$insertion_col_n_values[ $field_obj->get_table_column() ] = $prepared_value;
+			if ($prepared_value !== NULL) {
+				$insertion_col_n_values[$field_obj->get_table_column()] = $prepared_value;
 				$format_for_insertion[] = $field_obj->get_wpdb_data_type();
 			}
 		}
 
-		if($table instanceof EE_Secondary_Table && $new_id){
+		if ($table instanceof EE_Secondary_Table && $new_id) {
 			//its not the main table, so we should have already saved the main table's PK which we just inserted
 			//so add the fk to the main table as a column
 			$insertion_col_n_values[$table->get_fk_on_table()] = $new_id;
-			$format_for_insertion[]='%d';//yes right now we're only allowing these foreign keys to be INTs
+			$format_for_insertion[] = '%d'; //yes right now we're only allowing these foreign keys to be INTs
 		}
 		//insert the new entry
-		$result = $this->_do_wpdb_query( 'insert', array( $table->get_table_name(), $insertion_col_n_values, $format_for_insertion ) );
-		if( $result === false ) {
+		$result = $this->_do_wpdb_query('insert', array($table->get_table_name(), $insertion_col_n_values, $format_for_insertion));
+		if ($result === false) {
 			return false;
 		}
 		//ok, now what do we return for the ID of the newly-inserted thing?
-		if($this->has_primary_key_field()){
-			if($this->get_primary_key_field()->is_auto_increment()){
+		if ($this->has_primary_key_field()) {
+			if ($this->get_primary_key_field()->is_auto_increment()) {
 				return $wpdb->insert_id;
-			}else{
+			} else {
 				//it's not an auto-increment primary key, so
 				//it must have been supplied
 				return $fields_n_values[$this->get_primary_key_field()->get_name()];
 			}
-		}else{
+		} else {
 			//we can't return a  primary key because there is none. instead return
 			//a unique string indicating this model
 			return $this->get_index_primary_key_string($fields_n_values);
@@ -2286,15 +2286,15 @@ 
 	 * @param array $fields_n_values
 	 * @return mixed string|int|float depending on what the table column will be expecting
 	 */
-	protected function _prepare_value_or_use_default( $field_obj, $fields_n_values ){
+	protected function _prepare_value_or_use_default($field_obj, $fields_n_values) {
 		//if this field doesn't allow nullable, don't allow it
-		if( ! $field_obj->is_nullable() && (
-				! isset( $fields_n_values[ $field_obj->get_name() ] ) ||
-				$fields_n_values[ $field_obj->get_name() ] === NULL ) ){
-			$fields_n_values[ $field_obj->get_name() ] = $field_obj->get_default_value();
+		if ( ! $field_obj->is_nullable() && (
+				! isset($fields_n_values[$field_obj->get_name()]) ||
+				$fields_n_values[$field_obj->get_name()] === NULL )) {
+			$fields_n_values[$field_obj->get_name()] = $field_obj->get_default_value();
 		}
-		$unprepared_value = isset( $fields_n_values[ $field_obj->get_name() ] ) ? $fields_n_values[ $field_obj->get_name() ] : NULL;
-		return $this->_prepare_value_for_use_in_db( $unprepared_value, $field_obj);
+		$unprepared_value = isset($fields_n_values[$field_obj->get_name()]) ? $fields_n_values[$field_obj->get_name()] : NULL;
+		return $this->_prepare_value_for_use_in_db($unprepared_value, $field_obj);
 	}
 
 
@@ -2306,9 +2306,9 @@ 
 	 * @param EE_Model_Field_Base $field field which will be doing the preparing of the value. If null, we assume $value is a custom selection
 	 * @return mixed a value ready for use in the database for insertions, updating, or in a where clause
 	 */
-	private function _prepare_value_for_use_in_db($value, $field){
-		if($field && $field instanceof EE_Model_Field_Base){
-			switch( $this->_values_already_prepared_by_model_object ){
+	private function _prepare_value_for_use_in_db($value, $field) {
+		if ($field && $field instanceof EE_Model_Field_Base) {
+			switch ($this->_values_already_prepared_by_model_object) {
 				/** @noinspection PhpMissingBreakStatementInspection */
 				case self::not_prepared_by_model_object:
 					$value = $field->prepare_for_set($value);
@@ -2319,7 +2319,7 @@ 
 					//leave the value alone
 			}
 			return $value;
-		}else{
+		} else {
 			return $value;
 		}
 	}
@@ -2329,13 +2329,13 @@ 
 	 * @return EE_Primary_Table
 	 * @throws EE_Error
 	 */
-	protected function _get_main_table(){
-		foreach($this->_tables as $table){
-			if($table instanceof EE_Primary_Table){
+	protected function _get_main_table() {
+		foreach ($this->_tables as $table) {
+			if ($table instanceof EE_Primary_Table) {
 				return $table;
 			}
 		}
-		throw new EE_Error(sprintf(__('There are no main tables on %s. They should be added to _tables array in the constructor','event_espresso'),get_class($this)));
+		throw new EE_Error(sprintf(__('There are no main tables on %s. They should be added to _tables array in the constructor', 'event_espresso'), get_class($this)));
 	}
 
 	/**
@@ -2354,7 +2354,7 @@ 
 	 */
 	public function second_table() {
 		// grab second table from tables array
-		$second_table = end( $this->_tables );
+		$second_table = end($this->_tables);
 		return $second_table instanceof EE_Secondary_Table ? $second_table->get_table_name() : NULL;
 	}
 
@@ -2367,8 +2367,8 @@ 
 	 * @param string $table_alias
 	 * @return EE_Primary_Table | EE_Secondary_Table
 	 */
-	public function get_table_obj_by_alias( $table_alias = '' ) {
-		return isset( $this->_tables[ $table_alias ] ) ? $this->_tables[ $table_alias ] : NULL;
+	public function get_table_obj_by_alias($table_alias = '') {
+		return isset($this->_tables[$table_alias]) ? $this->_tables[$table_alias] : NULL;
 	}
 
 
@@ -2377,10 +2377,10 @@ 
 	 * Gets all the tables of type EE_Other_Table from EEM_CPT_Basel_Model::_tables
 	 * @return EE_Secondary_Table[]
 	 */
-	protected function _get_other_tables(){
-		$other_tables =array();
-		foreach($this->_tables as $table_alias => $table){
-			if($table instanceof EE_Secondary_Table){
+	protected function _get_other_tables() {
+		$other_tables = array();
+		foreach ($this->_tables as $table_alias => $table) {
+			if ($table instanceof EE_Secondary_Table) {
 				$other_tables[$table_alias] = $table;
 			}
 		}
@@ -2392,7 +2392,7 @@ 
 	 * @param string $table_alias, array key in EEM_Base::_tables
 	 * @return EE_Model_Field_Base[]
 	 */
-	function _get_fields_for_table($table_alias){
+	function _get_fields_for_table($table_alias) {
 		return $this->_fields[$table_alias];
 	}
 
@@ -2404,29 +2404,29 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_parameters['where']
 	 * @return EE_Model_Query_Info_Carrier
 	 */
-	function _extract_related_models_from_query($query_params){
+	function _extract_related_models_from_query($query_params) {
 		$query_info_carrier = new EE_Model_Query_Info_Carrier();
-		if(array_key_exists(0,$query_params)){
-			$this->_extract_related_models_from_sub_params_array_keys($query_params[0], $query_info_carrier,0);
-		}
-		if(array_key_exists('group_by', $query_params)){
-			if(is_array($query_params['group_by'])){
-				$this->_extract_related_models_from_sub_params_array_values($query_params['group_by'],$query_info_carrier,'group_by');
-			}elseif( ! empty ( $query_params['group_by'] )){
-				$this->_extract_related_model_info_from_query_param( $query_params['group_by'],$query_info_carrier,'group_by');
+		if (array_key_exists(0, $query_params)) {
+			$this->_extract_related_models_from_sub_params_array_keys($query_params[0], $query_info_carrier, 0);
+		}
+		if (array_key_exists('group_by', $query_params)) {
+			if (is_array($query_params['group_by'])) {
+				$this->_extract_related_models_from_sub_params_array_values($query_params['group_by'], $query_info_carrier, 'group_by');
+			}elseif ( ! empty ($query_params['group_by'])) {
+				$this->_extract_related_model_info_from_query_param($query_params['group_by'], $query_info_carrier, 'group_by');
 			}
 		}
-		if(array_key_exists('having',$query_params)){
-			$this->_extract_related_models_from_sub_params_array_keys($query_params[0], $query_info_carrier,'having');
+		if (array_key_exists('having', $query_params)) {
+			$this->_extract_related_models_from_sub_params_array_keys($query_params[0], $query_info_carrier, 'having');
 		}
-		if(array_key_exists('order_by', $query_params)){
-			if ( is_array( $query_params['order_by'] ) )
-				$this->_extract_related_models_from_sub_params_array_keys($query_params['order_by'],$query_info_carrier,'order_by');
-			elseif( ! empty( $query_params['order_by'] ))
-				$this->_extract_related_model_info_from_query_param( $query_params['order_by'], $query_info_carrier,'order_by');
+		if (array_key_exists('order_by', $query_params)) {
+			if (is_array($query_params['order_by']))
+				$this->_extract_related_models_from_sub_params_array_keys($query_params['order_by'], $query_info_carrier, 'order_by');
+			elseif ( ! empty($query_params['order_by']))
+				$this->_extract_related_model_info_from_query_param($query_params['order_by'], $query_info_carrier, 'order_by');
 		}
-		if(array_key_exists('force_join', $query_params)){
-			$this->_extract_related_models_from_sub_params_array_values($query_params['force_join'],$query_info_carrier,'force_join');
+		if (array_key_exists('force_join', $query_params)) {
+			$this->_extract_related_models_from_sub_params_array_values($query_params['force_join'], $query_info_carrier, 'force_join');
 		}
 		return $query_info_carrier;
 	}
@@ -2439,34 +2439,34 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Model_Query_Info_Carrier
 	 */
-	private function _extract_related_models_from_sub_params_array_keys($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier,$query_param_type){
-		if (!empty($sub_query_params)){
+	private function _extract_related_models_from_sub_params_array_keys($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier, $query_param_type) {
+		if ( ! empty($sub_query_params)) {
 			$sub_query_params = (array) $sub_query_params;
-			foreach($sub_query_params as $param => $possibly_array_of_params){
+			foreach ($sub_query_params as $param => $possibly_array_of_params) {
 				//$param could be simply 'EVT_ID', or it could be 'Registrations.REG_ID', or even 'Registrations.Transactions.Payments.PAY_amount'
-				$this->_extract_related_model_info_from_query_param( $param, $model_query_info_carrier,$query_param_type);
+				$this->_extract_related_model_info_from_query_param($param, $model_query_info_carrier, $query_param_type);
 
 				//if $possibly_array_of_params is an array, try recursing into it, searching for keys which
 				//indicate needed joins. Eg, array('NOT'=>array('Registration.TXN_ID'=>23)). In this case, we tried
 				//extracting models out of the 'NOT', which obviously wasn't successful, and then we recurse into the value
 				//of array('Registration.TXN_ID'=>23)
 				$query_param_sans_stars = $this->_remove_stars_and_anything_after_from_condition_query_param_key($param);
-				if(in_array($query_param_sans_stars, $this->_logic_query_param_keys,true)){
-					if (! is_array($possibly_array_of_params)){
+				if (in_array($query_param_sans_stars, $this->_logic_query_param_keys, true)) {
+					if ( ! is_array($possibly_array_of_params)) {
 						throw new EE_Error(sprintf(__("You used a special where query param %s, but the value isn't an array of where query params, it's just %s'. It should be an array, eg array('EVT_ID'=>23,'OR'=>array('Venue.VNU_ID'=>32,'Venue.VNU_name'=>'monkey_land'))", "event_espresso"),
-							$param,$possibly_array_of_params));
-					}else{
-						$this->_extract_related_models_from_sub_params_array_keys($possibly_array_of_params, $model_query_info_carrier,$query_param_type);
+							$param, $possibly_array_of_params));
+					} else {
+						$this->_extract_related_models_from_sub_params_array_keys($possibly_array_of_params, $model_query_info_carrier, $query_param_type);
 					}
-				}elseif($query_param_type === 0 //ie WHERE
+				}elseif ($query_param_type === 0 //ie WHERE
 						&& is_array($possibly_array_of_params)
 						&& isset($possibly_array_of_params[2])
-						&& $possibly_array_of_params[2] == true){
+						&& $possibly_array_of_params[2] == true) {
 					//then $possible_array_of_params looks something like array('<','DTT_sold',true)
 					//indicating that $possible_array_of_params[1] is actually a field name,
 					//from which we should extract query parameters!
-					if(! isset($possibly_array_of_params[0]) || ! isset($possibly_array_of_params[1])){
-						throw new EE_Error(sprintf(__("Improperly formed query parameter %s. It should be numerically indexed like array('<','DTT_sold',true); but you provided %s", "event_espresso"),$query_param_type,implode(",",$possibly_array_of_params)));
+					if ( ! isset($possibly_array_of_params[0]) || ! isset($possibly_array_of_params[1])) {
+						throw new EE_Error(sprintf(__("Improperly formed query parameter %s. It should be numerically indexed like array('<','DTT_sold',true); but you provided %s", "event_espresso"), $query_param_type, implode(",", $possibly_array_of_params)));
 					}
 					$this->_extract_related_model_info_from_query_param($possibly_array_of_params[1], $model_query_info_carrier, $query_param_type);
 				}
@@ -2485,14 +2485,14 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Model_Query_Info_Carrier
 	 */
-	private function _extract_related_models_from_sub_params_array_values($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier,$query_param_type){
-		if (!empty($sub_query_params)){
-			if(!is_array($sub_query_params)){
-				throw new EE_Error(sprintf(__("Query parameter %s should be an array, but it isn't.", "event_espresso"),$sub_query_params));
+	private function _extract_related_models_from_sub_params_array_values($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier, $query_param_type) {
+		if ( ! empty($sub_query_params)) {
+			if ( ! is_array($sub_query_params)) {
+				throw new EE_Error(sprintf(__("Query parameter %s should be an array, but it isn't.", "event_espresso"), $sub_query_params));
 			}
-			foreach($sub_query_params as $param){
+			foreach ($sub_query_params as $param) {
 				//$param could be simply 'EVT_ID', or it could be 'Registrations.REG_ID', or even 'Registrations.Transactions.Payments.PAY_amount'
-				$this->_extract_related_model_info_from_query_param( $param, $model_query_info_carrier, $query_param_type);
+				$this->_extract_related_model_info_from_query_param($param, $model_query_info_carrier, $query_param_type);
 			}
 		}
 		return $model_query_info_carrier;
@@ -2511,81 +2511,81 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Query_Info_Carrier
 	 */
-	function _create_model_query_info_carrier($query_params){
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::_create_model_query_info_carrier', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+	function _create_model_query_info_carrier($query_params) {
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::_create_model_query_info_carrier', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
-		if( isset( $query_params[0] ) ) {
+		if (isset($query_params[0])) {
 			$where_query_params = $query_params[0];
-		}else{
+		} else {
 			$where_query_params = array();
 		}
 		//first check if we should alter the query to account for caps or not
 		//because the caps might require us to do extra joins
-		if( isset( $query_params[ 'caps' ] ) && $query_params[ 'caps' ] != 'none' ) {
-			$query_params[0] = $where_query_params = array_replace_recursive( $where_query_params, $this->caps_where_conditions( $query_params[ 'caps' ] ) );
+		if (isset($query_params['caps']) && $query_params['caps'] != 'none') {
+			$query_params[0] = $where_query_params = array_replace_recursive($where_query_params, $this->caps_where_conditions($query_params['caps']));
 		}
 		$query_object = $this->_extract_related_models_from_query($query_params);
 
 		//verify where_query_params has NO numeric indexes.... that's simply not how you use it!
-		foreach($where_query_params as $key => $value){
-			if(is_int($key)){
-				throw new EE_Error(sprintf(__("WHERE query params must NOT be numerically-indexed. You provided the array key '%s' for value '%s' while querying model %s. All the query params provided were '%s' Please read documentation on EEM_Base::get_all.", "event_espresso"),$key, var_export( $value, true ), var_export( $query_params, true ), get_class($this)));
+		foreach ($where_query_params as $key => $value) {
+			if (is_int($key)) {
+				throw new EE_Error(sprintf(__("WHERE query params must NOT be numerically-indexed. You provided the array key '%s' for value '%s' while querying model %s. All the query params provided were '%s' Please read documentation on EEM_Base::get_all.", "event_espresso"), $key, var_export($value, true), var_export($query_params, true), get_class($this)));
 			}
 		}
-		if( array_key_exists( 'default_where_conditions',$query_params) && ! empty( $query_params['default_where_conditions'] )){
+		if (array_key_exists('default_where_conditions', $query_params) && ! empty($query_params['default_where_conditions'])) {
 			$use_default_where_conditions = $query_params['default_where_conditions'];
-		}else{
+		} else {
 			$use_default_where_conditions = 'all';
 		}
-		$where_query_params = array_merge($this->_get_default_where_conditions_for_models_in_query($query_object,$use_default_where_conditions,$where_query_params), $where_query_params );
-		$query_object->set_where_sql( $this->_construct_where_clause($where_query_params));
+		$where_query_params = array_merge($this->_get_default_where_conditions_for_models_in_query($query_object, $use_default_where_conditions, $where_query_params), $where_query_params);
+		$query_object->set_where_sql($this->_construct_where_clause($where_query_params));
 
 
 		//if this is a "on_join_limit" then we are limiting on on a specific table in a multi_table join.  So we need to setup a subquery and use that for the main join.  Note for now this only works on the primary table for the model.  So for instance, you could set the limit array like this:
 		//array( 'on_join_limit' => array('Primary_Table_Alias', array(1,10) ) )
-		if ( array_key_exists('on_join_limit', $query_params ) && ! empty( $query_params['on_join_limit'] )) {
-			$query_object->set_main_model_join_sql( $this->_construct_limit_join_select( $query_params['on_join_limit'][0], $query_params['on_join_limit'][1] ) );
+		if (array_key_exists('on_join_limit', $query_params) && ! empty($query_params['on_join_limit'])) {
+			$query_object->set_main_model_join_sql($this->_construct_limit_join_select($query_params['on_join_limit'][0], $query_params['on_join_limit'][1]));
 		}
 
 
 		//set limit
-		if(array_key_exists('limit',$query_params)){
-			if(is_array($query_params['limit'])){
-				if( ! isset($query_params['limit'][0]) || ! isset($query_params['limit'][1])){
-					$e = sprintf(__("Invalid DB query. You passed '%s' for the LIMIT, but only the following are valid: an integer, string representing an integer, a string like 'int,int', or an array like array(int,int)", "event_espresso"),  http_build_query($query_params['limit']));
+		if (array_key_exists('limit', $query_params)) {
+			if (is_array($query_params['limit'])) {
+				if ( ! isset($query_params['limit'][0]) || ! isset($query_params['limit'][1])) {
+					$e = sprintf(__("Invalid DB query. You passed '%s' for the LIMIT, but only the following are valid: an integer, string representing an integer, a string like 'int,int', or an array like array(int,int)", "event_espresso"), http_build_query($query_params['limit']));
 					throw new EE_Error($e."|".$e);
 				}
 				//they passed us an array for the limit. Assume it's like array(50,25), meaning offset by 50, and get 25
 				$query_object->set_limit_sql(" LIMIT ".$query_params['limit'][0].",".$query_params['limit'][1]);
-			}elseif( ! empty ( $query_params['limit'] )){
+			}elseif ( ! empty ($query_params['limit'])) {
 				$query_object->set_limit_sql((" LIMIT ".$query_params['limit']));
 			}
 		}
 		//set order by
-		if(array_key_exists('order_by',$query_params)){
-			if(is_array($query_params['order_by'])){
+		if (array_key_exists('order_by', $query_params)) {
+			if (is_array($query_params['order_by'])) {
 				//if they're using 'order_by' as an array, they can't use 'order' (because 'order_by' must
 				//specify whether to ascend or descend on each field. Eg 'order_by'=>array('EVT_ID'=>'ASC'). So
 				//including 'order' wouldn't make any sense if 'order_by' has already specified which way to order!
-				if(array_key_exists('order', $query_params)){
+				if (array_key_exists('order', $query_params)) {
 					throw new EE_Error(sprintf(__("In querying %s, we are using query parameter 'order_by' as an array (keys:%s,values:%s), and so we can't use query parameter 'order' (value %s). You should just use the 'order_by' parameter ", "event_espresso"),
-							get_class($this),implode(", ",array_keys($query_params['order_by'])),implode(", ",$query_params['order_by']),$query_params['order']));
+							get_class($this), implode(", ", array_keys($query_params['order_by'])), implode(", ", $query_params['order_by']), $query_params['order']));
 				}
-				 $this->_extract_related_models_from_sub_params_array_keys($query_params['order_by'],$query_object,'order_by');
+				 $this->_extract_related_models_from_sub_params_array_keys($query_params['order_by'], $query_object, 'order_by');
 				//assume it's an array of fields to order by
 				$order_array = array();
-				foreach($query_params['order_by'] as $field_name_to_order_by => $order){
+				foreach ($query_params['order_by'] as $field_name_to_order_by => $order) {
 					$order = $this->_extract_order($order);
 					$order_array[] = $this->_deduce_column_name_from_query_param($field_name_to_order_by).SP.$order;
 				}
-				$query_object->set_order_by_sql(" ORDER BY ".implode(",",$order_array));
-			}elseif( ! empty ( $query_params['order_by'] )){
-				$this->_extract_related_model_info_from_query_param($query_params['order_by'],$query_object,'order',$query_params['order_by']);
-				if(isset($query_params['order'])){
+				$query_object->set_order_by_sql(" ORDER BY ".implode(",", $order_array));
+			}elseif ( ! empty ($query_params['order_by'])) {
+				$this->_extract_related_model_info_from_query_param($query_params['order_by'], $query_object, 'order', $query_params['order_by']);
+				if (isset($query_params['order'])) {
 					$order = $this->_extract_order($query_params['order']);
-				}else{
+				} else {
 					$order = 'DESC';
 				}
 				$query_object->set_order_by_sql(" ORDER BY ".$this->_deduce_column_name_from_query_param($query_params['order_by']).SP.$order);
@@ -2593,46 +2593,46 @@ 
 		}
 
 		//if 'order_by' wasn't set, maybe they are just using 'order' on its own?
-		if( ! array_key_exists('order_by',$query_params) && array_key_exists('order',$query_params) && ! empty( $query_params['order'] )){
+		if ( ! array_key_exists('order_by', $query_params) && array_key_exists('order', $query_params) && ! empty($query_params['order'])) {
 			$pk_field = $this->get_primary_key_field();
 			$order = $this->_extract_order($query_params['order']);
 			$query_object->set_order_by_sql(" ORDER BY ".$pk_field->get_qualified_column().SP.$order);
 		}
 
 		//set group by
-		if(array_key_exists('group_by',$query_params)){
-			if(is_array($query_params['group_by'])){
+		if (array_key_exists('group_by', $query_params)) {
+			if (is_array($query_params['group_by'])) {
 				//it's an array, so assume we'll be grouping by a bunch of stuff
 				$group_by_array = array();
-				foreach($query_params['group_by'] as $field_name_to_group_by){
+				foreach ($query_params['group_by'] as $field_name_to_group_by) {
 					$group_by_array[] = $this->_deduce_column_name_from_query_param($field_name_to_group_by);
 				}
-				$query_object->set_group_by_sql(" GROUP BY ".implode(", ",$group_by_array));
-			}elseif( ! empty ( $query_params['group_by'] )){
+				$query_object->set_group_by_sql(" GROUP BY ".implode(", ", $group_by_array));
+			}elseif ( ! empty ($query_params['group_by'])) {
 				$query_object->set_group_by_sql(" GROUP BY ".$this->_deduce_column_name_from_query_param($query_params['group_by']));
 			}
 		}
 		//set having
-		if(array_key_exists('having',$query_params) && $query_params['having']){
-			$query_object->set_having_sql( $this->_construct_having_clause($query_params['having']));
+		if (array_key_exists('having', $query_params) && $query_params['having']) {
+			$query_object->set_having_sql($this->_construct_having_clause($query_params['having']));
 		}
 
 		//now, just verify they didn't pass anything wack
-		foreach($query_params as $query_key => $query_value){
-			if( ! in_array($query_key,$this->_allowed_query_params,true)){
+		foreach ($query_params as $query_key => $query_value) {
+			if ( ! in_array($query_key, $this->_allowed_query_params, true)) {
 				throw new EE_Error(
 					sprintf(
-						__("You passed %s as a query parameter to %s, which is illegal! The allowed query parameters are %s",'event_espresso'),
+						__("You passed %s as a query parameter to %s, which is illegal! The allowed query parameters are %s", 'event_espresso'),
 						$query_key,
 						get_class($this),
 //						print_r( $this->_allowed_query_params, TRUE )
-						implode( ',', $this->_allowed_query_params )
+						implode(',', $this->_allowed_query_params)
 					)
 				);
 			}
 		}
 		$main_model_join_sql = $query_object->get_main_model_join_sql();
-		if ( empty( $main_model_join_sql ) )
+		if (empty($main_model_join_sql))
 			$query_object->set_main_model_join_sql($this->_construct_internal_join());
 		return $query_object;
 	}
@@ -2643,17 +2643,17 @@ 
 	 * @param string $context one of EEM_Base::valid_cap_contexts()
 	 * @return array like EEM_Base::get_all() 's $query_params[0]
 	 */
-	public function caps_where_conditions( $context = self::caps_read ) {
-		EEM_Base::verify_is_valid_cap_context( $context );
+	public function caps_where_conditions($context = self::caps_read) {
+		EEM_Base::verify_is_valid_cap_context($context);
 		$cap_where_conditions = array();
-		$cap_restrictions = $this->caps_missing( $context );
+		$cap_restrictions = $this->caps_missing($context);
 		/**
 		 * @var $cap_restrictions EE_Default_Where_Conditions[]
 		 */
-		foreach( $cap_restrictions as $cap => $restriction_if_no_cap ) {
-				$cap_where_conditions = array_replace_recursive( $cap_where_conditions, $restriction_if_no_cap->get_default_where_conditions() );
+		foreach ($cap_restrictions as $cap => $restriction_if_no_cap) {
+				$cap_where_conditions = array_replace_recursive($cap_where_conditions, $restriction_if_no_cap->get_default_where_conditions());
 		}
-		return apply_filters( 'FHEE__EEM_Base__caps_where_conditions__return', $cap_where_conditions, $this, $context, $cap_restrictions );
+		return apply_filters('FHEE__EEM_Base__caps_where_conditions__return', $cap_where_conditions, $this, $context, $cap_restrictions);
 	}
 
 	/**
@@ -2663,11 +2663,11 @@ 
 	 * @return string either ASC, asc, DESC or desc
 	 * @throws EE_Error
 	 */
-	private function _extract_order($should_be_order_string){
-		if(in_array($should_be_order_string, $this->_allowed_order_values)){
+	private function _extract_order($should_be_order_string) {
+		if (in_array($should_be_order_string, $this->_allowed_order_values)) {
 			return $should_be_order_string;
-		}else{
-			throw new EE_Error(sprintf(__("While performing a query on '%s', tried to use '%s' as an order parameter. ", "event_espresso"),get_class($this),$should_be_order_string));
+		} else {
+			throw new EE_Error(sprintf(__("While performing a query on '%s', tried to use '%s' as an order parameter. ", "event_espresso"), get_class($this), $should_be_order_string));
 		}
 	}
 
@@ -2685,19 +2685,19 @@ 
 	 * @throws EE_Error
 	 * @return array like $query_params[0], see EEM_Base::get_all for documentation
 	 */
-	private function _get_default_where_conditions_for_models_in_query(EE_Model_Query_Info_Carrier $query_info_carrier,$use_default_where_conditions = 'all',$where_query_params = array()){
-		$allowed_used_default_where_conditions_values = array('all','this_model_only', 'other_models_only','none');
-		if( ! in_array($use_default_where_conditions,$allowed_used_default_where_conditions_values)){
-			throw new EE_Error(sprintf(__("You passed an invalid value to the query parameter 'default_where_conditions' of '%s'. Allowed values are %s", "event_espresso"),$use_default_where_conditions,implode(", ",$allowed_used_default_where_conditions_values)));
+	private function _get_default_where_conditions_for_models_in_query(EE_Model_Query_Info_Carrier $query_info_carrier, $use_default_where_conditions = 'all', $where_query_params = array()) {
+		$allowed_used_default_where_conditions_values = array('all', 'this_model_only', 'other_models_only', 'none');
+		if ( ! in_array($use_default_where_conditions, $allowed_used_default_where_conditions_values)) {
+			throw new EE_Error(sprintf(__("You passed an invalid value to the query parameter 'default_where_conditions' of '%s'. Allowed values are %s", "event_espresso"), $use_default_where_conditions, implode(", ", $allowed_used_default_where_conditions_values)));
 		}
-		if( in_array($use_default_where_conditions, array('all','this_model_only')) ){
+		if (in_array($use_default_where_conditions, array('all', 'this_model_only'))) {
 			$universal_query_params = $this->_get_default_where_conditions();
-		}else{
+		} else {
 			$universal_query_params = array();
 		}
 
-		if(in_array($use_default_where_conditions,array('all','other_models_only'))){
-			foreach($query_info_carrier->get_model_names_included() as $model_relation_path => $model_name){
+		if (in_array($use_default_where_conditions, array('all', 'other_models_only'))) {
+			foreach ($query_info_carrier->get_model_names_included() as $model_relation_path => $model_name) {
 				$related_model = $this->get_related_model_obj($model_name);
 				$related_model_universal_where_params = $related_model->_get_default_where_conditions($model_relation_path);
 
@@ -2724,22 +2724,22 @@ 
 	 * @param string $model_relation_path like 'Transaction.Payment.'
 	 * @return array like EEM_Base::get_all's $query_params[0]
 	 */
-	private function _override_defaults_or_make_null_friendly($default_where_conditions,$provided_where_conditions,$model,$model_relation_path){
+	private function _override_defaults_or_make_null_friendly($default_where_conditions, $provided_where_conditions, $model, $model_relation_path) {
 		$null_friendly_where_conditions = array();
 		$none_overridden = true;
 		$or_condition_key_for_defaults = 'OR*'.get_class($model);
 
-		foreach($default_where_conditions as $key => $val){
-			if( isset($provided_where_conditions[$key])){
+		foreach ($default_where_conditions as $key => $val) {
+			if (isset($provided_where_conditions[$key])) {
 				$none_overridden = false;
-			}else{
+			} else {
 				$null_friendly_where_conditions[$or_condition_key_for_defaults]['AND'][$key] = $val;
 			}
 		}
-		if( $none_overridden && $default_where_conditions){
-			if($model->has_primary_key_field()){
+		if ($none_overridden && $default_where_conditions) {
+			if ($model->has_primary_key_field()) {
 				$null_friendly_where_conditions[$or_condition_key_for_defaults][$model_relation_path.".".$model->primary_key_name()] = array('IS NULL');
-			}else{
+			} else {
 				//@todo NO PK, use other defaults
 			}
 		}
@@ -2754,8 +2754,8 @@ 
 	 * @param string $model_relation_path eg, path from Event to Payment is "Registration.Transaction.Payment."
 	 * @return array like EEM_Base::get_all's $query_params[0] (where conditions)
 	 */
-	private function _get_default_where_conditions($model_relation_path = null){
-		if ( $this->_ignore_where_strategy )
+	private function _get_default_where_conditions($model_relation_path = null) {
+		if ($this->_ignore_where_strategy)
 			return array();
 
 		return $this->_default_where_conditions_strategy->get_default_where_conditions($model_relation_path);
@@ -2766,13 +2766,13 @@ 
 	 * @param EE_Model_Query_Info_Carrier $model_query_info
 	 * @return string
 	 */
-	private function _construct_default_select_sql(EE_Model_Query_Info_Carrier $model_query_info){
+	private function _construct_default_select_sql(EE_Model_Query_Info_Carrier $model_query_info) {
 		$selects = $this->_get_columns_to_select_for_this_model();
-		foreach($model_query_info->get_model_names_included() as $model_relation_chain => $name_of_other_model_included){
+		foreach ($model_query_info->get_model_names_included() as $model_relation_chain => $name_of_other_model_included) {
 			$other_model_included = $this->get_related_model_obj($name_of_other_model_included);
 			$selects = array_merge($selects, $other_model_included->_get_columns_to_select_for_this_model($model_relation_chain));
 		}
-		return implode(", ",$selects);
+		return implode(", ", $selects);
 	}
 
 	/**
@@ -2781,19 +2781,19 @@ 
 	 * @param string $model_relation_chain like 'Question.Question_Group.Event'
 	 * @return array numerically indexed, values are columns to select and rename, eg "Event.ID AS 'Event.ID'"
 	 */
-	public function _get_columns_to_select_for_this_model($model_relation_chain = ''){
+	public function _get_columns_to_select_for_this_model($model_relation_chain = '') {
 		$fields = $this->field_settings();
 		$selects = array();
 		$table_alias_with_model_relation_chain_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model_name());
-		foreach($fields as $field_obj){
-			$selects[] = $table_alias_with_model_relation_chain_prefix . $field_obj->get_table_alias().".".$field_obj->get_table_column()." AS '".$table_alias_with_model_relation_chain_prefix.$field_obj->get_table_alias().".".$field_obj->get_table_column()."'";
+		foreach ($fields as $field_obj) {
+			$selects[] = $table_alias_with_model_relation_chain_prefix.$field_obj->get_table_alias().".".$field_obj->get_table_column()." AS '".$table_alias_with_model_relation_chain_prefix.$field_obj->get_table_alias().".".$field_obj->get_table_column()."'";
 		}
 		//make sure we are also getting the PKs of each table
 		$tables = $this->get_tables();
-		if(count($tables) > 1){
-			foreach($tables as $table_obj){
-				$qualified_pk_column = $table_alias_with_model_relation_chain_prefix . $table_obj->get_fully_qualified_pk_column();
-				if( ! in_array($qualified_pk_column,$selects)){
+		if (count($tables) > 1) {
+			foreach ($tables as $table_obj) {
+				$qualified_pk_column = $table_alias_with_model_relation_chain_prefix.$table_obj->get_fully_qualified_pk_column();
+				if ( ! in_array($qualified_pk_column, $selects)) {
 					$selects[] = "$qualified_pk_column AS '$qualified_pk_column'";
 				}
 			}
@@ -2817,66 +2817,66 @@ 
 	 * @throws EE_Error
 	 * @return void only modifies the EEM_Related_Model_Info_Carrier passed into it
 	 */
-	private function _extract_related_model_info_from_query_param( $query_param, EE_Model_Query_Info_Carrier $passed_in_query_info, $query_param_type, $original_query_param = NULL ){
-		if($original_query_param == NULL){
+	private function _extract_related_model_info_from_query_param($query_param, EE_Model_Query_Info_Carrier $passed_in_query_info, $query_param_type, $original_query_param = NULL) {
+		if ($original_query_param == NULL) {
 			$original_query_param = $query_param;
 		}
 		$query_param = $this->_remove_stars_and_anything_after_from_condition_query_param_key($query_param);
 		/** @var $allow_logic_query_params bool whether or not to allow logic_query_params like 'NOT','OR', or 'AND' */
-		$allow_logic_query_params = in_array($query_param_type,array('where','having'));
-		$allow_fields = in_array($query_param_type,array('where','having','order_by','group_by','order'));
+		$allow_logic_query_params = in_array($query_param_type, array('where', 'having'));
+		$allow_fields = in_array($query_param_type, array('where', 'having', 'order_by', 'group_by', 'order'));
 		//check to see if we have a field on this model
 		$this_model_fields = $this->field_settings(true);
-		if(array_key_exists($query_param,$this_model_fields)){
-			if($allow_fields){
+		if (array_key_exists($query_param, $this_model_fields)) {
+			if ($allow_fields) {
 				return;
-			}else{
+			} else {
 				throw new EE_Error(sprintf(__("Using a field name (%s) on model %s is not allowed on this query param type '%s'. Original query param was %s", "event_espresso"),
-						$query_param,get_class($this),$query_param_type,$original_query_param));
+						$query_param, get_class($this), $query_param_type, $original_query_param));
 			}
 		}
 		//check if this is a special logic query param
-		elseif(in_array($query_param, $this->_logic_query_param_keys, TRUE)){
-			if($allow_logic_query_params){
+		elseif (in_array($query_param, $this->_logic_query_param_keys, TRUE)) {
+			if ($allow_logic_query_params) {
 				return;
-			}else{
+			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'Logic query params ("%1$s") are being used incorrectly with the following query param ("%2$s") on model %3$s. %4$sAdditional Info:%4$s%5$s', 'event_espresso' ),
-						implode( '", "', $this->_logic_query_param_keys ),
-						$query_param ,
-						get_class( $this ),
+						__('Logic query params ("%1$s") are being used incorrectly with the following query param ("%2$s") on model %3$s. %4$sAdditional Info:%4$s%5$s', 'event_espresso'),
+						implode('", "', $this->_logic_query_param_keys),
+						$query_param,
+						get_class($this),
 						'<br />',
-						"\t" . ' $passed_in_query_info = <pre>' . print_r( $passed_in_query_info, TRUE ) . '</pre>' . "\n\t" . ' $query_param_type = ' . $query_param_type . "\n\t" . ' $original_query_param = ' . $original_query_param
+						"\t".' $passed_in_query_info = <pre>'.print_r($passed_in_query_info, TRUE).'</pre>'."\n\t".' $query_param_type = '.$query_param_type."\n\t".' $original_query_param = '.$original_query_param
 					)
 				);
 			}
 		}
 
 		//check if it's a custom selection
-		elseif(array_key_exists($query_param,$this->_custom_selections)){
+		elseif (array_key_exists($query_param, $this->_custom_selections)) {
 			return;
 		}
 
 		//check if has a model name at the beginning
 		//and
 		//check if it's a field on a related model
-		foreach($this->_model_relations as $valid_related_model_name=>$relation_obj){
-			if(strpos($query_param, $valid_related_model_name.".") === 0){
-				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info,$original_query_param);
+		foreach ($this->_model_relations as $valid_related_model_name=>$relation_obj) {
+			if (strpos($query_param, $valid_related_model_name.".") === 0) {
+				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info, $original_query_param);
 				$query_param = substr($query_param, strlen($valid_related_model_name."."));
-				if($query_param == ''){
+				if ($query_param == '') {
 					//nothing left to $query_param
 					//we should actually end in a field name, not a model like this!
 					throw new EE_Error(sprintf(__("Query param '%s' (of type %s on model %s) shouldn't end on a period (.) ", "event_espresso"),
-					$query_param,$query_param_type,get_class($this),$valid_related_model_name));
-				}else{
+					$query_param, $query_param_type, get_class($this), $valid_related_model_name));
+				} else {
 					$related_model_obj = $this->get_related_model_obj($valid_related_model_name);
 					$related_model_obj->_extract_related_model_info_from_query_param($query_param, $passed_in_query_info, $query_param_type, $original_query_param);
 					return;
 				}
-			}elseif($query_param == $valid_related_model_name){
-				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info,$original_query_param);
+			}elseif ($query_param == $valid_related_model_name) {
+				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info, $original_query_param);
 				return;
 			}
 		}
@@ -2886,7 +2886,7 @@ 
 		//and we previously confirmed it wasn't a logic query param or field on the current model
 		//it's wack, that's what it is
 		throw new EE_Error(sprintf(__("There is no model named '%s' related to %s. Query param type is %s and original query param is %s", "event_espresso"),
-				$query_param,get_class($this),$query_param_type,$original_query_param));
+				$query_param, get_class($this), $query_param_type, $original_query_param));
 
 	}
 
@@ -2903,26 +2903,26 @@ 
 	 * what models to prepend onto its default query params or in case it wants to rename tables (in case there are multiple joins to the same table)
 	 * @return void
 	 */
-	private function _add_join_to_model($model_name, EE_Model_Query_Info_Carrier $passed_in_query_info,$original_query_param){
+	private function _add_join_to_model($model_name, EE_Model_Query_Info_Carrier $passed_in_query_info, $original_query_param) {
 		$relation_obj = $this->related_settings_for($model_name);
 
 		$model_relation_chain = EE_Model_Parser::extract_model_relation_chain($model_name, $original_query_param);
 		//check if the relation is HABTM, because then we're essentially doing two joins
 		//If so, join first to the JOIN table, and add its data types, and then continue as normal
-		if($relation_obj instanceof EE_HABTM_Relation){
+		if ($relation_obj instanceof EE_HABTM_Relation) {
 			$join_model_obj = $relation_obj->get_join_model();
 			//replace the model specified with the join model for this relation chain, whi
 			$relation_chain_to_join_model = EE_Model_Parser::replace_model_name_with_join_model_name_in_model_relation_chain($model_name, $join_model_obj->get_this_model_name(), $model_relation_chain);
 			$new_query_info = new EE_Model_Query_Info_Carrier(
 					array($relation_chain_to_join_model => $join_model_obj->get_this_model_name()),
 					$relation_obj->get_join_to_intermediate_model_statement($relation_chain_to_join_model));
-			$passed_in_query_info->merge( $new_query_info  );
+			$passed_in_query_info->merge($new_query_info);
 		}
 		//now just join to the other table pointed to by the relation object, and add its data types
 		$new_query_info = new EE_Model_Query_Info_Carrier(
 				array($model_relation_chain=>$model_name),
 				$relation_obj->get_join_statement($model_relation_chain));
-		$passed_in_query_info->merge( $new_query_info  );
+		$passed_in_query_info->merge($new_query_info);
 	}
 
 
@@ -2931,11 +2931,11 @@ 
 	 * @param array $where_params like EEM_Base::get_all
 	 * @return string of SQL
 	 */
-	private function _construct_where_clause($where_params){
+	private function _construct_where_clause($where_params) {
 		$SQL = $this->_construct_condition_clause_recursive($where_params, ' AND ');
-		if($SQL){
-			return " WHERE ". $SQL;
-		}else{
+		if ($SQL) {
+			return " WHERE ".$SQL;
+		} else {
 			return '';
 		}
 	}
@@ -2946,11 +2946,11 @@ 
 	 * @param array $having_params
 	 * @return string
 	 */
-	private function _construct_having_clause($having_params){
+	private function _construct_having_clause($having_params) {
 		$SQL = $this->_construct_condition_clause_recursive($having_params, ' AND ');
-		if($SQL){
-			return " HAVING ". $SQL;
-		}else{
+		if ($SQL) {
+			return " HAVING ".$SQL;
+		} else {
 			return '';
 		}
 
@@ -2964,17 +2964,17 @@ 
 	 * @return EE_Model_Field_Base
 	 * @throws EE_Error
 	 */
-	protected function _get_field_on_model($field_name,$model_name){
+	protected function _get_field_on_model($field_name, $model_name) {
 		$model_class = 'EEM_'.$model_name;
 		$model_filepath = $model_class.".model.php";
-		EE_Registry::instance()->load_helper( 'File' );
-		if ( is_readable($model_filepath)){
+		EE_Registry::instance()->load_helper('File');
+		if (is_readable($model_filepath)) {
 			require_once($model_filepath);
-			$model_instance=call_user_func($model_name."::instance");
+			$model_instance = call_user_func($model_name."::instance");
 			/* @var $model_instance EEM_Base */
 			return $model_instance->field_settings_for($field_name);
-		}else{
-			throw new EE_Error(sprintf(__('No model named %s exists, with classname %s and filepath %s','event_espresso'),$model_name,$model_class,$model_filepath));
+		} else {
+			throw new EE_Error(sprintf(__('No model named %s exists, with classname %s and filepath %s', 'event_espresso'), $model_name, $model_class, $model_filepath));
 		}
 	}
 
@@ -2987,43 +2987,43 @@ 
 	 * @throws EE_Error
 	 * @return string of SQL
 	 */
-	private function _construct_condition_clause_recursive($where_params, $glue = ' AND'){
-		$where_clauses=array();
-		foreach($where_params as $query_param => $op_and_value_or_sub_condition){
-			$query_param = $this->_remove_stars_and_anything_after_from_condition_query_param_key($query_param);//str_replace("*",'',$query_param);
-			if(in_array($query_param,$this->_logic_query_param_keys)){
-				switch($query_param){
+	private function _construct_condition_clause_recursive($where_params, $glue = ' AND') {
+		$where_clauses = array();
+		foreach ($where_params as $query_param => $op_and_value_or_sub_condition) {
+			$query_param = $this->_remove_stars_and_anything_after_from_condition_query_param_key($query_param); //str_replace("*",'',$query_param);
+			if (in_array($query_param, $this->_logic_query_param_keys)) {
+				switch ($query_param) {
 					case 'not':
 					case 'NOT':
-						$where_clauses[] = "! (". $this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, $glue).")";
+						$where_clauses[] = "! (".$this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, $glue).")";
 						break;
 					case 'and':
 					case 'AND':
-						$where_clauses[] = " (". $this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' AND ') .")";
+						$where_clauses[] = " (".$this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' AND ').")";
 						break;
 					case 'or':
 					case 'OR':
-						$where_clauses[] = " (". $this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' OR ') .")";
+						$where_clauses[] = " (".$this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' OR ').")";
 						break;
 				}
-			}else{
+			} else {
 				$field_obj = $this->_deduce_field_from_query_param($query_param);
 
 				//if it's not a normal field, maybe it's a custom selection?
-				if( ! $field_obj){
-					if(isset( $this->_custom_selections[$query_param][1])){
+				if ( ! $field_obj) {
+					if (isset($this->_custom_selections[$query_param][1])) {
 						$field_obj = $this->_custom_selections[$query_param][1];
-					}else{
-						throw new EE_Error(sprintf(__("%s is neither a valid model field name, nor a custom selection", "event_espresso"),$query_param));
+					} else {
+						throw new EE_Error(sprintf(__("%s is neither a valid model field name, nor a custom selection", "event_espresso"), $query_param));
 					}
 				}
 				$op_and_value_sql = $this->_construct_op_and_value($op_and_value_or_sub_condition, $field_obj);
-				$where_clauses[]=$this->_deduce_column_name_from_query_param($query_param).SP.$op_and_value_sql;
+				$where_clauses[] = $this->_deduce_column_name_from_query_param($query_param).SP.$op_and_value_sql;
 			}
 		}
-		if($where_clauses){
-			$SQL = implode($glue,$where_clauses);
-		}else{
+		if ($where_clauses) {
+			$SQL = implode($glue, $where_clauses);
+		} else {
 			$SQL = '';
 		}
 		return $SQL;
@@ -3037,18 +3037,18 @@ 
 	 * @throws EE_Error
 	 * @return string table alias and column name for SQL, eg "Transaction.TXN_ID"
 	 */
-	private function _deduce_column_name_from_query_param($query_param){
+	private function _deduce_column_name_from_query_param($query_param) {
 		$field = $this->_deduce_field_from_query_param($query_param);
 
-		if( $field ){
-			$table_alias_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_from_query_param( $field->get_model_name(), $query_param );
-			return $table_alias_prefix . $field->get_qualified_column();
-		}elseif(array_key_exists($query_param,$this->_custom_selections)){
+		if ($field) {
+			$table_alias_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_from_query_param($field->get_model_name(), $query_param);
+			return $table_alias_prefix.$field->get_qualified_column();
+		}elseif (array_key_exists($query_param, $this->_custom_selections)) {
 			//maybe it's custom selection item?
 			//if so, just use it as the "column name"
 			return $query_param;
-		}else{
-			throw new EE_Error(sprintf(__("%s is not a valid field on this model, nor a custom selection (%s)", "event_espresso"),$query_param,implode(",",$this->_custom_selections)));
+		} else {
+			throw new EE_Error(sprintf(__("%s is not a valid field on this model, nor a custom selection (%s)", "event_espresso"), $query_param, implode(",", $this->_custom_selections)));
 		}
 	}
 
@@ -3060,11 +3060,11 @@ 
 	 * @param string $condition_query_param_key
 	 * @return string
 	 */
-	private function _remove_stars_and_anything_after_from_condition_query_param_key($condition_query_param_key){
+	private 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;
 		}
@@ -3079,54 +3079,54 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	private function _construct_op_and_value($op_and_value, $field_obj){
-		if(is_array( $op_and_value )){
+	private function _construct_op_and_value($op_and_value, $field_obj) {
+		if (is_array($op_and_value)) {
 			$operator = isset($op_and_value[0]) ? $this->_prepare_operator_for_sql($op_and_value[0]) : null;
-			if( ! $operator){
+			if ( ! $operator) {
 				$php_array_like_string = array();
-				foreach($op_and_value as $key => $value){
+				foreach ($op_and_value as $key => $value) {
 					$php_array_like_string[] = "$key=>$value";
 				}
-				throw new EE_Error(sprintf(__("You setup a query parameter like you were going to specify an operator, but didn't. You provided '(%s)', but the operator should be at array key index 0 (eg array('>',32))", "event_espresso"), implode(",",$php_array_like_string)));
+				throw new EE_Error(sprintf(__("You setup a query parameter like you were going to specify an operator, but didn't. You provided '(%s)', but the operator should be at array key index 0 (eg array('>',32))", "event_espresso"), implode(",", $php_array_like_string)));
 			}
 			$value = isset($op_and_value[1]) ? $op_and_value[1] : null;
-		}else{
+		} else {
 			$operator = '=';
 			$value = $op_and_value;
 		}
 
 		//check to see if the value is actually another field
-		if(is_array($op_and_value) && isset($op_and_value[2]) && $op_and_value[2] == true){
+		if (is_array($op_and_value) && isset($op_and_value[2]) && $op_and_value[2] == true) {
 			return $operator.SP.$this->_deduce_column_name_from_query_param($value);
-		}elseif(in_array($operator, $this->_in_style_operators) && is_array($value)){
+		}elseif (in_array($operator, $this->_in_style_operators) && is_array($value)) {
 			//in this case, the value should be an array, or at least a comma-separated list
 			//it will need to handle a little differently
 			$cleaned_value = $this->_construct_in_value($value, $field_obj);
 			//note: $cleaned_value has already been run through $wpdb->prepare()
 			return $operator.SP.$cleaned_value;
-		} elseif( in_array( $operator, $this->_between_style_operators ) && is_array( $value ) ) {
+		} elseif (in_array($operator, $this->_between_style_operators) && is_array($value)) {
 			//the value should be an array with count of two.
-			if ( count($value) !== 2 )
-				throw new EE_Error( sprintf( __("The '%s' operator must be used with an array of values and there must be exactly TWO values in that array.", 'event_espresso'), "BETWEEN" ) );
-			$cleaned_value = $this->_construct_between_value( $value, $field_obj );
+			if (count($value) !== 2)
+				throw new EE_Error(sprintf(__("The '%s' operator must be used with an array of values and there must be exactly TWO values in that array.", 'event_espresso'), "BETWEEN"));
+			$cleaned_value = $this->_construct_between_value($value, $field_obj);
 			return $operator.SP.$cleaned_value;
-		} elseif( in_array( $operator, $this->_null_style_operators ) ) {
-			if($value != NULL){
-				throw new EE_Error(sprintf(__("You attempted to give a value  (%s) while using a NULL-style operator (%s). That isn't valid", "event_espresso"),$value,$operator));
+		} elseif (in_array($operator, $this->_null_style_operators)) {
+			if ($value != NULL) {
+				throw new EE_Error(sprintf(__("You attempted to give a value  (%s) while using a NULL-style operator (%s). That isn't valid", "event_espresso"), $value, $operator));
 			}
 			return $operator;
-		}elseif( $operator == 'LIKE' && ! is_array($value)){
+		}elseif ($operator == 'LIKE' && ! is_array($value)) {
 			//if the operator is 'LIKE', we want to allow percent signs (%) and not
 			//remove other junk. So just treat it as a string.
 			return $operator.SP.$this->_wpdb_prepare_using_field($value, '%s');
-		}elseif( ! in_array($operator, $this->_in_style_operators) && ! is_array($value)){
-			return $operator.SP.$this->_wpdb_prepare_using_field($value,$field_obj);
-		}elseif(in_array($operator, $this->_in_style_operators) && ! is_array($value)){
-			throw new EE_Error(sprintf(__("Operator '%s' must be used with an array of values, eg 'Registration.REG_ID' => array('%s',array(1,2,3))",'event_espresso'),$operator, $operator));
-		}elseif( ! in_array($operator, $this->_in_style_operators) && is_array($value)){
-			throw new EE_Error(sprintf(__("Operator '%s' must be used with a single value, not an array. Eg 'Registration.REG_ID => array('%s',23))",'event_espresso'),$operator,$operator));
-		}else{
-			throw new EE_Error(sprintf(__("It appears you've provided some totally invalid query parameters. Operator and value were:'%s', which isn't right at all", "event_espresso"),  http_build_query($op_and_value)));
+		}elseif ( ! in_array($operator, $this->_in_style_operators) && ! is_array($value)) {
+			return $operator.SP.$this->_wpdb_prepare_using_field($value, $field_obj);
+		}elseif (in_array($operator, $this->_in_style_operators) && ! is_array($value)) {
+			throw new EE_Error(sprintf(__("Operator '%s' must be used with an array of values, eg 'Registration.REG_ID' => array('%s',array(1,2,3))", 'event_espresso'), $operator, $operator));
+		}elseif ( ! in_array($operator, $this->_in_style_operators) && is_array($value)) {
+			throw new EE_Error(sprintf(__("Operator '%s' must be used with a single value, not an array. Eg 'Registration.REG_ID => array('%s',23))", 'event_espresso'), $operator, $operator));
+		} else {
+			throw new EE_Error(sprintf(__("It appears you've provided some totally invalid query parameters. Operator and value were:'%s', which isn't right at all", "event_espresso"), http_build_query($op_and_value)));
 		}
 	}
 
@@ -3138,12 +3138,12 @@ 
 	 * @param EE_Model_Field_Base|string $field_obj if string, it should be the datatype to be used when querying, eg '%s'
 	 * @return string
 	 */
-	function _construct_between_value( $values, $field_obj ) {
+	function _construct_between_value($values, $field_obj) {
 		$cleaned_values = array();
-		foreach ( $values as $value ) {
-			$cleaned_values[] = $this->_wpdb_prepare_using_field($value,$field_obj);
+		foreach ($values as $value) {
+			$cleaned_values[] = $this->_wpdb_prepare_using_field($value, $field_obj);
 		}
-		return  $cleaned_values[0] . " AND " . $cleaned_values[1];
+		return  $cleaned_values[0]." AND ".$cleaned_values[1];
 	}
 
 
@@ -3159,26 +3159,26 @@ 
 	 * @param EE_Model_Field_Base|string $field_obj if string, it should be a wpdb data type like '%s', or '%d'
 	 * @return string of SQL to follow an 'IN' or 'NOT IN' operator
 	 */
-	function _construct_in_value($values,  $field_obj){
+	function _construct_in_value($values, $field_obj) {
 		//check if the value is a CSV list
-		if(is_string($values)){
+		if (is_string($values)) {
 			//in which case, turn it into an array
-			$values = explode(",",$values);
+			$values = explode(",", $values);
 		}
 		$cleaned_values = array();
-		foreach($values as $value){
-			$cleaned_values[] = $this->_wpdb_prepare_using_field($value,$field_obj);
+		foreach ($values as $value) {
+			$cleaned_values[] = $this->_wpdb_prepare_using_field($value, $field_obj);
 		}
 		//we would just LOVE to leave $cleaned_values as an empty array, and return the value as "()",
 		//but unfortunately that's invalid SQL. So instead we return a string which we KNOW will evaluate to be the empty set
 		//which is effectively equivalent to returning "()". We don't return "(0)" because that only works for auto-incrementing columns
-		if(empty($cleaned_values)){
+		if (empty($cleaned_values)) {
 			$all_fields = $this->field_settings();
 			$a_field = array_shift($all_fields);
 			$main_table = $this->_get_main_table();
 			$cleaned_values[] = "SELECT ".$a_field->get_table_column()." FROM ".$main_table->get_table_name()." WHERE FALSE";
 		}
-		return "(".implode(",",$cleaned_values).")";
+		return "(".implode(",", $cleaned_values).")";
 	}
 
 
@@ -3190,16 +3190,16 @@ 
 	 * @throws EE_Error
 	 * @return false|null|string
 	 */
-	private function _wpdb_prepare_using_field($value,$field_obj){
+	private function _wpdb_prepare_using_field($value, $field_obj) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		if($field_obj instanceof EE_Model_Field_Base){
-			return $wpdb->prepare($field_obj->get_wpdb_data_type(),$this->_prepare_value_for_use_in_db($value, $field_obj));
-		}else{//$field_obj should really just be a data type
-			if( ! in_array($field_obj,$this->_valid_wpdb_data_types)){
-				throw new EE_Error(sprintf(__("%s is not a valid wpdb datatype. Valid ones are %s", "event_espresso"),$field_obj,implode(",",$this->_valid_wpdb_data_types)));
+		if ($field_obj instanceof EE_Model_Field_Base) {
+			return $wpdb->prepare($field_obj->get_wpdb_data_type(), $this->_prepare_value_for_use_in_db($value, $field_obj));
+		} else {//$field_obj should really just be a data type
+			if ( ! in_array($field_obj, $this->_valid_wpdb_data_types)) {
+				throw new EE_Error(sprintf(__("%s is not a valid wpdb datatype. Valid ones are %s", "event_espresso"), $field_obj, implode(",", $this->_valid_wpdb_data_types)));
 			}
-			return $wpdb->prepare($field_obj,$value);
+			return $wpdb->prepare($field_obj, $value);
 		}
 	}
 
@@ -3211,27 +3211,27 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Field_Base
 	 */
-	protected function _deduce_field_from_query_param($query_param_name){
+	protected function _deduce_field_from_query_param($query_param_name) {
 		//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;
 			$model_obj = $this;
-		}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_obj = $this->get_related_model_obj( $query_param_parts[ $number_of_parts - 2 ]);
+			$model_obj = $this->get_related_model_obj($query_param_parts[$number_of_parts - 2]);
 		}
-		try{
+		try {
 			return $model_obj->field_settings_for($field_name);
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			return null;
 		}
 	}
@@ -3245,13 +3245,13 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	function _get_qualified_column_for_field($field_name){
+	function _get_qualified_column_for_field($field_name) {
 		$all_fields = $this->field_settings();
 		$field = isset($all_fields[$field_name]) ? $all_fields[$field_name] : FALSE;
-		if($field){
+		if ($field) {
 			return $field->get_qualified_column();
-		}else{
-			throw new EE_Error(sprintf(__("There is no field titled %s on model %s. Either the query trying to use it is bad, or you need to add it to the list of fields on the model.",'event_espresso'),$field_name,get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__("There is no field titled %s on model %s. Either the query trying to use it is bad, or you need to add it to the list of fields on the model.", 'event_espresso'), $field_name, get_class($this)));
 		}
 	}
 
@@ -3265,14 +3265,14 @@ 
 	 * @param  mixed|string $limit The limit for this select
 	 * @return string 				The final select join element for the query.
 	 */
-	function _construct_limit_join_select( $table_alias, $limit ) {
+	function _construct_limit_join_select($table_alias, $limit) {
 		$SQL = '';
 
-		foreach ( $this->_tables as $table_obj ) {
-			if ( $table_obj instanceof EE_Primary_Table ) {
-				$SQL .= $table_alias == $table_obj->get_table_alias() ? $table_obj->get_select_join_limit( $limit ) : SP.$table_obj->get_table_name()." AS ".$table_obj->get_table_alias().SP;
-			} elseif ( $table_obj instanceof EE_Secondary_Table ) {
-				$SQL .= $table_alias == $table_obj->get_table_alias() ? $table_obj->get_select_join_limit_join($limit) : SP . $table_obj->get_join_sql( $table_alias ).SP;
+		foreach ($this->_tables as $table_obj) {
+			if ($table_obj instanceof EE_Primary_Table) {
+				$SQL .= $table_alias == $table_obj->get_table_alias() ? $table_obj->get_select_join_limit($limit) : SP.$table_obj->get_table_name()." AS ".$table_obj->get_table_alias().SP;
+			} elseif ($table_obj instanceof EE_Secondary_Table) {
+				$SQL .= $table_alias == $table_obj->get_table_alias() ? $table_obj->get_select_join_limit_join($limit) : SP.$table_obj->get_join_sql($table_alias).SP;
 			}
 		}
 		return $SQL;
@@ -3285,7 +3285,7 @@ 
 	 * Eg "wp_post AS Event" or "wp_post AS Event INNER JOIN wp_postmeta Event_Meta ON Event.ID = Event_Meta.post_id"
 	 * @return string SQL
 	 */
-	function _construct_internal_join(){
+	function _construct_internal_join() {
 		$SQL = $this->_get_main_table()->get_table_sql();
 		$SQL .= $this->_construct_internal_join_to_table_with_alias($this->_get_main_table()->get_table_alias());
 		return $SQL;
@@ -3306,17 +3306,17 @@ 
 	 * @param string $alias_prefixed table alias to join to (this table should already be in the FROM SQL clause)
 	 * @return string
 	 */
-	function _construct_internal_join_to_table_with_alias($alias_prefixed){
+	function _construct_internal_join_to_table_with_alias($alias_prefixed) {
 		$SQL = '';
 		$alias_sans_prefix = EE_Model_Parser::remove_table_alias_model_relation_chain_prefix($alias_prefixed);
-		foreach($this->_tables as $table_obj){
-			if($table_obj instanceof EE_Secondary_Table){//table is secondary table
-				if($alias_sans_prefix == $table_obj->get_table_alias()){
+		foreach ($this->_tables as $table_obj) {
+			if ($table_obj instanceof EE_Secondary_Table) {//table is secondary table
+				if ($alias_sans_prefix == $table_obj->get_table_alias()) {
 					//so we're joining to this table, meaning the table is already in
 					//the FROM statement, BUT the primary table isn't. So we want
 					//to add the inverse join sql
 					$SQL .= $table_obj->get_inverse_join_sql($alias_prefixed);
-				}else{
+				} else {
 					//just add a regular JOIN to this table from the primary table
 					$SQL .= $table_obj->get_join_sql($alias_prefixed);
 				}
@@ -3330,9 +3330,9 @@ 
 	 * This should be a growing array of keys being table-columns (eg 'EVT_ID' and 'Event.EVT_ID'), and values being their data type (eg, '%s', '%d', etc)
 	 * @return array
 	 */
-	function _get_data_types(){
+	function _get_data_types() {
 		$data_types = array();
-		foreach(array_values($this->field_settings()) as $field_obj){
+		foreach (array_values($this->field_settings()) as $field_obj) {
 			//$data_types[$field_obj->get_table_column()] = $field_obj->get_wpdb_data_type();
 			/** @var $field_obj EE_Model_Field_Base */
 			$data_types[$field_obj->get_qualified_column()] = $field_obj->get_wpdb_data_type();
@@ -3348,11 +3348,11 @@ 
 	 * @throws EE_Error
 	 * @return EEM_Base
 	 */
-	function get_related_model_obj($model_name){
+	function get_related_model_obj($model_name) {
 
 		$model_classname = "EEM_".$model_name;
-		if(!class_exists($model_classname)){
-			throw new EE_Error(sprintf(__("You specified a related model named %s in your query. No such model exists, if it did, it would have the classname %s",'event_espresso'),$model_name,$model_classname));
+		if ( ! class_exists($model_classname)) {
+			throw new EE_Error(sprintf(__("You specified a related model named %s in your query. No such model exists, if it did, it would have the classname %s", 'event_espresso'), $model_name, $model_classname));
 		}
 		$model_obj = call_user_func($model_classname."::instance");
 		return $model_obj;
@@ -3363,7 +3363,7 @@ 
 	 * Returns the array of EE_ModelRelations for this model.
 	 * @return EE_Model_Relation_Base[]
 	 */
-	public function relation_settings(){
+	public function relation_settings() {
 		return $this->_model_relations;
 	}
 
@@ -3373,10 +3373,10 @@ 
 	 * (Eg, without an event, datetimes have little purpose.)
 	 * @return EE_Belongs_To_Relation[]
 	 */
-	public function belongs_to_relations(){
+	public function belongs_to_relations() {
 		$belongs_to_relations = array();
-		foreach($this->relation_settings() as $model_name => $relation_obj){
-			if($relation_obj instanceof EE_Belongs_To_Relation){
+		foreach ($this->relation_settings() as $model_name => $relation_obj) {
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
 				$belongs_to_relations[$model_name] = $relation_obj;
 			}
 		}
@@ -3391,15 +3391,15 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Relation_Base
 	 */
-	public function related_settings_for($relation_name){
-		$relatedModels=$this->relation_settings();
-		if(!array_key_exists($relation_name,$relatedModels)){
+	public function related_settings_for($relation_name) {
+		$relatedModels = $this->relation_settings();
+		if ( ! array_key_exists($relation_name, $relatedModels)) {
 			throw new EE_Error(
 				sprintf(
-					__('Cannot get %s related to %s. There is no model relation of that type. There is, however, %s...','event_espresso'),
+					__('Cannot get %s related to %s. There is no model relation of that type. There is, however, %s...', 'event_espresso'),
 					$relation_name,
 					$this->_get_class_name(),
-					implode( ', ', array_keys( $relatedModels ))
+					implode(', ', array_keys($relatedModels))
 				)
 			);
 		}
@@ -3414,10 +3414,10 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Field_Base
 	 */
-	public function field_settings_for($fieldName){
-		$fieldSettings=$this->field_settings(true);
-		if( ! array_key_exists($fieldName,$fieldSettings)){
-			throw new EE_Error(sprintf(__("There is no field/column '%s' on '%s'",'event_espresso'),$fieldName,get_class($this)));
+	public function field_settings_for($fieldName) {
+		$fieldSettings = $this->field_settings(true);
+		if ( ! array_key_exists($fieldName, $fieldSettings)) {
+			throw new EE_Error(sprintf(__("There is no field/column '%s' on '%s'", 'event_espresso'), $fieldName, get_class($this)));
 		}
 		return $fieldSettings[$fieldName];
 	}
@@ -3427,11 +3427,11 @@ 
 	 * @param string $fieldName a key in the model's _field_settings array
 	 * @return boolean
 	 */
-	public function has_field($fieldName){
+	public function has_field($fieldName) {
 		$fieldSettings = $this->field_settings(true);
-		if( isset($fieldSettings[$fieldName])){
+		if (isset($fieldSettings[$fieldName])) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -3441,11 +3441,11 @@ 
 	 * @param string $relation_name possibly one of the keys in the relation_settings array
 	 * @return boolean
 	 */
-	public function has_relation($relation_name){
+	public function has_relation($relation_name) {
 		$relations = $this->relation_settings();
-		if(isset($relations[$relation_name])){
+		if (isset($relations[$relation_name])) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -3457,7 +3457,7 @@ 
 	 * @param $field_obj
 	 * @return EE_Model_Field_Base
 	 */
-	public function is_primary_key_field( $field_obj ){
+	public function is_primary_key_field($field_obj) {
 		return $field_obj instanceof EE_Primary_Key_Field_Base ? TRUE : FALSE;
 	}
 
@@ -3469,16 +3469,16 @@ 
 	 * @return EE_Model_Field_Base
 	 * @throws EE_Error
 	 */
-	public function get_primary_key_field(){
-		if( $this->_primary_key_field === NULL ){
-			foreach( $this->field_settings( TRUE ) as $field_obj ){
-				if( $this->is_primary_key_field( $field_obj )){
+	public function get_primary_key_field() {
+		if ($this->_primary_key_field === NULL) {
+			foreach ($this->field_settings(TRUE) as $field_obj) {
+				if ($this->is_primary_key_field($field_obj)) {
 					$this->_primary_key_field = $field_obj;
 					break;
 				}
 			}
-			if( ! $this->_primary_key_field instanceof EE_Primary_Key_Field_Base ){
-				throw new EE_Error(sprintf(__("There is no Primary Key defined on model %s",'event_espresso'),get_class($this)));
+			if ( ! $this->_primary_key_field instanceof EE_Primary_Key_Field_Base) {
+				throw new EE_Error(sprintf(__("There is no Primary Key defined on model %s", 'event_espresso'), get_class($this)));
 			}
 		}
 		return $this->_primary_key_field;
@@ -3491,12 +3491,12 @@ 
 	 * Internally does some caching.
 	 * @return boolean
 	 */
-	public function has_primary_key_field(){
-		if($this->_has_primary_key_field === null){
-			try{
+	public function has_primary_key_field() {
+		if ($this->_has_primary_key_field === null) {
+			try {
 				$this->get_primary_key_field();
 				$this->_has_primary_key_field = true;
-			}catch(EE_Error $e){
+			} catch (EE_Error $e) {
 				$this->_has_primary_key_field = false;
 			}
 		}
@@ -3510,9 +3510,9 @@ 
 	 * @param string $field_class_name class name of field that you want to find. Eg, EE_Datetime_Field, EE_Foreign_Key_Field, etc
 	 * @return EE_Model_Field_Base or null if none is found
 	 */
-	public function get_a_field_of_type($field_class_name){
-		foreach($this->field_settings() as $field){
-			if( $field instanceof $field_class_name ){
+	public function get_a_field_of_type($field_class_name) {
+		foreach ($this->field_settings() as $field) {
+			if ($field instanceof $field_class_name) {
 				return $field;
 			}
 		}
@@ -3526,21 +3526,21 @@ 
 	 * @return EE_Foreign_Key_Field_Base
 	 * @throws EE_Error
 	 */
-	public function get_foreign_key_to($model_name){
-		if( ! isset( $this->_cache_foreign_key_to_fields[ $model_name ] ) ){
-			foreach($this->field_settings() as $field){
+	public function get_foreign_key_to($model_name) {
+		if ( ! isset($this->_cache_foreign_key_to_fields[$model_name])) {
+			foreach ($this->field_settings() as $field) {
 //				if(is_subclass_of($field, 'EE_Foreign_Key_Field_Base')){
-				if( $field instanceof EE_Foreign_Key_Field_Base ){
-					if (in_array($model_name,$field->get_model_names_pointed_to() ) ) {
-						$this->_cache_foreign_key_to_fields[ $model_name ] = $field;
+				if ($field instanceof EE_Foreign_Key_Field_Base) {
+					if (in_array($model_name, $field->get_model_names_pointed_to())) {
+						$this->_cache_foreign_key_to_fields[$model_name] = $field;
 					}
 				}
 			}
-			if( ! isset( $this->_cache_foreign_key_to_fields[ $model_name ] ) ){
-				throw new EE_Error(sprintf(__("There is no foreign key field pointing to model %s on model %s",'event_espresso'),$model_name,get_class($this)));
+			if ( ! isset($this->_cache_foreign_key_to_fields[$model_name])) {
+				throw new EE_Error(sprintf(__("There is no foreign key field pointing to model %s on model %s", 'event_espresso'), $model_name, get_class($this)));
 			}
 		}
-		return $this->_cache_foreign_key_to_fields[ $model_name ];
+		return $this->_cache_foreign_key_to_fields[$model_name];
 	}
 
 
@@ -3551,7 +3551,7 @@ 
 	 * a table alias with a model chain prefix, like 'Venue__Event_Venue___Event_Meta'. Either one works
 	 * @return EE_Table_Base
 	 */
-	function get_table_for_alias($table_alias){
+	function get_table_for_alias($table_alias) {
 		$table_alias_sans_model_relation_chain_prefix = EE_Model_Parser::remove_table_alias_model_relation_chain_prefix($table_alias);
 		return $this->_tables[$table_alias_sans_model_relation_chain_prefix]->get_table_name();
 	}
@@ -3564,25 +3564,25 @@ 
 	 * @param bool $include_db_only_fields flag indicating whether or not to include the db-only fields
 	 * @return EE_Model_Field_Base[] where the keys are the field's name
 	 */
-	public function field_settings($include_db_only_fields = false){
-		if( $include_db_only_fields ){
-			if( $this->_cached_fields === NULL ){
+	public function field_settings($include_db_only_fields = false) {
+		if ($include_db_only_fields) {
+			if ($this->_cached_fields === NULL) {
 				$this->_cached_fields = array();
-				foreach($this->_fields as $fields_corresponding_to_table){
-					foreach($fields_corresponding_to_table as $field_name => $field_obj){
-						$this->_cached_fields[$field_name]=$field_obj;
+				foreach ($this->_fields as $fields_corresponding_to_table) {
+					foreach ($fields_corresponding_to_table as $field_name => $field_obj) {
+						$this->_cached_fields[$field_name] = $field_obj;
 					}
 				}
 			}
 			return $this->_cached_fields;
-		}else{
-			if( $this->_cached_fields_non_db_only === NULL ){
+		} else {
+			if ($this->_cached_fields_non_db_only === NULL) {
 				$this->_cached_fields_non_db_only = array();
-				foreach($this->_fields as $fields_corresponding_to_table){
-					foreach($fields_corresponding_to_table as $field_name => $field_obj){
+				foreach ($this->_fields as $fields_corresponding_to_table) {
+					foreach ($fields_corresponding_to_table as $field_name => $field_obj) {
 						/** @var $field_obj EE_Model_Field_Base */
-						if( ! $field_obj->is_db_only_field() ){
-							$this->_cached_fields_non_db_only[$field_name]=$field_obj;
+						if ( ! $field_obj->is_db_only_field()) {
+							$this->_cached_fields_non_db_only[$field_name] = $field_obj;
 						}
 					}
 				}
@@ -3601,67 +3601,67 @@ 
 	 * @return \EE_Base_Class[] array keys are primary keys (if there is a primary key on the model. if not, numerically indexed)
 	 * @throws \EE_Error
 	 */
-	protected function _create_objects( $rows = array() ) {
-		$array_of_objects=array();
-		if(empty($rows)){
+	protected function _create_objects($rows = array()) {
+		$array_of_objects = array();
+		if (empty($rows)) {
 			return array();
 		}
 		$count_if_model_has_no_primary_key = 0;
 		$has_primary_key = $this->has_primary_key_field();
-		if( $has_primary_key ) {
+		if ($has_primary_key) {
 			$primary_key_field = $this->get_primary_key_field();
 		} else {
 			$primary_key_field = null;
 		}
-		foreach ( $rows as $row ) {
-			if(empty($row)){
+		foreach ($rows as $row) {
+			if (empty($row)) {
 				//wp did its weird thing where it returns an array like array(0=>null), which is totally not helpful...
 				return array();
 			}
 			//check if we've already set this object in the results array,
 			//in which case there's no need to process it further (again)
-			if( $has_primary_key ) {
+			if ($has_primary_key) {
 				$table_pk_value = $this->_get_column_value_with_table_alias_or_not(
 					$row,
 					$primary_key_field->get_qualified_column(),
 					$primary_key_field->get_table_column()
 				);
-				if( $table_pk_value &&
-					isset( $array_of_objects[ $table_pk_value ] ) ) {
+				if ($table_pk_value &&
+					isset($array_of_objects[$table_pk_value])) {
 					continue;
 				}
 			}
-			$classInstance=$this->instantiate_class_from_array_or_object($row);
-			if( ! $classInstance ) {
+			$classInstance = $this->instantiate_class_from_array_or_object($row);
+			if ( ! $classInstance) {
 				throw new EE_Error(
 					sprintf(
-						__( 'Could not create instance of class %s from row %s', 'event_espresso' ),
+						__('Could not create instance of class %s from row %s', 'event_espresso'),
 						$this->get_this_model_name(),
-						http_build_query( $row )
+						http_build_query($row)
 					)
 				);
 			}
 			//set the timezone on the instantiated objects
-			$classInstance->set_timezone( $this->_timezone );
+			$classInstance->set_timezone($this->_timezone);
 			//make sure if there is any timezone setting present that we set the timezone for the object
 			$key = $has_primary_key ? $classInstance->ID() : $count_if_model_has_no_primary_key++;
-			$array_of_objects[ $key ] = $classInstance;
+			$array_of_objects[$key] = $classInstance;
 			//also, for all the relations of type BelongsTo, see if we can cache
 			//those related models
 			//(we could do this for other relations too, but if there are conditions
 			//that filtered out some fo the results, then we'd be caching an incomplete set
 			//so it requires a little more thought than just caching them immediately...)
-			foreach($this->_model_relations as $modelName => $relation_obj){
-				if( $relation_obj instanceof EE_Belongs_To_Relation){
+			foreach ($this->_model_relations as $modelName => $relation_obj) {
+				if ($relation_obj instanceof EE_Belongs_To_Relation) {
 					//check if this model's INFO is present. If so, cache it on the model
 					$other_model = $relation_obj->get_other_model();
 
 					$other_model_obj_maybe = $other_model->instantiate_class_from_array_or_object($row);
 
 					//if we managed to make a model object from the results, cache it on the main model object
-					if( $other_model_obj_maybe ){
+					if ($other_model_obj_maybe) {
 						//set timezone on these other model objects if they are present
-						$other_model_obj_maybe->set_timezone( $this->_timezone );
+						$other_model_obj_maybe->set_timezone($this->_timezone);
 						$classInstance->cache($modelName, $other_model_obj_maybe);
 					}
 				}
@@ -3682,12 +3682,12 @@ 
 
 		$this_model_fields_and_values = array();
 		//setup the row using default values;
-		foreach ( $this->field_settings() as $field_name => $field_obj ) {
+		foreach ($this->field_settings() as $field_name => $field_obj) {
 			$this_model_fields_and_values[$field_name] = $field_obj->get_default_value();
 		}
 
 		$className = $this->_get_class_name();
-		$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_and_values ), FALSE, FALSE );
+		$classInstance = EE_Registry::instance()->load_class($className, array($this_model_fields_and_values), FALSE, FALSE);
 
 		return $classInstance;
 	}
@@ -3700,45 +3700,45 @@ 
 	 * or an stdClass where each property is the name of a column,
 	 * @return EE_Base_Class
 	 */
-	public function instantiate_class_from_array_or_object($cols_n_values){
-		if( ! is_array( $cols_n_values ) && is_object( $cols_n_values )) {
-			$cols_n_values = get_object_vars( $cols_n_values );
+	public function instantiate_class_from_array_or_object($cols_n_values) {
+		if ( ! is_array($cols_n_values) && is_object($cols_n_values)) {
+			$cols_n_values = get_object_vars($cols_n_values);
 		}
 		$primary_key = NULL;
 		//make sure the array only has keys that are fields/columns on this model
-		$this_model_fields_n_values = $this->_deduce_fields_n_values_from_cols_n_values( $cols_n_values );
-		if( $this->has_primary_key_field() && isset( $this_model_fields_n_values[ $this->primary_key_name() ] ) ){
-			$primary_key = $this_model_fields_n_values[ $this->primary_key_name() ];
+		$this_model_fields_n_values = $this->_deduce_fields_n_values_from_cols_n_values($cols_n_values);
+		if ($this->has_primary_key_field() && isset($this_model_fields_n_values[$this->primary_key_name()])) {
+			$primary_key = $this_model_fields_n_values[$this->primary_key_name()];
 		}
-		$className=$this->_get_class_name();
+		$className = $this->_get_class_name();
 
 		//check we actually found results that we can use to build our model object
 		//if not, return null
-		if( $this->has_primary_key_field()){
-			if(empty( $this_model_fields_n_values[$this->primary_key_name()] )){
+		if ($this->has_primary_key_field()) {
+			if (empty($this_model_fields_n_values[$this->primary_key_name()])) {
 				return NULL;
 			}
-		}else if($this->unique_indexes()){
+		} else if ($this->unique_indexes()) {
 			$first_column = reset($this_model_fields_n_values);
-			if(empty($first_column)){
+			if (empty($first_column)) {
 				return NULL;
 			}
 		}
 
 		// if there is no primary key or the object doesn't already exist in the entity map, then create a new instance
-		if ( $primary_key){
-			$classInstance = $this->get_from_entity_map( $primary_key );
-			if( ! $classInstance) {
-				$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_n_values, $this->_timezone ), TRUE, FALSE );
+		if ($primary_key) {
+			$classInstance = $this->get_from_entity_map($primary_key);
+			if ( ! $classInstance) {
+				$classInstance = EE_Registry::instance()->load_class($className, array($this_model_fields_n_values, $this->_timezone), TRUE, FALSE);
 				// add this new object to the entity map
-				$classInstance = $this->add_to_entity_map( $classInstance );
+				$classInstance = $this->add_to_entity_map($classInstance);
 			}
-		}else{
-			$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_n_values, $this->_timezone ), TRUE, FALSE );
+		} else {
+			$classInstance = EE_Registry::instance()->load_class($className, array($this_model_fields_n_values, $this->_timezone), TRUE, FALSE);
 		}
 
 			//it is entirely possible that the instantiated class object has a set timezone_string db field and has set it's internal _timezone property accordingly (see new_instance_from_db in model objects particularly EE_Event for example).  In this case, we want to make sure the model object doesn't have its timezone string overwritten by any timezone property currently set here on the model so, we intentionally override the model _timezone property with the model_object timezone property.
-		$this->set_timezone( $classInstance->get_timezone() );
+		$this->set_timezone($classInstance->get_timezone());
 		return $classInstance;
 	}
 	/**
@@ -3746,8 +3746,8 @@ 
 	 * @param int|string $id the ID of the model object
 	 * @return EE_Base_Class
 	 */
-	public function get_from_entity_map( $id ){
-		return isset( $this->_entity_map[ $id ] ) ? $this->_entity_map[ $id ] : NULL;
+	public function get_from_entity_map($id) {
+		return isset($this->_entity_map[$id]) ? $this->_entity_map[$id] : NULL;
 	}
 
 
@@ -3766,21 +3766,21 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Base_Class
 	 */
-	public function add_to_entity_map( EE_Base_Class $object) {
+	public function add_to_entity_map(EE_Base_Class $object) {
 		$className = $this->_get_class_name();
-		if( ! $object instanceof $className ){
-			throw new EE_Error(sprintf(__("You tried adding a %s to a mapping of %ss", "event_espresso"),is_object( $object ) ? get_class( $object ) : $object, $className ) );
+		if ( ! $object instanceof $className) {
+			throw new EE_Error(sprintf(__("You tried adding a %s to a mapping of %ss", "event_espresso"), is_object($object) ? get_class($object) : $object, $className));
 		}
 		/** @var $object EE_Base_Class */
-		if ( ! $object->ID() ){
-			throw new EE_Error(sprintf(__("You tried storing a model object with NO ID in the %s entity mapper.", "event_espresso"),get_class($this)));
+		if ( ! $object->ID()) {
+			throw new EE_Error(sprintf(__("You tried storing a model object with NO ID in the %s entity mapper.", "event_espresso"), get_class($this)));
 		}
 		// double check it's not already there
-		$classInstance = $this->get_from_entity_map( $object->ID() );
-		if ( $classInstance ) {
+		$classInstance = $this->get_from_entity_map($object->ID());
+		if ($classInstance) {
 			return $classInstance;
 		} else {
-			$this->_entity_map[ $object->ID() ] = $object;
+			$this->_entity_map[$object->ID()] = $object;
 			return $object;
 		}
 	}
@@ -3793,8 +3793,8 @@ 
 	 * @param array $cols_n_values
 	 * @return array
 	 */
-	public function deduce_fields_n_values_from_cols_n_values( $cols_n_values ) {
-		return $this->_deduce_fields_n_values_from_cols_n_values( $cols_n_values );
+	public function deduce_fields_n_values_from_cols_n_values($cols_n_values) {
+		return $this->_deduce_fields_n_values_from_cols_n_values($cols_n_values);
 	}
 
 
@@ -3807,40 +3807,40 @@ 
 	 * @param string $cols_n_values
 	 * @return array
 	 */
-	protected function _deduce_fields_n_values_from_cols_n_values( $cols_n_values ){
+	protected function _deduce_fields_n_values_from_cols_n_values($cols_n_values) {
 		$this_model_fields_n_values = array();
-		foreach( $this->get_tables() as $table_alias => $table_obj ) {
-			$table_pk_value = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $table_obj->get_fully_qualified_pk_column(), $table_obj->get_pk_column() );
+		foreach ($this->get_tables() as $table_alias => $table_obj) {
+			$table_pk_value = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $table_obj->get_fully_qualified_pk_column(), $table_obj->get_pk_column());
 			//there is a primary key on this table and its not set. Use defaults for all its columns
-			if( $table_obj->get_pk_column() && $table_pk_value === NULL ){
-				foreach( $this->_get_fields_for_table( $table_alias ) as $field_name => $field_obj ) {
-					if( ! $field_obj->is_db_only_field() ){
+			if ($table_obj->get_pk_column() && $table_pk_value === NULL) {
+				foreach ($this->_get_fields_for_table($table_alias) as $field_name => $field_obj) {
+					if ( ! $field_obj->is_db_only_field()) {
 						//prepare field as if its coming from db
-						$prepared_value = $field_obj->prepare_for_set( $field_obj->get_default_value() );
-						$this_model_fields_n_values[$field_name] = $field_obj->prepare_for_use_in_db( $prepared_value );
+						$prepared_value = $field_obj->prepare_for_set($field_obj->get_default_value());
+						$this_model_fields_n_values[$field_name] = $field_obj->prepare_for_use_in_db($prepared_value);
 					}
 				}
-			}else{
+			} else {
 				//the table's rows existed. Use their values
-				foreach( $this->_get_fields_for_table( $table_alias ) as $field_name => $field_obj ) {
-					if( ! $field_obj->is_db_only_field() )
-					$this_model_fields_n_values[$field_name] = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $field_obj->get_qualified_column(), $field_obj->get_table_column() );
+				foreach ($this->_get_fields_for_table($table_alias) as $field_name => $field_obj) {
+					if ( ! $field_obj->is_db_only_field())
+					$this_model_fields_n_values[$field_name] = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $field_obj->get_qualified_column(), $field_obj->get_table_column());
 				}
 			}
 		}
 		return $this_model_fields_n_values;
 	}
 
-	protected function _get_column_value_with_table_alias_or_not( $cols_n_values, $qualified_column, $regular_column ){
+	protected function _get_column_value_with_table_alias_or_not($cols_n_values, $qualified_column, $regular_column) {
 		//ask the field what it think it's table_name.column_name should be, and call it the "qualified column"
 		//does the field on the model relate to this column retrieved from the db?
 		//or is it a db-only field? (not relating to the model)
-		if( isset( $cols_n_values[ $qualified_column ] ) ){
-			$value = $cols_n_values[ $qualified_column ];
+		if (isset($cols_n_values[$qualified_column])) {
+			$value = $cols_n_values[$qualified_column];
 
-		}elseif( isset( $cols_n_values[ $regular_column ] ) ){
-			$value = $cols_n_values[ $regular_column ];
-		}else{
+		}elseif (isset($cols_n_values[$regular_column])) {
+			$value = $cols_n_values[$regular_column];
+		} else {
 			$value = NULL;
 		}
 
@@ -3858,23 +3858,23 @@ 
 	 * @param int|string $id
 	 * @return EE_Base_Class
 	 */
-	public function refresh_entity_map_from_db( $id ){
-		$obj_in_map = $this->get_from_entity_map( $id );
-		if( $obj_in_map ){
-			$wpdb_results = $this->_get_all_wpdb_results( array( array ( $this->get_primary_key_field()->get_name() => $id ), 'limit' => 1 ) );
-			if( $wpdb_results && is_array( $wpdb_results ) ){
-				$one_row = reset( $wpdb_results );
-				foreach( $this->_deduce_fields_n_values_from_cols_n_values($one_row ) as $field_name => $db_value ) {
-					$obj_in_map->set_from_db( $field_name, $db_value );
+	public function refresh_entity_map_from_db($id) {
+		$obj_in_map = $this->get_from_entity_map($id);
+		if ($obj_in_map) {
+			$wpdb_results = $this->_get_all_wpdb_results(array(array($this->get_primary_key_field()->get_name() => $id), 'limit' => 1));
+			if ($wpdb_results && is_array($wpdb_results)) {
+				$one_row = reset($wpdb_results);
+				foreach ($this->_deduce_fields_n_values_from_cols_n_values($one_row) as $field_name => $db_value) {
+					$obj_in_map->set_from_db($field_name, $db_value);
 				}
 				//clear the cache of related model objects
-				foreach ( $this->relation_settings() as $relation_name => $relation_obj ){
-					$obj_in_map->clear_cache($relation_name, NULL, TRUE );
+				foreach ($this->relation_settings() as $relation_name => $relation_obj) {
+					$obj_in_map->clear_cache($relation_name, NULL, TRUE);
 				}
 			}
 			return $obj_in_map;
-		}else{
-			return $this->get_one_by_ID( $id );
+		} else {
+			return $this->get_one_by_ID($id);
 		}
 	}
 
@@ -3892,24 +3892,24 @@ 
 	 * @param EE_Base_Class $replacing_model_obj
 	 * @return \EE_Base_Class
 	 */
-	public function refresh_entity_map_with( $id, $replacing_model_obj ) {
-		$obj_in_map = $this->get_from_entity_map( $id );
-		if( $obj_in_map ){
-			if( $replacing_model_obj instanceof EE_Base_Class ){
-				foreach( $replacing_model_obj->model_field_array() as $field_name => $value ) {
-					$obj_in_map->set( $field_name, $value );
+	public function refresh_entity_map_with($id, $replacing_model_obj) {
+		$obj_in_map = $this->get_from_entity_map($id);
+		if ($obj_in_map) {
+			if ($replacing_model_obj instanceof EE_Base_Class) {
+				foreach ($replacing_model_obj->model_field_array() as $field_name => $value) {
+					$obj_in_map->set($field_name, $value);
 				}
 				//make the model object in the entity map's cache match the $replacing_model_obj
-				foreach ( $this->relation_settings() as $relation_name => $relation_obj ){
-					$obj_in_map->clear_cache($relation_name, NULL, TRUE );
-					foreach( $replacing_model_obj->get_all_from_cache( $relation_name ) as $cache_id => $cached_obj ) {
-						$obj_in_map->cache( $relation_name, $cached_obj, $cache_id );
+				foreach ($this->relation_settings() as $relation_name => $relation_obj) {
+					$obj_in_map->clear_cache($relation_name, NULL, TRUE);
+					foreach ($replacing_model_obj->get_all_from_cache($relation_name) as $cache_id => $cached_obj) {
+						$obj_in_map->cache($relation_name, $cached_obj, $cache_id);
 					}
 				}
 			}
 			return $obj_in_map;
-		}else{
-			$this->add_to_entity_map( $replacing_model_obj );
+		} else {
+			$this->add_to_entity_map($replacing_model_obj);
 			return $replacing_model_obj;
 		}
 	}
@@ -3922,7 +3922,7 @@ 
 	 * require_once($this->_getClassName().".class.php");
 	 * @return string
 	 */
-	private function _get_class_name(){
+	private function _get_class_name() {
 		return "EE_".$this->get_this_model_name();
 	}
 
@@ -3935,10 +3935,10 @@ 
 	 * @param int $quantity
 	 * @return string
 	 */
-	public function item_name($quantity = 1){
-		if($quantity == 1){
+	public function item_name($quantity = 1) {
+		if ($quantity == 1) {
 			return $this->singular_item;
-		}else{
+		} else {
 			return $this->plural_item;
 		}
 	}
@@ -3967,13 +3967,13 @@ 
 	 * @throws EE_Error
 	 * @return mixed whatever the plugin which calls add_filter decides
 	 */
-	public function __call($methodName,$args){
-		$className=get_class($this);
-		$tagName="FHEE__{$className}__{$methodName}";
-		if(!has_filter($tagName)){
+	public function __call($methodName, $args) {
+		$className = get_class($this);
+		$tagName = "FHEE__{$className}__{$methodName}";
+		if ( ! has_filter($tagName)) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Method %1$s on model %2$s does not exist! You can create one with the following code in functions.php or in a plugin: %4$s function my_callback(%4$s \$previousReturnValue, EEM_Base \$object\ $argsArray=NULL ){%4$s     /*function body*/%4$s      return \$whatever;%4$s }%4$s add_filter( \'%3$s\', \'my_callback\', 10, 3 );', 'event_espresso' ),
+					__('Method %1$s on model %2$s does not exist! You can create one with the following code in functions.php or in a plugin: %4$s function my_callback(%4$s \$previousReturnValue, EEM_Base \$object\ $argsArray=NULL ){%4$s     /*function body*/%4$s      return \$whatever;%4$s }%4$s add_filter( \'%3$s\', \'my_callback\', 10, 3 );', 'event_espresso'),
 					$methodName,
 					$className,
 					$tagName,
@@ -3982,7 +3982,7 @@ 
 			);
 		}
 
-		return apply_filters($tagName,null,$this,$args);
+		return apply_filters($tagName, null, $this, $args);
 	}
 
 
@@ -3995,22 +3995,22 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class
 	 */
-	public function ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db = FALSE ){
+	public function ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db = FALSE) {
 		$className = $this->_get_class_name();
 		$primary_key_field = $this->get_primary_key_field();
-		if( $base_class_obj_or_id instanceof $className ){
+		if ($base_class_obj_or_id instanceof $className) {
 			$model_object = $base_class_obj_or_id;
-		}elseif( $primary_key_field instanceof EE_Primary_Key_Int_Field && (
-				is_int( $base_class_obj_or_id ) ||
-				is_string( $base_class_obj_or_id ) )){//assume it's an ID. either a proper integer or a string representing an integer (eg "101" instead of 101)
+		}elseif ($primary_key_field instanceof EE_Primary_Key_Int_Field && (
+				is_int($base_class_obj_or_id) ||
+				is_string($base_class_obj_or_id) )) {//assume it's an ID. either a proper integer or a string representing an integer (eg "101" instead of 101)
 			$model_object = $this->get_one_by_ID($base_class_obj_or_id);
-		}elseif( $primary_key_field instanceof EE_Primary_Key_String_Field && is_string($base_class_obj_or_id) ){
+		}elseif ($primary_key_field instanceof EE_Primary_Key_String_Field && is_string($base_class_obj_or_id)) {
 			//assume its a string representation of the object
 			$model_object = $this->get_one_by_ID($base_class_obj_or_id);
-		}else{
-			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'",'event_espresso'),$base_class_obj_or_id,$this->_get_class_name(),print_r($base_class_obj_or_id,true)));
+		} else {
+			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'", 'event_espresso'), $base_class_obj_or_id, $this->_get_class_name(), print_r($base_class_obj_or_id, true)));
 		}
-		if( $model_object->ID() == NULL && $ensure_is_in_db){
+		if ($model_object->ID() == NULL && $ensure_is_in_db) {
 			$model_object->save();
 		}
 		return $model_object;
@@ -4026,19 +4026,19 @@ 
 	 * @return int|string depending on the type of this model object's ID
 	 * @throws EE_Error
 	 */
-	public function ensure_is_ID($base_class_obj_or_id){
+	public function ensure_is_ID($base_class_obj_or_id) {
 		$className = $this->_get_class_name();
-		if( $base_class_obj_or_id instanceof $className ){
+		if ($base_class_obj_or_id instanceof $className) {
 			/** @var $base_class_obj_or_id EE_Base_Class */
 			$id = $base_class_obj_or_id->ID();
-		}elseif(is_int($base_class_obj_or_id)){
+		}elseif (is_int($base_class_obj_or_id)) {
 			//assume it's an ID
 			$id = $base_class_obj_or_id;
-		}elseif(is_string($base_class_obj_or_id)){
+		}elseif (is_string($base_class_obj_or_id)) {
 			//assume its a string representation of the object
 			$id = $base_class_obj_or_id;
-		}else{
-			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'",'event_espresso'),$base_class_obj_or_id,$this->_get_class_name(),print_r($base_class_obj_or_id,true)));
+		} else {
+			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'", 'event_espresso'), $base_class_obj_or_id, $this->_get_class_name(), print_r($base_class_obj_or_id, true)));
 		}
 		return $id;
 	}
@@ -4061,14 +4061,14 @@ 
 	 * @param int $values_already_prepared like one of the constants on EEM_Base
 	 * @return void
 	 */
-	public function assume_values_already_prepared_by_model_object($values_already_prepared = self::not_prepared_by_model_object){
+	public function assume_values_already_prepared_by_model_object($values_already_prepared = self::not_prepared_by_model_object) {
 		$this->_values_already_prepared_by_model_object = $values_already_prepared;
 	}
 	/**
 	 * Read comments for assume_values_already_prepared_by_model_object()
 	 * @return int
 	 */
-	public function get_assumption_concerning_values_already_prepared_by_model_object(){
+	public function get_assumption_concerning_values_already_prepared_by_model_object() {
 		return $this->_values_already_prepared_by_model_object;
 	}
 
@@ -4076,17 +4076,17 @@ 
 	 * Gets all the indexes on this model
 	 * @return EE_Index[]
 	 */
-	public function indexes(){
+	public function indexes() {
 		return $this->_indexes;
 	}
 	/**
 	 * Gets all the Unique Indexes on this model
 	 * @return EE_Unique_Index[]
 	 */
-	public function unique_indexes(){
+	public function unique_indexes() {
 		$unique_indexes = array();
-		foreach($this->_indexes as $name => $index){
-			if($index instanceof EE_Unique_Index){
+		foreach ($this->_indexes as $name => $index) {
+			if ($index instanceof EE_Unique_Index) {
 				$unique_indexes [$name] = $index;
 			}
 		}
@@ -4099,9 +4099,9 @@ 
 	 * on a primary index
 	 * @return EE_Model_Field_Base[]
 	 */
-	public function get_combined_primary_key_fields(){
-		foreach($this->indexes() as $index){
-			if($index instanceof EE_Primary_Key_Index){
+	public function get_combined_primary_key_fields() {
+		foreach ($this->indexes() as $index) {
+			if ($index instanceof EE_Primary_Key_Index) {
 				return $index->fields();
 			}
 		}
@@ -4114,7 +4114,7 @@ 
 	 * @param array $cols_n_values keys are field names, values are their values
 	 * @return string
 	 */
-	public function get_index_primary_key_string($cols_n_values){
+	public function get_index_primary_key_string($cols_n_values) {
 		$cols_n_values_for_primary_key_index = array_intersect_key($cols_n_values, $this->get_combined_primary_key_fields());
 		return http_build_query($cols_n_values_for_primary_key_index);
 	}
@@ -4126,13 +4126,13 @@ 
 	 * @param string $index_primary_key_string
 	 * @return null|array
 	 */
-	function parse_index_primary_key_string( $index_primary_key_string) {
+	function parse_index_primary_key_string($index_primary_key_string) {
 		$key_fields = $this->get_combined_primary_key_fields();
 		//check all of them are in the $id
 		$key_vals_in_combined_pk = array();
-		parse_str( $index_primary_key_string, $key_vals_in_combined_pk );
-		foreach( $key_fields as $key_field_name => $field_obj ) {
-			if( ! isset( $key_vals_in_combined_pk[ $key_field_name ] ) ){
+		parse_str($index_primary_key_string, $key_vals_in_combined_pk);
+		foreach ($key_fields as $key_field_name => $field_obj) {
+			if ( ! isset($key_vals_in_combined_pk[$key_field_name])) {
 				return NULL;
 			}
 		}
@@ -4145,10 +4145,10 @@ 
 	 * @param array $key_vals
 	 * @return boolean
 	 */
-	function has_all_combined_primary_key_fields( $key_vals ) {
-		$keys_it_should_have = array_keys( $this->get_combined_primary_key_fields() );
-		foreach( $keys_it_should_have as $key ){
-			if( ! isset( $key_vals[ $key ] ) ){
+	function has_all_combined_primary_key_fields($key_vals) {
+		$keys_it_should_have = array_keys($this->get_combined_primary_key_fields());
+		foreach ($keys_it_should_have as $key) {
+			if ( ! isset($key_vals[$key])) {
 				return false;
 			}
 		}
@@ -4164,23 +4164,23 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Base_Class[] Array keys are object IDs (if there is a primary key on the model. if not, numerically indexed)
 	 */
-	public function get_all_copies($model_object_or_attributes_array, $query_params = array()){
+	public function get_all_copies($model_object_or_attributes_array, $query_params = array()) {
 
-		if($model_object_or_attributes_array instanceof EE_Base_Class){
+		if ($model_object_or_attributes_array instanceof EE_Base_Class) {
 			$attributes_array = $model_object_or_attributes_array->model_field_array();
-		}elseif(is_array($model_object_or_attributes_array)){
+		}elseif (is_array($model_object_or_attributes_array)) {
 			$attributes_array = $model_object_or_attributes_array;
-		}else{
-			throw new EE_Error(sprintf(__("get_all_copies should be provided with either a model object or an array of field-value-pairs, but was given %s", "event_espresso"),$model_object_or_attributes_array));
+		} else {
+			throw new EE_Error(sprintf(__("get_all_copies should be provided with either a model object or an array of field-value-pairs, but was given %s", "event_espresso"), $model_object_or_attributes_array));
 		}
 		//even copies obviously won't have the same ID, so remove the primary key
 		//from the WHERE conditions for finding copies (if there is a primary key, of course)
-		if($this->has_primary_key_field() && isset($attributes_array[$this->primary_key_name()])){
+		if ($this->has_primary_key_field() && isset($attributes_array[$this->primary_key_name()])) {
 			unset($attributes_array[$this->primary_key_name()]);
 		}
-		if(isset($query_params[0])){
-			$query_params[0] = array_merge($attributes_array,$query_params);
-		}else{
+		if (isset($query_params[0])) {
+			$query_params[0] = array_merge($attributes_array, $query_params);
+		} else {
 			$query_params[0] = $attributes_array;
 		}
 		return $this->get_all($query_params);
@@ -4194,16 +4194,16 @@ 
 	 * @param array $query_params
 	 * @return EE_Base_Class
 	 */
-	function get_one_copy($model_object_or_attributes_array,$query_params = array()){
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::get_one_copy', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+	function get_one_copy($model_object_or_attributes_array, $query_params = array()) {
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::get_one_copy', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		$query_params['limit'] = 1;
-		$copies = $this->get_all_copies($model_object_or_attributes_array,$query_params);
-		if(is_array($copies)){
+		$copies = $this->get_all_copies($model_object_or_attributes_array, $query_params);
+		if (is_array($copies)) {
 			return array_shift($copies);
-		}else{
+		} else {
 			return null;
 		}
 	}
@@ -4217,10 +4217,10 @@ 
 	 * @param int|string $id the value of the primary key to update
 	 * @return int number of rows updated
 	 */
-	public function update_by_ID($fields_n_values,$id){
+	public function update_by_ID($fields_n_values, $id) {
 		$query_params = array(0=>array($this->get_primary_key_field()->get_name() => $id),
 			'default_where_conditions'=>'other_models_only',);
-		return $this->update($fields_n_values,$query_params);
+		return $this->update($fields_n_values, $query_params);
 	}
 
 
@@ -4231,12 +4231,12 @@ 
 	 * @return string an operator which can be used in SQL
 	 * @throws EE_Error
 	 */
-	private function _prepare_operator_for_sql($operator_supplied){
+	private function _prepare_operator_for_sql($operator_supplied) {
 		$sql_operator = isset($this->_valid_operators[$operator_supplied]) ? $this->_valid_operators[$operator_supplied] : null;
-		if($sql_operator){
+		if ($sql_operator) {
 			return $sql_operator;
-		}else{
-			throw new EE_Error(sprintf(__("The operator '%s' is not in the list of valid operators: %s", "event_espresso"),$operator_supplied,implode(",",array_keys($this->_valid_operators))));
+		} else {
+			throw new EE_Error(sprintf(__("The operator '%s' is not in the list of valid operators: %s", "event_espresso"), $operator_supplied, implode(",", array_keys($this->_valid_operators))));
 		}
 	}
 
@@ -4246,10 +4246,10 @@ 
 	 * @param array $query_params like get_all's
 	 * @return string[]
 	 */
-	public function get_all_names($query_params = array()){
+	public function get_all_names($query_params = array()) {
 		$objs = $this->get_all($query_params);
 		$names = array();
-		foreach($objs as $obj){
+		foreach ($objs as $obj) {
 			$names[$obj->ID()] = $obj->name();
 		}
 		return $names;
@@ -4264,22 +4264,22 @@ 
 	 * @param boolean $filter_out_empty_ids if a model object has an ID of '' or 0, don't bother including it in the returned array
 	 * @return array
 	 */
-	public function get_IDs( $model_objects, $filter_out_empty_ids = false) {
-		if( ! $this->has_primary_key_field() ) {
-			if( WP_DEBUG ) {
-				EE_Error::add_error( __( 'Trying to get IDs from a model than has no primary key', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public function get_IDs($model_objects, $filter_out_empty_ids = false) {
+		if ( ! $this->has_primary_key_field()) {
+			if (WP_DEBUG) {
+				EE_Error::add_error(__('Trying to get IDs from a model than has no primary key', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return array();
 			}
 		}
 		$IDs = array();
-		foreach( $model_objects as $model_object ) {
+		foreach ($model_objects as $model_object) {
 			$id = $model_object->ID();
-			if( ! $id ) {
-				if( $filter_out_empty_ids ) {
+			if ( ! $id) {
+				if ($filter_out_empty_ids) {
 					continue;
 				}
-				if( WP_DEBUG ) {
-					EE_Error::add_error(__( 'Called %1$s on a model object that has no ID and so probably hasn\'t been saved to the database', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				if (WP_DEBUG) {
+					EE_Error::add_error(__('Called %1$s on a model object that has no ID and so probably hasn\'t been saved to the database', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 			$IDs[] = $id;
@@ -4292,8 +4292,8 @@ 
 	 * are no capabilities that relate to this model returns false
 	 * @return string|false
 	 */
-	public function cap_slug(){
-		return apply_filters( 'FHEE__EEM_Base__cap_slug', $this->_caps_slug, $this);
+	public function cap_slug() {
+		return apply_filters('FHEE__EEM_Base__cap_slug', $this->_caps_slug, $this);
 	}
 
 	/**
@@ -4305,27 +4305,27 @@ 
 	 * @param string $context
 	 * @return EE_Default_Where_Conditions[] indexed by associated capability
 	 */
-	public function cap_restrictions( $context = EEM_Base::caps_read ) {
-		EEM_Base::verify_is_valid_cap_context( $context );
+	public function cap_restrictions($context = EEM_Base::caps_read) {
+		EEM_Base::verify_is_valid_cap_context($context);
 		//check if we ought to run the restriction generator first
-		if( isset( $this->_cap_restriction_generators[ $context ] ) &&
-				$this->_cap_restriction_generators[ $context ] instanceof EE_Restriction_Generator_Base &&
-				! $this->_cap_restriction_generators[ $context ]->has_generated_cap_restrictions() ) {
-			$this->_cap_restrictions[ $context ] = array_merge( $this->_cap_restrictions[ $context ],  $this->_cap_restriction_generators[ $context ]->generate_restrictions() );
+		if (isset($this->_cap_restriction_generators[$context]) &&
+				$this->_cap_restriction_generators[$context] instanceof EE_Restriction_Generator_Base &&
+				! $this->_cap_restriction_generators[$context]->has_generated_cap_restrictions()) {
+			$this->_cap_restrictions[$context] = array_merge($this->_cap_restrictions[$context], $this->_cap_restriction_generators[$context]->generate_restrictions());
 		}
 		//and make sure we've finalized the construction of each restriction
-		foreach( $this->_cap_restrictions[ $context ] as $where_conditions_obj ) {
-			$where_conditions_obj->_finalize_construct( $this );
+		foreach ($this->_cap_restrictions[$context] as $where_conditions_obj) {
+			$where_conditions_obj->_finalize_construct($this);
 		}
 
-		return $this->_cap_restrictions[ $context ];
+		return $this->_cap_restrictions[$context];
 	}
 
 	/**
 	 * Indicating whether or not this model thinks its a wp core model
 	 * @return boolean
 	 */
-	public function is_wp_core_model(){
+	public function is_wp_core_model() {
 		return $this->_wp_core_model;
 	}
 
@@ -4335,12 +4335,12 @@ 
 	 * @param string $context one of EEM_Base::caps_ constants
 	 * @return EE_Default_Where_Conditions[] indexed by capability name
 	 */
-	public function caps_missing( $context = EEM_Base::caps_read ) {
+	public function caps_missing($context = EEM_Base::caps_read) {
 		$missing_caps = array();
-		$cap_restrictions = $this->cap_restrictions( $context );
-		foreach( $cap_restrictions as $cap => $restriction_if_no_cap ) {
-			if( ! EE_Capabilities::instance()->current_user_can( $cap, $this->get_this_model_name() . '_model_applying_caps') ) {
-				$missing_caps[ $cap ] = $restriction_if_no_cap;
+		$cap_restrictions = $this->cap_restrictions($context);
+		foreach ($cap_restrictions as $cap => $restriction_if_no_cap) {
+			if ( ! EE_Capabilities::instance()->current_user_can($cap, $this->get_this_model_name().'_model_applying_caps')) {
+				$missing_caps[$cap] = $restriction_if_no_cap;
 			}
 		}
 		return $missing_caps;
@@ -4352,7 +4352,7 @@ 
 	 * one of 'read', 'edit', or 'delete'
 	 */
 	public function cap_contexts_to_cap_action_map() {
-		return apply_filters( 'FHEE__EEM_Base__cap_contexts_to_cap_action_map', $this->_cap_contexts_to_cap_action_map, $this );
+		return apply_filters('FHEE__EEM_Base__cap_contexts_to_cap_action_map', $this->_cap_contexts_to_cap_action_map, $this);
 	}
 
 
@@ -4363,19 +4363,19 @@ 
 	 * @return string one of EEM_Base::cap_contexts_to_cap_action_map() values
 	 * @throws \EE_Error
 	 */
-	public function cap_action_for_context( $context ) {
+	public function cap_action_for_context($context) {
 		$mapping = $this->cap_contexts_to_cap_action_map();
-		if( isset( $mapping[ $context ] ) ) {
-			return $mapping[ $context ];
+		if (isset($mapping[$context])) {
+			return $mapping[$context];
 		}
-		if( $action = apply_filters( 'FHEE__EEM_Base__cap_action_for_context', null, $this, $mapping, $context ) ) {
+		if ($action = apply_filters('FHEE__EEM_Base__cap_action_for_context', null, $this, $mapping, $context)) {
 			return $action;
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'Cannot find capability restrictions for context "%1$s", allowed values are:%2$s', 'event_espresso' ),
+				__('Cannot find capability restrictions for context "%1$s", allowed values are:%2$s', 'event_espresso'),
 				$context,
-				implode(',', array_keys( $this->cap_contexts_to_cap_action_map() ) )
+				implode(',', array_keys($this->cap_contexts_to_cap_action_map()))
 			)
 		);
 
@@ -4386,7 +4386,7 @@ 
 	 * @return array
 	 */
 	static public function valid_cap_contexts() {
-		return apply_filters( 'FHEE__EEM_Base__valid_cap_contexts', array(
+		return apply_filters('FHEE__EEM_Base__valid_cap_contexts', array(
 			self::caps_read,
 			self::caps_read_admin,
 			self::caps_edit,
@@ -4402,17 +4402,17 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	static public function verify_is_valid_cap_context( $context ) {
+	static public function verify_is_valid_cap_context($context) {
 		$valid_cap_contexts = EEM_Base::valid_cap_contexts();
-		if( in_array( $context, $valid_cap_contexts ) ) {
+		if (in_array($context, $valid_cap_contexts)) {
 			return true;
-		}else{
+		} else {
 			throw new EE_Error(
 				sprintf(
-					__( 'Context "%1$s" passed into model "%2$s" is not a valid context. They are: %3$s', 'event_espresso' ),
+					__('Context "%1$s" passed into model "%2$s" is not a valid context. They are: %3$s', 'event_espresso'),
 					$context,
-					'EEM_Base' ,
-					implode(',', $valid_cap_contexts )
+					'EEM_Base',
+					implode(',', $valid_cap_contexts)
 				)
 			);
 		}

core/libraries/batch/JobHandlers/RegistrationsReport.php

Doc Comments +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 	 * Gets the questions which are to be used for this report, so they
 	 * can be remembered for later
 	 * @param int|null $event_id
-	 * @return array of wpdb results for questions which are to be used for this report
+	 * @return \stdClass[] of wpdb results for questions which are to be used for this report
 	 */
 	protected function _get_questions_for_report( $event_id ) {
 		$question_query_params = array(
@@ -410,7 +410,7 @@ 
 	 * Performs any clean-up logic when we know the job is completed.
 	 * In this case, we delete the temporary file
 	 * @param JobParameters $job_parameters
-	 * @return boolean
+	 * @return JobStepResponse
 	 */
 	public function cleanup_job( JobParameters $job_parameters ){
 		$this->_file_helper->delete(

Spacing +139 added lines, -139 removed lines

@@ -19,8 +19,8 @@ 
 use EventEspressoBatchRequest\Helpers\JobParameters;
 use EventEspressoBatchRequest\Helpers\JobStepResponse;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -35,36 +35,36 @@ 
 	 * @throws BatchRequestException
 	 * @return JobStepResponse
 	 */
-	public function create_job( JobParameters $job_parameters ) {
-		$event_id = intval( $job_parameters->request_datum( 'EVT_ID', '0' ) );
-		if( ! \EE_Capabilities::instance()->current_user_can( 'ee_read_registrations', 'generating_report' ) ) {
+	public function create_job(JobParameters $job_parameters) {
+		$event_id = intval($job_parameters->request_datum('EVT_ID', '0'));
+		if ( ! \EE_Capabilities::instance()->current_user_can('ee_read_registrations', 'generating_report')) {
 			throw new BatchRequestException(
-				__( 'You do not have permission to view registrations', 'event_espresso')
+				__('You do not have permission to view registrations', 'event_espresso')
 			);
 		}
 		$filepath = $this->create_file_from_job_with_name(
 			$job_parameters->job_id(),
-			$this->get_filename_from_event( $event_id )
+			$this->get_filename_from_event($event_id)
 		);
-		$job_parameters->add_extra_data( 'filepath', $filepath );
-		$question_data_for_columns = $this->_get_questions_for_report( $event_id );
-		$job_parameters->add_extra_data( 'questions_data', $question_data_for_columns );
-		$job_parameters->set_job_size( $this->count_units_to_process( $event_id ) );
+		$job_parameters->add_extra_data('filepath', $filepath);
+		$question_data_for_columns = $this->_get_questions_for_report($event_id);
+		$job_parameters->add_extra_data('questions_data', $question_data_for_columns);
+		$job_parameters->set_job_size($this->count_units_to_process($event_id));
 		//we should also set the header columns
 		$csv_data_for_row = $this->get_csv_data_for(
 			$event_id,
 			0,
 			1,
-			$job_parameters->extra_datum( 'questions_data' ) );
-		\EE_Registry::instance()->load_helper( 'Export' );
-		\EEH_Export::write_data_array_to_csv( $filepath, $csv_data_for_row, true );
+			$job_parameters->extra_datum('questions_data') );
+		\EE_Registry::instance()->load_helper('Export');
+		\EEH_Export::write_data_array_to_csv($filepath, $csv_data_for_row, true);
 		//if we actually processed a row there, record it
-		if( $job_parameters->job_size() ) {
-			$job_parameters->mark_processed( 1 );
+		if ($job_parameters->job_size()) {
+			$job_parameters->mark_processed(1);
 		}
 		return new JobStepResponse(
 			$job_parameters,
-			__( 'Registrations report started successfully...', 'event_espresso' )
+			__('Registrations report started successfully...', 'event_espresso')
 		);
 	}
 
@@ -75,16 +75,16 @@ 
 	 * @param int $event_id
 	 * @return string
 	 */
-	protected function get_filename_from_event( $event_id ) {
-		if( $event_id ){
-			$event_slug =  \EEM_Event::instance()->get_var( array( array( 'EVT_ID' => $event_id ) ), 'EVT_slug' );
-			if( ! $event_slug ) {
-				$event_slug = __( 'unknown', 'event_espresso' );
+	protected function get_filename_from_event($event_id) {
+		if ($event_id) {
+			$event_slug = \EEM_Event::instance()->get_var(array(array('EVT_ID' => $event_id)), 'EVT_slug');
+			if ( ! $event_slug) {
+				$event_slug = __('unknown', 'event_espresso');
 			}
-		}else{
-			$event_slug = __( 'all', 'event_espresso' );
+		} else {
+			$event_slug = __('all', 'event_espresso');
 		}
-		return sprintf( "registrations-for-%s.csv", $event_slug );
+		return sprintf("registrations-for-%s.csv", $event_slug);
 	}
 
 	/**
@@ -93,17 +93,17 @@ 
 	 * @param int|null $event_id
 	 * @return array of wpdb results for questions which are to be used for this report
 	 */
-	protected function _get_questions_for_report( $event_id ) {
+	protected function _get_questions_for_report($event_id) {
 		$question_query_params = array(
 			array(
-				'Answer.ANS_ID' => array( 'IS_NOT_NULL' ),
+				'Answer.ANS_ID' => array('IS_NOT_NULL'),
 			),
-			'group_by' => array( 'QST_ID' )
+			'group_by' => array('QST_ID')
 		);
-		if( $event_id ) {
+		if ($event_id) {
 			$question_query_params[0]['Answer.Registration.EVT_ID'] = $event_id;
 		}
-		return \EEM_Question::instance()->get_all_wpdb_results( $question_query_params );
+		return \EEM_Question::instance()->get_all_wpdb_results($question_query_params);
 	}
 
 
@@ -116,28 +116,28 @@ 
 	 * @return JobStepResponse
 	 * @throws \EE_Error
 	 */
-	public function continue_job( JobParameters $job_parameters, $batch_size = 50 ) {
+	public function continue_job(JobParameters $job_parameters, $batch_size = 50) {
 		$csv_data = $this->get_csv_data_for(
-			$job_parameters->request_datum( 'EVT_ID', '0'),
+			$job_parameters->request_datum('EVT_ID', '0'),
 			$job_parameters->units_processed(),
 			$batch_size,
-			$job_parameters->extra_datum( 'questions_data' ) );
-		\EE_Registry::instance()->load_helper( 'Export' );
-		\EEH_Export::write_data_array_to_csv( $job_parameters->extra_datum( 'filepath' ), $csv_data, false );
-		$units_processed = count( $csv_data );
-		$job_parameters->mark_processed( $units_processed );
+			$job_parameters->extra_datum('questions_data') );
+		\EE_Registry::instance()->load_helper('Export');
+		\EEH_Export::write_data_array_to_csv($job_parameters->extra_datum('filepath'), $csv_data, false);
+		$units_processed = count($csv_data);
+		$job_parameters->mark_processed($units_processed);
 		$extra_response_data = array(
 			'file_url' => ''
 		);
-		if( $units_processed < $batch_size ) {
-			$job_parameters->set_status( JobParameters::status_complete );
-			$extra_response_data[ 'file_url' ] = $this->get_url_to_file( $job_parameters->extra_datum( 'filepath' ) );
+		if ($units_processed < $batch_size) {
+			$job_parameters->set_status(JobParameters::status_complete);
+			$extra_response_data['file_url'] = $this->get_url_to_file($job_parameters->extra_datum('filepath'));
 		}
 		return new JobStepResponse(
 				$job_parameters,
 				sprintf(
-					__( 'Wrote %1$s rows to report CSV file...', 'event_espresso' ),
-					count( $csv_data ) ),
+					__('Wrote %1$s rows to report CSV file...', 'event_espresso'),
+					count($csv_data) ),
 				$extra_response_data );
 	}
 
@@ -150,8 +150,8 @@ 
 	 * @return array top-level keys are numeric, next-level keys are column headers
 	 *
 	 */
-	function get_csv_data_for( $event_id, $offset, $limit, $questions_for_these_regs_rows ) {
-		\EE_Registry::instance()->load_helper( 'Export' );
+	function get_csv_data_for($event_id, $offset, $limit, $questions_for_these_regs_rows) {
+		\EE_Registry::instance()->load_helper('Export');
 		$reg_fields_to_include = array(
 			'TXN_ID',
 			'ATT_ID',
@@ -182,165 +182,165 @@ 
 				array(
 					'OR' => array(
 						//don't include registrations from failed or abandoned transactions...
-						'Transaction.STS_ID' => array( 'NOT IN', array( \EEM_Transaction::failed_status_code, \EEM_Transaction::abandoned_status_code ) ),
+						'Transaction.STS_ID' => array('NOT IN', array(\EEM_Transaction::failed_status_code, \EEM_Transaction::abandoned_status_code)),
 						//unless the registration is approved, in which case include it regardless of transaction status
 						'STS_ID' => \EEM_Registration::status_id_approved
 						),
-					'Ticket.TKT_deleted' => array( 'IN', array( true, false ) )
+					'Ticket.TKT_deleted' => array('IN', array(true, false))
 					),
-				'order_by' => array('Transaction.TXN_ID'=>'asc','REG_count'=>'asc'),
-				'force_join' => array( 'Transaction', 'Ticket', 'Attendee' ),
-				'limit' => array( $offset, $limit ),
+				'order_by' => array('Transaction.TXN_ID'=>'asc', 'REG_count'=>'asc'),
+				'force_join' => array('Transaction', 'Ticket', 'Attendee'),
+				'limit' => array($offset, $limit),
 			),
 			$event_id
 		);
-		if( $event_id ){
-			$query_params[0]['EVT_ID'] =  $event_id;
-		}else{
-			$query_params[ 'force_join' ][] = 'Event';
+		if ($event_id) {
+			$query_params[0]['EVT_ID'] = $event_id;
+		} else {
+			$query_params['force_join'][] = 'Event';
 		}
-		$registration_rows = $reg_model->get_all_wpdb_results( $query_params );
+		$registration_rows = $reg_model->get_all_wpdb_results($query_params);
 		//get all questions which relate to someone in this group
 		$registration_ids = array();
-		foreach( $registration_rows as $reg_row ) {
-			$registration_ids[] = intval( $reg_row[ 'Registration.REG_ID'] );
+		foreach ($registration_rows as $reg_row) {
+			$registration_ids[] = intval($reg_row['Registration.REG_ID']);
 		}
 
-		foreach($registration_rows as $reg_row){
-			if ( is_array( $reg_row ) ) {
+		foreach ($registration_rows as $reg_row) {
+			if (is_array($reg_row)) {
 				$reg_csv_array = array();
-				if( ! $event_id ){
+				if ( ! $event_id) {
 					//get the event's name and Id
-					$reg_csv_array[ __( 'Event', 'event_espresso' ) ] = sprintf( __( '%1$s (%2$s)', 'event_espresso' ), \EEH_Export::prepare_value_from_db_for_display( \EEM_Event::instance(), 'EVT_name', $reg_row[ 'Event_CPT.post_title'] ), $reg_row[ 'Event_CPT.ID' ] );
+					$reg_csv_array[__('Event', 'event_espresso')] = sprintf(__('%1$s (%2$s)', 'event_espresso'), \EEH_Export::prepare_value_from_db_for_display(\EEM_Event::instance(), 'EVT_name', $reg_row['Event_CPT.post_title']), $reg_row['Event_CPT.ID']);
 				}
-				$is_primary_reg = $reg_row[ 'Registration.REG_count' ] == '1' ? true : false;
+				$is_primary_reg = $reg_row['Registration.REG_count'] == '1' ? true : false;
 				/*@var $reg_row EE_Registration */
-				foreach($reg_fields_to_include as $field_name){
+				foreach ($reg_fields_to_include as $field_name) {
 					$field = $reg_model->field_settings_for($field_name);
-					if($field_name == 'REG_final_price'){
-						$value = \EEH_Export::prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_final_price'], 'localized_float' );
-					}elseif( $field_name == 'REG_count' ){
-						$value = sprintf( __( '%s of %s', 'event_espresso' ), \EEH_Export::prepare_value_from_db_for_display( $reg_model, 'REG_count', $reg_row['Registration.REG_count'] ), \EEH_Export::prepare_value_from_db_for_display( $reg_model, 'REG_group_size', $reg_row['Registration.REG_group_size' ] ) );
-					}elseif( $field_name == 'REG_date' ) {
-						$value = \EEH_Export::prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_date'], 'no_html' );
-					}else{
-						$value = \EEH_Export::prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ $field->get_qualified_column() ] );
+					if ($field_name == 'REG_final_price') {
+						$value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name, $reg_row['Registration.REG_final_price'], 'localized_float');
+					}elseif ($field_name == 'REG_count') {
+						$value = sprintf(__('%s of %s', 'event_espresso'), \EEH_Export::prepare_value_from_db_for_display($reg_model, 'REG_count', $reg_row['Registration.REG_count']), \EEH_Export::prepare_value_from_db_for_display($reg_model, 'REG_group_size', $reg_row['Registration.REG_group_size']));
+					}elseif ($field_name == 'REG_date') {
+						$value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name, $reg_row['Registration.REG_date'], 'no_html');
+					} else {
+						$value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name, $reg_row[$field->get_qualified_column()]);
 					}
 					$reg_csv_array[\EEH_Export::get_column_name_for_field($field)] = $value;
-					if($field_name == 'REG_final_price'){
+					if ($field_name == 'REG_final_price') {
 						//add a column named Currency after the final price
 						$reg_csv_array[__("Currency", "event_espresso")] = \EE_Config::instance()->currency->code;
 					}
 				}
 				//get pretty status
-				$stati = \EEM_Status::instance()->localized_status( array(
-					$reg_row[ 'Registration.STS_ID' ] => __( 'unknown', 'event_espresso' ),
-					$reg_row[ 'Transaction.STS_ID' ] => __( 'unknown', 'event_espresso' ) ),
+				$stati = \EEM_Status::instance()->localized_status(array(
+					$reg_row['Registration.STS_ID'] => __('unknown', 'event_espresso'),
+					$reg_row['Transaction.STS_ID'] => __('unknown', 'event_espresso') ),
 						FALSE,
-						'sentence' );
-				$reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[ $reg_row[ 'Registration.STS_ID' ] ];
+						'sentence');
+				$reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[$reg_row['Registration.STS_ID']];
 				//get pretty transaction status
-				$reg_csv_array[__("Transaction Status", 'event_espresso')] = $stati[ $reg_row[ 'Transaction.STS_ID' ] ];
-				$reg_csv_array[ __( 'Transaction Amount Due', 'event_espresso' ) ] = $is_primary_reg ? \EEH_Export::prepare_value_from_db_for_display( \EEM_Transaction::instance(), 'TXN_total', $reg_row[ 'Transaction.TXN_total' ], 'localized_float' ) : '0.00';
-				$reg_csv_array[ __( 'Amount Paid', 'event_espresso' )] = $is_primary_reg ? \EEH_Export::prepare_value_from_db_for_display( \EEM_Transaction::instance(), 'TXN_paid', $reg_row[ 'Transaction.TXN_paid' ], 'localized_float' ) : '0.00';
+				$reg_csv_array[__("Transaction Status", 'event_espresso')] = $stati[$reg_row['Transaction.STS_ID']];
+				$reg_csv_array[__('Transaction Amount Due', 'event_espresso')] = $is_primary_reg ? \EEH_Export::prepare_value_from_db_for_display(\EEM_Transaction::instance(), 'TXN_total', $reg_row['Transaction.TXN_total'], 'localized_float') : '0.00';
+				$reg_csv_array[__('Amount Paid', 'event_espresso')] = $is_primary_reg ? \EEH_Export::prepare_value_from_db_for_display(\EEM_Transaction::instance(), 'TXN_paid', $reg_row['Transaction.TXN_paid'], 'localized_float') : '0.00';
 				$payment_methods = array();
 				$gateway_txn_ids_etc = array();
 				$payment_times = array();
-				if( $is_primary_reg && $reg_row[ 'Transaction.TXN_ID' ] ){
+				if ($is_primary_reg && $reg_row['Transaction.TXN_ID']) {
 					$payments_info = \EEM_Payment::instance()->get_all_wpdb_results(
 							array(
 								array(
-									'TXN_ID' => $reg_row[ 'Transaction.TXN_ID' ],
+									'TXN_ID' => $reg_row['Transaction.TXN_ID'],
 									'STS_ID' => \EEM_Payment::status_id_approved
 								),
-								'force_join' => array( 'Payment_Method' ),
+								'force_join' => array('Payment_Method'),
 
 							),
 							ARRAY_A,
 							'Payment_Method.PMD_admin_name as name, Payment.PAY_txn_id_chq_nmbr as gateway_txn_id, Payment.PAY_timestamp as payment_time' );
 
-					foreach( $payments_info as $payment_method_and_gateway_txn_id ){
-						$payment_methods[] = isset( $payment_method_and_gateway_txn_id[ 'name' ] ) ? $payment_method_and_gateway_txn_id[ 'name' ] : __( 'Unknown', 'event_espresso' );
-						$gateway_txn_ids_etc[] = isset( $payment_method_and_gateway_txn_id[ 'gateway_txn_id' ] ) ? $payment_method_and_gateway_txn_id[ 'gateway_txn_id' ] : '';
-						$payment_times[] = isset( $payment_method_and_gateway_txn_id[ 'payment_time' ] ) ? $payment_method_and_gateway_txn_id[ 'payment_time' ] : '';
+					foreach ($payments_info as $payment_method_and_gateway_txn_id) {
+						$payment_methods[] = isset($payment_method_and_gateway_txn_id['name']) ? $payment_method_and_gateway_txn_id['name'] : __('Unknown', 'event_espresso');
+						$gateway_txn_ids_etc[] = isset($payment_method_and_gateway_txn_id['gateway_txn_id']) ? $payment_method_and_gateway_txn_id['gateway_txn_id'] : '';
+						$payment_times[] = isset($payment_method_and_gateway_txn_id['payment_time']) ? $payment_method_and_gateway_txn_id['payment_time'] : '';
 					}
 
 				}
-				$reg_csv_array[ __( 'Payment Date(s)', 'event_espresso' ) ] = implode( ',', $payment_times );
-				$reg_csv_array[ __( 'Payment Method(s)', 'event_espresso' ) ] = implode( ",", $payment_methods );
-				$reg_csv_array[ __( 'Gateway Transaction ID(s)', 'event_espresso' )] = implode( ',', $gateway_txn_ids_etc );
+				$reg_csv_array[__('Payment Date(s)', 'event_espresso')] = implode(',', $payment_times);
+				$reg_csv_array[__('Payment Method(s)', 'event_espresso')] = implode(",", $payment_methods);
+				$reg_csv_array[__('Gateway Transaction ID(s)', 'event_espresso')] = implode(',', $gateway_txn_ids_etc);
 
 				//get whether or not the user has checked in
-				$reg_csv_array[__("Check-Ins", "event_espresso")] = $reg_model->count_related( $reg_row[ 'Registration.REG_ID'] , 'Checkin' );
+				$reg_csv_array[__("Check-Ins", "event_espresso")] = $reg_model->count_related($reg_row['Registration.REG_ID'], 'Checkin');
 				//get ticket of registration and its price
 				$ticket_model = \EE_Registry::instance()->load_model('Ticket');
-				if( $reg_row[ 'Ticket.TKT_ID'] ) {
-					$ticket_name = \EEH_Export::prepare_value_from_db_for_display( $ticket_model, 'TKT_name', $reg_row[ 'Ticket.TKT_name' ] );
+				if ($reg_row['Ticket.TKT_ID']) {
+					$ticket_name = \EEH_Export::prepare_value_from_db_for_display($ticket_model, 'TKT_name', $reg_row['Ticket.TKT_name']);
 					$datetimes_strings = array();
-					foreach( \EEM_Datetime::instance()->get_all_wpdb_results( array( array( 'Ticket.TKT_ID' => $reg_row[ 'Ticket.TKT_ID' ] ), 'order_by' => array( 'DTT_EVT_start' => 'ASC' ), 'default_where_conditions' => 'none' ) ) as $datetime){
-						$datetimes_strings[] = \EEH_Export::prepare_value_from_db_for_display( \EEM_Datetime::instance(), 'DTT_EVT_start', $datetime[ 'Datetime.DTT_EVT_start'] );
+					foreach (\EEM_Datetime::instance()->get_all_wpdb_results(array(array('Ticket.TKT_ID' => $reg_row['Ticket.TKT_ID']), 'order_by' => array('DTT_EVT_start' => 'ASC'), 'default_where_conditions' => 'none')) as $datetime) {
+						$datetimes_strings[] = \EEH_Export::prepare_value_from_db_for_display(\EEM_Datetime::instance(), 'DTT_EVT_start', $datetime['Datetime.DTT_EVT_start']);
 					}
 
 				} else {
-					$ticket_name = __( 'Unknown', 'event_espresso' );
-					$datetimes_strings = array( __( 'Unknown', 'event_espresso' ) );
+					$ticket_name = __('Unknown', 'event_espresso');
+					$datetimes_strings = array(__('Unknown', 'event_espresso'));
 				}
 				$reg_csv_array[$ticket_model->field_settings_for('TKT_name')->get_nicename()] = $ticket_name;
 				$reg_csv_array[__("Datetimes of Ticket", "event_espresso")] = implode(", ", $datetimes_strings);
 				//get datetime(s) of registration
 
 				//add attendee columns
-				foreach($att_fields_to_include as $att_field_name){
+				foreach ($att_fields_to_include as $att_field_name) {
 					$field_obj = \EEM_Attendee::instance()->field_settings_for($att_field_name);
-					if( $reg_row[ 'Attendee_CPT.ID' ]){
-						if($att_field_name == 'STA_ID'){
-							$value = \EEM_State::instance()->get_var( array( array( 'STA_ID' => $reg_row[ 'Attendee_Meta.STA_ID' ] ) ), 'STA_name' );
-						}elseif($att_field_name == 'CNT_ISO'){
-							$value = \EEM_Country::instance()->get_var( array( array( 'CNT_ISO' => $reg_row[ 'Attendee_Meta.CNT_ISO' ] ) ), 'CNT_name' );
-						}else{
-							$value = \EEH_Export::prepare_value_from_db_for_display( \EEM_Attendee::instance(), $att_field_name, $reg_row[ $field_obj->get_qualified_column() ] );
+					if ($reg_row['Attendee_CPT.ID']) {
+						if ($att_field_name == 'STA_ID') {
+							$value = \EEM_State::instance()->get_var(array(array('STA_ID' => $reg_row['Attendee_Meta.STA_ID'])), 'STA_name');
+						}elseif ($att_field_name == 'CNT_ISO') {
+							$value = \EEM_Country::instance()->get_var(array(array('CNT_ISO' => $reg_row['Attendee_Meta.CNT_ISO'])), 'CNT_name');
+						} else {
+							$value = \EEH_Export::prepare_value_from_db_for_display(\EEM_Attendee::instance(), $att_field_name, $reg_row[$field_obj->get_qualified_column()]);
 						}
-					}else{
+					} else {
 						$value = '';
 					}
 
-					$reg_csv_array[ \EEH_Export::get_column_name_for_field($field_obj) ] = $value;
+					$reg_csv_array[\EEH_Export::get_column_name_for_field($field_obj)] = $value;
 				}
 
 				//make sure each registration has the same questions in the same order
-				foreach($questions_for_these_regs_rows as $question_row){
-					if( ! isset($reg_csv_array[$question_row[ 'Question.QST_admin_label']])){
-						$reg_csv_array[$question_row[ 'Question.QST_admin_label' ] ] = null;
+				foreach ($questions_for_these_regs_rows as $question_row) {
+					if ( ! isset($reg_csv_array[$question_row['Question.QST_admin_label']])) {
+						$reg_csv_array[$question_row['Question.QST_admin_label']] = null;
 					}
 				}
 				$answers = \EEM_Answer::instance()->get_all_wpdb_results(
 					array(
-						array( 'REG_ID' => $reg_row[ 'Registration.REG_ID' ] ),
-						'force_join' => array( 'Question' )
+						array('REG_ID' => $reg_row['Registration.REG_ID']),
+						'force_join' => array('Question')
 					)
 				);
 				//now fill out the questions THEY answered
-				foreach( $answers as $answer_row ){
-					if( $answer_row[ 'Question.QST_ID' ] ){
+				foreach ($answers as $answer_row) {
+					if ($answer_row['Question.QST_ID']) {
 						$question_label = \EEH_Export::prepare_value_from_db_for_display(
 							\EEM_Question::instance(),
 							'QST_admin_label',
-							$answer_row[ 'Question.QST_admin_label' ]
+							$answer_row['Question.QST_admin_label']
 						);
 					} else {
-						$question_label = sprintf( __( 'Question $s', 'event_espresso' ), $answer_row[ 'Answer.QST_ID' ] );
+						$question_label = sprintf(__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
 					}
-					if ( isset( $answer_row[ 'Question.QST_type' ] )
-						 && $answer_row[ 'Question.QST_type' ] == \EEM_Question::QST_type_state
+					if (isset($answer_row['Question.QST_type'])
+						 && $answer_row['Question.QST_type'] == \EEM_Question::QST_type_state
 					) {
-						$reg_csv_array[ $question_label ] = \EEM_State::instance()->get_state_name_by_ID(
-							$answer_row[ 'Answer.ANS_value' ]
+						$reg_csv_array[$question_label] = \EEM_State::instance()->get_state_name_by_ID(
+							$answer_row['Answer.ANS_value']
 						);
 					} else {
-						$reg_csv_array[ $question_label ] = \EEH_Export::prepare_value_from_db_for_display(
+						$reg_csv_array[$question_label] = \EEH_Export::prepare_value_from_db_for_display(
 							\EEM_Answer::instance(),
 							'ANS_value',
-							$answer_row[ 'Answer.ANS_value' ]
+							$answer_row['Answer.ANS_value']
 						);
 					}
 				}
@@ -351,17 +351,17 @@ 
 			}
 		}
 		//if we couldn't export anything, we want to at least show the column headers
-		if ( empty( $registrations_csv_ready_array ) ) {
+		if (empty($registrations_csv_ready_array)) {
 			$reg_csv_array = array();
 			$model_and_fields_to_include = array(
 				'Registration' => $reg_fields_to_include,
 				'Attendee'     => $att_fields_to_include
 			);
-			foreach ( $model_and_fields_to_include as $model_name => $field_list ) {
-				$model = \EE_Registry::instance()->load_model( $model_name );
-				foreach ( $field_list as $field_name ) {
-					$field = $model->field_settings_for( $field_name );
-					$reg_csv_array[ \EEH_Export::get_column_name_for_field( $field ) ] = null;
+			foreach ($model_and_fields_to_include as $model_name => $field_list) {
+				$model = \EE_Registry::instance()->load_model($model_name);
+				foreach ($field_list as $field_name) {
+					$field = $model->field_settings_for($field_name);
+					$reg_csv_array[\EEH_Export::get_column_name_for_field($field)] = null;
 				}
 			}
 			$registrations_csv_ready_array[] = $reg_csv_array;
@@ -377,7 +377,7 @@ 
 	 * @param int $event_id
 	 * @return int
 	 */
-	public function count_units_to_process( $event_id ) {
+	public function count_units_to_process($event_id) {
 		//use the legacy filter
 		$query_params = apply_filters(
 			'FHEE__EE_Export__report_registration_for_event',
@@ -385,23 +385,23 @@ 
 				array(
 					'OR' => array(
 						//don't include registrations from failed or abandoned transactions...
-						'Transaction.STS_ID' => array( 'NOT IN', array( \EEM_Transaction::failed_status_code, \EEM_Transaction::abandoned_status_code ) ),
+						'Transaction.STS_ID' => array('NOT IN', array(\EEM_Transaction::failed_status_code, \EEM_Transaction::abandoned_status_code)),
 						//unless the registration is approved, in which case include it regardless of transaction status
 						'STS_ID' => \EEM_Registration::status_id_approved
 						),
-					'Ticket.TKT_deleted' => array( 'IN', array( true, false ) )
+					'Ticket.TKT_deleted' => array('IN', array(true, false))
 					),
-				'order_by' => array('Transaction.TXN_ID'=>'asc','REG_count'=>'asc'),
-				'force_join' => array( 'Transaction', 'Ticket', 'Attendee' )
+				'order_by' => array('Transaction.TXN_ID'=>'asc', 'REG_count'=>'asc'),
+				'force_join' => array('Transaction', 'Ticket', 'Attendee')
 			),
 			$event_id
 		);
-		if( $event_id ){
-			$query_params[0]['EVT_ID'] =  $event_id;
+		if ($event_id) {
+			$query_params[0]['EVT_ID'] = $event_id;
 		} else {
-			$query_params[ 'force_join' ][] = 'Event';
+			$query_params['force_join'][] = 'Event';
 		}
-		return \EEM_Registration::instance()->count( $query_params );
+		return \EEM_Registration::instance()->count($query_params);
 	}
 
 
@@ -412,13 +412,13 @@ 
 	 * @param JobParameters $job_parameters
 	 * @return boolean
 	 */
-	public function cleanup_job( JobParameters $job_parameters ){
+	public function cleanup_job(JobParameters $job_parameters) {
 		$this->_file_helper->delete(
-			\EEH_File::remove_filename_from_filepath( $job_parameters->extra_datum( 'filepath' ) ),
+			\EEH_File::remove_filename_from_filepath($job_parameters->extra_datum('filepath')),
 			true,
 			'd'
 		);
-		return new JobStepResponse( $job_parameters, __( 'Cleaned up temporary file', 'event_espresso' ) );
+		return new JobStepResponse($job_parameters, __('Cleaned up temporary file', 'event_espresso'));
 	}
 }
 

core/db_models/EEM_Datetime.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -443,7 +443,7 @@
 	/**
 	 * This returns an array of counts of datetimes in the database for each Datetime status that can be queried.
 	 *
-	 * @param  array $stati_to_include        If included you can restrict the statuses we return counts for by including the stati
+	 * @param  string[] $stati_to_include        If included you can restrict the statuses we return counts for by including the stati
 	 *                               you want counts for as values in the array.  An empty array returns counts for all valid
 	 *                               stati.
 	 * @param  array  $query_params  If included can be used to refine the conditions for returning the count (i.e. only for

Spacing +132 added lines, -132 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Datetime.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Datetime.class.php');
 
 class EEM_Datetime extends EEM_Soft_Delete_Base {
 
@@ -35,27 +35,27 @@ 
 	 *		@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)
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Datetime','event_espresso');
-		$this->plural_item = __('Datetimes','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Datetime', 'event_espresso');
+		$this->plural_item = __('Datetimes', 'event_espresso');
 
 		$this->_tables = array(
 			'Datetime'=> new EE_Primary_Table('esp_datetime', 'DTT_ID')
 		);
 		$this->_fields = array(
 			'Datetime'=>array(
-				'DTT_ID'=> new EE_Primary_Key_Int_Field('DTT_ID', __('Datetime ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID','event_espresso'), false, 0, 'Event'),
+				'DTT_ID'=> new EE_Primary_Key_Int_Field('DTT_ID', __('Datetime ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'),
 				'DTT_name' => new EE_Plain_Text_Field('DTT_name', __('Datetime Name', 'event_espresso'), false, ''),
 				'DTT_description' => new EE_Full_HTML_Field('DTT_description', __('Description for Datetime', 'event_espresso'), false, ''),
-				'DTT_EVT_start'=>new EE_Datetime_Field('DTT_EVT_start', __('Start time/date of Event','event_espresso'), false, time(), $timezone ),
-				'DTT_EVT_end'=>new EE_Datetime_Field('DTT_EVT_end', __('End time/date of Event','event_espresso'), false, time(), $timezone ),
-				'DTT_reg_limit'=>new EE_Infinite_Integer_Field('DTT_reg_limit', __('Registration Limit for this time','event_espresso'), true, EE_INF),
-				'DTT_sold'=>new EE_Integer_Field('DTT_sold', __('How many sales for this Datetime that have occurred', 'event_espresso'), true, 0 ),
-				'DTT_is_primary'=>new EE_Boolean_Field('DTT_is_primary', __("Flag indicating datetime is primary one for event", "event_espresso"), false,false),
+				'DTT_EVT_start'=>new EE_Datetime_Field('DTT_EVT_start', __('Start time/date of Event', 'event_espresso'), false, time(), $timezone),
+				'DTT_EVT_end'=>new EE_Datetime_Field('DTT_EVT_end', __('End time/date of Event', 'event_espresso'), false, time(), $timezone),
+				'DTT_reg_limit'=>new EE_Infinite_Integer_Field('DTT_reg_limit', __('Registration Limit for this time', 'event_espresso'), true, EE_INF),
+				'DTT_sold'=>new EE_Integer_Field('DTT_sold', __('How many sales for this Datetime that have occurred', 'event_espresso'), true, 0),
+				'DTT_is_primary'=>new EE_Boolean_Field('DTT_is_primary', __("Flag indicating datetime is primary one for event", "event_espresso"), false, false),
 				'DTT_order' => new EE_Integer_Field('DTT_order', __('The order in which the Datetime is displayed', 'event_espresso'), false, 0),
-				'DTT_parent' => new EE_Integer_Field('DTT_parent', __('Indicates what DTT_ID is the parent of this DTT_ID'), true, 0 ),
-				'DTT_deleted' => new EE_Trashed_Flag_Field('DTT_deleted', __('Flag indicating datetime is archived', 'event_espresso'), false, false ),
+				'DTT_parent' => new EE_Integer_Field('DTT_parent', __('Indicates what DTT_ID is the parent of this DTT_ID'), true, 0),
+				'DTT_deleted' => new EE_Trashed_Flag_Field('DTT_deleted', __('Flag indicating datetime is archived', 'event_espresso'), false, false),
 			));
 		$this->_model_relations = array(
 			'Ticket'=>new EE_HABTM_Relation('Datetime_Ticket'),
@@ -64,11 +64,11 @@ 
 		);
 		$this->_model_chain_to_wp_user = 'Event';
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event', EEM_Base::caps_edit );
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected('Event', EEM_Base::caps_edit);
+		parent::__construct($timezone);
 	}
 
 
@@ -83,16 +83,16 @@ 
 	public function create_new_blank_datetime() {
 		$blank_datetime = EE_Datetime::new_instance(
 			array(
-				'DTT_EVT_start' => $this->current_time_for_query( 'DTT_EVT_start', true ) + (60 * 60 * 24 * 30),
-				'DTT_EVT_end' => $this->current_time_for_query( 'DTT_EVT_end', true ) + (60 * 60 * 24 * 30),
+				'DTT_EVT_start' => $this->current_time_for_query('DTT_EVT_start', true) + (60 * 60 * 24 * 30),
+				'DTT_EVT_end' => $this->current_time_for_query('DTT_EVT_end', true) + (60 * 60 * 24 * 30),
 				'DTT_order' => 1,
 				'DTT_reg_limit' => EE_INF
 			),
 			$this->_timezone
 		);
-		$blank_datetime->set_start_time( $this->convert_datetime_for_query( 'DTT_EVT_start', '8am', 'ga', $this->_timezone ) );
-		$blank_datetime->set_end_time( $this->convert_datetime_for_query( 'DTT_EVT_end', '5pm', 'ga', $this->_timezone ) );
-		return array( $blank_datetime );
+		$blank_datetime->set_start_time($this->convert_datetime_for_query('DTT_EVT_start', '8am', 'ga', $this->_timezone));
+		$blank_datetime->set_end_time($this->convert_datetime_for_query('DTT_EVT_end', '5pm', 'ga', $this->_timezone));
+		return array($blank_datetime);
 	}
 
 
@@ -106,13 +106,13 @@ 
 	* 		@param		int 			$EVT_ID
 	*		@return 		EE_Datetime[]		array on success, FALSE on fail
 	*/
-	public function get_all_event_dates( $EVT_ID = 0 ) {
-		if ( ! $EVT_ID ) { // on add_new_event event_id gets set to 0
+	public function get_all_event_dates($EVT_ID = 0) {
+		if ( ! $EVT_ID) { // on add_new_event event_id gets set to 0
 			return $this->create_new_blank_datetime();
 		}
-		$results =  $this->get_datetimes_for_event_ordered_by_DTT_order($EVT_ID);
+		$results = $this->get_datetimes_for_event_ordered_by_DTT_order($EVT_ID);
 
-		if ( empty( $results ) ) {
+		if (empty($results)) {
 			return $this->create_new_blank_datetime();
 		}
 
@@ -133,26 +133,26 @@ 
 	 *                        	the given number
 	 * @return EE_Datetime[]
 	 */
-	public function get_datetimes_for_event_ordered_by_DTT_order( $EVT_ID, $include_expired = TRUE, $include_deleted= TRUE, $limit = NULL  ) {
+	public function get_datetimes_for_event_ordered_by_DTT_order($EVT_ID, $include_expired = TRUE, $include_deleted = TRUE, $limit = NULL) {
 
 		//sanitize EVT_ID
-		$EVT_ID = intval( $EVT_ID );
+		$EVT_ID = intval($EVT_ID);
 
 		$old_assumption = $this->get_assumption_concerning_values_already_prepared_by_model_object();
-		$this->assume_values_already_prepared_by_model_object( EEM_Base::prepared_for_use_in_db );
-		$where_params = array( 'Event.EVT_ID' => $EVT_ID );
+		$this->assume_values_already_prepared_by_model_object(EEM_Base::prepared_for_use_in_db);
+		$where_params = array('Event.EVT_ID' => $EVT_ID);
 
-		$query_params = ! empty( $limit ) ? array( $where_params, 'limit' => $limit, 'order_by' => array( 'DTT_order' => 'ASC' ), 'default_where_conditions' => 'none' ) : array( $where_params, 'order_by' => array( 'DTT_order' => 'ASC' ), 'default_where_conditions' => 'none' );
+		$query_params = ! empty($limit) ? array($where_params, 'limit' => $limit, 'order_by' => array('DTT_order' => 'ASC'), 'default_where_conditions' => 'none') : array($where_params, 'order_by' => array('DTT_order' => 'ASC'), 'default_where_conditions' => 'none');
 
-		if( ! $include_expired){
-			$query_params[0]['DTT_EVT_end'] = array( '>=', current_time( 'mysql', TRUE ) );
+		if ( ! $include_expired) {
+			$query_params[0]['DTT_EVT_end'] = array('>=', current_time('mysql', TRUE));
 		}
-		if( $include_deleted){
-			$query_params[0]['DTT_deleted'] = array( 'IN', array( TRUE, FALSE ));
+		if ($include_deleted) {
+			$query_params[0]['DTT_deleted'] = array('IN', array(TRUE, FALSE));
 		}
 
-		$result = $this->get_all( $query_params );
-		$this->assume_values_already_prepared_by_model_object( $old_assumption );
+		$result = $this->get_all($query_params);
+		$this->assume_values_already_prepared_by_model_object($old_assumption);
 		return $result;
 	}
 
@@ -167,8 +167,8 @@ 
 	 * @param int $limit
 	 * @return EE_Datetime[]
 	 */
-	public function get_datetimes_for_event_ordered_by_importance( $EVT_ID = 0, $limit = NULL){
-		return $this->get_all( array(array('Event.EVT_ID'=>$EVT_ID),
+	public function get_datetimes_for_event_ordered_by_importance($EVT_ID = 0, $limit = NULL) {
+		return $this->get_all(array(array('Event.EVT_ID'=>$EVT_ID),
 			'limit'=>$limit,
 			'order_by'=>array('DTT_EVT_start'=>'ASC'),
 			'default_where_conditions' => 'none'));
@@ -183,11 +183,11 @@ 
 	 * @param boolean $include_deleted
 	 * @return EE_Datetime
 	 */
-	public function get_oldest_datetime_for_event($EVT_ID, $include_expired = false,$include_deleted = false){
-		$results =  $this->get_datetimes_for_event_ordered_by_start_time($EVT_ID, $include_expired, $include_deleted, 1);
-		if($results){
+	public function get_oldest_datetime_for_event($EVT_ID, $include_expired = false, $include_deleted = false) {
+		$results = $this->get_datetimes_for_event_ordered_by_start_time($EVT_ID, $include_expired, $include_deleted, 1);
+		if ($results) {
 			return array_shift($results);
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -201,16 +201,16 @@ 
 	 * @param bool $try_to_exclude_deleted
 	 * @return \EE_Datetime
 	 */
-	public function get_primary_datetime_for_event($EVT_ID,$try_to_exclude_expired = true, $try_to_exclude_deleted = true){
-		if($try_to_exclude_expired){
-			$non_expired = $this->get_oldest_datetime_for_event($EVT_ID, false,false);
-			if($non_expired){
+	public function get_primary_datetime_for_event($EVT_ID, $try_to_exclude_expired = true, $try_to_exclude_deleted = true) {
+		if ($try_to_exclude_expired) {
+			$non_expired = $this->get_oldest_datetime_for_event($EVT_ID, false, false);
+			if ($non_expired) {
 				return $non_expired;
 			}
 		}
-		if($try_to_exclude_deleted){
+		if ($try_to_exclude_deleted) {
 			$expired_even = $this->get_oldest_datetime_for_event($EVT_ID, true);
-			if($expired_even){
+			if ($expired_even) {
 				return $expired_even;
 			}
 		}
@@ -229,23 +229,23 @@ 
 	 * @param int $limit
 	 * @return EE_Datetime[]
 	 */
-	public function get_datetimes_for_event_ordered_by_start_time($EVT_ID, $include_expired = true, $include_deleted= true, $limit = NULL ){
+	public function get_datetimes_for_event_ordered_by_start_time($EVT_ID, $include_expired = true, $include_deleted = true, $limit = NULL) {
 		//sanitize EVT_ID
-		$EVT_ID = intval( $EVT_ID );
+		$EVT_ID = intval($EVT_ID);
 		$old_assumption = $this->get_assumption_concerning_values_already_prepared_by_model_object();
-		$this->assume_values_already_prepared_by_model_object( EEM_Base::prepared_for_use_in_db );
-		$query_params =array(array('Event.EVT_ID'=>$EVT_ID),'order_by'=>array('DTT_EVT_start'=>'asc'));
-		if( ! $include_expired){
-			$query_params[0]['DTT_EVT_end'] = array('>=',current_time('mysql', TRUE));
+		$this->assume_values_already_prepared_by_model_object(EEM_Base::prepared_for_use_in_db);
+		$query_params = array(array('Event.EVT_ID'=>$EVT_ID), 'order_by'=>array('DTT_EVT_start'=>'asc'));
+		if ( ! $include_expired) {
+			$query_params[0]['DTT_EVT_end'] = array('>=', current_time('mysql', TRUE));
 		}
-		if( $include_deleted){
-			$query_params[0]['DTT_deleted'] = array('IN',array(true,false));
+		if ($include_deleted) {
+			$query_params[0]['DTT_deleted'] = array('IN', array(true, false));
 		}
-		if($limit){
+		if ($limit) {
 			$query_params['limit'] = $limit;
 		}
-		$result = $this->get_all( $query_params );
-		$this->assume_values_already_prepared_by_model_object( $old_assumption );
+		$result = $this->get_all($query_params);
+		$this->assume_values_already_prepared_by_model_object($old_assumption);
 		return $result;
 	}
 
@@ -258,23 +258,23 @@ 
 	 * @param int $limit
 	 * @return EE_Datetime[]
 	 */
-	public function get_datetimes_for_ticket_ordered_by_start_time($TKT_ID, $include_expired = true, $include_deleted= true, $limit = NULL){
+	public function get_datetimes_for_ticket_ordered_by_start_time($TKT_ID, $include_expired = true, $include_deleted = true, $limit = NULL) {
 		//sanitize TKT_ID
-		$TKT_ID =  intval( $TKT_ID );
+		$TKT_ID = intval($TKT_ID);
 		$old_assumption = $this->get_assumption_concerning_values_already_prepared_by_model_object();
-		$this->assume_values_already_prepared_by_model_object( EEM_Base::prepared_for_use_in_db );
-		$query_params =array(array('Ticket.TKT_ID'=>$TKT_ID),'order_by'=>array('DTT_EVT_start'=>'asc'));
-		if( ! $include_expired){
-			$query_params[0]['DTT_EVT_end'] = array('>=',current_time('mysql', TRUE));
+		$this->assume_values_already_prepared_by_model_object(EEM_Base::prepared_for_use_in_db);
+		$query_params = array(array('Ticket.TKT_ID'=>$TKT_ID), 'order_by'=>array('DTT_EVT_start'=>'asc'));
+		if ( ! $include_expired) {
+			$query_params[0]['DTT_EVT_end'] = array('>=', current_time('mysql', TRUE));
 		}
-		if( $include_deleted){
-			$query_params[0]['DTT_deleted'] = array('IN',array(true,false));
+		if ($include_deleted) {
+			$query_params[0]['DTT_deleted'] = array('IN', array(true, false));
 		}
-		if($limit){
+		if ($limit) {
 			$query_params['limit'] = $limit;
 		}
-		$result = $this->get_all( $query_params );
-		$this->assume_values_already_prepared_by_model_object( $old_assumption );
+		$result = $this->get_all($query_params);
+		$this->assume_values_already_prepared_by_model_object($old_assumption);
 		return $result;
 	}
 
@@ -290,24 +290,24 @@ 
 	 *                                  that number
 	 * @return EE_Datetime[]
 	 */
-	public function get_datetimes_for_ticket_ordered_by_DTT_order( $TKT_ID, $include_expired = true, $include_deleted = true, $limit = NULL ) {
+	public function get_datetimes_for_ticket_ordered_by_DTT_order($TKT_ID, $include_expired = true, $include_deleted = true, $limit = NULL) {
 		//sanitize id.
-		$TKT_ID =  intval( $TKT_ID );
+		$TKT_ID = intval($TKT_ID);
 		$old_assumption = $this->get_assumption_concerning_values_already_prepared_by_model_object();
-		$this->assume_values_already_prepared_by_model_object( EEM_Base::prepared_for_use_in_db );
-		$where_params = array( 'Ticket.TKT_ID' => $TKT_ID );
-		$query_params = array( $where_params, 'order_by' => array( 'DTT_order' => 'ASC' ) );
-		if( ! $include_expired){
-			$query_params[0]['DTT_EVT_end'] = array('>=',current_time('mysql', TRUE));
+		$this->assume_values_already_prepared_by_model_object(EEM_Base::prepared_for_use_in_db);
+		$where_params = array('Ticket.TKT_ID' => $TKT_ID);
+		$query_params = array($where_params, 'order_by' => array('DTT_order' => 'ASC'));
+		if ( ! $include_expired) {
+			$query_params[0]['DTT_EVT_end'] = array('>=', current_time('mysql', TRUE));
 		}
-		if( $include_deleted){
-			$query_params[0]['DTT_deleted'] = array('IN',array(true,false));
+		if ($include_deleted) {
+			$query_params[0]['DTT_deleted'] = array('IN', array(true, false));
 		}
-		if($limit){
+		if ($limit) {
 			$query_params['limit'] = $limit;
 		}
-		$result = $this->get_all( $query_params );
-		$this->assume_values_already_prepared_by_model_object( $old_assumption );
+		$result = $this->get_all($query_params);
+		$this->assume_values_already_prepared_by_model_object($old_assumption);
 		return $result;
 	}
 
@@ -318,11 +318,11 @@ 
 	 * @param int $EVT_ID
 	 * @return EE_Datetime
 	 */
-	public function get_most_important_datetime_for_event($EVT_ID){
+	public function get_most_important_datetime_for_event($EVT_ID) {
 		$results = $this->get_datetimes_for_event_ordered_by_importance($EVT_ID, 1);
-		if($results){
+		if ($results) {
 			return array_shift($results);
-		}else{
+		} else {
 			return null;
 		}
 	}
@@ -341,71 +341,71 @@ 
 	 * 			- inactive = Events that are either not published.
 	 * @return wpdb results array
 	 */
-	public function get_dtt_months_and_years( $where_params, $evt_active_status = '' ) {
+	public function get_dtt_months_and_years($where_params, $evt_active_status = '') {
 
-		switch ( $evt_active_status ) {
+		switch ($evt_active_status) {
 			case 'upcoming' :
 					$where_params['Event.status'] = 'publish';
 					//if there are already query_params matching DTT_EVT_start then we need to modify that to add them.
-					if ( isset( $where_params['DTT_EVT_start'] ) ) {
+					if (isset($where_params['DTT_EVT_start'])) {
 						$where_params['DTT_EVT_start*****'] = $where_params['DTT_EVT_start'];
 					}
-					$where_params['DTT_EVT_start'] = array('>', $this->current_time_for_query( 'DTT_EVT_start' ) );
+					$where_params['DTT_EVT_start'] = array('>', $this->current_time_for_query('DTT_EVT_start'));
 					break;
 
 			case 'expired' :
-				if ( isset( $where_params['Event.status'] ) ) unset( $where_params['Event.status'] );
+				if (isset($where_params['Event.status'])) unset($where_params['Event.status']);
 				//get events to exclude
-				$exclude_query[0] = array_merge( $where_params, array( 'DTT_EVT_end' => array( '>', $this->current_time_for_query( 'DTT_EVT_end' ) ) ) );
+				$exclude_query[0] = array_merge($where_params, array('DTT_EVT_end' => array('>', $this->current_time_for_query('DTT_EVT_end'))));
 				//first get all events that have datetimes where its not expired.
-				$event_ids = $this->_get_all_wpdb_results( $exclude_query, OBJECT_K, 'Datetime.EVT_ID' );
-				$event_ids = array_keys( $event_ids );
+				$event_ids = $this->_get_all_wpdb_results($exclude_query, OBJECT_K, 'Datetime.EVT_ID');
+				$event_ids = array_keys($event_ids);
 
-				if ( isset( $where_params['DTT_EVT_end'] ) ) {
+				if (isset($where_params['DTT_EVT_end'])) {
 					$where_params['DTT_EVT_end****'] = $where_params['DTT_EVT_end'];
 				}
-				$where_params['DTT_EVT_end'] = array( '<', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) );
-				$where_params['Event.EVT_ID'] = array( 'NOT IN', $event_ids );
+				$where_params['DTT_EVT_end'] = array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
+				$where_params['Event.EVT_ID'] = array('NOT IN', $event_ids);
 				break;
 
 			case 'active' :
 				$where_params['Event.status'] = 'publish';
-				if ( isset( $where_params['DTT_EVT_start'] ) ) {
+				if (isset($where_params['DTT_EVT_start'])) {
 					$where_params['Datetime.DTT_EVT_start******'] = $where_params['DTT_EVT_start'];
 				}
-				if ( isset( $where_params['Datetime.DTT_EVT_end'] ) ) {
+				if (isset($where_params['Datetime.DTT_EVT_end'])) {
 					$where_params['Datetime.DTT_EVT_end*****'] = $where_params['DTT_EVT_end'];
 				}
-				$where_params['DTT_EVT_start'] = array('<',  $this->current_time_for_query( 'DTT_EVT_start' ) );
-				$where_params['DTT_EVT_end'] = array('>', $this->current_time_for_query( 'DTT_EVT_end' ) );
+				$where_params['DTT_EVT_start'] = array('<', $this->current_time_for_query('DTT_EVT_start'));
+				$where_params['DTT_EVT_end'] = array('>', $this->current_time_for_query('DTT_EVT_end'));
 				break;
 
 			case 'inactive' :
-				if ( isset( $where_params['Event.status'] ) ) unset( $where_params['Event.status'] );
-				if ( isset( $where_params['OR'] ) ) {
+				if (isset($where_params['Event.status'])) unset($where_params['Event.status']);
+				if (isset($where_params['OR'])) {
 					$where_params['AND']['OR'] = $where_params['OR'];
 				}
-				if ( isset( $where_params['DTT_EVT_end'] ) ) {
+				if (isset($where_params['DTT_EVT_end'])) {
 					$where_params['AND']['DTT_EVT_end****'] = $where_params['DTT_EVT_end'];
-					unset( $where_params['DTT_EVT_end'] );
+					unset($where_params['DTT_EVT_end']);
 				}
 
-				if ( isset( $where_params['DTT_EVT_start'] ) ) {
+				if (isset($where_params['DTT_EVT_start'])) {
 					$where_params['AND']['DTT_EVT_start'] = $where_params['DTT_EVT_start'];
-					unset( $where_params['DTT_EVT_start'] );
+					unset($where_params['DTT_EVT_start']);
 				}
-				$where_params['AND']['Event.status'] = array( '!=', 'publish' );
+				$where_params['AND']['Event.status'] = array('!=', 'publish');
 				break;
 		}
 
 		$query_params[0] = $where_params;
 		$query_params['group_by'] = array('dtt_year', 'dtt_month');
-		$query_params['order_by'] = array( 'DTT_EVT_start' => 'DESC' );
+		$query_params['order_by'] = array('DTT_EVT_start' => 'DESC');
 		$columns_to_select = array(
 			'dtt_year' => array('YEAR(DTT_EVT_start)', '%s'),
 			'dtt_month' => array('MONTHNAME(DTT_EVT_start)', '%s')
 			);
-		return $this->_get_all_wpdb_results( $query_params, OBJECT, $columns_to_select );
+		return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
 	}
 
 	/**
@@ -413,8 +413,8 @@ 
 	 * for the tickets for each datetime)
 	 * @param EE_Datetime[] $datetimes
 	 */
-	public function update_sold($datetimes){
-		foreach($datetimes as $datetime){
+	public function update_sold($datetimes) {
+		foreach ($datetimes as $datetime) {
 			$datetime->update_sold();
 		}
 	}
@@ -429,10 +429,10 @@ 
 	 * @param array $query_params
 	 * @return int of tickets available. If sold out, return less than 1. If infinite, returns EE_INF,  IF there are NO tickets attached to datetime then FALSE is returned.
 	 */
-	public function sum_tickets_currently_available_at_datetime( $DTT_ID, $query_params = array() ) {
-		$datetime = $this->get_one_by_ID( $DTT_ID );
-		if ( $datetime instanceof EE_Datetime ) {
-			return $datetime->tickets_remaining( $query_params );
+	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()) {
+		$datetime = $this->get_one_by_ID($DTT_ID);
+		if ($datetime instanceof EE_Datetime) {
+			return $datetime->tickets_remaining($query_params);
 		}
 		return 0;
 	}
@@ -454,36 +454,36 @@ 
 	 *                EE_Datetime::upcoming
 	 *                EE_Datetime::expired
 	 */
-	public function get_datetime_counts_by_status( $stati_to_include = array(), $query_params = array() ) {
+	public function get_datetime_counts_by_status($stati_to_include = array(), $query_params = array()) {
 		//only accept where conditions for this query.
-		$_where = isset( $query_params[0] ) ? $query_params[0] : array();
+		$_where = isset($query_params[0]) ? $query_params[0] : array();
 		$status_query_args = array(
 				EE_Datetime::active => array_merge(
 						$_where,
-						array( 'DTT_EVT_start' => array( '<', time() ), 'DTT_EVT_end' => array( '>', time() ) )
+						array('DTT_EVT_start' => array('<', time()), 'DTT_EVT_end' => array('>', time()))
 				),
 				EE_Datetime::upcoming => array_merge(
 						$_where,
-						array( 'DTT_EVT_start' => array( '>', time() ) )
+						array('DTT_EVT_start' => array('>', time()))
 				),
 				EE_Datetime::expired => array_merge(
 						$_where,
-						array( 'DTT_EVT_end' => array('<', time() ) )
+						array('DTT_EVT_end' => array('<', time()))
 				)
 		);
 
-		if ( ! empty( $stati_to_include ) ) {
-			foreach( array_keys( $status_query_args ) as $status ) {
-				if ( ! in_array( $status, $stati_to_include ) ) {
-					unset( $status_query_args[$status] );
+		if ( ! empty($stati_to_include)) {
+			foreach (array_keys($status_query_args) as $status) {
+				if ( ! in_array($status, $stati_to_include)) {
+					unset($status_query_args[$status]);
 				}
 			}
 		}
 
 		//loop through and query counts for each stati.
 		$status_query_results = array();
-		foreach( $status_query_args as $status => $status_where_conditions ) {
-			$status_query_results[ $status ] = EEM_Datetime::count( array( $status_where_conditions ), 'DTT_ID', true );
+		foreach ($status_query_args as $status => $status_where_conditions) {
+			$status_query_results[$status] = EEM_Datetime::count(array($status_where_conditions), 'DTT_ID', true);
 		}
 
 		return $status_query_results;
@@ -497,9 +497,9 @@ 
 	 * @param array $query_params
 	 * @return int
 	 */
-	public function get_datetime_count_for_status( $status = EE_Datetime::active, $query_params = array() ) {
-		$count = $this->get_datetime_counts_by_status( array( $status ), $query_params );
-		return ! empty( $count[$status] ) ? $count[$status] : 0;
+	public function get_datetime_count_for_status($status = EE_Datetime::active, $query_params = array()) {
+		$count = $this->get_datetime_counts_by_status(array($status), $query_params);
+		return ! empty($count[$status]) ? $count[$status] : 0;
 	}
 
 

core/db_classes/EE_Event.class.php

Spacing +197 added lines, -197 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
@@ -50,9 +50,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Event
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		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__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -63,8 +63,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Event
 	 */
-	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);
 	}
 
 
@@ -75,8 +75,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Datetime[]
 	 */
-	public function datetimes( $query_params = array() ) {
-		return $this->get_many_related( 'Datetime', $query_params );
+	public function datetimes($query_params = array()) {
+		return $this->get_many_related('Datetime', $query_params);
 	}
 
 
@@ -87,7 +87,7 @@ 
 	 * @return EE_Datetime[]
 	 */
 	public function datetimes_in_chronological_order() {
-		return $this->get_many_related( 'Datetime', array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) ) );
+		return $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
 	}
 
 
@@ -103,8 +103,8 @@ 
 	 * @param null $limit
 	 * @return \EE_Datetime[]
 	 */
-	public function datetimes_ordered( $show_expired = true, $show_deleted = false, $limit = null ) {
-		return EEM_Datetime::instance( $this->_timezone )->get_datetimes_for_event_ordered_by_DTT_order( $this->ID(), $show_expired, $show_deleted, $limit );
+	public function datetimes_ordered($show_expired = true, $show_deleted = false, $limit = null) {
+		return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_event_ordered_by_DTT_order($this->ID(), $show_expired, $show_deleted, $limit);
 	}
 
 
@@ -114,7 +114,7 @@ 
 	 * @return EE_Datetime
 	 */
 	public function first_datetime() {
-		return $this->get_first_related( 'Datetime' );
+		return $this->get_first_related('Datetime');
 	}
 
 
@@ -125,11 +125,11 @@ 
 	 * @param bool $try_to_exclude_deleted
 	 * @return EE_Datetime
 	 */
-	public function primary_datetime( $try_to_exclude_expired = TRUE, $try_to_exclude_deleted = TRUE ) {
-		if ( !empty ( $this->_Primary_Datetime ) ) {
+	public function primary_datetime($try_to_exclude_expired = TRUE, $try_to_exclude_deleted = TRUE) {
+		if ( ! empty ($this->_Primary_Datetime)) {
 			return $this->_Primary_Datetime;
 		}
-		$this->_Primary_Datetime = EEM_Datetime::instance( $this->_timezone )->get_primary_datetime_for_event( $this->ID(), $try_to_exclude_expired, $try_to_exclude_deleted );
+		$this->_Primary_Datetime = EEM_Datetime::instance($this->_timezone)->get_primary_datetime_for_event($this->ID(), $try_to_exclude_expired, $try_to_exclude_deleted);
 		return $this->_Primary_Datetime;
 	}
 
@@ -140,30 +140,30 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Ticket[]
 	 */
-	public function tickets( $query_params = array() ) {
+	public function tickets($query_params = array()) {
 		//first get all datetimes
 		$datetimes = $this->datetimes_ordered();
-		if ( ! $datetimes ) {
+		if ( ! $datetimes) {
 			return array();
 		}
 
 		$datetime_ids = array();
-		foreach ( $datetimes as $datetime ) {
+		foreach ($datetimes as $datetime) {
 			$datetime_ids[] = $datetime->ID();
 		}
 
-		$where_params = array( 'Datetime.DTT_ID' => array( 'IN', $datetime_ids ) );
+		$where_params = array('Datetime.DTT_ID' => array('IN', $datetime_ids));
 
 		//if incoming $query_params has where conditions let's merge but not override existing.
-		if ( is_array( $query_params ) && isset( $query_params[0]) ) {
-			$where_params = array_merge( $query_params[0], $where_params );
-			unset( $query_params[0] );
+		if (is_array($query_params) && isset($query_params[0])) {
+			$where_params = array_merge($query_params[0], $where_params);
+			unset($query_params[0]);
 		}
 
 		//now add $where_params to $query_params
 		$query_params[0] = $where_params;
 
-		return EEM_Ticket::instance()->get_all( $query_params );
+		return EEM_Ticket::instance()->get_all($query_params);
 	}
 
 
@@ -172,7 +172,7 @@ 
 	 * @return bool
 	 */
 	function additional_limit() {
-		return $this->get( 'EVT_additional_limit' );
+		return $this->get('EVT_additional_limit');
 	}
 
 
@@ -181,7 +181,7 @@ 
 	 * @return bool
 	 */
 	function allow_overflow() {
-		return $this->get( 'EVT_allow_overflow' );
+		return $this->get('EVT_allow_overflow');
 	}
 
 
@@ -190,7 +190,7 @@ 
 	 * @return bool
 	 */
 	function created() {
-		return $this->get( 'EVT_created' );
+		return $this->get('EVT_created');
 	}
 
 
@@ -199,7 +199,7 @@ 
 	 * @return bool
 	 */
 	function description() {
-		return $this->get( 'EVT_desc' );
+		return $this->get('EVT_desc');
 	}
 
 
@@ -209,7 +209,7 @@ 
 	 * @return string of html
 	 */
 	function description_filtered() {
-		return $this->get_pretty( 'EVT_desc' );
+		return $this->get_pretty('EVT_desc');
 	}
 
 
@@ -218,7 +218,7 @@ 
 	 * @return bool
 	 */
 	function display_description() {
-		return $this->get( 'EVT_display_desc' );
+		return $this->get('EVT_display_desc');
 	}
 
 
@@ -227,7 +227,7 @@ 
 	 * @return bool
 	 */
 	function display_ticket_selector() {
-		return (bool)$this->get( 'EVT_display_ticket_selector' );
+		return (bool) $this->get('EVT_display_ticket_selector');
 	}
 
 
@@ -236,7 +236,7 @@ 
 	 * @return bool
 	 */
 	function external_url() {
-		return $this->get( 'EVT_external_URL' );
+		return $this->get('EVT_external_URL');
 	}
 
 
@@ -245,7 +245,7 @@ 
 	 * @return bool
 	 */
 	function member_only() {
-		return $this->get( 'EVT_member_only' );
+		return $this->get('EVT_member_only');
 	}
 
 
@@ -254,7 +254,7 @@ 
 	 * @return bool
 	 */
 	function phone() {
-		return $this->get( 'EVT_phone' );
+		return $this->get('EVT_phone');
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 * @return bool
 	 */
 	function modified() {
-		return $this->get( 'EVT_modified' );
+		return $this->get('EVT_modified');
 	}
 
 
@@ -272,7 +272,7 @@ 
 	 * @return bool
 	 */
 	function name() {
-		return $this->get( 'EVT_name' );
+		return $this->get('EVT_name');
 	}
 
 
@@ -281,7 +281,7 @@ 
 	 * @return bool
 	 */
 	function order() {
-		return $this->get( 'EVT_order' );
+		return $this->get('EVT_order');
 	}
 
 
@@ -290,8 +290,8 @@ 
 	 * @return bool|string
 	 */
 	function default_registration_status() {
-		$event_default_registration_status = $this->get( 'EVT_default_registration_status' );
-		return !empty( $event_default_registration_status ) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID;
+		$event_default_registration_status = $this->get('EVT_default_registration_status');
+		return ! empty($event_default_registration_status) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID;
 	}
 
 
@@ -302,14 +302,14 @@ 
 	 * @param bool $not_full_desc
 	 * @return bool|string
 	 */
-	function short_description( $num_words = 55, $more = NULL, $not_full_desc = FALSE ) {
-		$short_desc = $this->get( 'EVT_short_desc' );
-		if ( !empty( $short_desc ) || $not_full_desc ) {
+	function short_description($num_words = 55, $more = NULL, $not_full_desc = FALSE) {
+		$short_desc = $this->get('EVT_short_desc');
+		if ( ! empty($short_desc) || $not_full_desc) {
 			return $short_desc;
 		}
 		else {
-			$full_desc = $this->get( 'EVT_desc' );
-			return wp_trim_words( $full_desc, $num_words, $more );
+			$full_desc = $this->get('EVT_desc');
+			return wp_trim_words($full_desc, $num_words, $more);
 		}
 	}
 
@@ -319,7 +319,7 @@ 
 	 * @return bool
 	 */
 	function slug() {
-		return $this->get( 'EVT_slug' );
+		return $this->get('EVT_slug');
 	}
 
 
@@ -328,7 +328,7 @@ 
 	 * @return bool
 	 */
 	function timezone_string() {
-		return $this->get( 'EVT_timezone_string' );
+		return $this->get('EVT_timezone_string');
 	}
 
 
@@ -337,7 +337,7 @@ 
 	 * @return bool
 	 */
 	function visible_on() {
-		return $this->get( 'EVT_visible_on' );
+		return $this->get('EVT_visible_on');
 	}
 
 
@@ -346,7 +346,7 @@ 
 	 * @return bool
 	 */
 	function wp_user() {
-		return $this->get( 'EVT_wp_user' );
+		return $this->get('EVT_wp_user');
 	}
 
 
@@ -355,7 +355,7 @@ 
 	 * @return bool
 	 */
 	function donations() {
-		return $this->get( 'EVT_donations' );
+		return $this->get('EVT_donations');
 	}
 
 
@@ -363,8 +363,8 @@ 
 	/**
 	 * @param $limit
 	 */
-	function set_additional_limit( $limit ) {
-		$this->set( 'EVT_additional_limit', $limit );
+	function set_additional_limit($limit) {
+		$this->set('EVT_additional_limit', $limit);
 	}
 
 
@@ -372,8 +372,8 @@ 
 	/**
 	 * @param $created
 	 */
-	function set_created( $created ) {
-		$this->set( 'EVT_created', $created );
+	function set_created($created) {
+		$this->set('EVT_created', $created);
 	}
 
 
@@ -381,8 +381,8 @@ 
 	/**
 	 * @param $desc
 	 */
-	function set_description( $desc ) {
-		$this->set( 'EVT_desc', $desc );
+	function set_description($desc) {
+		$this->set('EVT_desc', $desc);
 	}
 
 
@@ -390,8 +390,8 @@ 
 	/**
 	 * @param $display_desc
 	 */
-	function set_display_description( $display_desc ) {
-		$this->set( 'EVT_display_desc', $display_desc );
+	function set_display_description($display_desc) {
+		$this->set('EVT_display_desc', $display_desc);
 	}
 
 
@@ -399,8 +399,8 @@ 
 	/**
 	 * @param $display_ticket_selector
 	 */
-	function set_display_ticket_selector( $display_ticket_selector ) {
-		$this->set( 'EVT_display_ticket_selector', $display_ticket_selector );
+	function set_display_ticket_selector($display_ticket_selector) {
+		$this->set('EVT_display_ticket_selector', $display_ticket_selector);
 	}
 
 
@@ -408,8 +408,8 @@ 
 	/**
 	 * @param $external_url
 	 */
-	function set_external_url( $external_url ) {
-		$this->set( 'EVT_external_URL', $external_url );
+	function set_external_url($external_url) {
+		$this->set('EVT_external_URL', $external_url);
 	}
 
 
@@ -417,8 +417,8 @@ 
 	/**
 	 * @param $member_only
 	 */
-	function set_member_only( $member_only ) {
-		$this->set( 'EVT_member_only', $member_only );
+	function set_member_only($member_only) {
+		$this->set('EVT_member_only', $member_only);
 	}
 
 
@@ -426,8 +426,8 @@ 
 	/**
 	 * @param $event_phone
 	 */
-	function set_event_phone( $event_phone ) {
-		$this->set( 'EVT_phone', $event_phone );
+	function set_event_phone($event_phone) {
+		$this->set('EVT_phone', $event_phone);
 	}
 
 
@@ -435,8 +435,8 @@ 
 	/**
 	 * @param $modified
 	 */
-	function set_modified( $modified ) {
-		$this->set( 'EVT_modified', $modified );
+	function set_modified($modified) {
+		$this->set('EVT_modified', $modified);
 	}
 
 
@@ -444,8 +444,8 @@ 
 	/**
 	 * @param $name
 	 */
-	function set_name( $name ) {
-		$this->set( 'EVT_name', $name );
+	function set_name($name) {
+		$this->set('EVT_name', $name);
 	}
 
 
@@ -453,8 +453,8 @@ 
 	/**
 	 * @param $order
 	 */
-	function set_order( $order ) {
-		$this->set( 'EVT_order', $order );
+	function set_order($order) {
+		$this->set('EVT_order', $order);
 	}
 
 
@@ -462,8 +462,8 @@ 
 	/**
 	 * @param $short_desc
 	 */
-	function set_short_description( $short_desc ) {
-		$this->set( 'EVT_short_desc', $short_desc );
+	function set_short_description($short_desc) {
+		$this->set('EVT_short_desc', $short_desc);
 	}
 
 
@@ -471,8 +471,8 @@ 
 	/**
 	 * @param $slug
 	 */
-	function set_slug( $slug ) {
-		$this->set( 'EVT_slug', $slug );
+	function set_slug($slug) {
+		$this->set('EVT_slug', $slug);
 	}
 
 
@@ -480,8 +480,8 @@ 
 	/**
 	 * @param $timezone_string
 	 */
-	function set_timezone_string( $timezone_string ) {
-		$this->set( 'EVT_timezone_string', $timezone_string );
+	function set_timezone_string($timezone_string) {
+		$this->set('EVT_timezone_string', $timezone_string);
 	}
 
 
@@ -489,8 +489,8 @@ 
 	/**
 	 * @param $visible_on
 	 */
-	function set_visible_on( $visible_on ) {
-		$this->set( 'EVT_visible_on', $visible_on );
+	function set_visible_on($visible_on) {
+		$this->set('EVT_visible_on', $visible_on);
 	}
 
 
@@ -498,8 +498,8 @@ 
 	/**
 	 * @param $wp_user
 	 */
-	function set_wp_user( $wp_user ) {
-		$this->set( 'EVT_wp_user', $wp_user );
+	function set_wp_user($wp_user) {
+		$this->set('EVT_wp_user', $wp_user);
 	}
 
 
@@ -507,8 +507,8 @@ 
 	/**
 	 * @param $default_registration_status
 	 */
-	function set_default_registration_status( $default_registration_status ) {
-		$this->set( 'EVT_default_registration_status', $default_registration_status );
+	function set_default_registration_status($default_registration_status) {
+		$this->set('EVT_default_registration_status', $default_registration_status);
 	}
 
 
@@ -516,8 +516,8 @@ 
 	/**
 	 * @param $donations
 	 */
-	function set_donations( $donations ) {
-		$this->set( 'EVT_donations', $donations );
+	function set_donations($donations) {
+		$this->set('EVT_donations', $donations);
 	}
 
 
@@ -527,8 +527,8 @@ 
 	 * @param EE_Venue /int $venue_id_or_obj
 	 * @return EE_Venue
 	 */
-	function add_venue( $venue_id_or_obj ) {
-		return $this->_add_relation_to( $venue_id_or_obj, 'Venue' );
+	function add_venue($venue_id_or_obj) {
+		return $this->_add_relation_to($venue_id_or_obj, 'Venue');
 	}
 
 
@@ -538,8 +538,8 @@ 
 	 * @param EE_Venue /int $venue_id_or_obj
 	 * @return EE_Venue
 	 */
-	function remove_venue( $venue_id_or_obj ) {
-		return $this->_remove_relation_to( $venue_id_or_obj, 'Venue' );
+	function remove_venue($venue_id_or_obj) {
+		return $this->_remove_relation_to($venue_id_or_obj, 'Venue');
 	}
 
 
@@ -549,8 +549,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Venue[]
 	 */
-	function venues( $query_params = array() ) {
-		return $this->get_many_related( 'Venue', $query_params );
+	function venues($query_params = array()) {
+		return $this->get_many_related('Venue', $query_params);
 	}
 
 
@@ -562,7 +562,7 @@ 
 	 */
 	private function _has_ID_and_is_published() {
 		// first check if event id is present and not NULL, then check if this event is published (or any of the equivalent "published" statuses)
-		return ( $this->ID() && $this->ID() !== NULL && ( $this->status() == 'publish' || $this->status() == EEM_Event::sold_out || $this->status() == EEM_Event::postponed || $this->status() == EEM_Event::cancelled ) ) ? TRUE : FALSE;
+		return ($this->ID() && $this->ID() !== NULL && ($this->status() == 'publish' || $this->status() == EEM_Event::sold_out || $this->status() == EEM_Event::postponed || $this->status() == EEM_Event::cancelled)) ? TRUE : FALSE;
 	}
 
 
@@ -574,21 +574,21 @@ 
 	 */
 	public function is_upcoming() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$upcoming = FALSE;
 		//next let's get all datetimes and loop through them
 		$datetimes = $this->datetimes_in_chronological_order();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is expired then we continue cause one of the other datetimes might be upcoming.
-				if ( $datetime->is_expired() ) {
+				if ($datetime->is_expired()) {
 					continue;
 				}
 				//if this dtt is active then we return false.
-				if ( $datetime->is_active() ) {
+				if ($datetime->is_active()) {
 					return FALSE;
 				}
 				//otherwise let's check upcoming status
@@ -605,21 +605,21 @@ 
 	 */
 	public function is_active() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$active = FALSE;
 		//next let's get all datetimes and loop through them
 		$datetimes = $this->datetimes_in_chronological_order();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is expired then we continue cause one of the other datetimes might be active.
-				if ( $datetime->is_expired() ) {
+				if ($datetime->is_expired()) {
 					continue;
 				}
 				//if this dtt is upcoming then we return false.
-				if ( $datetime->is_upcoming() ) {
+				if ($datetime->is_upcoming()) {
 					return FALSE;
 				}
 				//otherwise let's check active status
@@ -636,17 +636,17 @@ 
 	 */
 	public function is_expired() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$expired = FALSE;
 		//first let's get all datetimes and loop through them
 		$datetimes = $this->datetimes_in_chronological_order();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is upcoming or active then we return false.
-				if ( $datetime->is_upcoming() || $datetime->is_active() ) {
+				if ($datetime->is_upcoming() || $datetime->is_active()) {
 					return FALSE;
 				}
 				//otherwise let's check active status
@@ -663,7 +663,7 @@ 
 	 */
 	public function is_inactive() {
 		// check if event id is present and if this event is published
-		if ( $this->_has_ID_and_is_published() ) {
+		if ($this->_has_ID_and_is_published()) {
 			return FALSE;
 		}
 		return TRUE;
@@ -681,26 +681,26 @@ 
 	 */
 	public function perform_sold_out_status_check() {
 		// get all unexpired untrashed tickets
-		$tickets = $this->tickets( array(
+		$tickets = $this->tickets(array(
 			array(
-				'TKT_end_date'   => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ),
+				'TKT_end_date'   => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
 				'TKT_deleted'    => false
 			)
 		));
 		// if all the tickets are just expired, then don't update the event status to sold out
-		if ( empty( $tickets )) {
+		if (empty($tickets)) {
 			return true;
 		}
 		// set initial value
 		$spaces_remaining = 0;
-		foreach( $tickets as $ticket ) {
-			if ( $ticket instanceof EE_Ticket ) {
-				$spaces_remaining += $ticket->qty( 'saleable' );
+		foreach ($tickets as $ticket) {
+			if ($ticket instanceof EE_Ticket) {
+				$spaces_remaining += $ticket->qty('saleable');
 			}
 		}
-		if ( $spaces_remaining === 0 ) {
-			$this->set_status( EEM_Event::sold_out );
-			if ( !is_admin() || ( is_admin() && defined( 'DOING_AJAX' ) ) ) {
+		if ($spaces_remaining === 0) {
+			$this->set_status(EEM_Event::sold_out);
+			if ( ! is_admin() || (is_admin() && defined('DOING_AJAX'))) {
 				$this->save();
 			}
 			$sold_out = TRUE;
@@ -728,15 +728,15 @@ 
 	 */
 	public function spaces_remaining_for_sale() {
 		//first get total available spaces including consideration for tickets that have already sold.
-		$spaces_available = $this->total_available_spaces( true );
+		$spaces_available = $this->total_available_spaces(true);
 
 		//if total available = 0, then exit right away because that means everything is expired.
-		if ( $spaces_available === 0 ) {
+		if ($spaces_available === 0) {
 			return 0;
 		}
 
 		//subtract total approved registrations from spaces available to get how many are remaining.
-		$spots_taken = EEM_Registration::instance()->count( array( array( 'EVT_ID' => $this->ID(), 'STS_ID' => EEM_Registration::status_id_approved ) ), 'REG_ID', true );
+		$spots_taken = EEM_Registration::instance()->count(array(array('EVT_ID' => $this->ID(), 'STS_ID' => EEM_Registration::status_id_approved)), 'REG_ID', true);
 		$spaces_remaining = $spaces_available - $spots_taken;
 
 		return $spaces_remaining > 0 ? $spaces_remaining : 0;
@@ -769,29 +769,29 @@ 
 	 *
 	 * @return  int|float  (Note: if EE_INF is returned its considered a float by PHP)
 	 */
-	public function total_available_spaces( $current_total_available = false ) {
+	public function total_available_spaces($current_total_available = false) {
 		$spaces_available = 0;
 
 		//first get all tickets on the event and include expired tickets
-		$tickets = $this->tickets( array( 'default_where_conditions' => 'none' ) );
+		$tickets = $this->tickets(array('default_where_conditions' => 'none'));
 		$ticket_sums = array();
 		$datetime_limits = array();
 
 		//loop through tickets and normalize them
-		foreach ( $tickets as $ticket ) {
-			$datetimes = $ticket->datetimes( array( 'order_by' => array( 'DTT_reg_limit' => 'ASC' ) ) );
+		foreach ($tickets as $ticket) {
+			$datetimes = $ticket->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
 
-			if ( empty( $datetimes ) ) {
+			if (empty($datetimes)) {
 				continue;
 			}
 
 			//first datetime should be the lowest datetime
-			$least_datetime = reset( $datetimes );
+			$least_datetime = reset($datetimes);
 
 			//lets reset the ticket quantity to be the lower of either the lowest datetime reg limit or the ticket quantity
 			//IF datetimes sold (and we're not doing current live total available, then use spaces remaining for datetime, not reg_limit.
-			if ( $current_total_available ) {
-				if ( $ticket->is_remaining() ) {
+			if ($current_total_available) {
+				if ($ticket->is_remaining()) {
 					$remaining = $ticket->remaining();
 				} else {
 					$spaces_available += $ticket->sold();
@@ -799,23 +799,23 @@ 
 					continue;
 				}
 			} else {
-				$remaining = min( $ticket->qty(), $least_datetime->reg_limit() );
+				$remaining = min($ticket->qty(), $least_datetime->reg_limit());
 			}
 
 			//if $ticket_limit == infinity then let's drop out right away and just return that because any infinity amount trumps all other "available" amounts.
-			if ( $remaining == EE_INF ) {
+			if ($remaining == EE_INF) {
 				return EE_INF;
 			}
 
 			//multiply normalized $tkt quantity by the number of datetimes on the ticket as the "sum"
 			//also include the sum of all the datetime reg limits on the ticket for breaking ties.
-			$ticket_sums[$ticket->ID()]['sum'] = $remaining * count( $datetimes );
+			$ticket_sums[$ticket->ID()]['sum'] = $remaining * count($datetimes);
 			$ticket_sums[$ticket->ID()]['datetime_sums'] = 0;
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime->reg_limit() === EE_INF ) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime->reg_limit() === EE_INF) {
 					$ticket_sums[$ticket->ID()]['datetime_sums'] = EE_INF;
 				} else {
-					$ticket_sums[ $ticket->ID() ]['datetime_sums'] += $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
+					$ticket_sums[$ticket->ID()]['datetime_sums'] += $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
 				}
 				$datetime_limits[$datetime->ID()] = $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
 			}
@@ -826,74 +826,74 @@ 
 		//ticket quantity by the number of datetimes on the ticket).  For tie-breakers, then the next sort is based on the
 		//ticket with the greatest sum of all remaining datetime->spaces_remaining() ( or $datetime->reg_limit() if not
 		//$current_total_available ) for the datetimes on the ticket.
-		usort( $ticket_sums, function( $a, $b ) {
-			if ( $a['sum'] == $b['sum'] ) {
-				if ( $a['datetime_sums'] == $b['datetime_sums'] ) {
+		usort($ticket_sums, function($a, $b) {
+			if ($a['sum'] == $b['sum']) {
+				if ($a['datetime_sums'] == $b['datetime_sums']) {
 					return 0;
 				}
 
 				return $a['datetime_sums'] < $b['datetime_sums'] ? 1 : -1;
 			}
-			return ( $a['sum'] < $b['sum'] ) ? -1 : 1;
+			return ($a['sum'] < $b['sum']) ? -1 : 1;
 		});
 
 		//now let's loop through the sorted tickets and simulate sellouts
-		foreach ( $ticket_sums as $ticket_info ) {
-			if ( $ticket_info['ticket'] instanceof EE_Ticket ) {
+		foreach ($ticket_sums as $ticket_info) {
+			if ($ticket_info['ticket'] instanceof EE_Ticket) {
 
-				$datetimes = $ticket_info['ticket']->datetimes( array( 'order_by' => array( 'DTT_reg_limit' => 'ASC' ) ) );
+				$datetimes = $ticket_info['ticket']->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
 				//need to sort these $datetimes by remaining (only if $current_total_available)
 				//setup datetimes for simulation
 				$ticket_datetimes_remaining = array();
-				foreach( $datetimes as $datetime ) {
+				foreach ($datetimes as $datetime) {
 					$ticket_datetimes_remaining[$datetime->ID()]['rem'] = $datetime_limits[$datetime->ID()];
 					$ticket_datetimes_remaining[$datetime->ID()]['datetime'] = $datetime;
 				}
-				usort( $ticket_datetimes_remaining, function( $a, $b ) {
-					if ( $a['rem'] == $b['rem'] ) {
+				usort($ticket_datetimes_remaining, function($a, $b) {
+					if ($a['rem'] == $b['rem']) {
 						return 0;
 					}
-					return ( $a['rem'] < $b['rem'] ) ? -1 : 1;
+					return ($a['rem'] < $b['rem']) ? -1 : 1;
 				});
 
 
 				//get the remaining on the first datetime (which should be the one with the least remaining) and that is
 				//what we add to the spaces_available running total.  Then we need to decrease the remaining on our datetime tracker.
-				$lowest_datetime = reset( $ticket_datetimes_remaining );
+				$lowest_datetime = reset($ticket_datetimes_remaining);
 
 				//need to get the lower of; what the remaining is on the lowest datetime, and the remaining on the ticket.
 				// If this ends up being 0 (because of previous tickets in our simulation selling out), then it has already
 				// been tracked on $spaces available and this ticket is now sold out for the simulation, so we can continue
 				// to the next ticket.
-				if ( $current_total_available ) {
-					$remaining = min( $lowest_datetime['rem'], $ticket_info['ticket']->remaining() );
+				if ($current_total_available) {
+					$remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->remaining());
 				} else {
-					$remaining = min( $lowest_datetime['rem'], $ticket_info['ticket']->qty() );
+					$remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->qty());
 				}
 
 				//if $remaining is infinite that means that all datetimes on this ticket are infinite but we've made it here because all
 				//tickets have a quantity.  So we don't have to track datetimes, we can just use ticket quantities for total
 				//available.
-				if ( $remaining === EE_INF ) {
+				if ($remaining === EE_INF) {
 					$spaces_available += $ticket_info['ticket']->qty();
 					continue;
 				}
 
 				//if ticket has sold amounts then we also need to add that (but only if doing live counts)
-				if ( $current_total_available ) {
+				if ($current_total_available) {
 					$spaces_available += $ticket_info['ticket']->sold();
 				}
 
-				if ( $remaining <= 0 ) {
+				if ($remaining <= 0) {
 					continue;
 				} else {
 					$spaces_available += $remaining;
 				}
 
 				//loop through the datetimes and sell them out!
-				foreach ( $ticket_datetimes_remaining as $datetime_info ) {
-					if ( $datetime_info['datetime'] instanceof EE_Datetime ) {
-						$datetime_limits[ $datetime_info['datetime']->ID() ] += - $remaining;
+				foreach ($ticket_datetimes_remaining as $datetime_info) {
+					if ($datetime_info['datetime'] instanceof EE_Datetime) {
+						$datetime_limits[$datetime_info['datetime']->ID()] += - $remaining;
 					}
 				}
 			}
@@ -909,8 +909,8 @@ 
 	 * @param  bool $actual whether or not to perform calculations to not only figure the actual status but also to flip the status if necessary to sold out If false, we just check the existing status of the event
 	 * @return boolean
 	 */
-	public function is_sold_out( $actual = FALSE ) {
-		if ( ! $actual ) {
+	public function is_sold_out($actual = FALSE) {
+		if ( ! $actual) {
 			return $this->status() == EEM_Event::sold_out;
 		}
 		else {
@@ -955,30 +955,30 @@ 
 	 *
 	 * @return bool | string - based on EE_Datetime active constants or FALSE if error.
 	 */
-	public function get_active_status( $reset = false ) {
+	public function get_active_status($reset = false) {
 		// if the active status has already been set, then just use that value (unless we are resetting it)
-		if ( ! empty( $this->_active_status ) && ! $reset ) {
+		if ( ! empty($this->_active_status) && ! $reset) {
 			return $this->_active_status;
 		}
 		//first check if event id is present on this object
-		if ( ! $this->ID() ) {
+		if ( ! $this->ID()) {
 			return false;
 		}
 
-		$where_params_for_event  = array( array( 'EVT_ID' => $this->ID() ) );
+		$where_params_for_event = array(array('EVT_ID' => $this->ID()));
 
 		//if event is published:
-		if ( $this->status() === 'publish' ) {
+		if ($this->status() === 'publish') {
 			//active?
-			if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::active, $where_params_for_event ) > 0 ) {
+			if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::active, $where_params_for_event) > 0) {
 				$this->_active_status = EE_Datetime::active;
 			} else {
 				//upcoming?
-				if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::upcoming, $where_params_for_event  ) > 0 ) {
+				if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::upcoming, $where_params_for_event) > 0) {
 					$this->_active_status = EE_Datetime::upcoming;
 				} else {
 					//expired?
-					if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::expired, $where_params_for_event  ) > 0 ) {
+					if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::expired, $where_params_for_event) > 0) {
 						$this->_active_status = EE_Datetime::expired;
 					} else {
 						//it would be odd if things make it this far because it basically means there are no datetime's
@@ -989,7 +989,7 @@ 
 			}
 		} else {
 			//the event is not published, so let's just set it's active status according to its' post status
-			switch ( $this->status() ) {
+			switch ($this->status()) {
 				case EEM_Event::sold_out :
 					$this->_active_status = EE_Datetime::sold_out;
 					break;
@@ -1015,10 +1015,10 @@ 
 	 * @param boolean $echo     whether to return (FALSE), or echo out the result (TRUE)
 	 * @return mixed void|string
 	 */
-	public function pretty_active_status( $echo = TRUE ) {
+	public function pretty_active_status($echo = TRUE) {
 		$active_status = $this->get_active_status();
-		$status = '<span class="ee-status event-active-status-' . $active_status . '">' . EEH_Template::pretty_status( $active_status, FALSE, 'sentence' ) . '</span>';
-		if ( $echo ) {
+		$status = '<span class="ee-status event-active-status-'.$active_status.'">'.EEH_Template::pretty_status($active_status, FALSE, 'sentence').'</span>';
+		if ($echo) {
 			echo $status;
 			return '';
 		}
@@ -1032,12 +1032,12 @@ 
 	 */
 	public function get_number_of_tickets_sold() {
 		$tkt_sold = 0;
-		if ( !$this->ID() ) {
+		if ( ! $this->ID()) {
 			return 0;
 		}
 		$datetimes = $this->datetimes();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				$tkt_sold += $datetime->sold();
 			}
 		}
@@ -1052,7 +1052,7 @@ 
 	 * @return int
 	 */
 	public function get_count_of_all_registrations() {
-		return EEM_Event::instance()->count_related( $this, 'Registration' );
+		return EEM_Event::instance()->count_related($this, 'Registration');
 	}
 
 
@@ -1062,9 +1062,9 @@ 
 	 * @return EE_Ticket
 	 */
 	public function get_ticket_with_earliest_start_time() {
-		$where[ 'Datetime.EVT_ID' ] = $this->ID();
-		$query_params = array( $where, 'order_by' => array( 'TKT_start_date' => 'ASC' ) );
-		return EE_Registry::instance()->load_model( 'Ticket' )->get_one( $query_params );
+		$where['Datetime.EVT_ID'] = $this->ID();
+		$query_params = array($where, 'order_by' => array('TKT_start_date' => 'ASC'));
+		return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
 	}
 
 
@@ -1074,9 +1074,9 @@ 
 	 * @return EE_Ticket
 	 */
 	public function get_ticket_with_latest_end_time() {
-		$where[ 'Datetime.EVT_ID' ] = $this->ID();
-		$query_params = array( $where, 'order_by' => array( 'TKT_end_date' => 'DESC' ) );
-		return EE_Registry::instance()->load_model( 'Ticket' )->get_one( $query_params );
+		$where['Datetime.EVT_ID'] = $this->ID();
+		$query_params = array($where, 'order_by' => array('TKT_end_date' => 'DESC'));
+		return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
 	}
 
 
@@ -1088,11 +1088,11 @@ 
 	public function tickets_on_sale() {
 		$earliest_ticket = $this->get_ticket_with_earliest_start_time();
 		$latest_ticket = $this->get_ticket_with_latest_end_time();
-		if ( !$latest_ticket instanceof EE_Ticket && !$earliest_ticket instanceof EE_Ticket ) {
+		if ( ! $latest_ticket instanceof EE_Ticket && ! $earliest_ticket instanceof EE_Ticket) {
 			return FALSE;
 		}
 		//check on sale for these two tickets.
-		if ( $latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale() ) {
+		if ($latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale()) {
 			return TRUE;
 		}
 		return FALSE;
@@ -1106,7 +1106,7 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		if ( $this->external_url() ) {
+		if ($this->external_url()) {
 			return $this->external_url();
 		}
 		else {
@@ -1121,10 +1121,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Term
 	 */
-	public function first_event_category( $query_params = array() ) {
-		$query_params[ 0 ][ 'Term_Taxonomy.taxonomy' ] = 'espresso_event_categories';
-		$query_params[ 0 ][ 'Term_Taxonomy.Event.EVT_ID' ] = $this->ID();
-		return EEM_Term::instance()->get_one( $query_params );
+	public function first_event_category($query_params = array()) {
+		$query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+		$query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
+		return EEM_Term::instance()->get_one($query_params);
 	}
 
 
@@ -1134,10 +1134,10 @@ 
 	 * @param array $query_params
 	 * @return EE_Term[]
 	 */
-	public function get_all_event_categories( $query_params = array() ) {
-		$query_params[ 0 ][ 'Term_Taxonomy.taxonomy' ] = 'espresso_event_categories';
-		$query_params[ 0 ][ 'Term_Taxonomy.Event.EVT_ID' ] = $this->ID();
-		return EEM_Term::instance()->get_all( $query_params );
+	public function get_all_event_categories($query_params = array()) {
+		$query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+		$query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
+		return EEM_Term::instance()->get_all($query_params);
 	}
 
 	/**
@@ -1145,8 +1145,8 @@ 
 	 * @param array $query_params @see EEM_Base::get_all
 	 * @return EE_Question_Group[]
 	 */
-	public function question_groups($query_params = array()){
-		$query_params = ! empty( $query_params ) ? $query_params : array( 'order_by' => array( 'QSG_order' => 'ASC' ));
+	public function question_groups($query_params = array()) {
+		$query_params = ! empty($query_params) ? $query_params : array('order_by' => array('QSG_order' => 'ASC'));
 		return $this->get_many_related('Question_Group', $query_params);
 	}
 
@@ -1186,12 +1186,12 @@ 
 	 */
 	public function get_admin_edit_link() {
 		EE_Registry::instance()->load_helper('URL');
-		return EEH_URL::add_query_args_and_nonce( array(
+		return EEH_URL::add_query_args_and_nonce(array(
 			'page' => 'espresso_events',
 			'action' => 'edit',
 			'post' => $this->ID()
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 
@@ -1204,11 +1204,11 @@ 
 	 */
 	public function get_admin_settings_link() {
 		EE_Registry::instance()->load_helper('URL');
-		return EEH_URL::add_query_args_and_nonce( array(
+		return EEH_URL::add_query_args_and_nonce(array(
 			'page' => 'espresso_events',
 			'action' => 'default_event_settings'
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 
@@ -1224,11 +1224,11 @@ 
 	public function get_admin_overview_link() {
 
 		EE_Registry::instance()->load_helper('URL');
-		return EEH_URL::add_query_args_and_nonce( array(
+		return EEH_URL::add_query_args_and_nonce(array(
 			'page' => 'espresso_events',
 			'action' => 'default'
 		),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 

core/admin/templates/admin_details_wrapper.template.php

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 global $post_type, $post;
 //action for registering metaboxes
-do_action( 'add_meta_boxes', $post_type, $post );
+do_action('add_meta_boxes', $post_type, $post);
 ?>
 <div id="admin-page-header">
 	<?php echo $admin_page_header; ?>
@@ -10,7 +10,7 @@ 
 		<!-- admin-page-header -->
 	<div id="post-body" class="metabox-holder columns-2">
 
-	<?php if ( ! empty( $post_body_content )) : ?>
+	<?php if ( ! empty($post_body_content)) : ?>
 		<div id="post-body-content">
 			<?php echo $post_body_content; ?>
 		</div>
@@ -18,13 +18,13 @@ 
 	<?php endif; ?>
 
 		<div id="postbox-container-1" class="postbox-container">
-			<?php do_meta_boxes( $current_page, 'side', NULL ); ?>
+			<?php do_meta_boxes($current_page, 'side', NULL); ?>
 		</div>
 		<!-- postbox-container-1 -->
 
 		<div id="postbox-container-2" class="postbox-container">
-			<?php do_meta_boxes( $current_page, 'normal', NULL ); ?>
-			<?php do_meta_boxes( $current_page, 'advanced', NULL ); ?>
+			<?php do_meta_boxes($current_page, 'normal', NULL); ?>
+			<?php do_meta_boxes($current_page, 'advanced', NULL); ?>
 		</div>
 		<!-- postbox-container-2 -->