eventespresso / event-espresso-core

core/db_models/EEM_Base.model.php

Doc Comments +17 added lines, -17 removed lines

@@ -761,7 +761,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() {
@@ -858,6 +858,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 array|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){
@@ -1200,7 +1201,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 );
@@ -1235,7 +1236,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' ) {
@@ -1535,7 +1536,7 @@ 
 	 * not just have a flag field on it switched
 	 * Wrapper for EEM_Base::delete_permanently()
 	 * @param mixed $id
-	 * @return boolean whether the row got deleted or not
+	 * @return integer whether the row got deleted or not
 	 */
 	public function delete_permanently_by_ID( $id ) {
 		return $this->delete_permanently( 
@@ -1552,7 +1553,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( 
@@ -1926,7 +1927,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
 	 */
@@ -1994,7 +1995,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')
@@ -2016,8 +2016,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.
@@ -2093,7 +2093,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
@@ -2482,7 +2482,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];
@@ -3569,8 +3569,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;
@@ -3664,7 +3664,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);
@@ -3791,7 +3791,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() {
 
@@ -3915,7 +3915,7 @@ 
 	 * returns an array of their corresponding field names and database values
 	 *
 	 * @param string $cols_n_values
-	 * @return array
+	 * @return string
 	 */
 	protected function _deduce_fields_n_values_from_cols_n_values( $cols_n_values ){
 		$this_model_fields_n_values = array();
@@ -4176,7 +4176,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 +954 added lines, -954 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
@@ -235,7 +235,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
@@ -297,19 +297,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
@@ -323,13 +323,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
@@ -362,17 +362,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
@@ -403,13 +403,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)
 				)
 			);
 		}
@@ -419,11 +419,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());
 			}
@@ -433,54 +433,54 @@ 
 		 * EE_Register_Model_Extension
 		 * @param EE_Model_Field_Base[] $_fields
 		 */
-		$this->_fields = apply_filters('FHEE__'.get_class($this).'__construct__fields',$this->_fields);
+		$this->_fields = apply_filters('FHEE__'.get_class($this).'__construct__fields', $this->_fields);
 		$this->_invalidate_field_caches();
-		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 ($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();
 		}
 		$this->_default_where_conditions_strategy->_finalize_construct($this);
-		if( ! $this->_minimum_where_conditions_strategy){
+		if ( ! $this->_minimum_where_conditions_strategy) {
 			//nothing was set during child constructor, so set default
 			$this->_minimum_where_conditions_strategy = new EE_Default_Where_Conditions();
 		}
@@ -488,15 +488,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,
@@ -506,23 +506,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);
 				}
 
 			}
@@ -536,11 +536,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();
 		}
 }
@@ -553,16 +553,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;
@@ -575,11 +575,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;
 	}
@@ -590,15 +590,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;
     }
@@ -739,7 +739,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));
 	}
 
@@ -749,10 +749,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;
 	}
@@ -765,19 +765,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;
 		}
 	}
@@ -791,7 +791,7 @@ 
 	 * (or transiently-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;
 	}
 
@@ -803,13 +803,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;
 			}
 		}
@@ -828,21 +828,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;
 	}
 
@@ -860,7 +860,7 @@ 
 	 * 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)
 	 */
-	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);
 	}
 
@@ -872,12 +872,12 @@ 
 	 * @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])){
+			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(
 							__(
@@ -889,24 +889,24 @@ 
 						)
 					);
 				}
-				if( ! in_array( $selection_and_datatype[1],$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 ],
+							$selection_and_datatype[1],
+							$selection_and_datatype[0],
 							$alias,
-							implode( ",", $this->_valid_wpdb_data_types )
+							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;
@@ -919,7 +919,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();
 	}
 
@@ -931,14 +931,14 @@ 
 	 * @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 );
+	function get_one_by_ID($id) {
+		if ($this->get_from_entity_map($id)) {
+			return $this->get_from_entity_map($id);
 		}
 		return $this->get_one( 
 			$this->alter_query_params_to_restrict_by_ID( 
 				$id,
-				array( 'default_where_conditions' => 'minimum' )
+				array('default_where_conditions' => 'minimum')
 			) 
 		);
 	}
@@ -950,15 +950,15 @@ 
 	 * @param array $query_params
 	 * @return array of normal query params, @see EEM_Base::get_all
 	 */
-	public function alter_query_params_to_restrict_by_ID( $id, $query_params = array() ) {
-		if( ! isset( $query_params[ 0 ] ) ) {
-			$query_params[ 0 ] = array();
+	public function alter_query_params_to_restrict_by_ID($id, $query_params = array()) {
+		if ( ! isset($query_params[0])) {
+			$query_params[0] = array();
 		}
-		if( $this->has_primary_key_field ( ) ) {
-			$query_params[ 0 ][ $this->primary_key_name() ] = $id ;
-		}else{
+		if ($this->has_primary_key_field( )) {
+			$query_params[0][$this->primary_key_name()] = $id;
+		} else {
 			//no primary key, so the $id must be from the get_index_primary_key_string()
-			$query_params[0] = array_replace_recursive( $query_params[ 0 ], $this->parse_index_primary_key_string( $id ) );
+			$query_params[0] = array_replace_recursive($query_params[0], $this->parse_index_primary_key_string($id));
 		}
 		return $query_params;
 	}
@@ -970,16 +970,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);
 		}
 	}
@@ -1003,8 +1003,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);
 	}
 
 
@@ -1027,8 +1027,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);
 	}
 
 
@@ -1050,9 +1050,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);
 	}
 
 
@@ -1074,9 +1074,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);
 	}
 
 
@@ -1102,40 +1102,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);
 		}
 	}
 
@@ -1146,18 +1146,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);
 			}
 		}
 	}
@@ -1172,9 +1172,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;
 				}
@@ -1182,9 +1182,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;
 	}
@@ -1202,19 +1202,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));
 	}
 
 
@@ -1238,25 +1238,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;
 		}
 	}
@@ -1280,18 +1280,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));
 	}
 
 
@@ -1301,7 +1301,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;
 	}
 
@@ -1335,9 +1335,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();
 		}
 		/**
@@ -1347,7 +1347,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
@@ -1355,10 +1355,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
@@ -1368,29 +1368,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 would 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;
 							}
 						}
@@ -1410,44 +1410,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.
 		 *
@@ -1456,8 +1456,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
 	}
 
 	/**
@@ -1469,22 +1469,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;
 	}
 
@@ -1494,12 +1494,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;
 		}
 	}
@@ -1513,19 +1513,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);
 
 	}
 	
@@ -1537,10 +1537,10 @@ 
 	 * @param mixed $id
 	 * @return boolean whether the row got deleted or not
 	 */
-	public function delete_permanently_by_ID( $id ) {
+	public function delete_permanently_by_ID($id) {
 		return $this->delete_permanently( 
 			array(
-				array( $this->get_primary_key_field()->get_name() => $id ),
+				array($this->get_primary_key_field()->get_name() => $id),
 				'limit' 	=> 1
 			) 
 		);
@@ -1554,10 +1554,10 @@ 
 	 * @param mixed $id
 	 * @return boolean whether the row got deleted or not
 	 */
-	public function delete_by_ID( $id ){
+	public function delete_by_ID($id) {
 		return $this->delete( 
 			array(
-				array( $this->get_primary_key_field()->get_name() => $id ),
+				array($this->get_primary_key_field()->get_name() => $id),
 				'limit' 	=> 1
 			) 
 		);
@@ -1571,7 +1571,7 @@ 
 	 * @param boolean $allow_blocking
 	 * @return @see EEM_Base::delete_permanently
 	 */
-	function delete($query_params,$allow_blocking = true){
+	function delete($query_params, $allow_blocking = true) {
 		return $this->delete_permanently($query_params, $allow_blocking);
 	}
 
@@ -1587,7 +1587,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_permanently($query_params,$allow_blocking = true){
+	function delete_permanently($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
@@ -1596,34 +1596,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]);
 				}
 			}
 		}
@@ -1635,8 +1635,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
 	}
 
 
@@ -1652,28 +1652,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;
 				}
@@ -1693,65 +1693,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)));
 		}
 	}
 
@@ -1765,21 +1765,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));
 	}
 
 	/**
@@ -1789,23 +1789,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;
 		}
 	}
 
@@ -1820,33 +1820,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;
 	}
@@ -1862,23 +1862,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 :
@@ -1886,11 +1886,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);
 
 		}
 
@@ -1906,18 +1906,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;
 	}
 
@@ -1930,16 +1930,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;
@@ -1954,7 +1954,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().
@@ -1967,7 +1967,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;
 	}
 
@@ -1976,8 +1976,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--;
 		}
@@ -2001,9 +2001,9 @@ 
 	 * @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);
+		return $relation_obj->add_relation_to($id_or_obj, $other_model_id_or_obj, $extra_join_model_fields_n_values);
 	}
 
 	/**
@@ -2022,9 +2022,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);
 	}
 
 
@@ -2037,9 +2037,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);
 	}
 
 
@@ -2052,10 +2052,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);
 	}
 
 	/**
@@ -2068,10 +2068,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);
 	}
 
 	/**
@@ -2084,10 +2084,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);
 	}
 
 	/**
@@ -2100,17 +2100,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);
 	}
 
 
@@ -2124,21 +2124,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);
 	}
 
 
@@ -2150,12 +2150,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;
 		}
 
@@ -2165,8 +2165,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));
 	}
 
 	/**
@@ -2174,14 +2174,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;
 	}
@@ -2202,19 +2202,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);
 				}
 			}
 			/**
@@ -2224,9 +2224,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;
 		}
 	}
@@ -2239,11 +2239,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;
 			}
 		}
@@ -2264,28 +2264,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);
 		}
 	}
@@ -2295,7 +2295,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;
 	}
@@ -2305,7 +2305,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)));
 	}
 
@@ -2325,45 +2325,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);
@@ -2378,15 +2378,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);
 	}
 
 
@@ -2398,9 +2398,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);
@@ -2411,7 +2411,7 @@ 
 					//leave the value alone
 			}
 			return $value;
-		}else{
+		} else {
 			return $value;
 		}
 	}
@@ -2421,13 +2421,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)));
 	}
 
 	/**
@@ -2446,7 +2446,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;
 	}
 
@@ -2459,8 +2459,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;
 	}
 
 
@@ -2469,10 +2469,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;
 			}
 		}
@@ -2484,7 +2484,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];
 	}
 
@@ -2496,29 +2496,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;
 	}
@@ -2531,34 +2531,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);
 				}
@@ -2577,14 +2577,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;
@@ -2603,81 +2603,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);
@@ -2685,46 +2685,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;
 	}
@@ -2735,17 +2735,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);
 	}
 
 	/**
@@ -2755,11 +2755,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));
 		}
 	}
 
@@ -2777,7 +2777,7 @@ 
 	 * @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()){
+	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', 
@@ -2785,19 +2785,19 @@ 
 				'minimum',
 				'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, $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();
-		}elseif( in_array( $use_default_where_conditions, array( 'minimum' ) ) ) {
+		}elseif (in_array($use_default_where_conditions, array('minimum'))) {
 			$universal_query_params = $this->_get_minimum_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);
 
@@ -2824,22 +2824,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
 			}
 		}
@@ -2854,8 +2854,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);
@@ -2869,8 +2869,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)
 	 */
-	protected function _get_minimum_where_conditions($model_relation_path = null){
-		if ( $this->_ignore_where_strategy )
+	protected function _get_minimum_where_conditions($model_relation_path = null) {
+		if ($this->_ignore_where_strategy)
 			return array();
 
 		return $this->_minimum_where_conditions_strategy->get_default_where_conditions($model_relation_path);
@@ -2881,13 +2881,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);
 	}
 
 	/**
@@ -2896,19 +2896,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'";
 				}
 			}
@@ -2932,66 +2932,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;
 			}
 		}
@@ -3001,7 +3001,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));
 
 	}
 
@@ -3018,26 +3018,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);
 	}
 
 
@@ -3046,11 +3046,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 '';
 		}
 	}
@@ -3061,11 +3061,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 '';
 		}
 
@@ -3079,17 +3079,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));
 		}
 	}
 
@@ -3102,43 +3102,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;
@@ -3152,18 +3152,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)));
 		}
 	}
 
@@ -3175,11 +3175,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;
 		}
@@ -3194,54 +3194,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)));
 		}
 	}
 
@@ -3253,12 +3253,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];
 	}
 
 
@@ -3274,26 +3274,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).")";
 	}
 
 
@@ -3305,16 +3305,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);
 		}
 	}
 
@@ -3326,27 +3326,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;
 		}
 	}
@@ -3360,13 +3360,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)));
 		}
 	}
 
@@ -3380,14 +3380,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;
@@ -3400,7 +3400,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;
@@ -3421,17 +3421,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);
 				}
@@ -3445,9 +3445,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();
@@ -3463,11 +3463,11 @@ 
 	 * @throws EE_Error
 	 * @return EEM_Base
 	 */
-	function get_related_model_obj($model_name){
+	function get_related_model_obj($model_name) {
 
-		$model_classname = strpos( $model_name, 'EEM_' ) === 0 ? $model_name : '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));
+		$model_classname = strpos($model_name, 'EEM_') === 0 ? $model_name : '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));
 		}
 		$model_obj = call_user_func($model_classname."::instance");
 		return $model_obj;
@@ -3478,7 +3478,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;
 	}
 
@@ -3488,10 +3488,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;
 			}
 		}
@@ -3506,15 +3506,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))
 				)
 			);
 		}
@@ -3529,10 +3529,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];
 	}
@@ -3542,11 +3542,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;
 		}
 	}
@@ -3556,11 +3556,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;
 		}
 	}
@@ -3572,7 +3572,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;
 	}
 
@@ -3584,16 +3584,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;
@@ -3606,12 +3606,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;
 			}
 		}
@@ -3625,9 +3625,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;
 			}
 		}
@@ -3641,21 +3641,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];
 	}
 
 
@@ -3666,7 +3666,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();
 	}
@@ -3679,25 +3679,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;
 						}
 					}
 				}
@@ -3716,67 +3716,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);
 					}
 				}
@@ -3797,12 +3797,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;
 	}
@@ -3815,40 +3815,40 @@ 
 	 * 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;
 			}
 		}
 
 		// 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;
 	}
 	/**
@@ -3856,8 +3856,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;
 	}
 
 
@@ -3876,21 +3876,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;
 		}
 	}
@@ -3903,8 +3903,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);
 	}
 
 
@@ -3917,40 +3917,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;
 		}
 
@@ -3968,23 +3968,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);
 		}
 	}
 
@@ -4002,24 +4002,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;
 		}
 	}
@@ -4032,7 +4032,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();
 	}
 
@@ -4045,10 +4045,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;
 		}
 	}
@@ -4077,13 +4077,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,
@@ -4092,7 +4092,7 @@ 
 			);
 		}
 
-		return apply_filters($tagName,null,$this,$args);
+		return apply_filters($tagName, null, $this, $args);
 	}
 
 
@@ -4105,22 +4105,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;
@@ -4136,19 +4136,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;
 	}
@@ -4171,14 +4171,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;
 	}
 
@@ -4186,17 +4186,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;
 			}
 		}
@@ -4209,9 +4209,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();
 			}
 		}
@@ -4224,7 +4224,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);
 	}
@@ -4236,13 +4236,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;
 			}
 		}
@@ -4255,10 +4255,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;
 			}
 		}
@@ -4274,23 +4274,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);
@@ -4304,16 +4304,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;
 		}
 	}
@@ -4327,10 +4327,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);
 	}
 
 
@@ -4341,12 +4341,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))));
 		}
 	}
 
@@ -4356,10 +4356,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;
@@ -4374,22 +4374,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;
@@ -4402,8 +4402,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);
 	}
 
 	/**
@@ -4415,27 +4415,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;
 	}
 
@@ -4445,12 +4445,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;
@@ -4462,7 +4462,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);
 	}
 
 
@@ -4473,19 +4473,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()))
 			)
 		);
 
@@ -4496,7 +4496,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,
@@ -4512,17 +4512,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)
 				)
 			);
 		}

Braces +131 added lines, -120 removed lines

@@ -540,7 +540,7 @@ 
 		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{
+		} else{
 			return array();
 		}
 }
@@ -591,8 +591,9 @@ 
 	 * @return array
 	 */
 	 public function status_array( $translated = FALSE ) {
-	 	if ( !array_key_exists('Status', $this->_model_relations ) )
-	 		return array();
+	 	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) ) );
@@ -771,13 +772,13 @@ 
 				$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{
+			} 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 ) {
+		} catch( EE_Error $e ) {
 			return false;
 		}
 	}
@@ -805,11 +806,11 @@ 
 	public function is_owned() {
 		if( $this->model_chain_to_wp_user() ){
 			return true;
-		}else{
+		} else{
 			try{
 				$this->get_foreign_key_to( 'WP_User' );
 				return true;
-			}catch( EE_Error $e ){
+			} catch( EE_Error $e ){
 				return false;
 			}
 		}
@@ -832,9 +833,9 @@ 
 		//remember the custom selections, if any
 		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();
 		}
 
@@ -906,7 +907,7 @@ 
 				$select_sql_array[] = "{$selection_and_datatype[0]} AS $alias";
 			}
 			$columns_to_select_string = implode(", ",$select_sql_array);
-		}else{
+		} else{
 			$columns_to_select_string = $columns_to_select;
 		}
 		return $columns_to_select_string;
@@ -956,7 +957,7 @@ 
 		}
 		if( $this->has_primary_key_field ( ) ) {
 			$query_params[ 0 ][ $this->primary_key_name() ] = $id ;
-		}else{
+		} else{
 			//no primary key, so the $id must be from the get_index_primary_key_string()
 			$query_params[0] = array_replace_recursive( $query_params[ 0 ], $this->parse_index_primary_key_string( $id ) );
 		}
@@ -979,7 +980,7 @@ 
 		$items = $this->get_all($query_params);
 		if(empty($items)){
 			return null;
-		}else{
+		} else{
 			return array_shift($items);
 		}
 	}
@@ -1374,7 +1375,7 @@ 
 				//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{
+				} else{
 					//if there's no primary key, we basically can't support having a 2nd table on the model (we could but it would be lots of work)
 					$main_table_pk_value = null;
 				}
@@ -1413,7 +1414,7 @@ 
 		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{
+			} 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 );
 				$model_objs_affected_ids = array();
@@ -1473,9 +1474,9 @@ 
 
 		if( $field_to_select ){
 			$field = $this->field_settings_for( $field_to_select );
-		}elseif( $this->has_primary_key_field ( ) ){
+		} 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());
 		}
@@ -1499,7 +1500,7 @@ 
 		$col = $this->get_col( $query_params, $field_to_select );
 		if( ! empty( $col ) ) {
 			return reset( $col );
-		}else{
+		} else{
 			return NULL;
 		}
 	}
@@ -1614,7 +1615,7 @@ 
 
 			//		/echo "delete sql:$SQL";
 			$rows_deleted = $this->_do_wpdb_query( 'query', array( $SQL ) );
-		}else{
+		} else{
 			$rows_deleted = 0;
 		}
 
@@ -1656,7 +1657,7 @@ 
 		//first, if $ignore_this_model_obj was supplied, get its model
 		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
@@ -1669,7 +1670,7 @@ 
 				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{
+				} else{
 					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id);
 				}
 
@@ -1706,24 +1707,28 @@ 
 				}
 
 				//primary table deletes
-				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()];
+				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 ) {
 
 						//first check if we've got the foreign key column here.
-						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()];
+						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()] ) )
-							$deletes[$ot->get_fully_qualified_pk_column()][] = $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()]) )
-							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_pk_column()];
+						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()];
+						}
 					}
 				}
 			}
@@ -1736,7 +1741,7 @@ 
 			}
 
 			return !empty($query) ? implode(' AND ', $query ) : '';
-		}elseif(count($this->get_combined_primary_key_fields()) > 1){
+		} 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?
@@ -1748,7 +1753,7 @@ 
 				$ways_to_identify_a_row[] = "(".implode(" AND ",$values_for_each_cpk_for_a_row).")";
 			}
 			return implode(" OR ",$ways_to_identify_a_row);
-		}else{
+		} 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)));
@@ -1770,10 +1775,10 @@ 
 		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 = '*';
 		}
 
@@ -1795,7 +1800,7 @@ 
 		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();
@@ -1804,7 +1809,7 @@ 
 		$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
+		} else{//must be %f
 			return (float)$return_value;
 		}
 	}
@@ -1842,10 +1847,10 @@ 
 			$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 ){
+			} 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 ) {
+		} 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;
@@ -2155,7 +2160,7 @@ 
 		$results = $this->get_all_related($id_or_obj,$other_model_name,$query_params);
 		if( $results ){
 			return array_shift($results);
-		}else{
+		} else{
 			return null;
 		}
 
@@ -2226,7 +2231,7 @@ 
 			 */
 			do_action( 'AHEE__EEM_Base__insert__end', $this, $field_n_values, $new_id );
 			return $new_id;
-		}else{
+		} else{
 			return FALSE;
 		}
 	}
@@ -2267,9 +2272,9 @@ 
 	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{
+		} 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();
@@ -2285,7 +2290,7 @@ 
 		//if there is nothing to base this search on, then we shouldn't find anything
 		if( empty( $query_params ) ){
 			return array();
-		}else{
+		} else{
 			return $this->get_one($query_params);
 		}
 	}
@@ -2358,12 +2363,12 @@ 
 		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);
@@ -2411,7 +2416,7 @@ 
 					//leave the value alone
 			}
 			return $value;
-		}else{
+		} else{
 			return $value;
 		}
 	}
@@ -2504,7 +2509,7 @@ 
 		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'] )){
+			} elseif( ! empty ( $query_params['group_by'] )){
 				$this->_extract_related_model_info_from_query_param( $query_params['group_by'],$query_info_carrier,'group_by');
 			}
 		}
@@ -2512,10 +2517,11 @@ 
 			$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 ( 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');
@@ -2547,10 +2553,10 @@ 
 					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{
+					} 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){
@@ -2610,7 +2616,7 @@ 
 		}
 		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
@@ -2628,7 +2634,7 @@ 
 		}
 		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 );
@@ -2651,7 +2657,7 @@ 
 				}
 				//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']));
 			}
 		}
@@ -2673,11 +2679,11 @@ 
 					$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'] )){
+			} 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);
@@ -2700,7 +2706,7 @@ 
 					$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'] )){
+			} 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']));
 			}
 		}
@@ -2724,8 +2730,9 @@ 
 			}
 		}
 		$main_model_join_sql = $query_object->get_main_model_join_sql();
-		if ( empty( $main_model_join_sql ) )
-			$query_object->set_main_model_join_sql($this->_construct_internal_join());
+		if ( empty( $main_model_join_sql ) ) {
+					$query_object->set_main_model_join_sql($this->_construct_internal_join());
+		}
 		return $query_object;
 	}
 
@@ -2758,7 +2765,7 @@ 
 	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{
+		} 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));
 		}
 	}
@@ -2790,9 +2797,9 @@ 
 		}
 		if( in_array($use_default_where_conditions, array('all','this_model_only')) ){
 			$universal_query_params = $this->_get_default_where_conditions();
-		}elseif( in_array( $use_default_where_conditions, array( 'minimum' ) ) ) {
+		} elseif( in_array( $use_default_where_conditions, array( 'minimum' ) ) ) {
 			$universal_query_params = $this->_get_minimum_where_conditions();
-		}else{
+		} else{
 			$universal_query_params = array();
 		}
 
@@ -2832,14 +2839,14 @@ 
 		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()){
 				$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
 			}
 		}
@@ -2855,8 +2862,9 @@ 
 	 * @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 )
-			return array();
+		if ( $this->_ignore_where_strategy ) {
+					return array();
+		}
 
 		return $this->_default_where_conditions_strategy->get_default_where_conditions($model_relation_path);
 	}
@@ -2870,8 +2878,9 @@ 
 	 * @return array like EEM_Base::get_all's $query_params[0] (where conditions)
 	 */
 	protected function _get_minimum_where_conditions($model_relation_path = null){
-		if ( $this->_ignore_where_strategy )
-			return array();
+		if ( $this->_ignore_where_strategy ) {
+					return array();
+		}
 
 		return $this->_minimum_where_conditions_strategy->get_default_where_conditions($model_relation_path);
 	}
@@ -2945,7 +2954,7 @@ 
 		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));
 			}
@@ -2954,7 +2963,7 @@ 
 		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' ),
@@ -2985,12 +2994,12 @@ 
 					//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{
+				} 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){
+			} elseif($query_param == $valid_related_model_name){
 				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info,$original_query_param);
 				return;
 			}
@@ -3050,7 +3059,7 @@ 
 		$SQL = $this->_construct_condition_clause_recursive($where_params, ' AND ');
 		if($SQL){
 			return " WHERE ". $SQL;
-		}else{
+		} else{
 			return '';
 		}
 	}
@@ -3065,7 +3074,7 @@ 
 		$SQL = $this->_construct_condition_clause_recursive($having_params, ' AND ');
 		if($SQL){
 			return " HAVING ". $SQL;
-		}else{
+		} else{
 			return '';
 		}
 
@@ -3088,7 +3097,7 @@ 
 			$model_instance=call_user_func($model_name."::instance");
 			/* @var $model_instance EEM_Base */
 			return $model_instance->field_settings_for($field_name);
-		}else{
+		} 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));
 		}
 	}
@@ -3121,14 +3130,14 @@ 
 						$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])){
 						$field_obj = $this->_custom_selections[$query_param][1];
-					}else{
+					} else{
 						throw new EE_Error(sprintf(__("%s is neither a valid model field name, nor a custom selection", "event_espresso"),$query_param));
 					}
 				}
@@ -3138,7 +3147,7 @@ 
 		}
 		if($where_clauses){
 			$SQL = implode($glue,$where_clauses);
-		}else{
+		} else{
 			$SQL = '';
 		}
 		return $SQL;
@@ -3158,11 +3167,11 @@ 
 		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)){
+		} 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{
+		} 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)));
 		}
 	}
@@ -3179,7 +3188,7 @@ 
 		$pos_of_star = strpos($condition_query_param_key, '*');
 		if($pos_of_star === FALSE){
 			return $condition_query_param_key;
-		}else{
+		} else{
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -3205,7 +3214,7 @@ 
 				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;
 		}
@@ -3213,7 +3222,7 @@ 
 		//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){
 			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);
@@ -3221,8 +3230,9 @@ 
 			return $operator.SP.$cleaned_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" ) );
+			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 ) ) {
@@ -3230,17 +3240,17 @@ 
 				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)){
+		} 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)){
+		} 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)){
+		} 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{
+		} 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)));
 		}
 	}
@@ -3310,7 +3320,7 @@ 
 		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
+		} 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)));
 			}
@@ -3339,14 +3349,14 @@ 
 		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 ]);
 		}
 		try{
 			return $model_obj->field_settings_for($field_name);
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			return null;
 		}
 	}
@@ -3365,7 +3375,7 @@ 
 		$field = isset($all_fields[$field_name]) ? $all_fields[$field_name] : FALSE;
 		if($field){
 			return $field->get_qualified_column();
-		}else{
+		} 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)));
 		}
 	}
@@ -3431,7 +3441,7 @@ 
 					//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);
 				}
@@ -3546,7 +3556,7 @@ 
 		$fieldSettings = $this->field_settings(true);
 		if( isset($fieldSettings[$fieldName])){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -3560,7 +3570,7 @@ 
 		$relations = $this->relation_settings();
 		if(isset($relations[$relation_name])){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -3611,7 +3621,7 @@ 
 			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;
 			}
 		}
@@ -3690,7 +3700,7 @@ 
 				}
 			}
 			return $this->_cached_fields;
-		}else{
+		} else{
 			if( $this->_cached_fields_non_db_only === NULL ){
 				$this->_cached_fields_non_db_only = array();
 				foreach($this->_fields as $fields_corresponding_to_table){
@@ -3843,7 +3853,7 @@ 
 				// add this new object to the entity map
 				$classInstance = $this->add_to_entity_map( $classInstance );
 			}
-		}else{
+		} else{
 			$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_n_values, $this->_timezone ), TRUE, FALSE );
 		}
 
@@ -3930,11 +3940,12 @@ 
 						$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() );
+					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() );
+					}
 				}
 			}
 		}
@@ -3948,9 +3959,9 @@ 
 		if( isset( $cols_n_values[ $qualified_column ] ) ){
 			$value = $cols_n_values[ $qualified_column ];
 
-		}elseif( isset( $cols_n_values[ $regular_column ] ) ){
+		} elseif( isset( $cols_n_values[ $regular_column ] ) ){
 			$value = $cols_n_values[ $regular_column ];
-		}else{
+		} else{
 			$value = NULL;
 		}
 
@@ -3983,7 +3994,7 @@ 
 				}
 			}
 			return $obj_in_map;
-		}else{
+		} else{
 			return $this->get_one_by_ID( $id );
 		}
 	}
@@ -4018,7 +4029,7 @@ 
 				}
 			}
 			return $obj_in_map;
-		}else{
+		} else{
 			$this->add_to_entity_map( $replacing_model_obj );
 			return $replacing_model_obj;
 		}
@@ -4048,7 +4059,7 @@ 
 	public function item_name($quantity = 1){
 		if($quantity == 1){
 			return $this->singular_item;
-		}else{
+		} else{
 			return $this->plural_item;
 		}
 	}
@@ -4110,14 +4121,14 @@ 
 		$primary_key_field = $this->get_primary_key_field();
 		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 && (
+		} 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{
+		} 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){
@@ -4141,13 +4152,13 @@ 
 		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{
+		} 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;
@@ -4278,9 +4289,9 @@ 
 
 		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{
+		} 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
@@ -4290,7 +4301,7 @@ 
 		}
 		if(isset($query_params[0])){
 			$query_params[0] = array_merge($attributes_array,$query_params);
-		}else{
+		} else{
 			$query_params[0] = $attributes_array;
 		}
 		return $this->get_all($query_params);
@@ -4313,7 +4324,7 @@ 
 		$copies = $this->get_all_copies($model_object_or_attributes_array,$query_params);
 		if(is_array($copies)){
 			return array_shift($copies);
-		}else{
+		} else{
 			return null;
 		}
 	}
@@ -4345,7 +4356,7 @@ 
 		$sql_operator = isset($this->_valid_operators[$operator_supplied]) ? $this->_valid_operators[$operator_supplied] : null;
 		if($sql_operator){
 			return $sql_operator;
-		}else{
+		} 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))));
 		}
 	}
@@ -4516,7 +4527,7 @@ 
 		$valid_cap_contexts = EEM_Base::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' ),

core/EE_Config.core.php

Spacing +398 added lines, -398 removed lines

@@ -128,7 +128,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Config ) {
+		if ( ! self::$_instance instanceof EE_Config) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -145,22 +145,22 @@ 
 	 * not be ready to instantiate EE_Config currently (eg if the site was put into maintenance mode)
 	 * @return EE_Config
 	 */
-	public static function reset( $hard_reset = FALSE, $reinstantiate = TRUE ){
-		if ( $hard_reset ) {
+	public static function reset($hard_reset = FALSE, $reinstantiate = TRUE) {
+		if ($hard_reset) {
 			self::$_instance->_config_option_names = array();
 			self::$_instance->_initialize_config();
 			self::$_instance->update_espresso_config();
 		}
-		if( self::$_instance instanceof EE_Config ){
+		if (self::$_instance instanceof EE_Config) {
 			self::$_instance->shutdown();
 		}
 		self::$_instance = NULL;
 		//we don't need to reset the static properties imo because those should
 		//only change when a module is added or removed. Currently we don't
 		//support removing a module during a request when it previously existed
-		if( $reinstantiate ){
+		if ($reinstantiate) {
 			return self::instance();
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -174,8 +174,8 @@ 
 	 * @return \EE_Config
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Config__construct__begin',$this );
-		$this->_config_option_names = get_option( 'ee_config_option_names', array() );
+		do_action('AHEE__EE_Config__construct__begin', $this);
+		$this->_config_option_names = get_option('ee_config_option_names', array());
 		// setup empty config classes
 		$this->_initialize_config();
 		// load existing EE site settings
@@ -183,15 +183,15 @@ 
 		// confirm everything loaded correctly and set filtered defaults if not
 		$this->_verify_config();
 		//  register shortcodes and modules
-		add_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets', array( $this, 'register_shortcodes_and_modules' ), 999 );
+		add_action('AHEE__EE_System__register_shortcodes_modules_and_widgets', array($this, 'register_shortcodes_and_modules'), 999);
 		//  initialize shortcodes and modules
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'initialize_shortcodes_and_modules' ));
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'initialize_shortcodes_and_modules'));
 		// register widgets
-		add_action( 'widgets_init', array( $this, 'widgets_init' ), 10 );
+		add_action('widgets_init', array($this, 'widgets_init'), 10);
 		// shutdown
-		add_action( 'shutdown', array( $this, 'shutdown' ), 10 );
+		add_action('shutdown', array($this, 'shutdown'), 10);
 		// construct__end hook
-		do_action( 'AHEE__EE_Config__construct__end',$this );
+		do_action('AHEE__EE_Config__construct__end', $this);
 		// hardcoded hack
 		$this->template_settings->current_espresso_theme = 'Espresso_Arabica_2014';
 	}
@@ -204,7 +204,7 @@ 
 	 * @return string current theme set.
 	 */
 	public static function get_current_theme() {
-		return isset( self::$_instance->template_settings->current_espresso_theme ) ? self::$_instance->template_settings->current_espresso_theme : 'Espresso_Arabica_2014';
+		return isset(self::$_instance->template_settings->current_espresso_theme) ? self::$_instance->template_settings->current_espresso_theme : 'Espresso_Arabica_2014';
 	}
 
 
@@ -238,27 +238,27 @@ 
 	 */
 	private function _load_core_config() {
 		// load_core_config__start hook
-		do_action( 'AHEE__EE_Config___load_core_config__start', $this );
+		do_action('AHEE__EE_Config___load_core_config__start', $this);
 		$espresso_config = $this->get_espresso_config();
-		foreach ( $espresso_config as $config => $settings ) {
+		foreach ($espresso_config as $config => $settings) {
 			// load_core_config__start hook
-			$settings = apply_filters( 'FHEE__EE_Config___load_core_config__config_settings', $settings, $config, $this );
-			if ( is_object( $settings ) && property_exists( $this, $config ) ) {
-				$this->{$config} = apply_filters( 'FHEE__EE_Config___load_core_config__' . $config, $settings );
+			$settings = apply_filters('FHEE__EE_Config___load_core_config__config_settings', $settings, $config, $this);
+			if (is_object($settings) && property_exists($this, $config)) {
+				$this->{$config} = apply_filters('FHEE__EE_Config___load_core_config__'.$config, $settings);
 				//call configs populate method to ensure any defaults are set for empty values.
-				if ( method_exists( $settings, 'populate' ) ) {
+				if (method_exists($settings, 'populate')) {
 					$this->{$config}->populate();
 				}
-				if ( method_exists( $settings, 'do_hooks' ) ) {
+				if (method_exists($settings, 'do_hooks')) {
 					$this->{$config}->do_hooks();
 				}
 			}
 		}
-		if ( apply_filters( 'FHEE__EE_Config___load_core_config__update_espresso_config', FALSE ) ) {
+		if (apply_filters('FHEE__EE_Config___load_core_config__update_espresso_config', FALSE)) {
 			$this->update_espresso_config();
 		}
 		// load_core_config__end hook
-		do_action( 'AHEE__EE_Config___load_core_config__end', $this );
+		do_action('AHEE__EE_Config___load_core_config__end', $this);
 	}
 
 
@@ -272,40 +272,40 @@ 
 	protected function _verify_config() {
 
 		$this->core = $this->core instanceof EE_Core_Config
-			? $this->core  : new EE_Core_Config();
-		$this->core = apply_filters( 'FHEE__EE_Config___initialize_config__core', $this->core );
+			? $this->core : new EE_Core_Config();
+		$this->core = apply_filters('FHEE__EE_Config___initialize_config__core', $this->core);
 
 		$this->organization = $this->organization instanceof EE_Organization_Config
-			? $this->organization  : new EE_Organization_Config();
-		$this->organization = apply_filters( 'FHEE__EE_Config___initialize_config__organization', $this->organization );
+			? $this->organization : new EE_Organization_Config();
+		$this->organization = apply_filters('FHEE__EE_Config___initialize_config__organization', $this->organization);
 
 		$this->currency = $this->currency instanceof EE_Currency_Config
 			? $this->currency : new EE_Currency_Config();
-		$this->currency = apply_filters( 'FHEE__EE_Config___initialize_config__currency', $this->currency );
+		$this->currency = apply_filters('FHEE__EE_Config___initialize_config__currency', $this->currency);
 
 		$this->registration = $this->registration instanceof EE_Registration_Config
 			? $this->registration : new EE_Registration_Config();
-		$this->registration = apply_filters( 'FHEE__EE_Config___initialize_config__registration', $this->registration );
+		$this->registration = apply_filters('FHEE__EE_Config___initialize_config__registration', $this->registration);
 
 		$this->admin = $this->admin instanceof EE_Admin_Config
 			? $this->admin : new EE_Admin_Config();
-		$this->admin = apply_filters( 'FHEE__EE_Config___initialize_config__admin', $this->admin );
+		$this->admin = apply_filters('FHEE__EE_Config___initialize_config__admin', $this->admin);
 
 		$this->template_settings = $this->template_settings instanceof EE_Template_Config
 			? $this->template_settings : new EE_Template_Config();
-		$this->template_settings = apply_filters( 'FHEE__EE_Config___initialize_config__template_settings', $this->template_settings );
+		$this->template_settings = apply_filters('FHEE__EE_Config___initialize_config__template_settings', $this->template_settings);
 
 		$this->map_settings = $this->map_settings instanceof EE_Map_Config
 			? $this->map_settings : new EE_Map_Config();
-		$this->map_settings = apply_filters( 'FHEE__EE_Config___initialize_config__map_settings', $this->map_settings );
+		$this->map_settings = apply_filters('FHEE__EE_Config___initialize_config__map_settings', $this->map_settings);
 
 		$this->environment = $this->environment instanceof EE_Environment_Config
 			? $this->environment : new EE_Environment_Config();
-		$this->environment = apply_filters( 'FHEE__EE_Config___initialize_config__environment', $this->environment );
+		$this->environment = apply_filters('FHEE__EE_Config___initialize_config__environment', $this->environment);
 
 		$this->gateway = $this->gateway instanceof EE_Gateway_Config
 			? $this->gateway : new EE_Gateway_Config();
-		$this->gateway = apply_filters( 'FHEE__EE_Config___initialize_config__gateway', $this->gateway );
+		$this->gateway = apply_filters('FHEE__EE_Config___initialize_config__gateway', $this->gateway);
 
 	}
 
@@ -319,7 +319,7 @@ 
 	 */
 	public function get_espresso_config() {
 		// grab espresso configuration
-		return apply_filters( 'FHEE__EE_Config__get_espresso_config__CFG', get_option( 'ee_config', array() ));
+		return apply_filters('FHEE__EE_Config__get_espresso_config__CFG', get_option('ee_config', array()));
 	}
 
 
@@ -332,12 +332,12 @@ 
 	 * @param        $old_value
 	 * @param        $value
 	 */
-	public function double_check_config_comparison( $option = '', $old_value, $value ) {
+	public function double_check_config_comparison($option = '', $old_value, $value) {
 		// make sure we're checking the ee config
-		if ( $option == 'ee_config' ) {
+		if ($option == 'ee_config') {
 			// run a loose comparison of the old value against the new value for type and properties,
 			// but NOT exact instance like WP update_option does
-			if ( $value != $old_value ) {
+			if ($value != $old_value) {
 				// if they are NOT the same, then remove the hook,
 				// which means the subsequent update results will be based solely on the update query results
 				// the reason we do this is because, as stated above,
@@ -352,7 +352,7 @@ 
 				// the string it sees in the db looks the same as the new one it has been passed!!!
 				// This results in the query returning an "affected rows" value of ZERO,
 				// which gets returned immediately by WP update_option and looks like an error.
-				remove_action( 'update_option', array( $this, 'check_config_updated' ));
+				remove_action('update_option', array($this, 'check_config_updated'));
 			}
 		}
 	}
@@ -367,11 +367,11 @@ 
 	 */
 	protected function  _reset_espresso_addon_config() {
 		$this->_config_option_names = array();
-		foreach( $this->addons as $addon_name => $addon_config_obj ) {
-			$addon_config_obj = maybe_unserialize( $addon_config_obj );
-			$config_class = get_class( $addon_config_obj );
-			if ( $addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class ) {
-				$this->update_config( 'addons', $addon_name, $addon_config_obj, FALSE );
+		foreach ($this->addons as $addon_name => $addon_config_obj) {
+			$addon_config_obj = maybe_unserialize($addon_config_obj);
+			$config_class = get_class($addon_config_obj);
+			if ($addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class) {
+				$this->update_config('addons', $addon_name, $addon_config_obj, FALSE);
 			}
 			$this->addons->{$addon_name} = NULL;
 		}
@@ -387,17 +387,17 @@ 
 	 * @param   bool $add_error
 	 * @return   bool
 	 */
-	public function  update_espresso_config( $add_success = FALSE, $add_error = TRUE ) {
+	public function  update_espresso_config($add_success = FALSE, $add_error = TRUE) {
 		// commented out the following re: https://events.codebasehq.com/projects/event-espresso/tickets/8197
 		//$clone = clone( self::$_instance );
 		//self::$_instance = NULL;
-		do_action( 'AHEE__EE_Config__update_espresso_config__begin',$this );
+		do_action('AHEE__EE_Config__update_espresso_config__begin', $this);
 		$this->_reset_espresso_addon_config();
 		// hook into update_option because that happens AFTER the ( $value === $old_value ) conditional
 		// but BEFORE the actual update occurs
-		add_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1, 3 );
+		add_action('update_option', array($this, 'double_check_config_comparison'), 1, 3);
 		// now update "ee_config"
-		$saved = update_option( 'ee_config', $this );
+		$saved = update_option('ee_config', $this);
 		// if not saved... check if the hook we just added still exists;
 		// if it does, it means one of two things:
 		// 		that update_option bailed at the ( $value === $old_value ) conditional,
@@ -408,25 +408,25 @@ 
 		// but just means no update occurred, so don't display an error to the user.
 		// BUT... if update_option returns FALSE, AND the hook is missing,
 		// then it means that something truly went wrong
-		$saved = ! $saved ? has_action( 'update_option', array( $this, 'double_check_config_comparison' )) : $saved;
+		$saved = ! $saved ? has_action('update_option', array($this, 'double_check_config_comparison')) : $saved;
 		// remove our action since we don't want it in the system anymore
-		remove_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1 );
-		do_action( 'AHEE__EE_Config__update_espresso_config__end', $this, $saved );
+		remove_action('update_option', array($this, 'double_check_config_comparison'), 1);
+		do_action('AHEE__EE_Config__update_espresso_config__end', $this, $saved);
 		//self::$_instance = $clone;
 		//unset( $clone );
 		// if config remains the same or was updated successfully
-		if ( $saved ) {
-			if ( $add_success ) {
+		if ($saved) {
+			if ($add_success) {
 				EE_Error::add_success(
-					__( 'The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso' ),
+					__('The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
 			return TRUE;
 		} else {
-			if ( $add_error ) {
+			if ($add_error) {
 				EE_Error::add_error(
-					__( 'The Event Espresso Configuration Settings were not updated.', 'event_espresso' ),
+					__('The Event Espresso Configuration Settings were not updated.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -452,20 +452,20 @@ 
 		$name = '',
 		$config_class = '',
 		$config_obj = NULL,
-		$tests_to_run = array( 1, 2, 3, 4, 5, 6, 7, 8 ),
+		$tests_to_run = array(1, 2, 3, 4, 5, 6, 7, 8),
 		$display_errors = TRUE
 	) {
 		try {
-			foreach ( $tests_to_run as $test ) {
-				switch ( $test ) {
+			foreach ($tests_to_run as $test) {
+				switch ($test) {
 
 					// TEST #1 : check that section was set
 					case 1 :
-						if ( empty( $section ) ) {
-							if ( $display_errors ) {
+						if (empty($section)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'No configuration section has been provided while attempting to save "%s".', 'event_espresso' ),
+										__('No configuration section has been provided while attempting to save "%s".', 'event_espresso'),
 										$config_class
 									)
 								);
@@ -476,11 +476,11 @@ 
 
 					// TEST #2 : check that settings section exists
 					case 2 :
-						if ( ! isset( $this->{$section} ) ) {
-							if ( $display_errors ) {
+						if ( ! isset($this->{$section} )) {
+							if ($display_errors) {
 								throw new EE_Error(
-									sprintf( __( 'The "%s" configuration section does not exist.', 'event_espresso' ),
-											 $section )
+									sprintf(__('The "%s" configuration section does not exist.', 'event_espresso'),
+											 $section)
 								);
 							}
 							return false;
@@ -490,12 +490,12 @@ 
 					// TEST #3 : check that section is the proper format
 					case 3 :
 						if (
-							! ( $this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass )
+							! ($this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass)
 						) {
-							if ( $display_errors ) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" configuration settings have not been formatted correctly.', 'event_espresso' ),
+										__('The "%s" configuration settings have not been formatted correctly.', 'event_espresso'),
 										$section
 									)
 								);
@@ -506,10 +506,10 @@ 
 
 					// TEST #4 : check that config section name has been set
 					case 4 :
-						if ( empty( $name ) ) {
-							if ( $display_errors ) {
+						if (empty($name)) {
+							if ($display_errors) {
 								throw new EE_Error(
-									__( 'No name has been provided for the specific configuration section.', 'event_espresso' )
+									__('No name has been provided for the specific configuration section.', 'event_espresso')
 								);
 							}
 							return false;
@@ -518,10 +518,10 @@ 
 
 					// TEST #5 : check that a config class name has been set
 					case 5 :
-						if ( empty( $config_class ) ) {
-							if ( $display_errors ) {
+						if (empty($config_class)) {
+							if ($display_errors) {
 								throw new EE_Error(
-									__( 'No class name has been provided for the specific configuration section.', 'event_espresso' )
+									__('No class name has been provided for the specific configuration section.', 'event_espresso')
 								);
 							}
 							return false;
@@ -530,11 +530,11 @@ 
 
 					// TEST #6 : verify config class is accessible
 					case 6 :
-						if ( ! class_exists( $config_class ) ) {
-							if ( $display_errors ) {
+						if ( ! class_exists($config_class)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" class does not exist. Please ensure that an autoloader has been set for it.', 'event_espresso' ),
+										__('The "%s" class does not exist. Please ensure that an autoloader has been set for it.', 'event_espresso'),
 										$config_class
 									)
 								);
@@ -545,11 +545,11 @@ 
 
 					// TEST #7 : check that config has even been set
 					case 7 :
-						if ( ! isset( $this->{$section}->{$name} ) ) {
-							if ( $display_errors ) {
+						if ( ! isset($this->{$section}->{$name} )) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'No configuration has been set for "%1$s->%2$s".', 'event_espresso' ),
+										__('No configuration has been set for "%1$s->%2$s".', 'event_espresso'),
 										$section,
 										$name
 									)
@@ -558,17 +558,17 @@ 
 							return false;
 						} else {
 							// and make sure it's not serialized
-							$this->{$section}->{$name} = maybe_unserialize( $this->{$section}->{$name} );
+							$this->{$section}->{$name} = maybe_unserialize($this->{$section}->{$name} );
 						}
 						break;
 
 					// TEST #8 : check that config is the requested type
 					case 8 :
-						if ( ! $this->{$section}->{$name} instanceof $config_class ) {
-							if ( $display_errors ) {
+						if ( ! $this->{$section}->{$name} instanceof $config_class) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The configuration for "%1$s->%2$s" is not of the "%3$s" class.', 'event_espresso' ),
+										__('The configuration for "%1$s->%2$s" is not of the "%3$s" class.', 'event_espresso'),
 										$section,
 										$name,
 										$config_class
@@ -581,12 +581,12 @@ 
 
 					// TEST #9 : verify config object
 					case 9 :
-						if ( ! $config_obj instanceof EE_Config_Base ) {
-							if ( $display_errors ) {
+						if ( ! $config_obj instanceof EE_Config_Base) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" class is not an instance of EE_Config_Base.', 'event_espresso' ),
-										print_r( $config_obj, true )
+										__('The "%s" class is not an instance of EE_Config_Base.', 'event_espresso'),
+										print_r($config_obj, true)
 									)
 								);
 							}
@@ -597,7 +597,7 @@ 
 				}
 			}
 
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		// you have successfully run the gauntlet
@@ -614,8 +614,8 @@ 
 	 * @param        string          $name
 	 * @return        string
 	 */
-	private function _generate_config_option_name( $section = '', $name = '' ) {
-		return 'ee_config-' . strtolower( $section . '-' . str_replace( array( 'EE_', 'EED_' ), '', $name ) );
+	private function _generate_config_option_name($section = '', $name = '') {
+		return 'ee_config-'.strtolower($section.'-'.str_replace(array('EE_', 'EED_'), '', $name));
 	}
 
 
@@ -629,10 +629,10 @@ 
 	 * @param 	string $name
 	 * @return 	string
 	 */
-	private function _set_config_class( $config_class = '', $name = '' ) {
-		return ! empty( $config_class )
+	private function _set_config_class($config_class = '', $name = '') {
+		return ! empty($config_class)
 			? $config_class
-			: str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $name ) ) ) . '_Config';
+			: str_replace(' ', '_', ucwords(str_replace('_', ' ', $name))).'_Config';
 	}
 
 
@@ -646,34 +646,34 @@ 
 	 * @param 	EE_Config_Base $config_obj
 	 * @return 	EE_Config_Base
 	 */
-	public function set_config( $section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = null ) {
+	public function set_config($section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = null) {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6, and 7 to verify all config params are set and valid
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, null, array( 1, 2, 3, 4, 5, 6 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, null, array(1, 2, 3, 4, 5, 6))) {
 			return null;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// if the config option name hasn't been added yet to the list of option names we're tracking, then do so now
-		if ( ! isset( $this->_config_option_names[ $config_option_name ] )) {
-			$this->_config_option_names[ $config_option_name ] = $config_class;
+		if ( ! isset($this->_config_option_names[$config_option_name])) {
+			$this->_config_option_names[$config_option_name] = $config_class;
 		}
 		// verify the incoming config object but suppress errors
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), false )) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), false)) {
 			$config_obj = new $config_class();
 		}
-		if ( get_option( $config_option_name ) ) {
-			update_option( $config_option_name, $config_obj );
+		if (get_option($config_option_name)) {
+			update_option($config_option_name, $config_obj);
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		} else {
 			// create a wp-option for this config
-			if ( add_option( $config_option_name, $config_obj, '', 'no' )) {
-				$this->{$section}->{$name} = maybe_unserialize( $config_obj );
+			if (add_option($config_option_name, $config_obj, '', 'no')) {
+				$this->{$section}->{$name} = maybe_unserialize($config_obj);
 				return $this->{$section}->{$name};
 			} else {
 				EE_Error::add_error(
-					sprintf( __( 'The "%s" could not be saved to the database.', 'event_espresso' ), $config_class ),
+					sprintf(__('The "%s" could not be saved to the database.', 'event_espresso'), $config_class),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				return null;
@@ -694,37 +694,37 @@ 
 	 * @param 	bool 					$throw_errors
 	 * @return 	bool
 	 */
-	public function update_config( $section = '', $name = '', $config_obj = '', $throw_errors = true ) {
-		$config_obj = maybe_unserialize( $config_obj );
+	public function update_config($section = '', $name = '', $config_obj = '', $throw_errors = true) {
+		$config_obj = maybe_unserialize($config_obj);
 		// get class name of the incoming object
-		$config_class = get_class( $config_obj );
+		$config_class = get_class($config_obj);
 		// run tests 1-5 and 9 to verify config
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 1, 2, 3, 4, 7, 9 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, $config_obj, array(1, 2, 3, 4, 7, 9))) {
 			return false;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// check if config object has been added to db by seeing if config option name is in $this->_config_option_names array
-		if ( ! isset( $this->_config_option_names[ $config_option_name ] )) {
+		if ( ! isset($this->_config_option_names[$config_option_name])) {
 			// save new config to db
-			return $this->set_config( $section, $name, $config_class, $config_obj );
+			return $this->set_config($section, $name, $config_class, $config_obj);
 		} else {
 			// first check if the record already exists
-			$existing_config = get_option( $config_option_name );
-			$config_obj = serialize( $config_obj );
+			$existing_config = get_option($config_option_name);
+			$config_obj = serialize($config_obj);
 			// just return if db record is already up to date
-			if ( $existing_config == $config_obj ) {
+			if ($existing_config == $config_obj) {
 				$this->{$section}->{$name} = $config_obj;
 				return true;
-			} else if ( update_option( $config_option_name, $config_obj )) {
+			} else if (update_option($config_option_name, $config_obj)) {
 				// update wp-option for this config class
 				$this->{$section}->{$name} = $config_obj;
 				return true;
-			} elseif ( $throw_errors ) {
+			} elseif ($throw_errors) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The "%1$s" object stored at"%2$s" was not successfully updated in the database.', 'event_espresso' ),
+						__('The "%1$s" object stored at"%2$s" was not successfully updated in the database.', 'event_espresso'),
 						$config_class,
-						'EE_Config->' . $section . '->' . $name
+						'EE_Config->'.$section.'->'.$name
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
@@ -744,34 +744,34 @@ 
 	 * @param 	string 	$config_class
 	 * @return 	mixed EE_Config_Base | NULL
 	 */
-	public function get_config( $section = '', $name = '', $config_class = '' ) {
+	public function get_config($section = '', $name = '', $config_class = '') {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6 and 7 to verify that all params have been set
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, NULL, array( 1, 2, 3, 4, 5, 6 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, NULL, array(1, 2, 3, 4, 5, 6))) {
 			return NULL;
 		}
 		// now test if the requested config object exists, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, NULL, array( 7, 8 ), FALSE )) {
+		if ($this->_verify_config_params($section, $name, $config_class, NULL, array(7, 8), FALSE)) {
 			// config already exists, so pass it back
 			return $this->{$section}->{$name};
 		}
 		// load config option from db if it exists
-		$config_obj = $this->get_config_option( $this->_generate_config_option_name( $section, $name ));
+		$config_obj = $this->get_config_option($this->_generate_config_option_name($section, $name));
 		// verify the newly retrieved config object, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), FALSE )) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), FALSE)) {
 			// config is good, so set it and pass it back
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		}
 		// oops! $config_obj is not already set and does not exist in the db, so create a new one
-		$config_obj =$this->set_config( $section, $name, $config_class );
+		$config_obj = $this->set_config($section, $name, $config_class);
 		// verify the newly created config object
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ))) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9))) {
 			return $this->{$section}->{$name};
 		} else {
 			EE_Error::add_error(
-				sprintf( __( 'The "%s" could not be retrieved from the database.', 'event_espresso' ), $config_class ),
+				sprintf(__('The "%s" could not be retrieved from the database.', 'event_espresso'), $config_class),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -786,9 +786,9 @@ 
 	 * @param 	string 	$config_option_name
 	 * @return 	mixed EE_Config_Base | FALSE
 	 */
-	public function get_config_option( $config_option_name = '' ) {
+	public function get_config_option($config_option_name = '') {
 		// retrieve the wp-option for this config class.
-		return maybe_unserialize( get_option( $config_option_name ));
+		return maybe_unserialize(get_option($config_option_name));
 	}
 
 
@@ -801,45 +801,45 @@ 
 	 * @param $page_for_posts
 	 * @return    void
 	 */
-	public function update_post_shortcodes( $page_for_posts = '' ) {
+	public function update_post_shortcodes($page_for_posts = '') {
 		// make sure page_for_posts is set
-		$page_for_posts = ! empty( $page_for_posts ) ? $page_for_posts : EE_Config::get_page_for_posts();
+		$page_for_posts = ! empty($page_for_posts) ? $page_for_posts : EE_Config::get_page_for_posts();
 		// critical page shortcodes that we do NOT want added to the Posts page (blog)
 		$critical_shortcodes = $this->core->get_critical_pages_shortcodes_array();
 		// allow others to mess stuff up :D
-		do_action( 'AHEE__EE_Config__update_post_shortcodes', $this->core->post_shortcodes, $page_for_posts );
+		do_action('AHEE__EE_Config__update_post_shortcodes', $this->core->post_shortcodes, $page_for_posts);
 		// verify that post_shortcodes is set
-		$this->core->post_shortcodes = isset( $this->core->post_shortcodes ) && is_array( $this->core->post_shortcodes ) ? $this->core->post_shortcodes : array();
+		$this->core->post_shortcodes = isset($this->core->post_shortcodes) && is_array($this->core->post_shortcodes) ? $this->core->post_shortcodes : array();
 		// cycle thru post_shortcodes
-		foreach( $this->core->post_shortcodes as $post_name => $shortcodes ){
+		foreach ($this->core->post_shortcodes as $post_name => $shortcodes) {
 			// are there any shortcodes to track ?
-			if ( ! empty( $shortcodes )) {
+			if ( ! empty($shortcodes)) {
 				// loop thru list of tracked shortcodes
-				foreach( $shortcodes as $shortcode => $post_id ) {
+				foreach ($shortcodes as $shortcode => $post_id) {
 					// if shortcode is for a critical page, BUT this is NOT the corresponding critical page for that shortcode
-					if ( isset( $critical_shortcodes[ $post_id ] ) && $post_name == $page_for_posts ) {
+					if (isset($critical_shortcodes[$post_id]) && $post_name == $page_for_posts) {
 						// then remove this shortcode, because we don't want critical page shortcodes like ESPRESSO_TXN_PAGE running on the "Posts Page" (blog)
-						unset( $this->core->post_shortcodes[ $post_name ][ $shortcode ] );
+						unset($this->core->post_shortcodes[$post_name][$shortcode]);
 					}
 					// skip the posts page, because we want all shortcodes registered for it
-					if ( $post_name == $page_for_posts ) {
+					if ($post_name == $page_for_posts) {
 						continue;
 					}
 					// make sure post still exists
-					$post = get_post( $post_id );
-					if ( $post ) {
+					$post = get_post($post_id);
+					if ($post) {
 						// check that the post name matches what we have saved
-						if ( $post->post_name == $post_name ) {
+						if ($post->post_name == $post_name) {
 							// if so, then break before hitting the unset below
 							continue;
 						}
 					}
 					// we don't like missing posts around here >:(
-					unset( $this->core->post_shortcodes[ $post_name ] );
+					unset($this->core->post_shortcodes[$post_name]);
 				}
 			} else {
 				// you got no shortcodes to keep track of !
-				unset( $this->core->post_shortcodes[ $post_name ] );
+				unset($this->core->post_shortcodes[$post_name]);
 			}
 		}
 		//only show errors
@@ -858,14 +858,14 @@ 
 	 *  @return 	string
 	 */
 	public static function get_page_for_posts() {
-		$page_for_posts = get_option( 'page_for_posts' );
-		if ( ! $page_for_posts ) {
+		$page_for_posts = get_option('page_for_posts');
+		if ( ! $page_for_posts) {
 			return 'posts';
 		}
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT post_name from $wpdb->posts WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
-		return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ));
+		return $wpdb->get_var($wpdb->prepare($SQL, $page_for_posts));
 	}
 
 
@@ -881,11 +881,11 @@ 
 	 *  @return 	void
 	 */
 	public function register_shortcodes_and_modules() {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return;
 		}
 		// allow shortcodes to register with WP and to set hooks for the rest of the system
-		EE_Registry::instance()->shortcodes =$this->_register_shortcodes();
+		EE_Registry::instance()->shortcodes = $this->_register_shortcodes();
 		// allow modules to set hooks for the rest of the system
 		EE_Registry::instance()->modules = $this->_register_modules();
 	}
@@ -899,7 +899,7 @@ 
 	 *  @return 	void
 	 */
 	public function initialize_shortcodes_and_modules() {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return;
 		}
 		// allow shortcodes to set hooks for the rest of the system
@@ -918,26 +918,26 @@ 
 	 * 	@return void
 	 */
 	public function widgets_init() {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return;
 		}
 		//only init widgets on admin pages when not in complete maintenance, and
 		//on frontend when not in any maintenance mode
-		if (( is_admin() && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance)  || ! EE_Maintenance_Mode::instance()->level() ) {
+		if ((is_admin() && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) || ! EE_Maintenance_Mode::instance()->level()) {
 			// grab list of installed widgets
-			$widgets_to_register = glob( EE_WIDGETS . '*', GLOB_ONLYDIR );
+			$widgets_to_register = glob(EE_WIDGETS.'*', GLOB_ONLYDIR);
 			// filter list of modules to register
-			$widgets_to_register = apply_filters( 'FHEE__EE_Config__register_widgets__widgets_to_register', $widgets_to_register );
+			$widgets_to_register = apply_filters('FHEE__EE_Config__register_widgets__widgets_to_register', $widgets_to_register);
 
-			if ( ! empty( $widgets_to_register ) ) {
+			if ( ! empty($widgets_to_register)) {
 				// cycle thru widget folders
-				foreach ( $widgets_to_register as $widget_path ) {
+				foreach ($widgets_to_register as $widget_path) {
 					// add to list of installed widget modules
-					EE_Config::register_ee_widget( $widget_path );
+					EE_Config::register_ee_widget($widget_path);
 				}
 			}
 			// filter list of installed modules
-			EE_Registry::instance()->widgets = apply_filters( 'FHEE__EE_Config__register_widgets__installed_widgets', EE_Registry::instance()->widgets );
+			EE_Registry::instance()->widgets = apply_filters('FHEE__EE_Config__register_widgets__installed_widgets', EE_Registry::instance()->widgets);
 		}
 	}
 
@@ -950,54 +950,54 @@ 
 	 *  @param 	string 	$widget_path - full path up to and including widget folder
 	 *  @return 	void
 	 */
-	public static function register_ee_widget( $widget_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_widget__begin', $widget_path );
+	public static function register_ee_widget($widget_path = NULL) {
+		do_action('AHEE__EE_Config__register_widget__begin', $widget_path);
 		$widget_ext = '.widget.php';
 		// make all separators match
-		$widget_path = rtrim( str_replace( '/\\', DS, $widget_path ), DS );
+		$widget_path = rtrim(str_replace('/\\', DS, $widget_path), DS);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $widget_path, $widget_ext ) !== FALSE ) {
+		if (strpos($widget_path, $widget_ext) !== FALSE) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$file_name = explode( '.', basename( $widget_path ));
+			$file_name = explode('.', basename($widget_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$widget = strpos( $file_name[0], 'EEW_' ) === 0 ? substr( $file_name[0], 4 ) : $file_name[0];
+			$widget = strpos($file_name[0], 'EEW_') === 0 ? substr($file_name[0], 4) : $file_name[0];
 			// sanitize shortcode directory name
-			$widget = sanitize_key( $widget );
+			$widget = sanitize_key($widget);
 			// now we need to rebuild the shortcode path
-			$widget_path = explode( DS, $widget_path );
+			$widget_path = explode(DS, $widget_path);
 			// remove last segment
-			array_pop( $widget_path );
+			array_pop($widget_path);
 			// glue it back together
-			$widget_path = implode( DS, $widget_path );
+			$widget_path = implode(DS, $widget_path);
 		} else {
 			// grab and sanitize widget directory name
-			$widget = sanitize_key( basename( $widget_path ));
+			$widget = sanitize_key(basename($widget_path));
 		}
 		// create classname from widget directory name
-		$widget = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $widget )));
+		$widget = str_replace(' ', '_', ucwords(str_replace('_', ' ', $widget)));
 		// add class prefix
-		$widget_class = 'EEW_' . $widget;
+		$widget_class = 'EEW_'.$widget;
 		// does the widget exist ?
-		if ( ! is_readable( $widget_path . DS . $widget_class . $widget_ext )) {
+		if ( ! is_readable($widget_path.DS.$widget_class.$widget_ext)) {
 			$msg = sprintf(
-				__( 'The requested %s widget file could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso' ),
+				__('The requested %s widget file could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso'),
 				$widget_class,
-				$widget_path . DS . $widget_class . $widget_ext
+				$widget_path.DS.$widget_class.$widget_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		// load the widget class file
-		require_once( $widget_path . DS . $widget_class . $widget_ext );
+		require_once($widget_path.DS.$widget_class.$widget_ext);
 		// verify that class exists
-		if ( ! class_exists( $widget_class )) {
-			$msg = sprintf( __( 'The requested %s widget class does not exist.', 'event_espresso' ), $widget_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($widget_class)) {
+			$msg = sprintf(__('The requested %s widget class does not exist.', 'event_espresso'), $widget_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
-		register_widget( $widget_class );
+		register_widget($widget_class);
 		// add to array of registered widgets
-		EE_Registry::instance()->widgets->{$widget_class} = $widget_path . DS . $widget_class . $widget_ext;
+		EE_Registry::instance()->widgets->{$widget_class} = $widget_path.DS.$widget_class.$widget_ext;
 	}
 
 
@@ -1010,18 +1010,18 @@ 
 	 */
 	private function _register_shortcodes() {
 		// grab list of installed shortcodes
-		$shortcodes_to_register = glob( EE_SHORTCODES . '*', GLOB_ONLYDIR );
+		$shortcodes_to_register = glob(EE_SHORTCODES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
-		$shortcodes_to_register = apply_filters( 'FHEE__EE_Config__register_shortcodes__shortcodes_to_register', $shortcodes_to_register );
-		if ( ! empty( $shortcodes_to_register ) ) {
+		$shortcodes_to_register = apply_filters('FHEE__EE_Config__register_shortcodes__shortcodes_to_register', $shortcodes_to_register);
+		if ( ! empty($shortcodes_to_register)) {
 			// cycle thru shortcode folders
-			foreach ( $shortcodes_to_register as $shortcode_path ) {
+			foreach ($shortcodes_to_register as $shortcode_path) {
 				// add to list of installed shortcode modules
-				EE_Config::register_shortcode( $shortcode_path );
+				EE_Config::register_shortcode($shortcode_path);
 			}
 		}
 		// filter list of installed modules
-		return apply_filters( 'FHEE__EE_Config___register_shortcodes__installed_shortcodes', EE_Registry::instance()->shortcodes );
+		return apply_filters('FHEE__EE_Config___register_shortcodes__installed_shortcodes', EE_Registry::instance()->shortcodes);
 	}
 
 
@@ -1033,56 +1033,56 @@ 
 	 *  @param 	string 		$shortcode_path - full path up to and including shortcode folder
 	 *  @return 	bool
 	 */
-	public static function register_shortcode( $shortcode_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_shortcode__begin',$shortcode_path );
+	public static function register_shortcode($shortcode_path = NULL) {
+		do_action('AHEE__EE_Config__register_shortcode__begin', $shortcode_path);
 		$shortcode_ext = '.shortcode.php';
 		// make all separators match
-		$shortcode_path = str_replace( array( '\\', '/' ), DS, $shortcode_path );
+		$shortcode_path = str_replace(array('\\', '/'), DS, $shortcode_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $shortcode_path, $shortcode_ext ) !== FALSE ) {
+		if (strpos($shortcode_path, $shortcode_ext) !== FALSE) {
 			// grab shortcode file name from directory name and break apart at dots
-			$shortcode_file = explode( '.', basename( $shortcode_path ));
+			$shortcode_file = explode('.', basename($shortcode_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$shortcode = strpos( $shortcode_file[0], 'EES_' ) === 0 ? substr( $shortcode_file[0], 4 ) : $shortcode_file[0];
+			$shortcode = strpos($shortcode_file[0], 'EES_') === 0 ? substr($shortcode_file[0], 4) : $shortcode_file[0];
 			// sanitize shortcode directory name
-			$shortcode = sanitize_key( $shortcode );
+			$shortcode = sanitize_key($shortcode);
 			// now we need to rebuild the shortcode path
-			$shortcode_path = explode( DS, $shortcode_path );
+			$shortcode_path = explode(DS, $shortcode_path);
 			// remove last segment
-			array_pop( $shortcode_path );
+			array_pop($shortcode_path);
 			// glue it back together
-			$shortcode_path = implode( DS, $shortcode_path ) . DS;
+			$shortcode_path = implode(DS, $shortcode_path).DS;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize shortcode directory name
-			$shortcode = sanitize_key( basename( $shortcode_path ));
-			$shortcode_path = rtrim( $shortcode_path, DS ) . DS;
+			$shortcode = sanitize_key(basename($shortcode_path));
+			$shortcode_path = rtrim($shortcode_path, DS).DS;
 		}
 		// create classname from shortcode directory or file name
-		$shortcode = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $shortcode )));
+		$shortcode = str_replace(' ', '_', ucwords(str_replace('_', ' ', $shortcode)));
 		// add class prefix
-		$shortcode_class = 'EES_' . $shortcode;
+		$shortcode_class = 'EES_'.$shortcode;
 		// does the shortcode exist ?
-		if ( ! is_readable( $shortcode_path . DS . $shortcode_class . $shortcode_ext )) {
+		if ( ! is_readable($shortcode_path.DS.$shortcode_class.$shortcode_ext)) {
 			$msg = sprintf(
-				__( 'The requested %s shortcode file could not be found or is not readable due to file permissions. It should be in %s', 'event_espresso' ),
+				__('The requested %s shortcode file could not be found or is not readable due to file permissions. It should be in %s', 'event_espresso'),
 				$shortcode_class,
-				$shortcode_path . DS . $shortcode_class . $shortcode_ext
+				$shortcode_path.DS.$shortcode_class.$shortcode_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// load the shortcode class file
-		require_once( $shortcode_path . $shortcode_class . $shortcode_ext );
+		require_once($shortcode_path.$shortcode_class.$shortcode_ext);
 		// verify that class exists
-		if ( ! class_exists( $shortcode_class )) {
-			$msg = sprintf( __( 'The requested %s shortcode class does not exist.', 'event_espresso' ), $shortcode_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($shortcode_class)) {
+			$msg = sprintf(__('The requested %s shortcode class does not exist.', 'event_espresso'), $shortcode_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		$shortcode = strtoupper( $shortcode );
+		$shortcode = strtoupper($shortcode);
 		// add to array of registered shortcodes
-		EE_Registry::instance()->shortcodes->{$shortcode} = $shortcode_path . $shortcode_class . $shortcode_ext;
+		EE_Registry::instance()->shortcodes->{$shortcode} = $shortcode_path.$shortcode_class.$shortcode_ext;
 		return TRUE;
 	}
 
@@ -1097,23 +1097,23 @@ 
 	 */
 	private function _register_modules() {
 		// grab list of installed modules
-		$modules_to_register = glob( EE_MODULES . '*', GLOB_ONLYDIR );
+		$modules_to_register = glob(EE_MODULES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
-		$modules_to_register = apply_filters( 'FHEE__EE_Config__register_modules__modules_to_register', $modules_to_register );
+		$modules_to_register = apply_filters('FHEE__EE_Config__register_modules__modules_to_register', $modules_to_register);
 
 
-		if ( ! empty( $modules_to_register ) ) {
+		if ( ! empty($modules_to_register)) {
 			// loop through folders
-			foreach ( $modules_to_register as $module_path ) {
+			foreach ($modules_to_register as $module_path) {
 				/**TEMPORARILY EXCLUDE gateways from modules for time being**/
-				if ( $module_path != EE_MODULES . 'zzz-copy-this-module-template' && $module_path != EE_MODULES . 'gateways' ) {
+				if ($module_path != EE_MODULES.'zzz-copy-this-module-template' && $module_path != EE_MODULES.'gateways') {
 					// add to list of installed modules
-					EE_Config::register_module( $module_path );
+					EE_Config::register_module($module_path);
 				}
 			}
 		}
 		// filter list of installed modules
-		return apply_filters( 'FHEE__EE_Config___register_modules__installed_modules', EE_Registry::instance()->modules );
+		return apply_filters('FHEE__EE_Config___register_modules__installed_modules', EE_Registry::instance()->modules);
 	}
 
 
@@ -1126,39 +1126,39 @@ 
 	 *  @param 	string 		$module_path - full path up to and including module folder
 	 *  @return 	bool
 	 */
-	public static function register_module( $module_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_module__begin', $module_path );
+	public static function register_module($module_path = NULL) {
+		do_action('AHEE__EE_Config__register_module__begin', $module_path);
 		$module_ext = '.module.php';
 		// make all separators match
-		$module_path = str_replace( array( '\\', '/' ), DS, $module_path );
+		$module_path = str_replace(array('\\', '/'), DS, $module_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $module_path, $module_ext ) !== FALSE ) {
+		if (strpos($module_path, $module_ext) !== FALSE) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$module_file = explode( '.', basename( $module_path ));
+			$module_file = explode('.', basename($module_path));
 			// now we need to rebuild the shortcode path
-			$module_path = explode( DS, $module_path );
+			$module_path = explode(DS, $module_path);
 			// remove last segment
-			array_pop( $module_path );
+			array_pop($module_path);
 			// glue it back together
-			$module_path = implode( DS, $module_path ) . DS;
+			$module_path = implode(DS, $module_path).DS;
 			// take first segment from file name pieces and sanitize it
-			$module = preg_replace( '/[^a-zA-Z0-9_\-]/', '', $module_file[0] );
+			$module = preg_replace('/[^a-zA-Z0-9_\-]/', '', $module_file[0]);
 			// ensure class prefix is added
-			$module_class = strpos( $module, 'EED_' ) !== 0 ? 'EED_' . $module : $module;
+			$module_class = strpos($module, 'EED_') !== 0 ? 'EED_'.$module : $module;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize module name
-			$module = strtolower( basename( $module_path ));
-			$module = preg_replace( '/[^a-z0-9_\-]/', '', $module);
+			$module = strtolower(basename($module_path));
+			$module = preg_replace('/[^a-z0-9_\-]/', '', $module);
 			// like trailingslashit()
-			$module_path = rtrim( $module_path, DS ) . DS;
+			$module_path = rtrim($module_path, DS).DS;
 			// create classname from module directory name
-			$module = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $module )));
+			$module = str_replace(' ', '_', ucwords(str_replace('_', ' ', $module)));
 			// add class prefix
-			$module_class = 'EED_' . $module;
+			$module_class = 'EED_'.$module;
 		}
 		// does the module exist ?
-		if ( ! is_readable( $module_path . DS . $module_class . $module_ext )) {
+		if ( ! is_readable($module_path.DS.$module_class.$module_ext)) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -1174,16 +1174,16 @@ 
 			return FALSE;
 		}
 		// load the module class file
-		require_once( $module_path . $module_class . $module_ext );
+		require_once($module_path.$module_class.$module_ext);
 		// verify that class exists
-		if ( ! class_exists( $module_class )) {
-			$msg = sprintf( __( 'The requested %s module class does not exist.', 'event_espresso' ), $module_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_class)) {
+			$msg = sprintf(__('The requested %s module class does not exist.', 'event_espresso'), $module_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// add to array of registered modules
-		EE_Registry::instance()->modules->{$module_class} = $module_path . $module_class . $module_ext;
-		do_action( 'AHEE__EE_Config__register_module__complete', $module_class, EE_Registry::instance()->modules->{$module_class} );
+		EE_Registry::instance()->modules->{$module_class} = $module_path.$module_class.$module_ext;
+		do_action('AHEE__EE_Config__register_module__complete', $module_class, EE_Registry::instance()->modules->{$module_class} );
 		return TRUE;
 	}
 
@@ -1197,23 +1197,23 @@ 
 	 */
 	private function _initialize_shortcodes() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path ) {
+		foreach (EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path) {
 			// add class prefix
-			$shortcode_class = 'EES_' . $shortcode;
+			$shortcode_class = 'EES_'.$shortcode;
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $shortcode_class, 'set_hooks_admin' ));
+				call_user_func(array($shortcode_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
-				add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array( $shortcode_class,'set_hooks' ));
+				add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array($shortcode_class, 'set_hooks'));
 				// convert classname to UPPERCASE and create WP shortcode.
-				$shortcode_tag = strtoupper( $shortcode );
+				$shortcode_tag = strtoupper($shortcode);
 				// but first check if the shortcode has already been added before assigning 'fallback_shortcode_processor'
-				if ( ! shortcode_exists( $shortcode_tag )) {
+				if ( ! shortcode_exists($shortcode_tag)) {
 					// NOTE: this shortcode declaration will get overridden if the shortcode is successfully detected in the post content in EE_Front_Controller->_initialize_shortcodes()
-					add_shortcode( $shortcode_tag, array( $shortcode_class, 'fallback_shortcode_processor' ));
+					add_shortcode($shortcode_tag, array($shortcode_class, 'fallback_shortcode_processor'));
 				}
 			}
 		}
@@ -1230,15 +1230,15 @@ 
 	 */
 	private function _initialize_modules() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->modules as $module_class => $module_path ) {
+		foreach (EE_Registry::instance()->modules as $module_class => $module_path) {
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $module_class, 'set_hooks_admin' ));
+				call_user_func(array($module_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
-				add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array( $module_class,'set_hooks' ));
+				add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array($module_class, 'set_hooks'));
 			}
 		}
 	}
@@ -1256,26 +1256,26 @@ 
 	 *  @param 	string 		$key - url param key indicating a route is being called
 	 *  @return 	bool
 	 */
-	public static function register_route( $route = NULL, $module = NULL, $method_name = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_route__begin', $route, $module, $method_name );
-		$module = str_replace( 'EED_', '', $module );
-		$module_class = 'EED_' . $module;
-		if ( ! isset( EE_Registry::instance()->modules->{$module_class} )) {
-			$msg = sprintf( __( 'The module %s has not been registered.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_route($route = NULL, $module = NULL, $method_name = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_route__begin', $route, $module, $method_name);
+		$module = str_replace('EED_', '', $module);
+		$module_class = 'EED_'.$module;
+		if ( ! isset(EE_Registry::instance()->modules->{$module_class} )) {
+			$msg = sprintf(__('The module %s has not been registered.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( empty( $route )) {
-			$msg = sprintf( __( 'No route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($route)) {
+			$msg = sprintf(__('No route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( ! method_exists ( 'EED_' . $module, $method_name )) {
-			$msg = sprintf( __( 'A valid class method for the %s route has not been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! method_exists('EED_'.$module, $method_name)) {
+			$msg = sprintf(__('A valid class method for the %s route has not been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_route_map[ $key ][ $route ] = array( 'EED_' . $module, $method_name );
+		EE_Config::$_module_route_map[$key][$route] = array('EED_'.$module, $method_name);
 		return TRUE;
 	}
 
@@ -1289,11 +1289,11 @@ 
 	 *  @param 	string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_route( $route = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_route__begin',$route );
-		$route = apply_filters( 'FHEE__EE_Config__get_route',$route );
-		if ( isset( EE_Config::$_module_route_map[ $key ][ $route ] )) {
-			return EE_Config::$_module_route_map[ $key ][ $route ];
+	public static function get_route($route = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_route__begin', $route);
+		$route = apply_filters('FHEE__EE_Config__get_route', $route);
+		if (isset(EE_Config::$_module_route_map[$key][$route])) {
+			return EE_Config::$_module_route_map[$key][$route];
 		}
 		return NULL;
 	}
@@ -1322,35 +1322,35 @@ 
 	 * @param    string 		$key - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_forward( $route = NULL, $status = 0, $forward = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_forward',$route,$status,$forward );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) ||  empty( $route )) {
-			$msg = sprintf( __( 'The module route %s for this forward has not been registered.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_forward($route = NULL, $status = 0, $forward = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_forward', $route, $status, $forward);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
+			$msg = sprintf(__('The module route %s for this forward has not been registered.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( empty( $forward )) {
-			$msg = sprintf( __( 'No forwarding route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($forward)) {
+			$msg = sprintf(__('No forwarding route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( is_array( $forward )) {
-			if ( ! isset( $forward[1] )) {
-				$msg = sprintf( __( 'A class method for the %s forwarding route has not been supplied.', 'event_espresso' ), $route );
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_array($forward)) {
+			if ( ! isset($forward[1])) {
+				$msg = sprintf(__('A class method for the %s forwarding route has not been supplied.', 'event_espresso'), $route);
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
-			if ( ! method_exists( $forward[0], $forward[1] )) {
-				$msg = sprintf( __( 'The class method %s for the %s forwarding route is in invalid.', 'event_espresso' ), $forward[1], $route );
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! method_exists($forward[0], $forward[1])) {
+				$msg = sprintf(__('The class method %s for the %s forwarding route is in invalid.', 'event_espresso'), $forward[1], $route);
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
-		} else if ( ! function_exists( $forward )) {
-			$msg = sprintf( __( 'The function %s for the %s forwarding route is in invalid.', 'event_espresso' ), $forward, $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		} else if ( ! function_exists($forward)) {
+			$msg = sprintf(__('The function %s for the %s forwarding route is in invalid.', 'event_espresso'), $forward, $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_forward_map[ $key ][ $route ][ absint( $status ) ] = $forward;
+		EE_Config::$_module_forward_map[$key][$route][absint($status)] = $forward;
 		return TRUE;
 	}
 
@@ -1365,10 +1365,10 @@ 
 	 *  @param    string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_forward( $route = NULL, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_forward__begin',$route,$status );
-		if ( isset( EE_Config::$_module_forward_map[ $key ][ $route ][ $status ] )) {
-			return apply_filters( 'FHEE__EE_Config__get_forward', EE_Config::$_module_forward_map[ $key ][ $route ][ $status ], $route,$status );
+	public static function get_forward($route = NULL, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_forward__begin', $route, $status);
+		if (isset(EE_Config::$_module_forward_map[$key][$route][$status])) {
+			return apply_filters('FHEE__EE_Config__get_forward', EE_Config::$_module_forward_map[$key][$route][$status], $route, $status);
 		}
 		return NULL;
 	}
@@ -1385,19 +1385,19 @@ 
 	 * @param    string 		$key - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_view( $route = NULL, $status = 0, $view = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_view__begin',$route,$status,$view );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) ||  empty( $route )) {
-			$msg = sprintf( __( 'The module route %s for this view has not been registered.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_view($route = NULL, $status = 0, $view = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_view__begin', $route, $status, $view);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
+			$msg = sprintf(__('The module route %s for this view has not been registered.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( ! is_readable( $view )) {
-			$msg = sprintf( __( 'The %s view file could not be found or is not readable due to file permissions.', 'event_espresso' ), $view );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_readable($view)) {
+			$msg = sprintf(__('The %s view file could not be found or is not readable due to file permissions.', 'event_espresso'), $view);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_view_map[ $key ][ $route ][ absint( $status ) ] = $view;
+		EE_Config::$_module_view_map[$key][$route][absint($status)] = $view;
 		return TRUE;
 	}
 
@@ -1414,10 +1414,10 @@ 
 	 *  @param    string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_view( $route = NULL, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_view__begin',$route,$status );
-		if ( isset( EE_Config::$_module_view_map[ $key ][ $route ][ $status ] )) {
-			return apply_filters( 'FHEE__EE_Config__get_view', EE_Config::$_module_view_map[ $key ][ $route ][ $status ], $route,$status );
+	public static function get_view($route = NULL, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_view__begin', $route, $status);
+		if (isset(EE_Config::$_module_view_map[$key][$route][$status])) {
+			return apply_filters('FHEE__EE_Config__get_view', EE_Config::$_module_view_map[$key][$route][$status], $route, $status);
 		}
 		return NULL;
 	}
@@ -1425,7 +1425,7 @@ 
 
 
 	public function shutdown() {
-		update_option( 'ee_config_option_names', $this->_config_option_names );
+		update_option('ee_config_option_names', $this->_config_option_names);
 	}
 
 
@@ -1441,7 +1441,7 @@ 
  * magic functions in use, except we'll allow them to magically set and get stuff...
  * basically, they should just be well-defined stdClasses
  */
-class EE_Config_Base{
+class EE_Config_Base {
 
 	/**
 	 * Utility function for escaping the value of a property and returning.
@@ -1450,13 +1450,13 @@ 
 	 * @return mixed if a detected type found return the escaped value, otherwise just the raw value is returned.
 	 * @throws \EE_Error
 	 */
-	public function get_pretty( $property ) {
-		if ( ! property_exists( $this, $property ) ) {
-			throw new EE_Error( sprintf( __('%1$s::get_pretty() has been called with the property %2$s which does not exist on the %1$s config class.', 'event_espresso' ), get_class( $this ), $property ) );
+	public function get_pretty($property) {
+		if ( ! property_exists($this, $property)) {
+			throw new EE_Error(sprintf(__('%1$s::get_pretty() has been called with the property %2$s which does not exist on the %1$s config class.', 'event_espresso'), get_class($this), $property));
 		}
 		//just handling escaping of strings for now.
-		if ( is_string( $this->{$property} ) ) {
-			return stripslashes( $this->{$property} );
+		if (is_string($this->{$property} )) {
+			return stripslashes($this->{$property} );
 		}
 		return $this->{$property};
 	}
@@ -1465,19 +1465,19 @@ 
 
 	public function populate() {
 		//grab defaults via a new instance of this class.
-		$class_name = get_class( $this );
+		$class_name = get_class($this);
 		$defaults = new $class_name;
 
 		//loop through the properties for this class and see if they are set.  If they are NOT, then grab the
 		//default from our $defaults object.
-		foreach ( get_object_vars( $defaults ) as $property => $value ) {
-			if ( is_null( $this->{$property} ) ) {
+		foreach (get_object_vars($defaults) as $property => $value) {
+			if (is_null($this->{$property} )) {
 				$this->{$property} = $value;
 			}
 		}
 
 		//cleanup
-		unset( $defaults );
+		unset($defaults);
 	}
 
 
@@ -1569,12 +1569,12 @@ 
 	 */
 	public function __construct() {
 		$current_network_main_site = is_multisite() ? get_current_site() : NULL;
-		$current_main_site_id = !empty( $current_network_main_site ) ? $current_network_main_site->blog_id : 1;
+		$current_main_site_id = ! empty($current_network_main_site) ? $current_network_main_site->blog_id : 1;
 		// set default organization settings
 		$this->current_blog_id = get_current_blog_id();
 		$this->current_blog_id = $this->current_blog_id === NULL ? 1 : $this->current_blog_id;
-		$this->ee_ueip_optin = is_main_site() ? get_option( 'ee_ueip_optin', TRUE ) : get_blog_option( $current_main_site_id, 'ee_ueip_optin', TRUE );
-		$this->ee_ueip_has_notified = is_main_site() ? get_option( 'ee_ueip_has_notified', FALSE ) : TRUE;
+		$this->ee_ueip_optin = is_main_site() ? get_option('ee_ueip_optin', TRUE) : get_blog_option($current_main_site_id, 'ee_ueip_optin', TRUE);
+		$this->ee_ueip_has_notified = is_main_site() ? get_option('ee_ueip_has_notified', FALSE) : TRUE;
 		$this->post_shortcodes = array();
 		$this->module_route_map = array();
 		$this->module_forward_map = array();
@@ -1593,7 +1593,7 @@ 
 		$this->event_cpt_slug = __('events', 'event_espresso');
 
 		//ueip constant check
-		if ( defined( 'EE_DISABLE_UXIP' ) && EE_DISABLE_UXIP ) {
+		if (defined('EE_DISABLE_UXIP') && EE_DISABLE_UXIP) {
 			$this->ee_ueip_optin = FALSE;
 			$this->ee_ueip_has_notified = TRUE;
 		}
@@ -1633,8 +1633,8 @@ 
 	 *  @return 	string
 	 */
 	public function reg_page_url() {
-		if ( ! $this->reg_page_url ) {
-			$this->reg_page_url = get_permalink( $this->reg_page_id ) . '#checkout';
+		if ( ! $this->reg_page_url) {
+			$this->reg_page_url = get_permalink($this->reg_page_id).'#checkout';
 		}
 		return $this->reg_page_url;
 	}
@@ -1647,12 +1647,12 @@ 
 	 *  @return 	string
 	 */
 	public function txn_page_url($query_args = array()) {
-		if ( ! $this->txn_page_url ) {
-			$this->txn_page_url = get_permalink( $this->txn_page_id );
+		if ( ! $this->txn_page_url) {
+			$this->txn_page_url = get_permalink($this->txn_page_id);
 		}
-		if($query_args){
-			return add_query_arg($query_args,$this->txn_page_url);
-		}else{
+		if ($query_args) {
+			return add_query_arg($query_args, $this->txn_page_url);
+		} else {
 			return $this->txn_page_url;
 		}
 	}
@@ -1664,12 +1664,12 @@ 
 	 *  @return 	string
 	 */
 	public function thank_you_page_url($query_args = array()) {
-		if ( ! $this->thank_you_page_url ) {
-			$this->thank_you_page_url = get_permalink( $this->thank_you_page_id );
+		if ( ! $this->thank_you_page_url) {
+			$this->thank_you_page_url = get_permalink($this->thank_you_page_id);
 		}
-		if($query_args){
-			return add_query_arg($query_args,$this->thank_you_page_url);
-		}else{
+		if ($query_args) {
+			return add_query_arg($query_args, $this->thank_you_page_url);
+		} else {
 			return $this->thank_you_page_url;
 		}
 	}
@@ -1680,8 +1680,8 @@ 
 	 *  @return 	string
 	 */
 	public function cancel_page_url() {
-		if ( ! $this->cancel_page_url ) {
-			$this->cancel_page_url = get_permalink( $this->cancel_page_id );
+		if ( ! $this->cancel_page_url) {
+			$this->cancel_page_url = get_permalink($this->cancel_page_id);
 		}
 		return $this->cancel_page_url;
 	}
@@ -1709,7 +1709,7 @@ 
 		//reset all url properties
 		$this->_reset_urls();
 		//return what to save to db
-		return array_keys( get_object_vars( $this ) );
+		return array_keys(get_object_vars($this));
 	}
 
 }
@@ -1941,39 +1941,39 @@ 
 	 * @param null $CNT_ISO
 	 * @return \EE_Currency_Config
 	 */
-	public function __construct( $CNT_ISO = NULL ) {
+	public function __construct($CNT_ISO = NULL) {
 
 		// get country code from organization settings or use default
-		$ORG_CNT = isset( EE_Registry::instance()->CFG->organization ) && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ? EE_Registry::instance()->CFG->organization->CNT_ISO : NULL;
+		$ORG_CNT = isset(EE_Registry::instance()->CFG->organization) && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ? EE_Registry::instance()->CFG->organization->CNT_ISO : NULL;
 		// but override if requested
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : $ORG_CNT;
-		EE_Registry::instance()->load_helper( 'Activation' );
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : $ORG_CNT;
+		EE_Registry::instance()->load_helper('Activation');
 		// so if that all went well, and we are not in M-Mode (cuz you can't query the db in M-Mode) and double-check the countries table exists
-		if ( ! empty( $CNT_ISO ) && EE_Maintenance_Mode::instance()->models_can_query() && EEH_Activation::table_exists( EE_Registry::instance()->load_model( 'Country' )->table() ) ) {
+		if ( ! empty($CNT_ISO) && EE_Maintenance_Mode::instance()->models_can_query() && EEH_Activation::table_exists(EE_Registry::instance()->load_model('Country')->table())) {
 			// retrieve the country settings from the db, just in case they have been customized
-			$country = EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $CNT_ISO );
-			if ( $country instanceof EE_Country ) {
-				$this->code = $country->currency_code(); 	// currency code: USD, CAD, EUR
-				$this->name = $country->currency_name_single();	// Dollar
-				$this->plural = $country->currency_name_plural(); 	// Dollars
-				$this->sign =  $country->currency_sign(); 			// currency sign: $
-				$this->sign_b4 = $country->currency_sign_before(); 		// currency sign before or after: $TRUE  or  FALSE$
-				$this->dec_plc = $country->currency_decimal_places();	// decimal places: 2 = 0.00  3 = 0.000
-				$this->dec_mrk = $country->currency_decimal_mark();	// decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-				$this->thsnds = $country->currency_thousands_separator();	// thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($CNT_ISO);
+			if ($country instanceof EE_Country) {
+				$this->code = $country->currency_code(); // currency code: USD, CAD, EUR
+				$this->name = $country->currency_name_single(); // Dollar
+				$this->plural = $country->currency_name_plural(); // Dollars
+				$this->sign = $country->currency_sign(); // currency sign: $
+				$this->sign_b4 = $country->currency_sign_before(); // currency sign before or after: $TRUE  or  FALSE$
+				$this->dec_plc = $country->currency_decimal_places(); // decimal places: 2 = 0.00  3 = 0.000
+				$this->dec_mrk = $country->currency_decimal_mark(); // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+				$this->thsnds = $country->currency_thousands_separator(); // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 			}
 		}
 		// fallback to hardcoded defaults, in case the above failed
-		if ( empty( $this->code )) {
+		if (empty($this->code)) {
 			// set default currency settings
-			$this->code = 'USD'; 	// currency code: USD, CAD, EUR
-			$this->name = __( 'Dollar', 'event_espresso' ); 	// Dollar
-			$this->plural = __( 'Dollars', 'event_espresso' ); 	// Dollars
-			$this->sign =  '$'; 	// currency sign: $
-			$this->sign_b4 = TRUE; 	// currency sign before or after: $TRUE  or  FALSE$
-			$this->dec_plc = 2; 	// decimal places: 2 = 0.00  3 = 0.000
-			$this->dec_mrk = '.'; 	// decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-			$this->thsnds = ','; 	// thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$this->code = 'USD'; // currency code: USD, CAD, EUR
+			$this->name = __('Dollar', 'event_espresso'); // Dollar
+			$this->plural = __('Dollars', 'event_espresso'); // Dollars
+			$this->sign = '$'; // currency sign: $
+			$this->sign_b4 = TRUE; // currency sign before or after: $TRUE  or  FALSE$
+			$this->dec_plc = 2; // decimal places: 2 = 0.00  3 = 0.000
+			$this->dec_mrk = '.'; // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+			$this->thsnds = ','; // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 		}
 	}
 }
@@ -2113,7 +2113,7 @@ 
 	 * @since 4.8.8.rc.019
 	 */
 	public function do_hooks() {
-		add_action( 'AHEE__EE_Config___load_core_config__end', array( $this, 'set_default_reg_status_on_EEM_Event' ));
+		add_action('AHEE__EE_Config___load_core_config__end', array($this, 'set_default_reg_status_on_EEM_Event'));
 	}
 
 
@@ -2121,7 +2121,7 @@ 
 	 * @return void
 	 */
 	public function set_default_reg_status_on_EEM_Event() {
-		EEM_Event::set_default_reg_status( $this->default_STS_ID );
+		EEM_Event::set_default_reg_status($this->default_STS_ID);
 	}
 
 
@@ -2226,10 +2226,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function log_file_name( $reset = FALSE ) {
-		if ( empty( $this->log_file_name ) || $reset ) {
-			$this->log_file_name = sanitize_key( 'espresso_log_' . md5( uniqid( '', TRUE ))) . '.txt';
-			EE_Config::instance()->update_espresso_config( FALSE, FALSE );
+	public function log_file_name($reset = FALSE) {
+		if (empty($this->log_file_name) || $reset) {
+			$this->log_file_name = sanitize_key('espresso_log_'.md5(uniqid('', TRUE))).'.txt';
+			EE_Config::instance()->update_espresso_config(FALSE, FALSE);
 		}
 		return $this->log_file_name;
 	}
@@ -2241,10 +2241,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function debug_file_name( $reset = FALSE ) {
-		if ( empty( $this->debug_file_name ) || $reset ) {
-			$this->debug_file_name = sanitize_key( 'espresso_debug_' . md5( uniqid( '', TRUE ))) . '.txt';
-			EE_Config::instance()->update_espresso_config( FALSE, FALSE );
+	public function debug_file_name($reset = FALSE) {
+		if (empty($this->debug_file_name) || $reset) {
+			$this->debug_file_name = sanitize_key('espresso_debug_'.md5(uniqid('', TRUE))).'.txt';
+			EE_Config::instance()->update_espresso_config(FALSE, FALSE);
 		}
 		return $this->debug_file_name;
 	}
@@ -2417,21 +2417,21 @@ 
 		// set default map settings
 		$this->use_google_maps = TRUE;
 		// for event details pages (reg page)
-		$this->event_details_map_width = 585; 			// ee_map_width_single
-		$this->event_details_map_height = 362; 			// ee_map_height_single
-		$this->event_details_map_zoom = 14; 			// ee_map_zoom_single
-		$this->event_details_display_nav = TRUE; 			// ee_map_nav_display_single
-		$this->event_details_nav_size = FALSE; 			// ee_map_nav_size_single
-		$this->event_details_control_type = 'default'; 		// ee_map_type_control_single
-		$this->event_details_map_align = 'center'; 			// ee_map_align_single
+		$this->event_details_map_width = 585; // ee_map_width_single
+		$this->event_details_map_height = 362; // ee_map_height_single
+		$this->event_details_map_zoom = 14; // ee_map_zoom_single
+		$this->event_details_display_nav = TRUE; // ee_map_nav_display_single
+		$this->event_details_nav_size = FALSE; // ee_map_nav_size_single
+		$this->event_details_control_type = 'default'; // ee_map_type_control_single
+		$this->event_details_map_align = 'center'; // ee_map_align_single
 		// for event list pages
-		$this->event_list_map_width = 300; 			// ee_map_width
-		$this->event_list_map_height = 185; 		// ee_map_height
-		$this->event_list_map_zoom = 12; 			// ee_map_zoom
-		$this->event_list_display_nav = FALSE; 		// ee_map_nav_display
-		$this->event_list_nav_size = TRUE; 			// ee_map_nav_size
-		$this->event_list_control_type = 'dropdown'; 		// ee_map_type_control
-		$this->event_list_map_align = 'center'; 			// ee_map_align
+		$this->event_list_map_width = 300; // ee_map_width
+		$this->event_list_map_height = 185; // ee_map_height
+		$this->event_list_map_zoom = 12; // ee_map_zoom
+		$this->event_list_display_nav = FALSE; // ee_map_nav_display
+		$this->event_list_nav_size = TRUE; // ee_map_nav_size
+		$this->event_list_control_type = 'dropdown'; // ee_map_type_control
+		$this->event_list_map_align = 'center'; // ee_map_align
 	}
 
 }
@@ -2442,7 +2442,7 @@ 
 /**
  * stores Events_Archive settings
  */
-class EE_Events_Archive_Config extends EE_Config_Base{
+class EE_Events_Archive_Config extends EE_Config_Base {
 
 	public $display_status_banner;
 	public $display_description;
@@ -2461,7 +2461,7 @@ 
 	/**
 	 *	class constructor
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->display_status_banner = 0;
 		$this->display_description = 1;
 		$this->display_ticket_selector = 0;
@@ -2481,7 +2481,7 @@ 
 /**
  * Stores Event_Single_Config settings
  */
-class EE_Event_Single_Config extends EE_Config_Base{
+class EE_Event_Single_Config extends EE_Config_Base {
 
 	public $display_status_banner_single;
 	public $display_venue;
@@ -2510,7 +2510,7 @@ 
 /**
  * Stores Ticket_Selector_Config settings
  */
-class EE_Ticket_Selector_Config extends EE_Config_Base{
+class EE_Ticket_Selector_Config extends EE_Config_Base {
 	public $show_ticket_sale_columns;
 	public $show_ticket_details;
 	public $show_expired_tickets;
@@ -2564,7 +2564,7 @@ 
 	 * @return void
 	 */
 	protected function _set_php_values() {
-		$this->php->max_input_vars = ini_get( 'max_input_vars' );
+		$this->php->max_input_vars = ini_get('max_input_vars');
 		$this->php->version = phpversion();
 	}
 
@@ -2583,8 +2583,8 @@ 
 	 *         @type string $msg 		Any message to be displayed.
 	 * }
 	 */
-	public function max_input_vars_limit_check( $input_count = 0 ) {
-		if ( ( $input_count >= $this->php->max_input_vars ) && ( PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >=9 ) ) {
+	public function max_input_vars_limit_check($input_count = 0) {
+		if (($input_count >= $this->php->max_input_vars) && (PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >= 9)) {
 			return  __('The number of inputs on this page has been exceeded.  You cannot add anymore items (i.e. tickets, datetimes, custom fields) on this page because of your servers PHP "max_input_vars" setting.', 'event_espresso');
 		} else {
 			return '';
@@ -2620,7 +2620,7 @@ 
  * stores payment gateway info
  * @deprecated
  */
-class EE_Gateway_Config extends EE_Config_Base{
+class EE_Gateway_Config extends EE_Config_Base {
 
 	/**
 	 * Array with keys that are payment gateways slugs, and values are arrays
@@ -2642,9 +2642,9 @@ 
 	 *	class constructor
 	 * @deprecated
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->payment_settings = array();
-		$this->active_gateways = array( 'Invoice' => FALSE );
+		$this->active_gateways = array('Invoice' => FALSE);
 	}
 }
 

modules/single_page_checkout/inc/EE_Checkout.class.php

Spacing +205 added lines, -205 removed lines

@@ -242,9 +242,9 @@ 
 		$this->reg_page_base_url = EE_Registry::instance()->CFG->core->reg_page_url();
 		$this->thank_you_page_url = EE_Registry::instance()->CFG->core->thank_you_page_url();
 		$this->cancel_page_url = EE_Registry::instance()->CFG->core->cancel_page_url();
-		$this->continue_reg = apply_filters( 'FHEE__EE_Checkout___construct___continue_reg', TRUE );
+		$this->continue_reg = apply_filters('FHEE__EE_Checkout___construct___continue_reg', TRUE);
 		$this->admin_request = is_admin() && ! EE_Registry::instance()->REQ->ajax;
-		$this->reg_cache_where_params = array( 'order_by' => array( 'REG_count' => 'ASC' ));
+		$this->reg_cache_where_params = array('order_by' => array('REG_count' => 'ASC'));
 	}
 
 
@@ -254,8 +254,8 @@ 
 	 * @return array
 	 */
 	public function any_reg_status_updated() {
-		foreach ( $this->reg_status_updated as $reg_status ) {
-			if ( $reg_status ) {
+		foreach ($this->reg_status_updated as $reg_status) {
+			if ($reg_status) {
 				return true;
 			}
 		}
@@ -268,8 +268,8 @@ 
 	 * @param $REG_ID
 	 * @return array
 	 */
-	public function reg_status_updated( $REG_ID ) {
-		return isset( $this->reg_status_updated[ $REG_ID ] ) ? $this->reg_status_updated[ $REG_ID ] : false;
+	public function reg_status_updated($REG_ID) {
+		return isset($this->reg_status_updated[$REG_ID]) ? $this->reg_status_updated[$REG_ID] : false;
 	}
 
 
@@ -278,8 +278,8 @@ 
 	 * @param $REG_ID
 	 * @param $reg_status
 	 */
-	public function set_reg_status_updated( $REG_ID, $reg_status ) {
-		$this->reg_status_updated[ $REG_ID ] = filter_var( $reg_status, FILTER_VALIDATE_BOOLEAN );
+	public function set_reg_status_updated($REG_ID, $reg_status) {
+		$this->reg_status_updated[$REG_ID] = filter_var($reg_status, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -300,7 +300,7 @@ 
 	 * can ONLY be set by the  Finalize_Registration reg step
 	 */
 	public function set_exit_spco() {
-		if ( $this->current_step instanceof EE_SPCO_Reg_Step_Finalize_Registration ) {
+		if ($this->current_step instanceof EE_SPCO_Reg_Step_Finalize_Registration) {
 			$this->exit_spco = true;
 		}
 	}
@@ -317,12 +317,12 @@ 
 	 */
 	public function reset_for_current_request() {
 		$this->process_form_submission = FALSE;
-		$this->continue_reg = apply_filters( 'FHEE__EE_Checkout___construct___continue_reg', true );
+		$this->continue_reg = apply_filters('FHEE__EE_Checkout___construct___continue_reg', true);
 		$this->admin_request = is_admin() && ! EE_Registry::instance()->REQ->front_ajax;
 		$this->continue_reg = true;
 		$this->redirect = false;
 		// don't reset the cached redirect form if we're about to be asked to display it !!!
-		if ( EE_Registry::instance()->REQ->get( 'action', 'display_spco_reg_step' ) !== 'redirect_form' ) {
+		if (EE_Registry::instance()->REQ->get('action', 'display_spco_reg_step') !== 'redirect_form') {
 			$this->redirect_form = '';
 		}
 		$this->redirect_url = '';
@@ -339,8 +339,8 @@ 
 	 * @param EE_SPCO_Reg_Step $reg_step_obj
 	 * @return    void
 	 */
-	public function add_reg_step( EE_SPCO_Reg_Step $reg_step_obj ) {
-		$this->reg_steps[ $reg_step_obj->slug()  ] = $reg_step_obj;
+	public function add_reg_step(EE_SPCO_Reg_Step $reg_step_obj) {
+		$this->reg_steps[$reg_step_obj->slug()] = $reg_step_obj;
 	}
 
 
@@ -356,22 +356,22 @@ 
 	 * @param string $reg_step_slug
 	 * @return    void
 	 */
-	public function skip_reg_step( $reg_step_slug = '' ) {
-		$step_to_skip = $this->find_reg_step( $reg_step_slug );
-		if ( $step_to_skip instanceof EE_SPCO_Reg_Step && $step_to_skip->is_current_step() ) {
-			$step_to_skip->set_is_current_step( false );
+	public function skip_reg_step($reg_step_slug = '') {
+		$step_to_skip = $this->find_reg_step($reg_step_slug);
+		if ($step_to_skip instanceof EE_SPCO_Reg_Step && $step_to_skip->is_current_step()) {
+			$step_to_skip->set_is_current_step(false);
 			$step_to_skip->set_completed();
 			// advance to the next step
-			$this->set_current_step( $this->next_step->slug() );
+			$this->set_current_step($this->next_step->slug());
 			// also reset the step param in the request in case any other code references that directly
-			EE_Registry::instance()->REQ->set( 'step', $this->current_step->slug() );
+			EE_Registry::instance()->REQ->set('step', $this->current_step->slug());
 			// since we are skipping a step and setting the current step to be what was previously the next step,
 			// we need to check that the next step is now correct, and not still set to the current step.
-			if ( $this->current_step->slug() == $this->next_step->slug() ) {
+			if ($this->current_step->slug() == $this->next_step->slug()) {
 				// correctly setup the next step
 				$this->set_next_step();
 			}
-			$this->set_reg_step_initiated( $this->current_step );
+			$this->set_reg_step_initiated($this->current_step);
 		}
 	}
 
@@ -385,16 +385,16 @@ 
 	 * @param bool   $reset whether to reset reg steps after removal
 	 * @throws EE_Error
 	 */
-	public function remove_reg_step( $reg_step_slug = '', $reset = true ) {
-		unset( $this->reg_steps[ $reg_step_slug  ] );
-		if ( $this->transaction instanceof EE_Transaction ) {
+	public function remove_reg_step($reg_step_slug = '', $reset = true) {
+		unset($this->reg_steps[$reg_step_slug]);
+		if ($this->transaction instanceof EE_Transaction) {
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// now remove reg step from TXN and save
-			$transaction_processor->remove_reg_step( $this->transaction, $reg_step_slug );
+			$transaction_processor->remove_reg_step($this->transaction, $reg_step_slug);
 			$this->transaction->save();
 		}
-		if ( $reset ) {
+		if ($reset) {
 			$this->reset_reg_steps();
 		}
 	}
@@ -409,9 +409,9 @@ 
 	 * @param int    $order
 	 * @return    void
 	 */
-	public function set_reg_step_order( $reg_step_slug = '', $order = 100 ) {
-		if ( isset( $this->reg_steps[ $reg_step_slug  ] )) {
-			$this->reg_steps[ $reg_step_slug ]->set_order( $order );
+	public function set_reg_step_order($reg_step_slug = '', $order = 100) {
+		if (isset($this->reg_steps[$reg_step_slug])) {
+			$this->reg_steps[$reg_step_slug]->set_order($order);
 		}
 	}
 
@@ -424,25 +424,25 @@ 
 	 * @param string $current_step
 	 * @return    void
 	 */
-	public function set_current_step( $current_step ) {
+	public function set_current_step($current_step) {
 		// grab what step we're on
-		$this->current_step = isset( $this->reg_steps[ $current_step ] ) ? $this->reg_steps[ $current_step ] : reset( $this->reg_steps );
+		$this->current_step = isset($this->reg_steps[$current_step]) ? $this->reg_steps[$current_step] : reset($this->reg_steps);
 		// verify instance
-		if ( $this->current_step instanceof EE_SPCO_Reg_Step ) {
+		if ($this->current_step instanceof EE_SPCO_Reg_Step) {
 			// we don't want to repeat completed steps if this is the first time through SPCO
-			if ( $this->continue_reg && $this->current_step->completed() && ! $this->revisit ) {
+			if ($this->continue_reg && $this->current_step->completed() && ! $this->revisit) {
 				// so advance to the next step
 				$this->set_next_step();
-				if ( $this->next_step instanceof EE_SPCO_Reg_Step ) {
+				if ($this->next_step instanceof EE_SPCO_Reg_Step) {
 					// and attempt to set it as the current step
-					$this->set_current_step( $this->next_step->slug() );
+					$this->set_current_step($this->next_step->slug());
 				}
 				return;
 			}
-			$this->current_step->set_is_current_step( TRUE );
+			$this->current_step->set_is_current_step(TRUE);
 		} else {
 			EE_Error::add_error(
-				__( 'The current step could not be set.', 'event_espresso' ),
+				__('The current step could not be set.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -459,20 +459,20 @@ 
 	 */
 	public function set_next_step() {
 		// set pointer to start of array
-		reset( $this->reg_steps );
+		reset($this->reg_steps);
 		// if there is more than one step
-		if ( count( $this->reg_steps ) > 1 ) {
+		if (count($this->reg_steps) > 1) {
 			// advance to the current step and set pointer
-			while ( key( $this->reg_steps ) != $this->current_step->slug() && key( $this->reg_steps ) != '' ) {
-				next( $this->reg_steps );
+			while (key($this->reg_steps) != $this->current_step->slug() && key($this->reg_steps) != '') {
+				next($this->reg_steps);
 			}
 		}
 		// advance one more spot ( if it exists )
-		$this->next_step = next( $this->reg_steps );
+		$this->next_step = next($this->reg_steps);
 		// verify instance
-		$this->next_step = $this->next_step instanceof EE_SPCO_Reg_Step ? $this->next_step  : NULL;
+		$this->next_step = $this->next_step instanceof EE_SPCO_Reg_Step ? $this->next_step : NULL;
 		// then back to current step to reset
-		prev( $this->reg_steps );
+		prev($this->reg_steps);
 	}
 
 
@@ -486,8 +486,8 @@ 
 	 *  @return 	EE_SPCO_Reg_Step | null
 	 */
 	public function get_next_reg_step() {
-		$next = next( $this->reg_steps );
-		prev( $this->reg_steps );
+		$next = next($this->reg_steps);
+		prev($this->reg_steps);
 		return $next instanceof EE_SPCO_Reg_Step ? $next : null;
 	}
 
@@ -502,8 +502,8 @@ 
 	 *  @return 	EE_SPCO_Reg_Step | null
 	 */
 	public function get_prev_reg_step() {
-		$prev = prev( $this->reg_steps );
-		next( $this->reg_steps );
+		$prev = prev($this->reg_steps);
+		next($this->reg_steps);
 		return $prev instanceof EE_SPCO_Reg_Step ? $prev : null;
 	}
 
@@ -516,8 +516,8 @@ 
 	 * @return void
 	 */
 	public function sort_reg_steps() {
-		$reg_step_sorting_callback = apply_filters( 'FHEE__EE_Checkout__sort_reg_steps__reg_step_sorting_callback', 'reg_step_sorting_callback' );
-		uasort( $this->reg_steps, array( $this, $reg_step_sorting_callback ));
+		$reg_step_sorting_callback = apply_filters('FHEE__EE_Checkout__sort_reg_steps__reg_step_sorting_callback', 'reg_step_sorting_callback');
+		uasort($this->reg_steps, array($this, $reg_step_sorting_callback));
 	}
 
 
@@ -530,19 +530,19 @@ 
 	 * @param string $reg_step_slug
 	 * @return EE_SPCO_Reg_Step|null
 	 */
-	public function find_reg_step( $reg_step_slug = '' ) {
-		if ( ! empty( $reg_step_slug ) ) {
+	public function find_reg_step($reg_step_slug = '') {
+		if ( ! empty($reg_step_slug)) {
 			// copy reg step array
 			$reg_steps = $this->reg_steps;
 			// set pointer to start of array
-			reset( $reg_steps );
+			reset($reg_steps);
 			// if there is more than one step
-			if ( count( $reg_steps ) > 1 ) {
+			if (count($reg_steps) > 1) {
 				// advance to the current step and set pointer
-				while ( key( $reg_steps ) != $reg_step_slug && key( $reg_steps ) != '' ) {
-					next( $reg_steps );
+				while (key($reg_steps) != $reg_step_slug && key($reg_steps) != '') {
+					next($reg_steps);
 				}
-				return current( $reg_steps );
+				return current($reg_steps);
 			}
 		}
 		return null;
@@ -558,17 +558,17 @@ 
 	 * @param EE_SPCO_Reg_Step $reg_step_B
 	 * @return array()
 	 */
-	public function reg_step_sorting_callback( EE_SPCO_Reg_Step $reg_step_A, EE_SPCO_Reg_Step $reg_step_B ) {
+	public function reg_step_sorting_callback(EE_SPCO_Reg_Step $reg_step_A, EE_SPCO_Reg_Step $reg_step_B) {
 		// send finalize_registration step to the end of the array
-		if ( $reg_step_A->slug() == 'finalize_registration' ) {
+		if ($reg_step_A->slug() == 'finalize_registration') {
 			return 1;
-		} else if ( $reg_step_B->slug() == 'finalize_registration' ) {
+		} else if ($reg_step_B->slug() == 'finalize_registration') {
 			return -1;
 		}
-		if ( $reg_step_A->order() == $reg_step_B->order() ) {
+		if ($reg_step_A->order() == $reg_step_B->order()) {
 			return 0;
 		}
-		return ( $reg_step_A->order() > $reg_step_B->order() ) ? 1 : -1;
+		return ($reg_step_A->order() > $reg_step_B->order()) ? 1 : -1;
 	}
 
 
@@ -579,7 +579,7 @@ 
 	 * @access 	public
 	 * @param 	EE_SPCO_Reg_Step $reg_step
 	 */
-	public function set_reg_step_initiated( EE_SPCO_Reg_Step $reg_step ) {
+	public function set_reg_step_initiated(EE_SPCO_Reg_Step $reg_step) {
 		// call set_reg_step_initiated ???
 		if (
 			// first time visiting SPCO ?
@@ -588,13 +588,13 @@ 
 			&& $this->action === 'display_spco_reg_step'
 		) {
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// set the start time for this reg step
-			if ( ! $transaction_processor->set_reg_step_initiated( $this->transaction, $reg_step->slug() ) ) {
-				if ( WP_DEBUG ) {
+			if ( ! $transaction_processor->set_reg_step_initiated($this->transaction, $reg_step->slug())) {
+				if (WP_DEBUG) {
 					EE_Error::add_error(
 						sprintf(
-							__( 'The "%1$s" registration step was not initialized properly.', 'event_espresso' ),
+							__('The "%1$s" registration step was not initialized properly.', 'event_espresso'),
 							$reg_step->name()
 						),
 						__FILE__, __FUNCTION__, __LINE__
@@ -613,10 +613,10 @@ 
 	 * 	@return 	void
 	 */
 	public function set_reg_step_JSON_info() {
-		EE_Registry::$i18n_js_strings[ 'reg_steps' ] = array();
+		EE_Registry::$i18n_js_strings['reg_steps'] = array();
 		// pass basic reg step data to JS
-		foreach ( $this->reg_steps as $reg_step ) {
-			EE_Registry::$i18n_js_strings[ 'reg_steps' ][] = $reg_step->slug();
+		foreach ($this->reg_steps as $reg_step) {
+			EE_Registry::$i18n_js_strings['reg_steps'][] = $reg_step->slug();
 		}
 		// reset reg step html
 //		$this->json_response->set_reg_step_html( '' );
@@ -632,7 +632,7 @@ 
 	 */
 	public function reset_reg_steps() {
 		$this->sort_reg_steps();
-		$this->set_current_step( EE_Registry::instance()->REQ->get( 'step' ));
+		$this->set_current_step(EE_Registry::instance()->REQ->get('step'));
 		$this->set_next_step();
 		// the text that appears on the reg step form submit button
 		$this->current_step->set_submit_button_text();
@@ -649,9 +649,9 @@ 
 	 */
 	public function get_registration_time_limit() {
 
-		$registration_time_limit = (float)( EE_Registry::instance()	->SSN->expiration() - time() );
+		$registration_time_limit = (float) (EE_Registry::instance()	->SSN->expiration() - time());
 		$time_limit_format = $registration_time_limit > 60 * MINUTE_IN_SECONDS ? 'H:i:s' : 'i:s';
-		$registration_time_limit = gmdate( $time_limit_format, $registration_time_limit );
+		$registration_time_limit = gmdate($time_limit_format, $registration_time_limit);
 		return apply_filters(
 			'FHEE__EE_Checkout__get_registration_time_limit__registration_time_limit',
 			$registration_time_limit
@@ -671,7 +671,7 @@ 
 		//		overpaid TXN
 		//		free TXN ( total = 0.00 )
 		// then payment required is TRUE
-		return ! ( $this->admin_request || $this->transaction->is_completed() || $this->transaction->is_overpaid() || $this->transaction->is_free() ) ? TRUE : FALSE;
+		return ! ($this->admin_request || $this->transaction->is_completed() || $this->transaction->is_overpaid() || $this->transaction->is_free()) ? TRUE : FALSE;
 	}
 
 
@@ -684,8 +684,8 @@ 
 	 */
 	public function initialize_txn_reg_steps_array() {
 		$txn_reg_steps_array = array();
-		foreach ( $this->reg_steps as $reg_step ) {
-			$txn_reg_steps_array[ $reg_step->slug() ] = FALSE;
+		foreach ($this->reg_steps as $reg_step) {
+			$txn_reg_steps_array[$reg_step->slug()] = FALSE;
 		}
 		return $txn_reg_steps_array;
 	}
@@ -701,13 +701,13 @@ 
 	public function update_txn_reg_steps_array() {
 		$updated = FALSE;
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-		foreach ( $this->reg_steps as $reg_step ) {
-			if ( $reg_step->completed() ) {
-				$updated = $transaction_processor->set_reg_step_completed( $this->transaction, $reg_step->slug() ) ? TRUE : $updated;
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		foreach ($this->reg_steps as $reg_step) {
+			if ($reg_step->completed()) {
+				$updated = $transaction_processor->set_reg_step_completed($this->transaction, $reg_step->slug()) ? TRUE : $updated;
 			}
 		}
-		if ( $updated ) {
+		if ($updated) {
 			$this->transaction->save();
 		}
 		return $updated;
@@ -722,14 +722,14 @@ 
 	 * 	@return 	void
 	 */
 	public function stash_transaction_and_checkout() {
-		if ( ! $this->revisit ) {
+		if ( ! $this->revisit) {
 			$this->update_txn_reg_steps_array();
 		}
 		$this->track_transaction_and_registration_status_updates();
 		// save all data to the db, but suppress errors
 		//$this->save_all_data( FALSE );
 		// cache the checkout in the session
-		EE_Registry::instance()->SSN->set_checkout( $this );
+		EE_Registry::instance()->SSN->set_checkout($this);
 	}
 
 
@@ -745,21 +745,21 @@ 
 	 */
 	public function track_transaction_and_registration_status_updates() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction ) {
+		if ($this->transaction instanceof EE_Transaction) {
 			/** @type EE_Transaction_Payments $transaction_payments */
-			$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+			$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// has there been a TXN status change during this checkout?
-			if ( $transaction_payments->txn_status_updated() || $transaction_processor->txn_status_updated() ) {
+			if ($transaction_payments->txn_status_updated() || $transaction_processor->txn_status_updated()) {
 				$this->txn_status_updated = true;
 			}
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as $registration ) {
-				if ( $registration_processor->reg_status_updated( $registration->ID() ) ) {
-					$this->set_reg_status_updated( $registration->ID(), true );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as $registration) {
+				if ($registration_processor->reg_status_updated($registration->ID())) {
+					$this->set_reg_status_updated($registration->ID(), true);
 				}
 			}
 		}
@@ -781,8 +781,8 @@ 
 	 * @param 	EE_Registration 	$registration
 	 * 	@return 	bool
 	 */
-	public function visit_allows_processing_of_this_registration( EE_Registration $registration ) {
-		return ! $this->revisit || $this->primary_revisit || ( $this->revisit && $this->reg_url_link == $registration->reg_url_link() ) ? TRUE : FALSE;
+	public function visit_allows_processing_of_this_registration(EE_Registration $registration) {
+		return ! $this->revisit || $this->primary_revisit || ($this->revisit && $this->reg_url_link == $registration->reg_url_link()) ? TRUE : FALSE;
 	}
 
 
@@ -807,18 +807,18 @@ 
 	 * @param bool $show_errors
 	 * @return bool
 	 */
-	public function save_all_data( $show_errors = TRUE ) {
+	public function save_all_data($show_errors = TRUE) {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction ) {
+		if ($this->transaction instanceof EE_Transaction) {
 			// save to ensure that TXN has ID
 			$this->transaction->save();
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as  $registration ) {
-				$this->_save_registration( $registration, $show_errors );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as  $registration) {
+				$this->_save_registration($registration, $show_errors);
 			}
 		} else {
-			if ( $show_errors ) {
-				EE_Error::add_error( __( 'A valid Transaction was not found when attempting to save your registration information.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			if ($show_errors) {
+				EE_Error::add_error(__('A valid Transaction was not found when attempting to save your registration information.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return FALSE;
 		}
@@ -833,32 +833,32 @@ 
 	 * @param bool $show_errors
 	 * @return void
 	 */
-	private function _save_registration( $registration, $show_errors = TRUE  ) {
+	private function _save_registration($registration, $show_errors = TRUE) {
 		// verify object
-		if ( $registration instanceof EE_Registration ) {
+		if ($registration instanceof EE_Registration) {
 			// should this registration be processed during this visit ?
-			if ( $this->visit_allows_processing_of_this_registration( $registration ) ) {
+			if ($this->visit_allows_processing_of_this_registration($registration)) {
 				//set TXN ID
-				if ( ! $registration->transaction_ID() ) {
-					$registration->set_transaction_id( $this->transaction->ID() );
+				if ( ! $registration->transaction_ID()) {
+					$registration->set_transaction_id($this->transaction->ID());
 				}
 				// verify and save the attendee
-				$this->_save_registration_attendee( $registration, $show_errors );
+				$this->_save_registration_attendee($registration, $show_errors);
 				// save answers to reg form questions
-				$this->_save_registration_answers( $registration, $show_errors );
+				$this->_save_registration_answers($registration, $show_errors);
 				// save changes
 				$registration->save();
 				// update txn cache
-				if ( ! $this->transaction->update_cache_after_object_save( 'Registration', $registration )) {
-					if ( $show_errors ) {
-						EE_Error::add_error( __( 'The newly saved Registration object could not be cached on the Transaction.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+				if ( ! $this->transaction->update_cache_after_object_save('Registration', $registration)) {
+					if ($show_errors) {
+						EE_Error::add_error(__('The newly saved Registration object could not be cached on the Transaction.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
 		} else {
-			if ( $show_errors ) {
+			if ($show_errors) {
 				EE_Error::add_error(
-					__( 'An invalid Registration object was discovered when attempting to save your registration information.', 'event_espresso' ),
+					__('An invalid Registration object was discovered when attempting to save your registration information.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -874,26 +874,26 @@ 
 	 * @param bool $show_errors
 	 * @return void
 	 */
-	private function _save_registration_attendee( $registration, $show_errors = TRUE ) {
-		if ( $registration->attendee() instanceof EE_Attendee ) {
+	private function _save_registration_attendee($registration, $show_errors = TRUE) {
+		if ($registration->attendee() instanceof EE_Attendee) {
 			// save so that ATT has ID
 			$registration->attendee()->save();
-			if ( ! $registration->update_cache_after_object_save( 'Attendee', $registration->attendee() )) {
-				if ( $show_errors ) {
+			if ( ! $registration->update_cache_after_object_save('Attendee', $registration->attendee())) {
+				if ($show_errors) {
 					EE_Error::add_error(
-						__( 'The newly saved Attendee object could not be cached on the registration.', 'event_espresso' ),
+						__('The newly saved Attendee object could not be cached on the registration.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
 			}
 		} else {
-			if ( $show_errors ) {
+			if ($show_errors) {
 				ob_start();
-				var_dump( $registration->attendee() );
+				var_dump($registration->attendee());
 				EE_Error::add_error(
 					sprintf(
 						'%1$s||%1$s $attendee = %2$s',
-						__( 'Either no Attendee information was found, or an invalid Attendee object was discovered when attempting to save your registration information.', 'event_espresso' ),
+						__('Either no Attendee information was found, or an invalid Attendee object was discovered when attempting to save your registration information.', 'event_espresso'),
 						ob_get_clean()
 					),
 					__FILE__, __FUNCTION__, __LINE__
@@ -911,25 +911,25 @@ 
 	 * @param bool $show_errors
 	 * @return void
 	 */
-	private function _save_registration_answers( $registration, $show_errors = TRUE ) {
+	private function _save_registration_answers($registration, $show_errors = TRUE) {
 		// now save the answers
-		foreach ( $registration->answers() as $cache_key => $answer ) {
+		foreach ($registration->answers() as $cache_key => $answer) {
 			// verify object
-			if ( $answer instanceof EE_Answer ) {
-				$answer->set_registration( $registration->ID() );
+			if ($answer instanceof EE_Answer) {
+				$answer->set_registration($registration->ID());
 				$answer->save();
-				if ( ! $registration->update_cache_after_object_save( 'Answer', $answer, $cache_key )) {
-					if ( $show_errors ) {
+				if ( ! $registration->update_cache_after_object_save('Answer', $answer, $cache_key)) {
+					if ($show_errors) {
 						EE_Error::add_error(
-							__( 'The newly saved Answer object could not be cached on the registration.', 'event_espresso' ),
+							__('The newly saved Answer object could not be cached on the registration.', 'event_espresso'),
 							__FILE__, __FUNCTION__, __LINE__
 						);
 					}
 				}
 			} else {
-				if ( $show_errors ) {
+				if ($show_errors) {
 					EE_Error::add_error(
-						__( 'An invalid Answer object was discovered when attempting to save your registration information.', 'event_espresso' ),
+						__('An invalid Answer object was discovered when attempting to save your registration information.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
@@ -947,7 +947,7 @@ 
 	 * @param bool $from_db
 	 * @return bool
 	 */
-	public function refresh_all_entities( $from_db = false ) {
+	public function refresh_all_entities($from_db = false) {
 		$from_db = $this->current_step->is_final_step() || $this->action == 'process_gateway_response' ? true : $from_db;
 		//$this->log(
 		//	__CLASS__, __FUNCTION__, __LINE__,
@@ -968,11 +968,11 @@ 
 	 */
 	protected function refresh_from_db() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
+		if ($this->transaction instanceof EE_Transaction && $this->transaction->ID()) {
 			// pull fresh TXN data from the db
-			$this->transaction = $this->transaction->get_model()->refresh_entity_map_from_db( $this->transaction->ID() );
+			$this->transaction = $this->transaction->get_model()->refresh_entity_map_from_db($this->transaction->ID());
 			// update EE_Checkout's cached primary_attendee object
-			$this->primary_attendee_obj = $this->_refresh_primary_attendee_obj_from_db( $this->transaction );
+			$this->primary_attendee_obj = $this->_refresh_primary_attendee_obj_from_db($this->transaction);
 			// update EE_Checkout's cached payment object
 			$payment = $this->transaction->last_payment();
 			$this->payment = $payment instanceof EE_Payment ? $payment : $this->payment;
@@ -980,15 +980,15 @@ 
 			$payment_method = $this->payment instanceof EE_Payment ? $this->payment->payment_method() : null;
 			$this->payment_method = $payment_method instanceof EE_Payment_Method ? $payment_method : $this->payment_method;
 			//now refresh the cart, based on the TXN
-			$this->cart = EE_Cart::get_cart_from_txn( $this->transaction );
+			$this->cart = EE_Cart::get_cart_from_txn($this->transaction);
 			// verify and update the cart because inaccurate totals are not so much fun
-			if ( $this->cart instanceof EE_Cart ) {
+			if ($this->cart instanceof EE_Cart) {
 				$this->cart->get_grand_total()->recalculate_total_including_taxes();
 			} else {
-				$this->cart = EE_Registry::instance()->load_core( 'Cart' );
+				$this->cart = EE_Registry::instance()->load_core('Cart');
 			}
 		} else {
-			EE_Error::add_error( __( 'A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		return TRUE;
@@ -1002,24 +1002,24 @@ 
 	 * @param   EE_Transaction $transaction
 	 * @return  EE_Attendee | null
 	 */
-	protected function _refresh_primary_attendee_obj_from_db( EE_Transaction $transaction ) {
+	protected function _refresh_primary_attendee_obj_from_db(EE_Transaction $transaction) {
 
 		$primary_attendee_obj = null;
 		// grab the saved registrations from the transaction
-		foreach ( $transaction->registrations( $this->reg_cache_where_params, true ) as $registration ) {
+		foreach ($transaction->registrations($this->reg_cache_where_params, true) as $registration) {
 			// verify object
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				$attendee = $registration->attendee();
 				// verify object
-				if ( $attendee instanceof EE_Attendee  ) {
+				if ($attendee instanceof EE_Attendee) {
 					// maybe cache primary_attendee_obj ?
-					if ( $registration->is_primary_registrant() ) {
+					if ($registration->is_primary_registrant()) {
 						$primary_attendee_obj = $attendee;
 					}
 				}
 			} else {
 				EE_Error::add_error(
-						__( 'An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+						__('An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -1039,43 +1039,43 @@ 
 	 */
 	protected function refresh_entity_map() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
+		if ($this->transaction instanceof EE_Transaction && $this->transaction->ID()) {
 			// never cache payment info
-			$this->transaction->clear_cache( 'Payment' );
+			$this->transaction->clear_cache('Payment');
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// is the Payment Options Reg Step completed ?
-			if ( $transaction_processor->reg_step_completed( $this->transaction, 'payment_options' ) ) {
+			if ($transaction_processor->reg_step_completed($this->transaction, 'payment_options')) {
 				// then check for payments and update TXN accordingly
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
-				$transaction_payments->calculate_total_payments_and_update_status( $this->transaction );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
+				$transaction_payments->calculate_total_payments_and_update_status($this->transaction);
 			}
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as $reg_cache_ID => $registration ) {
-				$this->_refresh_registration( $reg_cache_ID, $registration );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as $reg_cache_ID => $registration) {
+				$this->_refresh_registration($reg_cache_ID, $registration);
 			}
 			// make sure our cached TXN is added to the model entity mapper
-			$this->transaction = $this->transaction->get_model()->refresh_entity_map_with( $this->transaction->ID(), $this->transaction );
+			$this->transaction = $this->transaction->get_model()->refresh_entity_map_with($this->transaction->ID(), $this->transaction);
 
 		} else {
-			EE_Error::add_error( __( 'A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// verify and update the cart because inaccurate totals are not so much fun
-		if ( $this->cart instanceof EE_Cart ) {
+		if ($this->cart instanceof EE_Cart) {
 			$grand_total = $this->cart->get_grand_total();
-			if ( $grand_total instanceof EE_Line_Item && $grand_total->ID() ) {
+			if ($grand_total instanceof EE_Line_Item && $grand_total->ID()) {
 				$grand_total->recalculate_total_including_taxes();
 				$grand_total = $grand_total->get_model()->refresh_entity_map_with(
 					$this->cart->get_grand_total()->ID(),
 					$this->cart->get_grand_total()
 				);
 			}
-			if ( $grand_total instanceof EE_Line_Item ) {
-				$this->cart = EE_Cart::instance( $grand_total );
+			if ($grand_total instanceof EE_Line_Item) {
+				$this->cart = EE_Cart::instance($grand_total);
 			} else {
-				EE_Error::add_error( __( 'A valid Cart was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('A valid Cart was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
@@ -1091,19 +1091,19 @@ 
 	 * @param 	EE_Registration 	$registration
 	 * @return void
 	 */
-	protected function _refresh_registration( $reg_cache_ID, $registration ) {
+	protected function _refresh_registration($reg_cache_ID, $registration) {
 
 		// verify object
-		if ( $registration instanceof EE_Registration ) {
+		if ($registration instanceof EE_Registration) {
 			// update the entity mapper attendee
-			$this->_refresh_registration_attendee( $registration );
+			$this->_refresh_registration_attendee($registration);
 			// update the entity mapper answers for reg form questions
-			$this->_refresh_registration_answers( $registration );
+			$this->_refresh_registration_answers($registration);
 			// make sure the cached registration is added to the model entity mapper
-			$registration->get_model()->refresh_entity_map_with( $reg_cache_ID, $registration );
+			$registration->get_model()->refresh_entity_map_with($reg_cache_ID, $registration);
 		} else {
 			EE_Error::add_error(
-				__( 'An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+				__('An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -1117,15 +1117,15 @@ 
 	 * @param 	EE_Registration 	$registration
 	 * @return void
 	 */
-	protected function _refresh_registration_attendee( $registration ) {
+	protected function _refresh_registration_attendee($registration) {
 
 		$attendee = $registration->attendee();
 		// verify object
-		if ( $attendee instanceof EE_Attendee && $attendee->ID() ) {
+		if ($attendee instanceof EE_Attendee && $attendee->ID()) {
 			// make sure the cached attendee is added to the model entity mapper
-			$registration->attendee()->get_model()->refresh_entity_map_with( $attendee->ID(), $attendee );
+			$registration->attendee()->get_model()->refresh_entity_map_with($attendee->ID(), $attendee);
 			// maybe cache primary_attendee_obj ?
-			if ( $registration->is_primary_registrant() ) {
+			if ($registration->is_primary_registrant()) {
 				$this->primary_attendee_obj = $attendee;
 			}
 		}
@@ -1139,19 +1139,19 @@ 
 	 * @param 	EE_Registration 	$registration
 	 * @return void
 	 */
-	protected function _refresh_registration_answers( $registration ) {
+	protected function _refresh_registration_answers($registration) {
 
 		// now update the answers
-		foreach ( $registration->answers() as $cache_key => $answer ) {
+		foreach ($registration->answers() as $cache_key => $answer) {
 			// verify object
-			if ( $answer instanceof EE_Answer ) {
-				if ( $answer->ID() ) {
+			if ($answer instanceof EE_Answer) {
+				if ($answer->ID()) {
 					// make sure the cached answer is added to the model entity mapper
-					$answer->get_model()->refresh_entity_map_with( $answer->ID(), $answer );
+					$answer->get_model()->refresh_entity_map_with($answer->ID(), $answer);
 				}
 			} else {
 				EE_Error::add_error(
-					__( 'An invalid Answer object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+					__('An invalid Answer object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -1166,7 +1166,7 @@ 
 	 * this will reinstate the EE_Checkout object on each EE_SPCO_Reg_Step object
 	 */
 	function __wakeup() {
-		foreach ( $this->reg_steps as $reg_step ) {
+		foreach ($this->reg_steps as $reg_step) {
 			$reg_step->checkout = $this;
 		}
 	}
@@ -1182,11 +1182,11 @@ 
 	 * @param array $info
 	 * @param bool $display_request
 	 */
-	function log( $class = '', $func = '', $line = '', $info = array(), $display_request = false ) {
-		if ( WP_DEBUG && false ) {
-			$debug_data = get_option( 'EE_DEBUG_SPCO_' . EE_Session::instance()->id(), array() );
+	function log($class = '', $func = '', $line = '', $info = array(), $display_request = false) {
+		if (WP_DEBUG && false) {
+			$debug_data = get_option('EE_DEBUG_SPCO_'.EE_Session::instance()->id(), array());
 			$default_data = array(
-				$class 		=> $func . '() : ' . $line,
+				$class 		=> $func.'() : '.$line,
 				'request->step' 		=> $this->step,
 				'request->action' 	=> $this->action,
 				'current_step->slug' => $this->current_step instanceof EE_SPCO_Reg_Step ?
@@ -1198,24 +1198,24 @@ 
 				'reg_url_link' => $this->reg_url_link,
 				'REQ' => $display_request ? $_REQUEST : '',
 			);
-			if ( $this->transaction instanceof EE_Transaction ) {
-				$default_data[ 'TXN_status' ] 		= $this->transaction->status_ID();
-				$default_data[ 'TXN_reg_steps' ] 	= $this->transaction->reg_steps();
-				foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as $REG_ID => $registration ) {
-					$default_data[ 'registrations' ][ $REG_ID ] = $registration->status_ID();
+			if ($this->transaction instanceof EE_Transaction) {
+				$default_data['TXN_status'] = $this->transaction->status_ID();
+				$default_data['TXN_reg_steps'] = $this->transaction->reg_steps();
+				foreach ($this->transaction->registrations($this->reg_cache_where_params) as $REG_ID => $registration) {
+					$default_data['registrations'][$REG_ID] = $registration->status_ID();
 				}
-				if ( $this->transaction->ID() ) {
-					$TXN_ID = 'EE_Transaction: ' . $this->transaction->ID();
+				if ($this->transaction->ID()) {
+					$TXN_ID = 'EE_Transaction: '.$this->transaction->ID();
 					// don't serialize objects
-					$info = $this->_strip_objects( $info );
-					if ( ! isset( $debug_data[ $TXN_ID ] ) ) {
-						$debug_data[ $TXN_ID ] = array();
+					$info = $this->_strip_objects($info);
+					if ( ! isset($debug_data[$TXN_ID])) {
+						$debug_data[$TXN_ID] = array();
 					}
-					$debug_data[ $TXN_ID ][ microtime() ] = array_merge(
+					$debug_data[$TXN_ID][microtime()] = array_merge(
 						$default_data,
 						$info
 					);
-					update_option( 'EE_DEBUG_SPCO_' . EE_Session::instance()->id(), $debug_data );
+					update_option('EE_DEBUG_SPCO_'.EE_Session::instance()->id(), $debug_data);
 				}
 			}
 		}
@@ -1228,23 +1228,23 @@ 
 	 * @param array $info
 	 * @return array
 	 */
-	function _strip_objects( $info = array() ) {
-		foreach ( $info as $key => $value ) {
-			if ( is_array( $value )) {
-				$info[ $key ] = $this->_strip_objects( $value );
-			} else if ( is_object( $value ) ) {
-				$object_class = get_class( $value );
-				$info[ $object_class ] = array();
-				$info[ $object_class ][ 'ID' ] = method_exists( $value, 'ID' ) ? $value->ID() : 0;
-				if ( method_exists( $value, 'status' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status();
-				} else if ( method_exists( $value, 'status_ID' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status_ID();
+	function _strip_objects($info = array()) {
+		foreach ($info as $key => $value) {
+			if (is_array($value)) {
+				$info[$key] = $this->_strip_objects($value);
+			} else if (is_object($value)) {
+				$object_class = get_class($value);
+				$info[$object_class] = array();
+				$info[$object_class]['ID'] = method_exists($value, 'ID') ? $value->ID() : 0;
+				if (method_exists($value, 'status')) {
+					$info[$object_class]['status'] = $value->status();
+				} else if (method_exists($value, 'status_ID')) {
+					$info[$object_class]['status'] = $value->status_ID();
 				}
-				unset( $info[ $key ] );
+				unset($info[$key]);
 			}
 		}
-		return (array)$info;
+		return (array) $info;
 	}
 
 

caffeinated/admin/new/pricing/espresso_events_Pricing_Hooks.class.php

Spacing +381 added lines, -381 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -54,23 +54,23 @@ 
 		$this->_name = 'pricing';
 
 		//capability check
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_default_prices', 'advanced_ticket_datetime_metabox' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_default_prices', 'advanced_ticket_datetime_metabox')) {
 			return;
 		}
 
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
+		EE_Registry::instance()->load_helper('DTT_Helper');
 
 		//if we were going to add our own metaboxes we'd use the below.
 		$this->_metaboxes = array(
 			0 => array(
-				'page_route' => array('edit','create_new'),
+				'page_route' => array('edit', 'create_new'),
 				'func' => 'pricing_metabox',
 				'label' => __('Event Tickets & Datetimes', 'event_espresso'),
 				'priority' => 'high',
 				'context' => 'normal'
 				),
 
-			);/**/
+			); /**/
 
 		$this->_remove_metaboxes = array(
 			0 => array(
@@ -89,24 +89,24 @@ 
 		 *
 		 * @var array  Expected an array returned with 'date' and 'time' keys.
 		 */
-		$this->_date_format_strings = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___set_hooks_properties__date_format_strings', array(
+		$this->_date_format_strings = apply_filters('FHEE__espresso_events_Pricing_Hooks___set_hooks_properties__date_format_strings', array(
 				'date' => 'Y-m-d',
 				'time' => 'h:i a'
 			));
 
 		//validate
-		$this->_date_format_strings['date'] = isset( $this->_date_format_strings['date'] ) ? $this->_date_format_strings['date'] : null;
-		$this->_date_format_strings['time'] = isset( $this->_date_format_strings['time'] ) ? $this->_date_format_strings['time'] : null;
+		$this->_date_format_strings['date'] = isset($this->_date_format_strings['date']) ? $this->_date_format_strings['date'] : null;
+		$this->_date_format_strings['time'] = isset($this->_date_format_strings['time']) ? $this->_date_format_strings['time'] : null;
 
 		//validate format strings
-		$format_validation = EEH_DTT_Helper::validate_format_string( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
-		if ( is_array( $format_validation ) ) {
-			$msg = '<p>' . sprintf( __( 'The format "%s" was likely added via a filter and is invalid for the following reasons:', 'event_espresso' ), $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ) . '</p><ul>';
-			foreach ( $format_validation as $error ) {
-				$msg .= '<li>' . $error . '</li>';
+		$format_validation = EEH_DTT_Helper::validate_format_string($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
+		if (is_array($format_validation)) {
+			$msg = '<p>'.sprintf(__('The format "%s" was likely added via a filter and is invalid for the following reasons:', 'event_espresso'), $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']).'</p><ul>';
+			foreach ($format_validation as $error) {
+				$msg .= '<li>'.$error.'</li>';
 			}
-			$msg .= '</ul></p><p>' . sprintf( __( '%sPlease note that your date and time formats have been reset to "Y-m-d" and "h:i a" respectively.%s', 'event_espresso' ), '<span style="color:#D54E21;">', '</span>' ) . '</p>';
-			EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg .= '</ul></p><p>'.sprintf(__('%sPlease note that your date and time formats have been reset to "Y-m-d" and "h:i a" respectively.%s', 'event_espresso'), '<span style="color:#D54E21;">', '</span>').'</p>';
+			EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 			$this->_date_format_strings = array(
 				'date' => 'Y-m-d',
 				'time' => 'h:i a'
@@ -117,60 +117,60 @@ 
 		$this->_scripts_styles = array(
 			'registers' => array(
 				'ee-tickets-datetimes-css' => array(
-					'url' => PRICING_ASSETS_URL . 'event-tickets-datetimes.css',
+					'url' => PRICING_ASSETS_URL.'event-tickets-datetimes.css',
 					'type' => 'css'
 					),
 				'ee-dtt-ticket-metabox' => array(
-					'url' => PRICING_ASSETS_URL . 'ee-datetime-ticket-metabox.js',
+					'url' => PRICING_ASSETS_URL.'ee-datetime-ticket-metabox.js',
 					'depends' => array('ee-datepicker', 'ee-dialog', 'underscore')
 					)
 				),
 			'deregisters' => array(
-				'event-editor-css' => array('type' => 'css' ),
+				'event-editor-css' => array('type' => 'css'),
 				'event-datetime-metabox' => array('type' => 'js')
 				),
 			'enqueues' => array(
-				'ee-tickets-datetimes-css' => array( 'edit', 'create_new' ),
-				'ee-dtt-ticket-metabox' => array( 'edit', 'create_new' )
+				'ee-tickets-datetimes-css' => array('edit', 'create_new'),
+				'ee-dtt-ticket-metabox' => array('edit', 'create_new')
 				),
 			'localize' => array(
 				'ee-dtt-ticket-metabox' => array(
 					'DTT_TRASH_BLOCK' => array(
 						'main_warning' => __('The Datetime you are attempting to trash is the only datetime selected for the following ticket(s):', 'event_espresso'),
 						'after_warning' => __('In order to trash this datetime you must first make sure the above ticket(s) are assigned to other datetimes.', 'event_espresso'),
-						'cancel_button' => '<button class="button-secondary ee-modal-cancel">' . __('Cancel', 'event_espresso') . '</button>',
+						'cancel_button' => '<button class="button-secondary ee-modal-cancel">'.__('Cancel', 'event_espresso').'</button>',
 						'single_warning_from_tkt' => __('The Datetime you are attempting to unassign from this ticket is the only remaining datetime for this ticket. Tickets must always have at least one datetime assigned to them.', 'event_espresso'),
 						'single_warning_from_dtt' => __('The ticket you are attempting to unassign from this datetime cannot be unassigned because the datetime is the only remaining datetime for the ticket.  Tickets must always have at least one datetime assigned to them.', 'event_espresso'),
-						'dismiss_button' => '<button class="button-secondary ee-modal-cancel">' . __('Dismiss', 'event_espresso') . '</button>'
+						'dismiss_button' => '<button class="button-secondary ee-modal-cancel">'.__('Dismiss', 'event_espresso').'</button>'
 						),
 					'DTT_ERROR_MSG' => array(
 						'no_ticket_name' => __('General Admission', 'event_espresso'),
-						'dismiss_button' => '<div class="save-cancel-button-container"><button class="button-secondary ee-modal-cancel">' . __('Dismiss', 'event_espresso') . '</button></div>'
+						'dismiss_button' => '<div class="save-cancel-button-container"><button class="button-secondary ee-modal-cancel">'.__('Dismiss', 'event_espresso').'</button></div>'
 						),
 					'DTT_OVERSELL_WARNING' => array(
 						'datetime_ticket' => __('You cannot add this ticket to this datetime because it has a sold amount that is greater than the amount of spots remaining for this datetime.', 'event_espresso'),
 						'ticket_datetime' => __('You cannot add this datetime to this ticket because the ticket has a sold amount that is greater than the amount of spots remaining on the datetime.', 'event_espresso')
 						),
-					'DTT_CONVERTED_FORMATS' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats( $this->_date_format_strings['date'], $this->_date_format_strings['time'] ),
-					'DTT_START_OF_WEEK' => array( 'dayValue' => (int) get_option( 'start_of_week' ) )
+					'DTT_CONVERTED_FORMATS' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats($this->_date_format_strings['date'], $this->_date_format_strings['time']),
+					'DTT_START_OF_WEEK' => array('dayValue' => (int) get_option('start_of_week'))
 					)
 				)
 			);
 
 
-		add_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_Extend_Events_Admin_Page', array( $this, 'autosave_handling' ), 10 );
-		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( $this, 'caf_updates' ), 10 );
+		add_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_Extend_Events_Admin_Page', array($this, 'autosave_handling'), 10);
+		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array($this, 'caf_updates'), 10);
 	}
 
 
 
-	public function caf_updates( $update_callbacks ) {
-		foreach ( $update_callbacks as $key => $callback ) {
-			if ( $callback[1] == '_default_tickets_update' )
-				unset( $update_callbacks[$key] );
+	public function caf_updates($update_callbacks) {
+		foreach ($update_callbacks as $key => $callback) {
+			if ($callback[1] == '_default_tickets_update')
+				unset($update_callbacks[$key]);
 		}
 
-		$update_callbacks[] = array( $this, 'dtt_and_tickets_caf_update' );
+		$update_callbacks[] = array($this, 'dtt_and_tickets_caf_update');
 		return $update_callbacks;
 	}
 
@@ -183,11 +183,11 @@ 
 	 * @param  array    $data   The request data from the form
 	 * @return bool             success or fail
 	 */
-	public function dtt_and_tickets_caf_update( $evtobj, $data ) {
+	public function dtt_and_tickets_caf_update($evtobj, $data) {
 		//first we need to start with datetimes cause they are the "root" items attached to events.
-		$saved_dtts = $this->_update_dtts( $evtobj, $data );
+		$saved_dtts = $this->_update_dtts($evtobj, $data);
 		//next tackle the tickets (and prices?)
-		$this->_update_tkts( $evtobj, $saved_dtts, $data );
+		$this->_update_tkts($evtobj, $saved_dtts, $data);
 	}
 
 
@@ -198,41 +198,41 @@ 
 	 * @param  array    	$data    the request data from the form
 	 * @return EE_Datetime[]
 	 */
-	protected function _update_dtts( $evt_obj, $data ) {
-		$timezone = isset( $data['timezone_string'] ) ? $data['timezone_string'] : NULL;
+	protected function _update_dtts($evt_obj, $data) {
+		$timezone = isset($data['timezone_string']) ? $data['timezone_string'] : NULL;
 		$saved_dtt_ids = array();
 		$saved_dtt_objs = array();
 
-		foreach ( $data['edit_event_datetimes'] as $row => $dtt ) {
+		foreach ($data['edit_event_datetimes'] as $row => $dtt) {
 			//trim all values to ensure any excess whitespace is removed.
 			$dtt = array_map(
-				function( $datetime_data ) {
-					return is_array( $datetime_data ) ? $datetime_data : trim( $datetime_data );
+				function($datetime_data) {
+					return is_array($datetime_data) ? $datetime_data : trim($datetime_data);
 				},
 				$dtt
 			);
-			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty( $dtt['DTT_EVT_end'] ) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
+			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty($dtt['DTT_EVT_end']) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
 			$datetime_values = array(
-				'DTT_ID' 			=> ! empty( $dtt['DTT_ID'] ) ? $dtt['DTT_ID'] : NULL,
-				'DTT_name' 			=> ! empty( $dtt['DTT_name'] ) ? $dtt['DTT_name'] : '',
-				'DTT_description' 	=> ! empty( $dtt['DTT_description'] ) ? $dtt['DTT_description'] : '',
+				'DTT_ID' 			=> ! empty($dtt['DTT_ID']) ? $dtt['DTT_ID'] : NULL,
+				'DTT_name' 			=> ! empty($dtt['DTT_name']) ? $dtt['DTT_name'] : '',
+				'DTT_description' 	=> ! empty($dtt['DTT_description']) ? $dtt['DTT_description'] : '',
 				'DTT_EVT_start' 	=> $dtt['DTT_EVT_start'],
 				'DTT_EVT_end' 		=> $dtt['DTT_EVT_end'],
-				'DTT_reg_limit' 	=> empty( $dtt['DTT_reg_limit'] ) ? EE_INF : $dtt[ 'DTT_reg_limit' ],
-				'DTT_order' 		=> ! isset( $dtt['DTT_order'] ) ? $row : $dtt['DTT_order'],
+				'DTT_reg_limit' 	=> empty($dtt['DTT_reg_limit']) ? EE_INF : $dtt['DTT_reg_limit'],
+				'DTT_order' 		=> ! isset($dtt['DTT_order']) ? $row : $dtt['DTT_order'],
 			);
 
 			//if we have an id then let's get existing object first and then set the new values.  Otherwise we instantiate a new object for save.
 
-			if ( !empty( $dtt['DTT_ID'] ) ) {
-				$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone) )->get_one_by_ID($dtt['DTT_ID'] );
+			if ( ! empty($dtt['DTT_ID'])) {
+				$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone))->get_one_by_ID($dtt['DTT_ID']);
 
 				//set date and time format according to what is set in this class.
-				$DTM->set_date_format( $this->_date_format_strings['date'] );
-				$DTM->set_time_format( $this->_date_format_strings['time'] );
+				$DTM->set_date_format($this->_date_format_strings['date']);
+				$DTM->set_time_format($this->_date_format_strings['time']);
 
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 
 				// make sure the $dtt_id here is saved just in case after the add_relation_to() the autosave replaces it.
@@ -240,24 +240,24 @@ 
 				$saved_dtt_ids[$DTM->ID()] = $DTM->ID();
 
 			} else {
-				$DTM = EE_Registry::instance()->load_class('Datetime', array( $datetime_values, $timezone ), FALSE, FALSE );
+				$DTM = EE_Registry::instance()->load_class('Datetime', array($datetime_values, $timezone), FALSE, FALSE);
 
 				//reset date and times to match the format
-				$DTM->set_date_format( $this->_date_format_strings['date'] );
-				$DTM->set_time_format( $this->_date_format_strings['time'] );
-				foreach( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				$DTM->set_date_format($this->_date_format_strings['date']);
+				$DTM->set_time_format($this->_date_format_strings['time']);
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 			}
 
 
 			$DTM->save();
-			$DTM = $evt_obj->_add_relation_to( $DTM, 'Datetime' );
+			$DTM = $evt_obj->_add_relation_to($DTM, 'Datetime');
 			$evt_obj->save();
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $DTM->get_raw('DTT_EVT_start') > $DTM->get_raw('DTT_EVT_end') ) {
-				$DTM->set('DTT_EVT_end', $DTM->get('DTT_EVT_start') );
+			if ($DTM->get_raw('DTT_EVT_start') > $DTM->get_raw('DTT_EVT_end')) {
+				$DTM->set('DTT_EVT_end', $DTM->get('DTT_EVT_start'));
 				EE_Registry::instance()->load_helper('DTT_Helper');
 				$DTM = EEH_DTT_Helper::date_time_add($DTM, 'DTT_EVT_end', 'days');
 				$DTM->save();
@@ -273,25 +273,25 @@ 
 		}
 
 		//now we need to REMOVE any dtts that got deleted.  Keep in mind that this process will only kick in for DTT's that don't have any DTT_sold on them. So its safe to permanently delete at this point.
-		$old_datetimes = explode(',', $data['datetime_IDs'] );
+		$old_datetimes = explode(',', $data['datetime_IDs']);
 		$old_datetimes = $old_datetimes[0] == '' ? array() : $old_datetimes;
 
-		if ( is_array( $old_datetimes ) ) {
-			$dtts_to_delete = array_diff( $old_datetimes, $saved_dtt_ids );
-			foreach ( $dtts_to_delete as $id ) {
-				$id = absint( $id );
-				if ( empty( $id ) )
+		if (is_array($old_datetimes)) {
+			$dtts_to_delete = array_diff($old_datetimes, $saved_dtt_ids);
+			foreach ($dtts_to_delete as $id) {
+				$id = absint($id);
+				if (empty($id))
 					continue;
 
 				$dtt_to_remove = EE_Registry::instance()->load_model('Datetime')->get_one_by_ID($id);
 
 				//remove tkt relationships.
 				$related_tickets = $dtt_to_remove->get_many_related('Ticket');
-				foreach ( $related_tickets as $tkt ) {
+				foreach ($related_tickets as $tkt) {
 					$dtt_to_remove->_remove_relation_to($tkt, 'Ticket');
 				}
 
-				$evt_obj->_remove_relation_to( $id, 'Datetime' );
+				$evt_obj->_remove_relation_to($id, 'Datetime');
 				$dtt_to_remove->refresh_cache_of_related_objects();
 
 			}
@@ -312,86 +312,86 @@ 
 	 * @param  array            $data       incoming request data
 	 * @return EE_Ticket[]
 	 */
-	protected function _update_tkts( $evtobj, $saved_dtts, $data ) {
+	protected function _update_tkts($evtobj, $saved_dtts, $data) {
 
 		$new_tkt = null;
 		$new_default = null;
 		//stripslashes because WP filtered the $_POST ($data) array to add slashes
 		$data = stripslashes_deep($data);
-		$timezone = isset( $data['timezone_string'] ) ? $data['timezone_string'] : NULL;
+		$timezone = isset($data['timezone_string']) ? $data['timezone_string'] : NULL;
 		$saved_tickets = $dtts_on_existing = array();
-		$old_tickets = isset( $data['ticket_IDs'] ) ? explode(',', $data['ticket_IDs'] ) : array();
+		$old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
 
 		//load money helper
-		EE_Registry::instance()->load_helper( 'Money' );
+		EE_Registry::instance()->load_helper('Money');
 
-		foreach ( $data['edit_tickets'] as $row => $tkt ) {
+		foreach ($data['edit_tickets'] as $row => $tkt) {
 
 			$update_prices = $create_new_TKT = FALSE;
 
 			//figure out what dtts were added to the ticket and what dtts were removed from the ticket in the session.
 
-			$starting_tkt_dtt_rows = explode(',',$data['starting_ticket_datetime_rows'][$row]);
-			$tkt_dtt_rows = explode(',', $data['ticket_datetime_rows'][$row] );
+			$starting_tkt_dtt_rows = explode(',', $data['starting_ticket_datetime_rows'][$row]);
+			$tkt_dtt_rows = explode(',', $data['ticket_datetime_rows'][$row]);
 			$dtts_added = array_diff($tkt_dtt_rows, $starting_tkt_dtt_rows);
 			$dtts_removed = array_diff($starting_tkt_dtt_rows, $tkt_dtt_rows);
 
 			// trim inputs to ensure any excess whitespace is removed.
 			$tkt = array_map(
-				function( $ticket_data ) {
-					return is_array( $ticket_data ) ? $ticket_data : trim( $ticket_data );
+				function($ticket_data) {
+					return is_array($ticket_data) ? $ticket_data : trim($ticket_data);
 				},
 				$tkt
 			);
 
 			//note we are doing conversions to floats here instead of allowing EE_Money_Field to handle because we're doing calcs prior to using the models.
 			//note incoming ['TKT_price'] value is already in standard notation (via js).
-			$ticket_price = isset( $tkt['TKT_price'] ) ?  round ( (float) $tkt['TKT_price'], 3 ) : 0;
+			$ticket_price = isset($tkt['TKT_price']) ?  round ((float) $tkt['TKT_price'], 3) : 0;
 
 			//note incoming base price needs converted from localized value.
-			$base_price = isset( $tkt['TKT_base_price'] ) ? EEH_Money::convert_to_float_from_localized_money( $tkt['TKT_base_price'] ) : 0;
+			$base_price = isset($tkt['TKT_base_price']) ? EEH_Money::convert_to_float_from_localized_money($tkt['TKT_base_price']) : 0;
 			//if ticket price == 0 and $base_price != 0 then ticket price == base_price
 			$ticket_price = $ticket_price === 0 && $base_price !== 0 ? $base_price : $ticket_price;
-			$base_price_id = isset( $tkt['TKT_base_price_ID'] ) ? $tkt['TKT_base_price_ID'] : 0;
+			$base_price_id = isset($tkt['TKT_base_price_ID']) ? $tkt['TKT_base_price_ID'] : 0;
 
 			$price_rows = is_array($data['edit_prices']) && isset($data['edit_prices'][$row]) ? $data['edit_prices'][$row] : array();
 
 			$now = null;
-			if ( empty( $tkt['TKT_start_date'] ) ) {
+			if (empty($tkt['TKT_start_date'])) {
 				//lets' use now in the set timezone.
-				$now = new DateTime( 'now', new DateTimeZone( $evtobj->get_timezone() ) );
-				$tkt['TKT_start_date'] = $now->format( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
+				$now = new DateTime('now', new DateTimeZone($evtobj->get_timezone()));
+				$tkt['TKT_start_date'] = $now->format($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
 			}
 
-			if ( empty( $tkt['TKT_end_date'] ) ) {
+			if (empty($tkt['TKT_end_date'])) {
 				/**
 				 * set the TKT_end_date to the first datetime attached to the ticket.
 				 */
-				$first_dtt = $saved_dtts[reset( $tkt_dtt_rows )];
-				$tkt['TKT_end_date'] = $first_dtt->start_date_and_time( $this->_date_format_strings['date'] . ' ' . $this->_date_format_string['time'] );
+				$first_dtt = $saved_dtts[reset($tkt_dtt_rows)];
+				$tkt['TKT_end_date'] = $first_dtt->start_date_and_time($this->_date_format_strings['date'].' '.$this->_date_format_string['time']);
 			}
 
 			$TKT_values = array(
-				'TKT_ID' 			=> ! empty( $tkt['TKT_ID'] ) ? $tkt['TKT_ID'] : NULL,
-				'TTM_ID' 			=> ! empty( $tkt['TTM_ID'] ) ? $tkt['TTM_ID'] : 0,
-				'TKT_name' 			=> ! empty( $tkt['TKT_name'] ) ? $tkt['TKT_name'] : '',
-				'TKT_description' 	=> ! empty( $tkt['TKT_description'] ) && $tkt['TKT_description'] != __('You can modify this description', 'event_espresso') ? $tkt['TKT_description'] : '',
+				'TKT_ID' 			=> ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : NULL,
+				'TTM_ID' 			=> ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0,
+				'TKT_name' 			=> ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '',
+				'TKT_description' 	=> ! empty($tkt['TKT_description']) && $tkt['TKT_description'] != __('You can modify this description', 'event_espresso') ? $tkt['TKT_description'] : '',
 				'TKT_start_date' 	=> $tkt['TKT_start_date'],
 				'TKT_end_date' 		=> $tkt['TKT_end_date'],
-				'TKT_qty' 			=> ! isset( $tkt[ 'TKT_qty' ] ) || $tkt[ 'TKT_qty' ] === '' ? EE_INF : $tkt[ 'TKT_qty' ],
-				'TKT_uses' 			=> ! isset( $tkt[ 'TKT_uses' ] ) || $tkt[ 'TKT_uses' ] === '' ? EE_INF : $tkt['TKT_uses'],
-				'TKT_min' 			=> empty( $tkt['TKT_min'] ) ? 0 : $tkt['TKT_min'],
-				'TKT_max' 			=> empty( $tkt['TKT_max'] ) ? EE_INF : $tkt['TKT_max'],
+				'TKT_qty' 			=> ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
+				'TKT_uses' 			=> ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
+				'TKT_min' 			=> empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'],
+				'TKT_max' 			=> empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'],
 				'TKT_row' 			=> $row,
-				'TKT_order' 		=> isset( $tkt['TKT_order'] ) ? $tkt['TKT_order'] : 0,
-				'TKT_taxable' 		=> ! empty( $tkt['TKT_taxable'] ) ? 1 : 0,
-				'TKT_required' 		=> ! empty( $tkt['TKT_required'] ) ? 1 : 0,
+				'TKT_order' 		=> isset($tkt['TKT_order']) ? $tkt['TKT_order'] : 0,
+				'TKT_taxable' 		=> ! empty($tkt['TKT_taxable']) ? 1 : 0,
+				'TKT_required' 		=> ! empty($tkt['TKT_required']) ? 1 : 0,
 				'TKT_price' 		=> $ticket_price
 			);
 
 
 			//if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly, which means in turn that the prices will become new prices as well.
-			if ( isset( $tkt['TKT_is_default'] ) && $tkt['TKT_is_default'] ) {
+			if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) {
 				$TKT_values['TKT_ID'] = 0;
 				$TKT_values['TKT_is_default'] = 0;
 				$update_prices = TRUE;
@@ -403,21 +403,21 @@ 
 			// but DID have it's items modified.
 			// keep in mind that if the TKT has been sold (and we have changed pricing information),
 			// then we won't be updating the tkt but instead a new tkt will be created and the old one archived.
-			if ( absint( $TKT_values['TKT_ID'] ) ) {
-				$TKT = EE_Registry::instance()->load_model( 'Ticket', array( $timezone ) )->get_one_by_ID( $tkt['TKT_ID'] );
-				if ( $TKT instanceof EE_Ticket ) {
+			if (absint($TKT_values['TKT_ID'])) {
+				$TKT = EE_Registry::instance()->load_model('Ticket', array($timezone))->get_one_by_ID($tkt['TKT_ID']);
+				if ($TKT instanceof EE_Ticket) {
 
-					$TKT = $this->_update_ticket_datetimes( $TKT, $saved_dtts, $dtts_added, $dtts_removed );
+					$TKT = $this->_update_ticket_datetimes($TKT, $saved_dtts, $dtts_added, $dtts_removed);
 					// are there any registrations using this ticket ?
 					$tickets_sold = $TKT->count_related(
 						'Registration',
-						array( array(
-								'STS_ID' => array( 'NOT IN', array( EEM_Registration::status_id_incomplete ) )
-						) )
+						array(array(
+								'STS_ID' => array('NOT IN', array(EEM_Registration::status_id_incomplete))
+						))
 					);
 					//set ticket formats
-					$TKT->set_date_format( $this->_date_format_strings['date'] );
-					$TKT->set_time_format( $this->_date_format_strings['time'] );
+					$TKT->set_date_format($this->_date_format_strings['date']);
+					$TKT->set_time_format($this->_date_format_strings['time']);
 
 					// let's just check the total price for the existing ticket
 					// and determine if it matches the new total price.
@@ -427,17 +427,17 @@ 
 							? TRUE : FALSE;
 
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field === 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field === 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 
 					//if $create_new_TKT is false then we can safely update the existing ticket.  Otherwise we have to create a new ticket.
-					if ( $create_new_TKT ) {
-						$new_tkt = $this->_duplicate_ticket( $TKT, $price_rows, $ticket_price, $base_price, $base_price_id );
+					if ($create_new_TKT) {
+						$new_tkt = $this->_duplicate_ticket($TKT, $price_rows, $ticket_price, $base_price, $base_price_id);
 					}
 				}
 
@@ -446,12 +446,12 @@ 
 				$TKT = EE_Ticket::new_instance(
 					$TKT_values,
 					$timezone,
-					array( $this->_date_format_strings[ 'date' ], $this->_date_format_strings[ 'time' ]  )
+					array($this->_date_format_strings['date'], $this->_date_format_strings['time'])
 				);
-				if ( $TKT instanceof EE_Ticket ) {
+				if ($TKT instanceof EE_Ticket) {
 					// make sure ticket has an ID of setting relations won't work
 					$TKT->save();
-					$TKT = $this->_update_ticket_datetimes( $TKT, $saved_dtts, $dtts_added, $dtts_removed );
+					$TKT = $this->_update_ticket_datetimes($TKT, $saved_dtts, $dtts_added, $dtts_removed);
 					$update_prices = TRUE;
 				}
 			}
@@ -459,38 +459,38 @@ 
 			//$TKT->save();
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date') ) {
-				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date') );
+			if ($TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date')) {
+				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date'));
 				EE_Registry::instance()->load_helper('DTT_Helper');
 				$TKT = EEH_DTT_Helper::date_time_add($TKT, 'TKT_end_date', 'days');
 			}
 
 			//let's make sure the base price is handled
-			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket( array(), $TKT, $update_prices, $base_price, $base_price_id ) : $TKT;
+			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket(array(), $TKT, $update_prices, $base_price, $base_price_id) : $TKT;
 
 			//add/update price_modifiers
-			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket( $price_rows, $TKT, $update_prices ) : $TKT;
+			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket($price_rows, $TKT, $update_prices) : $TKT;
 
 			//need to make sue that the TKT_price is accurate after saving the prices.
 			$TKT->ensure_TKT_Price_correct();
 
 			//handle CREATING a default tkt from the incoming tkt but ONLY if this isn't an autosave.
-			if ( ! defined('DOING_AUTOSAVE' ) ) {
-				if ( !empty($tkt['TKT_is_default_selector'] ) ) {
+			if ( ! defined('DOING_AUTOSAVE')) {
+				if ( ! empty($tkt['TKT_is_default_selector'])) {
 					$update_prices = TRUE;
 					$new_default = clone $TKT;
-					$new_default->set( 'TKT_ID', 0 );
-					$new_default->set( 'TKT_is_default', 1 );
-					$new_default->set( 'TKT_row', 1 );
-					$new_default->set( 'TKT_price', $ticket_price );
+					$new_default->set('TKT_ID', 0);
+					$new_default->set('TKT_is_default', 1);
+					$new_default->set('TKT_row', 1);
+					$new_default->set('TKT_price', $ticket_price);
 					//remove any dtt relations cause we DON'T want dtt relations attached (note this is just removing the cached relations in the object)
 					$new_default->_remove_relations('Datetime');
 					//todo we need to add the current attached prices as new prices to the new default ticket.
-					$new_default = $this->_add_prices_to_ticket( $price_rows, $new_default, $update_prices );
+					$new_default = $this->_add_prices_to_ticket($price_rows, $new_default, $update_prices);
 					//don't forget the base price!
-					$new_default = $this->_add_prices_to_ticket( array(), $new_default, $update_prices, $base_price, $base_price_id );
+					$new_default = $this->_add_prices_to_ticket(array(), $new_default, $update_prices, $base_price, $base_price_id);
 					$new_default->save();
-					do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_default_ticket', $new_default, $row, $TKT, $data );
+					do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_new_default_ticket', $new_default, $row, $TKT, $data);
 				}
 			}
 
@@ -501,19 +501,19 @@ 
 			//let's assign any tickets that have been setup to the saved_tickets tracker
 			//save existing TKT
 			$TKT->save();
-			if ( $create_new_TKT && $new_tkt instanceof EE_Ticket ) {
+			if ($create_new_TKT && $new_tkt instanceof EE_Ticket) {
 				//save new TKT
 				$new_tkt->save();
 				//add new ticket to array
-				$saved_tickets[ $new_tkt->ID() ] = $new_tkt;
+				$saved_tickets[$new_tkt->ID()] = $new_tkt;
 
-				do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_ticket', $new_tkt, $row, $tkt, $data );
+				do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_new_ticket', $new_tkt, $row, $tkt, $data);
 
 			} else {
 				//add tkt to saved tkts
-				$saved_tickets[ $TKT->ID() ] = $TKT;
+				$saved_tickets[$TKT->ID()] = $TKT;
 
-				do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_update_ticket', $TKT, $row, $tkt, $data );
+				do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_update_ticket', $TKT, $row, $tkt, $data);
 			}
 
 		}
@@ -523,22 +523,22 @@ 
 		// (i.e. autosaves are happening and then in between autosaves the user trashes a ticket).
 		// Or a draft event was saved and in the process of editing a ticket is trashed.
 		// No sense in keeping all the related data in the db!
-		$old_tickets = isset( $old_tickets[0] ) && $old_tickets[0] == '' ? array() : $old_tickets;
-		$tickets_removed = array_diff( $old_tickets, array_keys($saved_tickets) );
+		$old_tickets = isset($old_tickets[0]) && $old_tickets[0] == '' ? array() : $old_tickets;
+		$tickets_removed = array_diff($old_tickets, array_keys($saved_tickets));
 
-		foreach ( $tickets_removed as $id ) {
-			$id = absint( $id );
+		foreach ($tickets_removed as $id) {
+			$id = absint($id);
 
 			//get the ticket for this id
 			$tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id);
 
 			//if this tkt is a default tkt we leave it alone cause it won't be attached to the datetime
-			if ( $tkt_to_remove->get('TKT_is_default') )
+			if ($tkt_to_remove->get('TKT_is_default'))
 				continue;
 
 			// if this tkt has any registrations attached so then we just ARCHIVE
 			// because we don't actually permanently delete these tickets.
-			if ( $tkt_to_remove->count_related('Registration') > 0 ) {
+			if ($tkt_to_remove->count_related('Registration') > 0) {
 				$tkt_to_remove->delete();
 				continue;
 			}
@@ -547,7 +547,7 @@ 
 			// (remember this process can ONLY kick off if there are NO tkts_sold)
 			$dtts = $tkt_to_remove->get_many_related('Datetime');
 
-			foreach( $dtts as $dtt ) {
+			foreach ($dtts as $dtt) {
 				$tkt_to_remove->_remove_relation_to($dtt, 'Datetime');
 			}
 
@@ -555,7 +555,7 @@ 
 			// tickets can only be trashed if they don't have any TKTs sold (otherwise they are just archived))
 			$tkt_to_remove->delete_related_permanently('Price');
 
-			do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_delete_ticket', $tkt_to_remove );
+			do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_delete_ticket', $tkt_to_remove);
 
 			// finally let's delete this ticket
 			// (which should not be blocked at this point b/c we've removed all our relationships)
@@ -587,39 +587,39 @@ 
 		// and removing the ticket from datetimes it got removed from.
 
 		// first let's add datetimes
-		if ( ! empty( $added_datetimes ) && is_array( $added_datetimes ) ) {
-			foreach ( $added_datetimes as $row_id ) {
-				$row_id = (int)$row_id;
-				if ( isset( $saved_datetimes[ $row_id ] ) && $saved_datetimes[ $row_id ] instanceof EE_Datetime ) {
-					$ticket->_add_relation_to( $saved_datetimes[ $row_id ], 'Datetime' );
+		if ( ! empty($added_datetimes) && is_array($added_datetimes)) {
+			foreach ($added_datetimes as $row_id) {
+				$row_id = (int) $row_id;
+				if (isset($saved_datetimes[$row_id]) && $saved_datetimes[$row_id] instanceof EE_Datetime) {
+					$ticket->_add_relation_to($saved_datetimes[$row_id], 'Datetime');
 					// Is this an existing ticket (has an ID) and does it have any sold?
 					// If so, then we need to add that to the DTT sold because this DTT is getting added.
-					if ( $ticket->ID() && $ticket->sold() > 0 ) {
-						$saved_datetimes[ $row_id ]->increase_sold( $ticket->sold() );
-						$saved_datetimes[ $row_id ]->save();
+					if ($ticket->ID() && $ticket->sold() > 0) {
+						$saved_datetimes[$row_id]->increase_sold($ticket->sold());
+						$saved_datetimes[$row_id]->save();
 					}
 				}
 			}
 		}
 		// then remove datetimes
-		if ( ! empty( $removed_datetimes ) && is_array( $removed_datetimes ) ) {
-			foreach ( $removed_datetimes as $row_id ) {
-				$row_id = (int)$row_id;
+		if ( ! empty($removed_datetimes) && is_array($removed_datetimes)) {
+			foreach ($removed_datetimes as $row_id) {
+				$row_id = (int) $row_id;
 				// its entirely possible that a datetime got deleted (instead of just removed from relationship.
 				// So make sure we skip over this if the dtt isn't in the $saved_datetimes array)
-				if ( isset( $saved_datetimes[ $row_id ] ) && $saved_datetimes[ $row_id ] instanceof EE_Datetime ) {
-					$ticket->_remove_relation_to( $saved_datetimes[ $row_id ], 'Datetime' );
+				if (isset($saved_datetimes[$row_id]) && $saved_datetimes[$row_id] instanceof EE_Datetime) {
+					$ticket->_remove_relation_to($saved_datetimes[$row_id], 'Datetime');
 					// Is this an existing ticket (has an ID) and does it have any sold?
 					// If so, then we need to remove it's sold from the DTT_sold.
-					if ( $ticket->ID() && $ticket->sold() > 0 ) {
-						$saved_datetimes[ $row_id ]->decrease_sold( $ticket->sold() );
-						$saved_datetimes[ $row_id ]->save();
+					if ($ticket->ID() && $ticket->sold() > 0) {
+						$saved_datetimes[$row_id]->decrease_sold($ticket->sold());
+						$saved_datetimes[$row_id]->save();
 					}
 				}
 			}
 		}
 		// cap ticket qty by datetime reg limits
-		$ticket->set_qty( min( $ticket->qty(), $ticket->qty( 'reg_limit' ) ) );
+		$ticket->set_qty(min($ticket->qty(), $ticket->qty('reg_limit')));
 		return $ticket;
 	}
 
@@ -640,39 +640,39 @@ 
 		EE_Ticket $ticket,
 		$price_rows = array(),
 		$ticket_price = 0,
-		$base_price = 0 ,
+		$base_price = 0,
 		$base_price_id = 0
 	) {
 
 		// create new ticket that's a copy of the existing
 		// except a new id of course (and not archived)
 		// AND has the new TKT_price associated with it.
-		$new_ticket = clone( $ticket );
-		$new_ticket->set( 'TKT_ID', 0 );
-		$new_ticket->set( 'TKT_deleted', 0 );
-		$new_ticket->set( 'TKT_price', $ticket_price );
-		$new_ticket->set( 'TKT_sold', 0 );
+		$new_ticket = clone($ticket);
+		$new_ticket->set('TKT_ID', 0);
+		$new_ticket->set('TKT_deleted', 0);
+		$new_ticket->set('TKT_price', $ticket_price);
+		$new_ticket->set('TKT_sold', 0);
 		// let's get a new ID for this ticket
 		$new_ticket->save();
 		// we also need to make sure this new ticket gets the same datetime attachments as the archived ticket
-		$datetimes_on_existing = $ticket->get_many_related( 'Datetime' );
+		$datetimes_on_existing = $ticket->get_many_related('Datetime');
 		$new_ticket = $this->_update_ticket_datetimes(
 			$new_ticket,
 			$datetimes_on_existing,
-			array_keys( $datetimes_on_existing )
+			array_keys($datetimes_on_existing)
 		);
 
 		// $ticket will get archived later b/c we are NOT adding it to the saved_tickets array.
 		// if existing $ticket has sold amount, then we need to adjust the qty for the new TKT to = the remaining
 		// available.
-		if ( $ticket->sold() > 0 ) {
+		if ($ticket->sold() > 0) {
 			$new_qty = $ticket->qty() - $ticket->sold();
-			$new_ticket->set_qty( $new_qty );
+			$new_ticket->set_qty($new_qty);
 		}
 		//now we update the prices just for this ticket
-		$new_ticket = $this->_add_prices_to_ticket( $price_rows, $new_ticket, true );
+		$new_ticket = $this->_add_prices_to_ticket($price_rows, $new_ticket, true);
 		//and we update the base price
-		$new_ticket = $this->_add_prices_to_ticket( array(), $new_ticket, true, $base_price, $base_price_id );
+		$new_ticket = $this->_add_prices_to_ticket(array(), $new_ticket, true, $base_price, $base_price_id);
 		return $new_ticket;
 	}
 
@@ -692,7 +692,7 @@ 
 	 * @param int|bool 		$base_price_id  if present then this is the base_price_id being updated.
 	 * @return EE_Ticket
 	 */
-	protected function  _add_prices_to_ticket( $prices = array(), EE_Ticket $ticket, $new_prices = FALSE, $base_price = FALSE, $base_price_id = FALSE ) {
+	protected function  _add_prices_to_ticket($prices = array(), EE_Ticket $ticket, $new_prices = FALSE, $base_price = FALSE, $base_price_id = FALSE) {
 
 		//let's just get any current prices that may exist on the given ticket so we can remove any prices that got trashed in this session.
 		$current_prices_on_ticket = $base_price !== FALSE ? $ticket->base_price(TRUE) : $ticket->price_modifiers();
@@ -700,7 +700,7 @@ 
 		$updated_prices = array();
 
 		// if $base_price ! FALSE then updating a base price.
-		if ( $base_price !== FALSE ) {
+		if ($base_price !== FALSE) {
 			$prices[1] = array(
 				'PRC_ID' => $new_prices || $base_price_id === 1 ? NULL : $base_price_id,
 				'PRT_ID' => 1,
@@ -711,47 +711,47 @@ 
 		}
 
 		//possibly need to save tkt
-		if ( ! $ticket->ID() )
+		if ( ! $ticket->ID())
 			$ticket->save();
 
-		foreach ( $prices as $row => $prc ) {
-			$prt_id = !empty( $prc['PRT_ID'] ) ? $prc['PRT_ID'] : NULL;
-			if ( empty($prt_id) )
+		foreach ($prices as $row => $prc) {
+			$prt_id = ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : NULL;
+			if (empty($prt_id))
 				continue; //prices MUST have a price type id.
 			$PRC_values = array(
-				'PRC_ID' => !empty( $prc['PRC_ID'] ) ? $prc['PRC_ID'] : NULL,
+				'PRC_ID' => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : NULL,
 				'PRT_ID' => $prt_id,
-				'PRC_amount' => !empty( $prc['PRC_amount'] ) ? $prc['PRC_amount'] : 0,
-				'PRC_name' => !empty( $prc['PRC_name'] ) ? $prc['PRC_name'] : '',
-				'PRC_desc' => !empty( $prc['PRC_desc'] ) ? $prc['PRC_desc'] : '',
+				'PRC_amount' => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0,
+				'PRC_name' => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '',
+				'PRC_desc' => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '',
 				'PRC_is_default' => false, //make sure we set PRC_is_default to false for all ticket saves from event_editor
 				'PRC_order' => $row
 				);
-			if ( $new_prices || empty( $PRC_values['PRC_ID'] ) ) {
+			if ($new_prices || empty($PRC_values['PRC_ID'])) {
 				$PRC_values['PRC_ID'] = 0;
-				$PRC = EE_Registry::instance()->load_class('Price', array( $PRC_values ), FALSE, FALSE);
+				$PRC = EE_Registry::instance()->load_class('Price', array($PRC_values), FALSE, FALSE);
 			} else {
-				$PRC = EE_Registry::instance()->load_model( 'Price' )->get_one_by_ID( $prc['PRC_ID'] );
+				$PRC = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']);
 				//update this price with new values
-				foreach ( $PRC_values as $field => $newprc ) {
-					$PRC->set( $field, $newprc );
+				foreach ($PRC_values as $field => $newprc) {
+					$PRC->set($field, $newprc);
 				}
 			}
 			$PRC->save();
 			$prcid = $PRC->ID();
 			$updated_prices[$prcid] = $PRC;
-			$ticket->_add_relation_to( $PRC, 'Price' );
+			$ticket->_add_relation_to($PRC, 'Price');
 		}
 
 		//now let's remove any prices that got removed from the ticket
-		if ( !empty ( $current_prices_on_ticket ) ) {
+		if ( ! empty ($current_prices_on_ticket)) {
 			$current = array_keys($current_prices_on_ticket);
 			$updated = array_keys($updated_prices);
 			$prices_to_remove = array_diff($current, $updated);
-			if ( !empty( $prices_to_remove ) ) {
-				foreach ( $prices_to_remove as $prc_id ) {
+			if ( ! empty($prices_to_remove)) {
+				foreach ($prices_to_remove as $prc_id) {
 					$p = $current_prices_on_ticket[$prc_id];
-					$ticket->_remove_relation_to( $p, 'Price' );
+					$ticket->_remove_relation_to($p, 'Price');
 
 					//delete permanently the price
 					$p->delete_permanently();
@@ -764,7 +764,7 @@ 
 
 
 
-	public function autosave_handling( $event_admin_obj ) {
+	public function autosave_handling($event_admin_obj) {
 		return $event_admin_obj; //doing nothing for the moment.
 		//todo when I get to this remember that I need to set the template args on the $event_admin_obj (use the set_template_args() method)
 
@@ -798,12 +798,12 @@ 
 
 		//default main template args
 		$main_template_args = array(
-			'event_datetime_help_link' => EEH_Template::get_help_tab_link('event_editor_event_datetimes_help_tab', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add a filter to the template for the help text in the Events_Admin_Page core file so we can add further help
+			'event_datetime_help_link' => EEH_Template::get_help_tab_link('event_editor_event_datetimes_help_tab', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add a filter to the template for the help text in the Events_Admin_Page core file so we can add further help
 			'existing_datetime_ids' => '',
 			'total_dtt_rows' => 1,
-			'add_new_dtt_help_link' => EEH_Template::get_help_tab_link('add_new_dtt_info', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
+			'add_new_dtt_help_link' => EEH_Template::get_help_tab_link('add_new_dtt_info', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
 			'datetime_rows' => '',
-			'show_tickets_container' => '',//$this->_adminpage_obj->get_cpt_model_obj()->ID() > 1 ? ' style="display:none;"' : '',
+			'show_tickets_container' => '', //$this->_adminpage_obj->get_cpt_model_obj()->ID() > 1 ? ' style="display:none;"' : '',
 			'ticket_rows' => '',
 			'existing_ticket_ids' => '',
 			'total_ticket_rows' => 1,
@@ -813,7 +813,7 @@ 
 
 		$timezone = $evtobj instanceof EE_Event ? $evtobj->timezone_string() : NULL;
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		/**
 		 * 1. Start with retrieving Datetimes
@@ -821,37 +821,37 @@ 
 		 * 3. For each ticket get related prices
 		 */
 
-		$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone) );
-		$times = $DTM->get_all_event_dates( $evtID );
+		$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone));
+		$times = $DTM->get_all_event_dates($evtID);
 
 
 
 		$main_template_args['total_dtt_rows'] = count($times);
-		foreach ( $times as $time ) {
+		foreach ($times as $time) {
 			$dttid = $time->get('DTT_ID');
 			$dttrow = $time->get('DTT_order');
 			$existing_datetime_ids[] = $dttid;
 
 			//tickets attached
-			$related_tickets = $time->ID() > 0 ? $time->get_many_related('Ticket', array( array( 'OR' => array( 'TKT_deleted' => 1, 'TKT_deleted*' => 0 ) ), 'default_where_conditions' => 'none', 'order_by' => array('TKT_order' => 'ASC' ) ) ) : array();
+			$related_tickets = $time->ID() > 0 ? $time->get_many_related('Ticket', array(array('OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0)), 'default_where_conditions' => 'none', 'order_by' => array('TKT_order' => 'ASC'))) : array();
 
 			//if there are no related tickets this is likely a new event OR autodraft
 			// event so we need to generate the default tickets because dtts
 			// ALWAYS have at least one related ticket!!.  EXCEPT, we dont' do this if there is already more than one
 			// datetime on the event.
-			if ( empty ( $related_tickets ) && count( $times ) < 2 ) {
+			if (empty ($related_tickets) && count($times) < 2) {
 				$related_tickets = EE_Registry::instance()->load_model('Ticket')->get_all_default_tickets();
 
 				//this should be ordered by TKT_ID, so let's grab the first default ticket (which will be the main default) and ensure it has any default prices added to it (but do NOT save).
 				$default_prices = EEM_Price::instance()->get_all_default_prices();
 
-				$main_default_ticket = reset( $related_tickets );
-				if ( $main_default_ticket instanceof EE_Ticket ) {
-					foreach ( $default_prices as $default_price ) {
-						if ( $default_price->is_base_price() ) {
+				$main_default_ticket = reset($related_tickets);
+				if ($main_default_ticket instanceof EE_Ticket) {
+					foreach ($default_prices as $default_price) {
+						if ($default_price->is_base_price()) {
 							continue;
 						}
-						$main_default_ticket->cache( 'Price', $default_price );
+						$main_default_ticket->cache('Price', $default_price);
 					}
 				}
 			}
@@ -860,11 +860,11 @@ 
 			//we can't actually setup rows in this loop yet cause we don't know all the unique tickets for this event yet (tickets are linked through all datetimes). So we're going to temporarily cache some of that information.
 
 			//loop through and setup the ticket rows and make sure the order is set.
-			foreach ( $related_tickets as $ticket ) {
+			foreach ($related_tickets as $ticket) {
 				$tktid = $ticket->get('TKT_ID');
 				$tktrow = $ticket->get('TKT_row');
 				//we only want unique tickets in our final display!!
-				if ( !in_array( $tktid, $existing_ticket_ids ) ) {
+				if ( ! in_array($tktid, $existing_ticket_ids)) {
 					$existing_ticket_ids[] = $tktid;
 					$all_tickets[] = $ticket;
 				}
@@ -873,56 +873,56 @@ 
 				$datetime_tickets[$dttid][] = $tktrow;
 
 				//temporary cache of this datetime info for this ticket for later processing of ticket rows.
-				if ( !isset( $ticket_datetimes[$tktid] ) || ! in_array( $dttrow, $ticket_datetimes[$tktid] ) )
+				if ( ! isset($ticket_datetimes[$tktid]) || ! in_array($dttrow, $ticket_datetimes[$tktid]))
 					$ticket_datetimes[$tktid][] = $dttrow;
 			}
 		}
 
-		$main_template_args['total_ticket_rows'] = count( $existing_ticket_ids );
-		$main_template_args['existing_ticket_ids'] = implode( ',', $existing_ticket_ids );
-		$main_template_args['existing_datetime_ids'] = implode( ',', $existing_datetime_ids );
+		$main_template_args['total_ticket_rows'] = count($existing_ticket_ids);
+		$main_template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
+		$main_template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
 
 		//sort $all_tickets by order
-		usort( $all_tickets, function( $a, $b ) {
+		usort($all_tickets, function($a, $b) {
 			$a_order = (int) $a->get('TKT_order');
 			$b_order = (int) $b->get('TKT_order');
-			if ( $a_order == $b_order ) {
+			if ($a_order == $b_order) {
 				return 0;
 			}
-			return ( $a_order < $b_order ) ? -1 : 1;
+			return ($a_order < $b_order) ? -1 : 1;
 		});
 
 		//k NOW we have all the data we need for setting up the dtt rows and ticket rows so we start our dtt loop again.
 		$dttrow = 1;
-		foreach ( $times as $time ) {
-			$main_template_args['datetime_rows'] .= $this->_get_datetime_row( $dttrow, $time, $datetime_tickets, $all_tickets, FALSE, $times );
+		foreach ($times as $time) {
+			$main_template_args['datetime_rows'] .= $this->_get_datetime_row($dttrow, $time, $datetime_tickets, $all_tickets, FALSE, $times);
 			$dttrow++;
 		}
 
 		//then loop through all tickets for the ticket rows.
 		$tktrow = 1;
-		foreach ( $all_tickets as $ticket ) {
-			$main_template_args['ticket_rows'] .= $this->_get_ticket_row( $tktrow, $ticket, $ticket_datetimes, $times, FALSE, $all_tickets );
+		foreach ($all_tickets as $ticket) {
+			$main_template_args['ticket_rows'] .= $this->_get_ticket_row($tktrow, $ticket, $ticket_datetimes, $times, FALSE, $all_tickets);
 			$tktrow++;
 		}
 
 		$main_template_args['ticket_js_structure'] = $this->_get_ticket_js_structure($times, $all_tickets);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php';
-		EEH_Template::display_template( $template, $main_template_args );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_metabox_main.template.php';
+		EEH_Template::display_template($template, $main_template_args);
 		return;
 	}
 
 
 
-	protected function _get_datetime_row( $dttrow, EE_Datetime $dtt, $datetime_tickets, $all_tickets, $default = FALSE, $all_dtts = array() ) {
+	protected function _get_datetime_row($dttrow, EE_Datetime $dtt, $datetime_tickets, $all_tickets, $default = FALSE, $all_dtts = array()) {
 
 		$dtt_display_template_args = array(
-			'dtt_edit_row' => $this->_get_dtt_edit_row( $dttrow, $dtt, $default, $all_dtts ),
-			'dtt_attached_tickets_row' => $this->_get_dtt_attached_tickets_row( $dttrow, $dtt, $datetime_tickets, $all_tickets, $default ),
+			'dtt_edit_row' => $this->_get_dtt_edit_row($dttrow, $dtt, $default, $all_dtts),
+			'dtt_attached_tickets_row' => $this->_get_dtt_attached_tickets_row($dttrow, $dtt, $datetime_tickets, $all_tickets, $default),
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow
 			);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_row_wrapper.template.php';
-		return EEH_Template::display_template( $template, $dtt_display_template_args, TRUE);
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_row_wrapper.template.php';
+		return EEH_Template::display_template($template, $dtt_display_template_args, TRUE);
 	}
 
 
@@ -940,7 +940,7 @@ 
 	 *
 	 * @return string Generated edit row.
 	 */
-	protected function _get_dtt_edit_row( $dttrow, $dtt, $default, $all_dtts ) {
+	protected function _get_dtt_edit_row($dttrow, $dtt, $default, $all_dtts) {
 
 		// if the incomign $dtt object is NOT an instance of EE_Datetime then force default to true.
 		$default = ! $dtt instanceof EE_Datetime ? true : false;
@@ -948,30 +948,30 @@ 
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
 			'event_datetimes_name' => $default ? 'DTTNAMEATTR' : 'edit_event_datetimes',
-			'edit_dtt_expanded' => '',//$this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? '' : ' ee-edit-editing',
+			'edit_dtt_expanded' => '', //$this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? '' : ' ee-edit-editing',
 			'DTT_ID' => $default ? '' : $dtt->ID(),
 			'DTT_name' => $default ? '' : $dtt->name(),
 			'DTT_description' => $default ? '' : $dtt->description(),
-			'DTT_EVT_start' => $default ? '' : $dtt->start_date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'DTT_EVT_end' => $default ? '' : $dtt->end_date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'DTT_reg_limit' => $default ? '' : $dtt->get_pretty('DTT_reg_limit','input'),
+			'DTT_EVT_start' => $default ? '' : $dtt->start_date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'DTT_EVT_end' => $default ? '' : $dtt->end_date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'DTT_reg_limit' => $default ? '' : $dtt->get_pretty('DTT_reg_limit', 'input'),
 			'DTT_order' => $default ? 'DTTNUM' : $dttrow,
 			'dtt_sold' => $default ? '0' : $dtt->get('DTT_sold'),
-			'clone_icon' => !empty( $dtt ) && $dtt->get('DTT_sold') > 0 ? '' : 'clone-icon ee-icon ee-icon-clone clickable',
-			'trash_icon' => !empty( $dtt ) && $dtt->get('DTT_sold') > 0  ? 'ee-lock-icon' : 'trash-icon dashicons dashicons-post-trash clickable'
+			'clone_icon' => ! empty($dtt) && $dtt->get('DTT_sold') > 0 ? '' : 'clone-icon ee-icon ee-icon-clone clickable',
+			'trash_icon' => ! empty($dtt) && $dtt->get('DTT_sold') > 0 ? 'ee-lock-icon' : 'trash-icon dashicons dashicons-post-trash clickable'
 			);
 
-		$template_args['show_trash'] = count( $all_dtts ) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon' ? ' style="display:none"' : '';
+		$template_args['show_trash'] = count($all_dtts) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon' ? ' style="display:none"' : '';
 
 		//allow filtering of template args at this point.
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_dtt_edit_row__template_args', $template_args, $dttrow, $dtt, $default, $all_dtts, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_dtt_edit_row__template_args', $template_args, $dttrow, $dtt, $default, $all_dtts, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_edit_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_edit_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
-	protected function _get_dtt_attached_tickets_row( $dttrow, $dtt, $datetime_tickets, $all_tickets, $default ) {
+	protected function _get_dtt_attached_tickets_row($dttrow, $dtt, $datetime_tickets, $all_tickets, $default) {
 
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
@@ -979,47 +979,47 @@ 
 			'DTT_description' => $default ? '' : $dtt->description(),
 			'datetime_tickets_list' => $default ? '<li class="hidden"></li>' : '',
 			'show_tickets_row' => ' style="display:none;"', //$default || $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? ' style="display:none;"' : '',
-			'add_new_datetime_ticket_help_link' => EEH_Template::get_help_tab_link('add_new_ticket_via_datetime', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
+			'add_new_datetime_ticket_help_link' => EEH_Template::get_help_tab_link('add_new_ticket_via_datetime', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
 			'DTT_ID' => $default ? '' : $dtt->ID()
 			);
 
 		//need to setup the list items (but only if this isnt' a default skeleton setup)
-		if ( !$default ) {
+		if ( ! $default) {
 			$tktrow = 1;
-			foreach ( $all_tickets as $ticket ) {
-				$template_args['datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item( $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default );
+			foreach ($all_tickets as $ticket) {
+				$template_args['datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item($dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default);
 				$tktrow++;
 			}
 		}
 
 		//filter template args at this point
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_dtt_attached_ticket_row__template_args', $template_args, $dttrow, $dtt, $datetime_tickets, $all_tickets, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_dtt_attached_ticket_row__template_args', $template_args, $dttrow, $dtt, $datetime_tickets, $all_tickets, $default, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_attached_tickets_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_attached_tickets_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_datetime_tickets_list_item( $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default ) {
-		$tktid = !empty( $ticket ) ? $ticket->ID() : 0;
-		$dtt_tkts = $dtt instanceof EE_Datetime && isset( $datetime_tickets[$dtt->ID()] ) ? $datetime_tickets[$dtt->ID()] : array();
+	protected function _get_datetime_tickets_list_item($dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default) {
+		$tktid = ! empty($ticket) ? $ticket->ID() : 0;
+		$dtt_tkts = $dtt instanceof EE_Datetime && isset($datetime_tickets[$dtt->ID()]) ? $datetime_tickets[$dtt->ID()] : array();
 
-		$displayrow = !empty( $ticket ) ? $ticket->get('TKT_row') : 0;
+		$displayrow = ! empty($ticket) ? $ticket->get('TKT_row') : 0;
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
-			'tkt_row' => $default && empty( $ticket ) ? 'TICKETNUM' : $tktrow,
+			'tkt_row' => $default && empty($ticket) ? 'TICKETNUM' : $tktrow,
 			'datetime_ticket_checked' => in_array($displayrow, $dtt_tkts) ? ' checked="checked"' : '',
 			'ticket_selected' => in_array($displayrow, $dtt_tkts) ? ' ticket-selected' : '',
-			'TKT_name' => $default && empty( $ticket ) ? 'TKTNAME' : $ticket->get('TKT_name'),
-			'tkt_status_class' => ( $default && empty( $ticket ) ) || $this->_is_creating_event ? ' tkt-status-' . EE_Ticket::onsale : ' tkt-status-' . $ticket->ticket_status(),
+			'TKT_name' => $default && empty($ticket) ? 'TKTNAME' : $ticket->get('TKT_name'),
+			'tkt_status_class' => ($default && empty($ticket)) || $this->_is_creating_event ? ' tkt-status-'.EE_Ticket::onsale : ' tkt-status-'.$ticket->ticket_status(),
 			);
 
 		//filter template args
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_datetime_tickets_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_datetime_tickets_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_dtt_tickets_list.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_dtt_tickets_list.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
@@ -1041,37 +1041,37 @@ 
 	 *
 	 * @return [type] [description]
 	 */
-	protected function _get_ticket_row( $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default = FALSE, $all_tickets = array() ) {
+	protected function _get_ticket_row($tktrow, $ticket, $ticket_datetimes, $all_dtts, $default = FALSE, $all_tickets = array()) {
 
 		//if $ticket is not an instance of EE_Ticket then force default to true.
-		$default =  ! $ticket instanceof EE_Ticket ? true : false;
+		$default = ! $ticket instanceof EE_Ticket ? true : false;
 
-		$prices = ! empty( $ticket ) && ! $default ? $ticket->get_many_related('Price', array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC') ) ) : array();
+		$prices = ! empty($ticket) && ! $default ? $ticket->get_many_related('Price', array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC'))) : array();
 
 		//if there is only one price (which would be the base price) or NO prices and this ticket is a default ticket, let's just make sure there are no cached default prices on
 		//the object.  This is done by not including any query_params.
-		if ( $ticket instanceof EE_Ticket && $ticket->is_default() && ( count( $prices ) === 1  || empty( $prices ) ) ) {
-			$prices = $ticket->get_many_related( 'Price' );
+		if ($ticket instanceof EE_Ticket && $ticket->is_default() && (count($prices) === 1 || empty($prices))) {
+			$prices = $ticket->get_many_related('Price');
 		}
 
 		// check if we're dealing with a default ticket in which case we don't want any starting_ticket_datetime_row values set (otherwise there won't be any new relationships created for tickets based off of the default ticket).  This will future proof in case there is ever any behaviour change between what the primary_key defaults to.
-		$default_dtt = $default || ($ticket instanceof EE_Ticket && $ticket->get('TKT_is_default') ) ? TRUE : FALSE;
+		$default_dtt = $default || ($ticket instanceof EE_Ticket && $ticket->get('TKT_is_default')) ? TRUE : FALSE;
 
-		$tkt_dtts = $ticket instanceof EE_Ticket && isset( $ticket_datetimes[$ticket->ID()] ) ? $ticket_datetimes[$ticket->ID()] : array();
+		$tkt_dtts = $ticket instanceof EE_Ticket && isset($ticket_datetimes[$ticket->ID()]) ? $ticket_datetimes[$ticket->ID()] : array();
 
 		$ticket_subtotal = $default ? 0 : $ticket->get_ticket_subtotal();
 		$base_price = $default ? NULL :  $ticket->base_price();
 		$count_price_mods = EEM_Price::instance()->get_all_default_prices(TRUE);
 
 		//breaking out complicated condition for ticket_status
-		if ( $default ) {
-			$ticket_status_class = ' tkt-status-' . EE_Ticket::onsale;
+		if ($default) {
+			$ticket_status_class = ' tkt-status-'.EE_Ticket::onsale;
 		} else {
-			$ticket_status_class =  $ticket->is_default() ? ' tkt-status-' . EE_Ticket::onsale : ' tkt-status-' . $ticket->ticket_status();
+			$ticket_status_class = $ticket->is_default() ? ' tkt-status-'.EE_Ticket::onsale : ' tkt-status-'.$ticket->ticket_status();
 		}
 
 		//breaking out complicated condition for TKT_taxable
-		if ( $default ) {
+		if ($default) {
 			$TKT_taxable = '';
 		} else {
 			$TKT_taxable = $ticket->get('TKT_taxable') ? ' checked="checked"' : '';
@@ -1086,19 +1086,19 @@ 
 			'edit_tkt_expanded' => '',
 			'edit_tickets_name' => $default ? 'TICKETNAMEATTR' : 'edit_tickets',
 			'TKT_name' => $default ? '' : $ticket->get('TKT_name'),
-			'TKT_start_date' => $default ? '' : $ticket->get_date('TKT_start_date', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'TKT_end_date' => $default ? '' : $ticket->get_date('TKT_end_date', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time']  ),
-			'TKT_status' => $default ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->is_default() ? EEH_Template::pretty_status( EE_Ticket::onsale, FALSE, 'sentence') : $ticket->ticket_status(TRUE),
+			'TKT_start_date' => $default ? '' : $ticket->get_date('TKT_start_date', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'TKT_end_date' => $default ? '' : $ticket->get_date('TKT_end_date', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'TKT_status' => $default ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->is_default() ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->ticket_status(TRUE),
 			'TKT_price' => $default ? '' : EEH_Template::format_currency($ticket->get_ticket_total_with_taxes(), FALSE, FALSE),
 			'TKT_price_code' => EE_Registry::instance()->CFG->currency->code,
 			'TKT_price_amount' => $default ? 0 : $ticket_subtotal,
-			'TKT_qty' => $default ? '' : $ticket->get_pretty('TKT_qty','symbol'),
-			'TKT_qty_for_input'=> $default ? '' : $ticket->get_pretty('TKT_qty','input'),
-			'TKT_uses' => $default ? '' : $ticket->get_pretty('TKT_uses','input'),
-			'TKT_min' => $default ? '' : ( $ticket->get('TKT_min') === -1 || $ticket->get('TKT_min') === 0 ? '' : $ticket->get('TKT_min') ),
-			'TKT_max' => $default ? '' :  $ticket->get_pretty('TKT_max','input'),
+			'TKT_qty' => $default ? '' : $ticket->get_pretty('TKT_qty', 'symbol'),
+			'TKT_qty_for_input'=> $default ? '' : $ticket->get_pretty('TKT_qty', 'input'),
+			'TKT_uses' => $default ? '' : $ticket->get_pretty('TKT_uses', 'input'),
+			'TKT_min' => $default ? '' : ($ticket->get('TKT_min') === -1 || $ticket->get('TKT_min') === 0 ? '' : $ticket->get('TKT_min')),
+			'TKT_max' => $default ? '' : $ticket->get_pretty('TKT_max', 'input'),
 			'TKT_sold' => $default ? 0 : $ticket->tickets_sold('ticket'),
-			'TKT_registrations' => $default ? 0 : $ticket->count_registrations( array( array( 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) ) ) ),
+			'TKT_registrations' => $default ? 0 : $ticket->count_registrations(array(array('STS_ID' => array('!=', EEM_Registration::status_id_incomplete)))),
 			'TKT_ID' => $default ? 0 : $ticket->get('TKT_ID'),
 			'TKT_description' => $default ? '' : $ticket->get('TKT_description'),
 			'TKT_is_default' => $default ? 0 : $ticket->get('TKT_is_default'),
@@ -1107,99 +1107,99 @@ 
 			'ticket_price_rows' => '',
 			'TKT_base_price' => $default || ! $base_price instanceof EE_Price ? '' : $base_price->get_pretty('PRC_amount', 'localized_float'),
 			'TKT_base_price_ID' => $default || ! $base_price instanceof EE_Price ? 0 : $base_price->ID(),
-			'show_price_modifier' => count($prices) > 1 || ( $default && $count_price_mods > 0 ) ? '' : ' style="display:none;"',
-			'show_price_mod_button' => count($prices) > 1 || ( $default && $count_price_mods > 0 ) || ( !$default && $ticket->get('TKT_deleted') ) ? ' style="display:none;"' : '',
+			'show_price_modifier' => count($prices) > 1 || ($default && $count_price_mods > 0) ? '' : ' style="display:none;"',
+			'show_price_mod_button' => count($prices) > 1 || ($default && $count_price_mods > 0) || ( ! $default && $ticket->get('TKT_deleted')) ? ' style="display:none;"' : '',
 			'total_price_rows' => count($prices) > 1 ? count($prices) : 1,
 			'ticket_datetimes_list' => $default ? '<li class="hidden"></li>' : '',
 			'starting_ticket_datetime_rows' => $default || $default_dtt ? '' : implode(',', $tkt_dtts),
 			'ticket_datetime_rows' => $default ? '' : implode(',', $tkt_dtts),
-			'existing_ticket_price_ids' => $default, '', implode(',', array_keys( $prices) ),
+			'existing_ticket_price_ids' => $default, '', implode(',', array_keys($prices)),
 			'ticket_template_id' => $default ? 0 : $ticket->get('TTM_ID'),
 			'TKT_taxable' => $TKT_taxable,
 			'display_subtotal' => $ticket instanceof EE_Ticket && $ticket->get('TKT_taxable') ? '' : ' style="display:none"',
 			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
-			'TKT_subtotal_amount_display' => EEH_Template::format_currency($ticket_subtotal, FALSE, FALSE ),
+			'TKT_subtotal_amount_display' => EEH_Template::format_currency($ticket_subtotal, FALSE, FALSE),
 			'TKT_subtotal_amount' => $ticket_subtotal,
-			'tax_rows' => $this->_get_tax_rows( $tktrow, $ticket ),
+			'tax_rows' => $this->_get_tax_rows($tktrow, $ticket),
 			'disabled' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? TRUE: FALSE,
 			'ticket_archive_class' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? ' ticket-archived' : '',
 			'trash_icon' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? 'ee-lock-icon ' : 'trash-icon dashicons dashicons-post-trash clickable',
 			'clone_icon' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? '' : 'clone-icon ee-icon ee-icon-clone clickable'
 			);
 
-		$template_args['trash_hidden'] = count( $all_tickets ) === 1 && $template_args['trash_icon'] != 'ee-lock-icon' ? ' style="display:none"' : '';
+		$template_args['trash_hidden'] = count($all_tickets) === 1 && $template_args['trash_icon'] != 'ee-lock-icon' ? ' style="display:none"' : '';
 
 		//handle rows that should NOT be empty
-		if ( empty( $template_args['TKT_start_date'] ) ) {
+		if (empty($template_args['TKT_start_date'])) {
 			//if empty then the start date will be now.
-			$template_args['TKT_start_date'] = date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] , current_time('timestamp'));
-			$template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
+			$template_args['TKT_start_date'] = date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time'], current_time('timestamp'));
+			$template_args['tkt_status_class'] = ' tkt-status-'.EE_Ticket::onsale;
 		}
 
-		if ( empty( $template_args['TKT_end_date'] ) ) {
+		if (empty($template_args['TKT_end_date'])) {
 
 			//get the earliest datetime (if present);
-			$earliest_dtt = $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? $this->_adminpage_obj->get_cpt_model_obj()->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL;
+			$earliest_dtt = $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? $this->_adminpage_obj->get_cpt_model_obj()->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC'))) : NULL;
 
-			if ( !empty( $earliest_dtt ) ) {
-				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
+			if ( ! empty($earliest_dtt)) {
+				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
 			} else {
 				//default so let's just use what's been set for the default date-time which is 30 days from now.
-				$template_args['TKT_end_date'] = date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] , mktime(24, 0, 0, date("m"), date("d") + 29, date("Y") )  );
+				$template_args['TKT_end_date'] = date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time'], mktime(24, 0, 0, date("m"), date("d") + 29, date("Y")));
 			}
-			$template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
+			$template_args['tkt_status_class'] = ' tkt-status-'.EE_Ticket::onsale;
 		}
 
 		//generate ticket_datetime items
-		if ( ! $default ) {
+		if ( ! $default) {
 			$dttrow = 1;
-			foreach ( $all_dtts as $dtt ) {
-				$template_args['ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item( $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default );
+			foreach ($all_dtts as $dtt) {
+				$template_args['ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item($dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default);
 				$dttrow++;
 			}
 		}
 
 		$prcrow = 1;
-		foreach ( $prices as $price ) {
-			if ( $price->is_base_price() ) {
+		foreach ($prices as $price) {
+			if ($price->is_base_price()) {
 				$prcrow++;
 				continue;
 			}
-			$show_trash = ( count( $prices ) > 1 && $prcrow === 1 ) || count( $prices ) === 1  ? FALSE : TRUE;
-			$show_create = count( $prices ) > 1 && count( $prices ) !== $prcrow ? FALSE : TRUE;
-			$template_args['ticket_price_rows'] .= $this->_get_ticket_price_row( $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create );
+			$show_trash = (count($prices) > 1 && $prcrow === 1) || count($prices) === 1 ? FALSE : TRUE;
+			$show_create = count($prices) > 1 && count($prices) !== $prcrow ? FALSE : TRUE;
+			$template_args['ticket_price_rows'] .= $this->_get_ticket_price_row($tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create);
 			$prcrow++;
 		}
 
 		//filter $template_args
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_row__template_args', $template_args, $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default, $all_tickets, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_row__template_args', $template_args, $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default, $all_tickets, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
 
 
-	protected function _get_tax_rows( $tktrow, $ticket ) {
+	protected function _get_tax_rows($tktrow, $ticket) {
 		$tax_rows = '';
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_tax_row.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_tax_row.template.php';
 		$template_args = array();
-		$taxes = empty( $ticket ) ? EE_Taxes::get_taxes_for_admin() : $ticket->get_ticket_taxes_for_admin();
-		foreach ( $taxes as $tax ) {
-			$tax_added = $this->_get_tax_added( $tax, $ticket );
+		$taxes = empty($ticket) ? EE_Taxes::get_taxes_for_admin() : $ticket->get_ticket_taxes_for_admin();
+		foreach ($taxes as $tax) {
+			$tax_added = $this->_get_tax_added($tax, $ticket);
 			$template_args = array(
-				'display_tax' => !empty( $ticket ) && $ticket->get('TKT_taxable') ? '' : ' style="display:none;"',
+				'display_tax' => ! empty($ticket) && $ticket->get('TKT_taxable') ? '' : ' style="display:none;"',
 				'tax_id' => $tax->ID(),
 				'tkt_row' => $tktrow,
 				'tax_label' => $tax->get('PRC_name'),
 				'tax_added' => $tax_added,
-				'tax_added_display' => EEH_Template::format_currency($tax_added, FALSE, FALSE ),
+				'tax_added_display' => EEH_Template::format_currency($tax_added, FALSE, FALSE),
 				'tax_amount' => $tax->get('PRC_amount')
 				);
-			$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_tax_rows__template_args', $template_args, $tktrow, $ticket, $this->_is_creating_event  );
-			$tax_rows .= EEH_Template::display_template( $template, $template_args, TRUE );
+			$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_tax_rows__template_args', $template_args, $tktrow, $ticket, $this->_is_creating_event);
+			$tax_rows .= EEH_Template::display_template($template, $template_args, TRUE);
 		}
 
 
@@ -1207,81 +1207,81 @@ 
 	}
 
 
-	protected function _get_tax_added( EE_Price $tax, $ticket ) {
-		$subtotal = empty( $ticket ) ? 0 : $ticket->get_ticket_subtotal();
+	protected function _get_tax_added(EE_Price $tax, $ticket) {
+		$subtotal = empty($ticket) ? 0 : $ticket->get_ticket_subtotal();
 		return $subtotal * $tax->get('PRC_amount') / 100;
 	}
 
 
 
 
-	protected function _get_ticket_price_row( $tktrow, $prcrow, $price, $default, $ticket, $show_trash = TRUE, $show_create = TRUE ) {
-		$send_disabled = !empty( $ticket ) && $ticket->get('TKT_deleted') ? TRUE : FALSE;
+	protected function _get_ticket_price_row($tktrow, $prcrow, $price, $default, $ticket, $show_trash = TRUE, $show_create = TRUE) {
+		$send_disabled = ! empty($ticket) && $ticket->get('TKT_deleted') ? TRUE : FALSE;
 		$template_args = array(
 			'tkt_row' => $default && empty($ticket) ? 'TICKETNUM' : $tktrow,
 			'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
 			'edit_prices_name' => $default && empty($price) ? 'PRICENAMEATTR' : 'edit_prices',
-			'price_type_selector' => $default && empty( $price ) ? $this->_get_base_price_template( $tktrow, $prcrow, $price, $default ) : $this->_get_price_type_selector( $tktrow, $prcrow, $price, $default, $send_disabled ),
+			'price_type_selector' => $default && empty($price) ? $this->_get_base_price_template($tktrow, $prcrow, $price, $default) : $this->_get_price_type_selector($tktrow, $prcrow, $price, $default, $send_disabled),
 			'PRC_ID' => $default && empty($price) ? 0 : $price->ID(),
 			'PRC_is_default' => $default && empty($price) ? 0 : $price->get('PRC_is_default'),
 			'PRC_name' => $default && empty($price) ? '' : $price->get('PRC_name'),
 			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
 			'show_plus_or_minus' => $default && empty($price) ? '' : ' style="display:none;"',
-			'show_plus' => $default && empty( $price ) ? ' style="display:none;"' : ( $price->is_discount() || $price->is_base_price() ? ' style="display:none;"' : ''),
-			'show_minus' => $default && empty( $price ) ? ' style="display:none;"' : ($price->is_discount() ? '' : ' style="display:none;"'),
-			'show_currency_symbol' => $default && empty( $price ) ? ' style="display:none"' : ($price->is_percent() ? ' style="display:none"' : '' ),
-			'PRC_amount' => $default && empty( $price ) ? 0 : $price->get_pretty('PRC_amount', 'localized_float'),
-			'show_percentage' => $default && empty( $price ) ? ' style="display:none;"' : ( $price->is_percent() ? '' : ' style="display:none;"' ),
+			'show_plus' => $default && empty($price) ? ' style="display:none;"' : ($price->is_discount() || $price->is_base_price() ? ' style="display:none;"' : ''),
+			'show_minus' => $default && empty($price) ? ' style="display:none;"' : ($price->is_discount() ? '' : ' style="display:none;"'),
+			'show_currency_symbol' => $default && empty($price) ? ' style="display:none"' : ($price->is_percent() ? ' style="display:none"' : ''),
+			'PRC_amount' => $default && empty($price) ? 0 : $price->get_pretty('PRC_amount', 'localized_float'),
+			'show_percentage' => $default && empty($price) ? ' style="display:none;"' : ($price->is_percent() ? '' : ' style="display:none;"'),
 			'show_trash_icon' => $show_trash ? '' : ' style="display:none;"',
 			'show_create_button' => $show_create ? '' : ' style="display:none;"',
-			'PRC_desc' => $default && empty( $price ) ? '' : $price->get('PRC_desc'),
-			'disabled' => !empty( $ticket ) && $ticket->get('TKT_deleted') ? TRUE : FALSE
+			'PRC_desc' => $default && empty($price) ? '' : $price->get('PRC_desc'),
+			'disabled' => ! empty($ticket) && $ticket->get('TKT_deleted') ? TRUE : FALSE
 			);
 
-	$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_price_row__template_args', $template_args, $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create, $this->_is_creating_event );
+	$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_price_row__template_args', $template_args, $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_price_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_price_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
-	protected function _get_price_type_selector( $tktrow, $prcrow, $price, $default, $disabled = FALSE ) {
-		if ( $price->is_base_price() ) {
-			return $this->_get_base_price_template( $tktrow, $prcrow, $price, $default );
+	protected function _get_price_type_selector($tktrow, $prcrow, $price, $default, $disabled = FALSE) {
+		if ($price->is_base_price()) {
+			return $this->_get_base_price_template($tktrow, $prcrow, $price, $default);
 		} else {
-			return $this->_get_price_modifier_template( $tktrow, $prcrow, $price, $default, $disabled );
+			return $this->_get_price_modifier_template($tktrow, $prcrow, $price, $default, $disabled);
 		}
 
 	}
 
 
-	protected function _get_base_price_template( $tktrow, $prcrow, $price, $default ) {
+	protected function _get_base_price_template($tktrow, $prcrow, $price, $default) {
 		$template_args = array(
 				'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-				'PRC_order' => $default && empty( $price ) ? 'PRICENUM' : $prcrow,
-				'PRT_ID' => $default && empty( $price ) ? 1 : $price->get('PRT_ID'),
+				'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
+				'PRT_ID' => $default && empty($price) ? 1 : $price->get('PRT_ID'),
 				'PRT_name' => __('Price', 'event_espresso'),
 				'price_selected_operator' => '+',
 				'price_selected_is_percent' => 0
 			);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_type_base.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_type_base.template.php';
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_base_price_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_base_price_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $this->_is_creating_event);
 
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_price_modifier_template( $tktrow, $prcrow, $price, $default, $disabled = FALSE ) {
-		$select_name = $default && empty( $price ) ? 'edit_prices[TICKETNUM][PRICENUM][PRT_ID]' : 'edit_prices[' . $tktrow . '][' . $prcrow . '][PRT_ID]';
-		$price_types = EE_Registry::instance()->load_model('Price_Type')->get_all(array( array('OR' => array('PBT_ID' => '2', 'PBT_ID*' => '3' ) ) ) );
-		$price_option_span_template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_option_span.template.php';
-		$all_price_types = $default && empty( $price ) ? array(array('id' => 0, 'text' => __('Select Modifier', 'event_espresso')) ) : array();
-		$selected_price_type_id = $default && empty( $price ) ? 0 : $price->type();
+	protected function _get_price_modifier_template($tktrow, $prcrow, $price, $default, $disabled = FALSE) {
+		$select_name = $default && empty($price) ? 'edit_prices[TICKETNUM][PRICENUM][PRT_ID]' : 'edit_prices['.$tktrow.']['.$prcrow.'][PRT_ID]';
+		$price_types = EE_Registry::instance()->load_model('Price_Type')->get_all(array(array('OR' => array('PBT_ID' => '2', 'PBT_ID*' => '3'))));
+		$price_option_span_template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_option_span.template.php';
+		$all_price_types = $default && empty($price) ? array(array('id' => 0, 'text' => __('Select Modifier', 'event_espresso'))) : array();
+		$selected_price_type_id = $default && empty($price) ? 0 : $price->type();
 		$price_option_spans = '';
 		//setup pricetypes for selector
-		foreach ( $price_types as $price_type ) {
+		foreach ($price_types as $price_type) {
 			$all_price_types[] = array(
 				'id' => $price_type->ID(),
 				'text' => $price_type->get('PRT_name'),
@@ -1293,50 +1293,50 @@ 
 				'PRT_operator' => $price_type->is_discount() ? '-' : '+',
 				'PRT_is_percent' => $price_type->get('PRT_is_percent') ? 1 : 0
 				);
-			$price_option_spans .= EEH_Template::display_template($price_option_span_template, $spanargs, TRUE );
+			$price_option_spans .= EEH_Template::display_template($price_option_span_template, $spanargs, TRUE);
 		}
 
-		$select_params = $disabled ? 'style="width:auto;" disabled'  : 'style="width:auto;"';
+		$select_params = $disabled ? 'style="width:auto;" disabled' : 'style="width:auto;"';
 		$main_name = $select_name;
-		$select_name = $disabled ? 'archive_price[' . $tktrow . '][' . $prcrow . '][PRT_ID]' : $main_name;
+		$select_name = $disabled ? 'archive_price['.$tktrow.']['.$prcrow.'][PRT_ID]' : $main_name;
 
 		$template_args = array(
 			'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-			'PRC_order' => $default && empty( $price ) ? 'PRICENUM' : $prcrow,
-			'price_modifier_selector' => EEH_Form_Fields::select_input( $select_name, $all_price_types, $selected_price_type_id, $select_params, 'edit-price-PRT_ID' ),
+			'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
+			'price_modifier_selector' => EEH_Form_Fields::select_input($select_name, $all_price_types, $selected_price_type_id, $select_params, 'edit-price-PRT_ID'),
 			'main_name' => $main_name,
 			'selected_price_type_id' => $selected_price_type_id,
 			'price_option_spans' => $price_option_spans,
-			'price_selected_operator' => $default && empty( $price ) ? '' : ( $price->is_discount() ? '-' : '+' ),
-			'price_selected_is_percent' => $default && empty( $price ) ? '' : ( $price->is_percent() ? 1 : 0 ),
+			'price_selected_operator' => $default && empty($price) ? '' : ($price->is_discount() ? '-' : '+'),
+			'price_selected_is_percent' => $default && empty($price) ? '' : ($price->is_percent() ? 1 : 0),
 			'disabled' => $disabled
 			);
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_price_modifier_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $disabled, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_price_modifier_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $disabled, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_modifier_selector.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_modifier_selector.template.php';
 
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_ticket_datetime_list_item( $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default ) {
-		$dttid = !empty($dtt) ? $dtt->ID() : 0;
-		$displayrow = !empty($dtt) ? $dtt->get('DTT_order') : 0;
-		$tkt_dtts = $ticket instanceof EE_Ticket && isset( $ticket_datetimes[$ticket->ID()] ) ? $ticket_datetimes[$ticket->ID()] : array();
+	protected function _get_ticket_datetime_list_item($dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default) {
+		$dttid = ! empty($dtt) ? $dtt->ID() : 0;
+		$displayrow = ! empty($dtt) ? $dtt->get('DTT_order') : 0;
+		$tkt_dtts = $ticket instanceof EE_Ticket && isset($ticket_datetimes[$ticket->ID()]) ? $ticket_datetimes[$ticket->ID()] : array();
 		$template_args = array(
-			'dtt_row' => $default && empty( $dtt ) ? 'DTTNUM' : $dttrow,
+			'dtt_row' => $default && empty($dtt) ? 'DTTNUM' : $dttrow,
 			'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-			'ticket_datetime_selected' => in_array( $displayrow, $tkt_dtts ) ? ' ticket-selected' : '',
-			'ticket_datetime_checked' => in_array( $displayrow, $tkt_dtts ) ? ' checked="checked"' : '',
-			'DTT_name' => $default && empty( $dtt ) ? 'DTTNAME' : $dtt->get_dtt_display_name( TRUE ),
+			'ticket_datetime_selected' => in_array($displayrow, $tkt_dtts) ? ' ticket-selected' : '',
+			'ticket_datetime_checked' => in_array($displayrow, $tkt_dtts) ? ' checked="checked"' : '',
+			'DTT_name' => $default && empty($dtt) ? 'DTTNAME' : $dtt->get_dtt_display_name(TRUE),
 			'tkt_status_class' => '',
 			);
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_datetime_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default, $this->_is_creating_event );
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_datetimes_list_item.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_datetime_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default, $this->_is_creating_event);
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_datetimes_list_item.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
@@ -1344,53 +1344,53 @@ 
 	protected function _get_ticket_js_structure($all_dtts, $all_tickets) {
 		$template_args = array(
 			'default_datetime_edit_row' => $this->_get_dtt_edit_row('DTTNUM', NULL, TRUE, $all_dtts),
-			'default_ticket_row' => $this->_get_ticket_row( 'TICKETNUM', NULL, array(), array(), TRUE),
-			'default_price_row' => $this->_get_ticket_price_row( 'TICKETNUM', 'PRICENUM', NULL, TRUE, NULL ),
+			'default_ticket_row' => $this->_get_ticket_row('TICKETNUM', NULL, array(), array(), TRUE),
+			'default_price_row' => $this->_get_ticket_price_row('TICKETNUM', 'PRICENUM', NULL, TRUE, NULL),
 			'default_price_rows' => '',
 			'default_base_price_amount' => 0,
 			'default_base_price_name' => '',
 			'default_base_price_description' => '',
-			'default_price_modifier_selector_row' => $this->_get_price_modifier_template( 'TICKETNUM', 'PRICENUM', NULL, TRUE ),
-			'default_available_tickets_for_datetime' => $this->_get_dtt_attached_tickets_row( 'DTTNUM', NULL, array(), array(), TRUE ),
+			'default_price_modifier_selector_row' => $this->_get_price_modifier_template('TICKETNUM', 'PRICENUM', NULL, TRUE),
+			'default_available_tickets_for_datetime' => $this->_get_dtt_attached_tickets_row('DTTNUM', NULL, array(), array(), TRUE),
 			'existing_available_datetime_tickets_list' => '',
 			'existing_available_ticket_datetimes_list' => '',
-			'new_available_datetime_ticket_list_item' => $this->_get_datetime_tickets_list_item( 'DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE ),
-			'new_available_ticket_datetime_list_item' => $this->_get_ticket_datetime_list_item( 'DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE )
+			'new_available_datetime_ticket_list_item' => $this->_get_datetime_tickets_list_item('DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE),
+			'new_available_ticket_datetime_list_item' => $this->_get_ticket_datetime_list_item('DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE)
 			);
 
 		$tktrow = 1;
-		foreach ( $all_tickets as $ticket ) {
-			$template_args['existing_available_datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item( 'DTTNUM', $tktrow, NULL, $ticket, array(), TRUE );
+		foreach ($all_tickets as $ticket) {
+			$template_args['existing_available_datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item('DTTNUM', $tktrow, NULL, $ticket, array(), TRUE);
 			$tktrow++;
 		}
 
 
 		$dttrow = 1;
-		foreach ( $all_dtts as $dtt ) {
-			$template_args['existing_available_ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item( $dttrow, 'TICKETNUM', $dtt, NULL, array(), TRUE );
+		foreach ($all_dtts as $dtt) {
+			$template_args['existing_available_ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item($dttrow, 'TICKETNUM', $dtt, NULL, array(), TRUE);
 			$dttrow++;
 		}
 
 		$default_prices = EE_Registry::instance()->load_model('Price')->get_all_default_prices();
 		$prcrow = 1;
-		foreach ( $default_prices as $price ) {
-			if ( $price->is_base_price() ) {
+		foreach ($default_prices as $price) {
+			if ($price->is_base_price()) {
 				$template_args['default_base_price_amount'] = $price->get_pretty('PRC_amount', 'localized_float');
 				$template_args['default_base_price_name'] = $price->get('PRC_name');
 				$template_args['default_base_price_description'] = $price->get('PRC_desc');
 				$prcrow++;
 				continue;
 			}
-			$show_trash = ( count( $default_prices ) > 1 && $prcrow === 1 ) || count( $default_prices ) === 1  ? FALSE : TRUE;
-			$show_create = count( $default_prices ) > 1 && count( $default_prices ) !== $prcrow ? FALSE : TRUE;
-			$template_args['default_price_rows'] .= $this->_get_ticket_price_row( 'TICKETNUM', $prcrow, $price, TRUE, NULL, $show_trash, $show_create );
+			$show_trash = (count($default_prices) > 1 && $prcrow === 1) || count($default_prices) === 1 ? FALSE : TRUE;
+			$show_create = count($default_prices) > 1 && count($default_prices) !== $prcrow ? FALSE : TRUE;
+			$template_args['default_price_rows'] .= $this->_get_ticket_price_row('TICKETNUM', $prcrow, $price, TRUE, NULL, $show_trash, $show_create);
 			$prcrow++;
 		}
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_js_structure__template_args', $template_args, $all_dtts, $all_tickets, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_js_structure__template_args', $template_args, $all_dtts, $all_tickets, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_js_structure.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_js_structure.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 

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

Spacing +135 added lines, -135 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{
+abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable {
 
 	/**
 	 * the input's name attribute
@@ -141,67 +141,67 @@ 
 	 *		@type EE_Validation_Strategy_Base[] $validation_strategies
 	 * }
 	 */
-	public function __construct( $input_args = array() ){
-		$input_args = apply_filters( 'FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this );
+	public function __construct($input_args = array()) {
+		$input_args = apply_filters('FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this);
 		// the following properties must be cast as arrays
 		$set_as_array = array(
 			'validation_strategies'
 		);
 		// loop thru incoming options
-		foreach( $input_args as $key => $value ) {
+		foreach ($input_args as $key => $value) {
 			// add underscore to $key to match property names
-			$_key = '_' . $key;
-			if ( property_exists( $this, $_key )) {
+			$_key = '_'.$key;
+			if (property_exists($this, $_key)) {
 				// first check if this property needs to be set as an array
-				if ( isset( $set_as_array[ $key ] )) {
+				if (isset($set_as_array[$key])) {
 					// ensure value is an array
-					$value = is_array( $value ) ? $value : array( $value );
+					$value = is_array($value) ? $value : array($value);
 					// and merge with existing values
-					$this->{$_key} = array_merge( $this->{$_key}, $value );
+					$this->{$_key} = array_merge($this->{$_key}, $value);
 				} else {
 					$this->{$_key} = $value;
 				}
 			}
 		}
 		// ensure that "required" is set correctly
-		$this->set_required( $this->_required, isset( $input_args[ 'required_validation_error_message' ] ) ? $input_args[ 'required_validation_error_message' ] : NULL );
+		$this->set_required($this->_required, isset($input_args['required_validation_error_message']) ? $input_args['required_validation_error_message'] : NULL);
 
-		$this->_html_name_specified = isset( $input_args['html_name'] ) ? TRUE : FALSE;
+		$this->_html_name_specified = isset($input_args['html_name']) ? TRUE : FALSE;
 
 		$this->_display_strategy->_construct_finalize($this);
 
-		if ( $this->_validation_strategies ){
-			foreach( $this->_validation_strategies as $validation_strategy ){
+		if ($this->_validation_strategies) {
+			foreach ($this->_validation_strategies as $validation_strategy) {
 				$validation_strategy->_construct_finalize($this);
 			}
 		}
 
-		if( ! $this->_normalization_strategy){
+		if ( ! $this->_normalization_strategy) {
 			$this->_normalization_strategy = new EE_Text_Normalization();
 		}
 		$this->_normalization_strategy->_construct_finalize($this);
 
 		//at least we can use the normalization strategy to populate the default
-		if( isset( $input_args[ 'default' ] ) ) {
-			$this->set_default( $input_args[ 'default' ] );
+		if (isset($input_args['default'])) {
+			$this->set_default($input_args['default']);
 		}
 
-		if( ! $this->_sensitive_data_removal_strategy){
+		if ( ! $this->_sensitive_data_removal_strategy) {
 			$this->_sensitive_data_removal_strategy = new EE_No_Sensitive_Data_Removal();
 		}
 		$this->_sensitive_data_removal_strategy->_construct_finalize($this);
-		parent::__construct( $input_args );
+		parent::__construct($input_args);
 	}
 
 	/**
 	 * Sets the html_name to its default value, if none was specified in teh constructor.
 	 * Calculation involves using the name and the parent's html_name
 	 */
-	protected function _set_default_html_name_if_empty(){
-		if( ! $this->_html_name){
-			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper){
-				$this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
-			}else{
+	protected function _set_default_html_name_if_empty() {
+		if ( ! $this->_html_name) {
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_name = $this->_parent_section->html_name_prefix()."[{$this->name()}]";
+			} else {
 				$this->_html_name = $this->name();
 			}
 		}
@@ -216,12 +216,12 @@ 
 	function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_html_name_if_empty();
-		if( ! $this->_html_label ){
-			if( ! $this->_html_label_text){
-				$this->_html_label_text = ucwords( str_replace("_"," ",$name));
+		if ( ! $this->_html_label) {
+			if ( ! $this->_html_label_text) {
+				$this->_html_label_text = ucwords(str_replace("_", " ", $name));
 			}
 		}
-		do_action( 'AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name );
+		do_action('AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name);
 	}
 
 	 /**
@@ -229,10 +229,10 @@ 
 	  * @return EE_Display_Strategy_Base
 	  * @throws EE_Error
 	  */
-	protected function _get_display_strategy(){
-		if( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base){
-			throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"),$this->html_name(),$this->html_id()));
-		}else{
+	protected function _get_display_strategy() {
+		if ( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) {
+			throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"), $this->html_name(), $this->html_id()));
+		} else {
 			return $this->_display_strategy;
 		}
 	}
@@ -240,7 +240,7 @@ 
 	 * Sets the display strategy.
 	 * @param EE_Display_Strategy_Base $strategy
 	 */
-	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy){
+	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy) {
 		$this->_display_strategy = $strategy;
 	}
 
@@ -248,7 +248,7 @@ 
 	 * Sets the sanitization strategy
 	 * @param EE_Normalization_Strategy_Base $strategy
 	 */
-	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy){
+	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy) {
 		$this->_normalization_strategy = $strategy;
 	}
 
@@ -274,14 +274,14 @@ 
 	 * Gets the display strategy for this input
 	 * @return EE_Display_Strategy_Base
 	 */
-	public function get_display_strategy(){
+	public function get_display_strategy() {
 		return $this->_display_strategy;
 	}
 	/**
 	 * Overwrites the display strategy
 	 * @param EE_Display_Strategy_Base $display_strategy
 	 */
-	public function set_display_strategy($display_strategy){
+	public function set_display_strategy($display_strategy) {
 		$this->_display_strategy = $display_strategy;
 		$this->_display_strategy->_construct_finalize($this);
 	}
@@ -289,14 +289,14 @@ 
 	 * Gets the normalization strategy set on this input
 	 * @return EE_Normalization_Strategy_Base
 	 */
-	public function get_normalization_strategy(){
+	public function get_normalization_strategy() {
 		return $this->_normalization_strategy;
 	}
 	/**
 	 * Overwrites the normalization strategy
 	 * @param EE_Normalization_Strategy_Base $normalization_strategy
 	 */
-	public function set_normalization_strategy($normalization_strategy){
+	public function set_normalization_strategy($normalization_strategy) {
 		$this->_normalization_strategy = $normalization_strategy;
 		$this->_normalization_strategy->_construct_finalize($this);
 	}
@@ -305,10 +305,10 @@ 
 	 * Returns all teh validation strategies which apply to this field, numerically indexed
 	 * @return EE_Validation_Strategy_Base[]
 	 */
-	public function get_validation_strategies(){
-		if(is_array($this->_validation_strategies)){
+	public function get_validation_strategies() {
+		if (is_array($this->_validation_strategies)) {
 			return $this->_validation_strategies;
-		}else{
+		} else {
 			return array();
 		}
 
@@ -318,9 +318,9 @@ 
 	 * @param EE_Validation_Strategy_Base $validation_strategy
 	 * @return void
 	 */
-	protected function _add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ){
-		$validation_strategy->_construct_finalize( $this );
-		$this->_validation_strategies[ get_class($validation_strategy) ] = $validation_strategy;
+	protected function _add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
+		$validation_strategy->_construct_finalize($this);
+		$this->_validation_strategies[get_class($validation_strategy)] = $validation_strategy;
 
 	}
 
@@ -329,18 +329,18 @@ 
 	 * @param EE_Validation_Strategy_Base $validation_strategy
 	 * @return void
 	 */
-	public function add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ) {
-		$this->_add_validation_strategy( $validation_strategy );
+	public function add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
+		$this->_add_validation_strategy($validation_strategy);
 	}
 
 	/**
 	 * The classname of the validation strategy to remove
 	 * @param string $validation_strategy_classname
 	 */
-	public function remove_validation_strategy( $validation_strategy_classname ) {
-		foreach( $this->_validation_strategies as $key => $validation_strategy ){
-			if( is_subclass_of( $validation_strategy, $validation_strategy_classname ) ){
-				unset( $this->_validation_strategies[ $key ] );
+	public function remove_validation_strategy($validation_strategy_classname) {
+		foreach ($this->_validation_strategies as $key => $validation_strategy) {
+			if (is_subclass_of($validation_strategy, $validation_strategy_classname)) {
+				unset($this->_validation_strategies[$key]);
 			}
 		}
 	}
@@ -349,7 +349,7 @@ 
 	 * to the parent form's layout strategy
 	 * @return string
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		return $this->_parent_section->get_html_for_input($this);
 	}
 	/**
@@ -358,7 +358,7 @@ 
 	 * Makes sure the JS and CSS are enqueued for it
 	 * @return string
 	 */
-	public function get_html_for_input(){
+	public function get_html_for_input() {
 		return  $this->_get_display_strategy()->display();
 	}
 
@@ -368,7 +368,7 @@ 
 	 * @return string
 	 */
 	public function html_other_attributes() {
-		return ! empty( $this->_html_other_attributes ) ? ' ' . $this->_html_other_attributes : '';
+		return ! empty($this->_html_other_attributes) ? ' '.$this->_html_other_attributes : '';
 	}
 
 
@@ -376,7 +376,7 @@ 
 	/**
 	 * @param string $html_other_attributes
 	 */
-	public function set_html_other_attributes( $html_other_attributes ) {
+	public function set_html_other_attributes($html_other_attributes) {
 		$this->_html_other_attributes = $html_other_attributes;
 	}
 
@@ -385,7 +385,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_label(){
+	public function get_html_for_label() {
 		return $this->_parent_section->get_layout_strategy()->display_label($this);
 	}
 	/**
@@ -393,7 +393,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_errors(){
+	public function get_html_for_errors() {
 		return $this->_parent_section->get_layout_strategy()->display_errors($this);
 	}
 	/**
@@ -401,7 +401,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_help(){
+	public function get_html_for_help() {
 		return $this->_parent_section->get_layout_strategy()->display_help_text($this);
 	}
 	/**
@@ -410,20 +410,20 @@ 
 	 * @return boolean
 	 */
 	protected function _validate() {
-		if(is_array($this->_validation_strategies)){
-			foreach($this->_validation_strategies as $validation_strategy){
-				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
-					try{
+		if (is_array($this->_validation_strategies)) {
+			foreach ($this->_validation_strategies as $validation_strategy) {
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
+					try {
 						$validation_strategy->validate($this->normalized_value());
-					}catch(EE_Validation_Error $e){
+					} catch (EE_Validation_Error $e) {
 						$this->add_validation_error($e);
 					}
 				}
 			}
 		}
-		if( $this->get_validation_errors()){
+		if ($this->get_validation_errors()) {
 			return false;
-		}else{
+		} else {
 			return true;
 		}
 	}
@@ -436,8 +436,8 @@ 
 	 * @param string $value
 	 * @return null|string
 	 */
-	private function _sanitize($value){
-		return $value !== NULL ?stripslashes(html_entity_decode($value)) : NULL;//don't sanitize_text_field
+	private function _sanitize($value) {
+		return $value !== NULL ?stripslashes(html_entity_decode($value)) : NULL; //don't sanitize_text_field
 	}
 
 
@@ -449,24 +449,24 @@ 
 	 * @param array $req_data like $_POST
 	 * @return boolean whether or not there was an error
 	 */
-	protected function _normalize( $req_data ) {
+	protected function _normalize($req_data) {
 		//any existing validation errors don't apply so clear them
 		$this->_validation_errors = array();
 		try {
-			$raw_input = $this->find_form_data_for_this_section( $req_data );
+			$raw_input = $this->find_form_data_for_this_section($req_data);
 			//super simple sanitization for now
-			if ( is_array( $raw_input )) {
+			if (is_array($raw_input)) {
 				$this->_raw_value = array();
-				foreach( $raw_input as $key => $value ) {
-					$this->_raw_value[ $key ] = $this->_sanitize( $value );
+				foreach ($raw_input as $key => $value) {
+					$this->_raw_value[$key] = $this->_sanitize($value);
 				}
 			} else {
-				$this->_raw_value = $this->_sanitize( $raw_input );
+				$this->_raw_value = $this->_sanitize($raw_input);
 			}
 			//we want ot mostly leave the input alone in case we need to re-display it to the user
-			$this->_normalized_value = $this->_normalization_strategy->normalize( $this->raw_value() );
-		} catch ( EE_Validation_Error $e ) {
-			$this->add_validation_error( $e );
+			$this->_normalized_value = $this->_normalization_strategy->normalize($this->raw_value());
+		} catch (EE_Validation_Error $e) {
+			$this->add_validation_error($e);
 		}
 	}
 
@@ -475,7 +475,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_name(){
+	public function html_name() {
 		return $this->_html_name;
 	}
 
@@ -484,8 +484,8 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_id(){
-		return ! empty( $this->_html_label_id ) ? $this->_html_label_id : $this->_html_id . '-lbl';
+	function html_label_id() {
+		return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->_html_id.'-lbl';
 	}
 
 
@@ -493,7 +493,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_class(){
+	function html_label_class() {
 		return $this->_html_label_class;
 	}
 
@@ -502,7 +502,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_style(){
+	function html_label_style() {
 		return $this->_html_label_style;
 	}
 
@@ -511,7 +511,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_text(){
+	function html_label_text() {
 		return $this->_html_label_text;
 	}
 
@@ -520,7 +520,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_help_text(){
+	function html_help_text() {
 		return $this->_html_help_text;
 	}
 
@@ -529,7 +529,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_help_class(){
+	function html_help_class() {
 		return $this->_html_help_class;
 	}
 
@@ -538,7 +538,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_help_style(){
+	function html_help_style() {
 		return $this->_html_style;
 	}
 	/**
@@ -551,7 +551,7 @@ 
 	 * in which case, we would have stored the malicious content to our database.
 	 * @return string
 	 */
-	function raw_value(){
+	function raw_value() {
 		return $this->_raw_value;
 	}
 	/**
@@ -559,15 +559,15 @@ 
 	 * it escapes all html entities
 	 * @return string
 	 */
-	function raw_value_in_form(){
-		return htmlentities($this->raw_value(),ENT_QUOTES, 'UTF-8');
+	function raw_value_in_form() {
+		return htmlentities($this->raw_value(), ENT_QUOTES, 'UTF-8');
 	}
 	/**
 	 * returns the value after it's been sanitized, and then converted into it's proper type
 	 * in PHP. Eg, a string, an int, an array,
 	 * @return mixed
 	 */
-	function normalized_value(){
+	function normalized_value() {
 		return $this->_normalized_value;
 	}
 
@@ -577,7 +577,7 @@ 
 	 * the best thing to display
 	 * @return string
 	 */
-	function pretty_value(){
+	function pretty_value() {
 		return $this->_normalized_value;
 	}
 	/**
@@ -596,15 +596,15 @@ 
 		  }</code>
 	 * @return array
 	 */
-	function get_jquery_validation_rules(){
+	function get_jquery_validation_rules() {
 		$jquery_validation_rules = array();
-		foreach($this->get_validation_strategies() as $validation_strategy){
-			$jquery_validation_rules = array_replace_recursive( $jquery_validation_rules, $validation_strategy->get_jquery_validation_rule_array());
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
+			$jquery_validation_rules = array_replace_recursive($jquery_validation_rules, $validation_strategy->get_jquery_validation_rule_array());
 		}
 
-		if(! empty($jquery_validation_rules)){
-			$jquery_validation_js[ $this->html_id( TRUE ) ] = $jquery_validation_rules;
-		}else{
+		if ( ! empty($jquery_validation_rules)) {
+			$jquery_validation_js[$this->html_id(TRUE)] = $jquery_validation_rules;
+		} else {
 			return array();
 		}
 		return $jquery_validation_js;
@@ -616,9 +616,9 @@ 
 	 * @param mixed $value
 	 * @return void
 	 */
-	function set_default($value){
+	function set_default($value) {
 		$this->_normalized_value = $value;
-		$this->_raw_value = $this->_normalization_strategy->unnormalize( $value );
+		$this->_raw_value = $this->_normalization_strategy->unnormalize($value);
 	}
 
 	/**
@@ -626,7 +626,7 @@ 
 	 * @param string $label
 	 * @return void
 	 */
-	function set_html_label_text($label){
+	function set_html_label_text($label) {
 		$this->_html_label_text = $label;
 	}
 
@@ -638,12 +638,12 @@ 
 	 * @param boolean $required
 	 * @param null    $required_text
 	 */
-	function set_required($required = true, $required_text = NULL ){
-		$required = filter_var( $required, FILTER_VALIDATE_BOOLEAN );
-		if ( $required ) {
-			$this->_add_validation_strategy( new EE_Required_Validation_Strategy( $required_text ) );
+	function set_required($required = true, $required_text = NULL) {
+		$required = filter_var($required, FILTER_VALIDATE_BOOLEAN);
+		if ($required) {
+			$this->_add_validation_strategy(new EE_Required_Validation_Strategy($required_text));
 		} else {
-			unset( $this->_validation_strategies[ get_class( new EE_Required_Validation_Strategy() ) ] );
+			unset($this->_validation_strategies[get_class(new EE_Required_Validation_Strategy())]);
 		}
 		$this->_required = $required;
 	}
@@ -651,7 +651,7 @@ 
 	 * Returns whether or not this field is required
 	 * @return boolean
 	 */
-	public function required(){
+	public function required() {
 		return $this->_required;
 	}
 
@@ -660,7 +660,7 @@ 
 	/**
 	 * @param string $required_css_class
 	 */
-	public function set_required_css_class( $required_css_class ) {
+	public function set_required_css_class($required_css_class) {
 		$this->_required_css_class = $required_css_class;
 	}
 
@@ -679,7 +679,7 @@ 
 	 * Sets the help text, in case
 	 * @param string $text
 	 */
-	public function set_html_help_text($text){
+	public function set_html_help_text($text) {
 		$this->_html_help_text = $text;
 	}
 	/**
@@ -691,8 +691,8 @@ 
 	public function clean_sensitive_data() {
 		//if we do ANY kind of sensitive data removal on this, then just clear out the raw value
 		//if we need more logic than this we'll make a strategy for it
-		if( $this->_sensitive_data_removal_strategy &&
-				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal ){
+		if ($this->_sensitive_data_removal_strategy &&
+				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal) {
 			$this->_raw_value = NULL;
 		}
 		//and clean the normalized value according to the appropriate strategy
@@ -706,10 +706,10 @@ 
 	 * @param string $button_size
 	 * @param string $other_attributes
 	 */
-	public function set_button_css_attributes( $primary = TRUE, $button_size = '', $other_attributes = '' ) {
+	public function set_button_css_attributes($primary = TRUE, $button_size = '', $other_attributes = '') {
 		$button_css_attributes = 'button';
 		$button_css_attributes .= $primary === TRUE ? ' button-primary' : ' button-secondary';
-		switch ( $button_size ) {
+		switch ($button_size) {
 			case 'xs' :
 			case 'extra-small' :
 				$button_css_attributes .= ' button-xs';
@@ -730,7 +730,7 @@ 
 			default :
 				$button_css_attributes .= '';
 		}
-		$this->_button_css_attributes .= ! empty( $other_attributes ) ? $button_css_attributes . ' ' . $other_attributes : $button_css_attributes;
+		$this->_button_css_attributes .= ! empty($other_attributes) ? $button_css_attributes.' '.$other_attributes : $button_css_attributes;
 	}
 
 
@@ -739,7 +739,7 @@ 
 	 * @return string
 	 */
 	public function button_css_attributes() {
-		if ( empty( $this->_button_css_attributes )) {
+		if (empty($this->_button_css_attributes)) {
 			$this->set_button_css_attributes();
 		}
 		return $this->_button_css_attributes;
@@ -759,27 +759,27 @@ 
 	 * @param array $req_data
 	 * @return mixed whatever the raw value of this form section is in the request data
 	 */
-	public function find_form_data_for_this_section( $req_data ){
+	public function find_form_data_for_this_section($req_data) {
 		// break up the html name by "[]"
-		if ( strpos( $this->html_name(), '[' ) !== FALSE ) {
-			$before_any_brackets = substr( $this->html_name(), 0, strpos($this->html_name(), '[') );
+		if (strpos($this->html_name(), '[') !== FALSE) {
+			$before_any_brackets = substr($this->html_name(), 0, strpos($this->html_name(), '['));
 		} else {
 			$before_any_brackets = $this->html_name();
 		}
 		// grab all of the segments
-		preg_match_all('~\[([^]]*)\]~',$this->html_name(), $matches);
-		if( isset( $matches[ 1 ] ) && is_array( $matches[ 1 ] ) ){
-			$name_parts = $matches[ 1 ];
+		preg_match_all('~\[([^]]*)\]~', $this->html_name(), $matches);
+		if (isset($matches[1]) && is_array($matches[1])) {
+			$name_parts = $matches[1];
 			array_unshift($name_parts, $before_any_brackets);
-		}else{
-			$name_parts = array( $before_any_brackets );
+		} else {
+			$name_parts = array($before_any_brackets);
 		}
 		// now get the value for the input
 		$value = $this->_find_form_data_for_this_section_using_name_parts($name_parts, $req_data);
-		if( $value === NULL ){
+		if ($value === NULL) {
 			//check if this thing's name is at the TOP level of the request data
-			if( isset( $req_data[ $this->name() ] ) ){
-				$value = $req_data[ $this->name() ];
+			if (isset($req_data[$this->name()])) {
+				$value = $req_data[$this->name()];
 			}
 		}
 		return $value;
@@ -793,15 +793,15 @@ 
 	 * @param array $req_data
 	 * @return array | NULL
 	 */
-	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data){
-		$first_part_to_consider = array_shift( $html_name_parts );
-		if( isset( $req_data[ $first_part_to_consider ] ) ){
-			if( empty($html_name_parts ) ){
-				return $req_data[ $first_part_to_consider ];
-			}else{
-				return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[ $first_part_to_consider ] );
+	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data) {
+		$first_part_to_consider = array_shift($html_name_parts);
+		if (isset($req_data[$first_part_to_consider])) {
+			if (empty($html_name_parts)) {
+				return $req_data[$first_part_to_consider];
+			} else {
+				return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[$first_part_to_consider]);
 			}
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -813,14 +813,14 @@ 
 	 * @param array $req_data like $_POST
 	 * @return boolean
 	 */
-	public function form_data_present_in($req_data = NULL){
-		if( $req_data === NULL ){
+	public function form_data_present_in($req_data = NULL) {
+		if ($req_data === NULL) {
 			$req_data = $_POST;
 		}
-		$checked_value = $this->find_form_data_for_this_section( $req_data );
-		if( $checked_value !== null ){
+		$checked_value = $this->find_form_data_for_this_section($req_data);
+		if ($checked_value !== null) {
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}

core/admin/EE_Admin_Page.core.php

Spacing +594 added lines, -594 removed lines

@@ -144,9 +144,9 @@ 
 	 * 		@access public
 	 * 		@return void
 	 */
-	public function __construct( $routing = TRUE ) {
+	public function __construct($routing = TRUE) {
 
-		if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false )
+		if (strpos($this->_get_dir(), 'caffeinated') !== false)
 			$this->_is_caf = TRUE;
 
 		$this->_yes_no_values = array(
@@ -157,7 +157,7 @@ 
 
 
 		//set the _req_data property.
-		$this->_req_data = array_merge( $_GET, $_POST );
+		$this->_req_data = array_merge($_GET, $_POST);
 
 
 		//routing enabled?
@@ -178,7 +178,7 @@ 
 		$this->_do_other_page_hooks();
 
 		//This just allows us to have extending clases do something specific before the parent constructor runs _page_setup.
-		if ( method_exists( $this, '_before_page_setup' ) )
+		if (method_exists($this, '_before_page_setup'))
 			$this->_before_page_setup();
 
 		//set up page dependencies
@@ -448,16 +448,16 @@ 
 	 */
 	protected function _global_ajax_hooks() {
 		//for lazy loading of metabox content
-		add_action( 'wp_ajax_espresso-ajax-content', array( $this, 'ajax_metabox_content'), 10 );
+		add_action('wp_ajax_espresso-ajax-content', array($this, 'ajax_metabox_content'), 10);
 	}
 
 
 
 	public function ajax_metabox_content() {
-		$contentid = isset( $this->_req_data['contentid'] ) ? $this->_req_data['contentid'] : '';
-		$url = isset( $this->_req_data['contenturl'] ) ? $this->_req_data['contenturl'] : '';
+		$contentid = isset($this->_req_data['contentid']) ? $this->_req_data['contentid'] : '';
+		$url = isset($this->_req_data['contenturl']) ? $this->_req_data['contenturl'] : '';
 
-		self::cached_rss_display( $contentid, $url );
+		self::cached_rss_display($contentid, $url);
 		wp_die();
 	}
 
@@ -478,87 +478,87 @@ 
 
 
 		//admin_init stuff - global - we're setting this REALLY early so if EE_Admin pages have to hook into other WP pages they can.  But keep in mind, not everything is available from the EE_Admin Page object at this point.
-		add_action( 'admin_init', array( $this, 'admin_init_global' ), 5 );
+		add_action('admin_init', array($this, 'admin_init_global'), 5);
 
 
 		//next verify if we need to load anything...
-		$this->_current_page = !empty( $_GET['page'] ) ? sanitize_key( $_GET['page'] ) : FALSE;
-		$this->page_folder = strtolower( str_replace( '_Admin_Page', '', str_replace( 'Extend_', '', get_class($this) ) ) );
+		$this->_current_page = ! empty($_GET['page']) ? sanitize_key($_GET['page']) : FALSE;
+		$this->page_folder = strtolower(str_replace('_Admin_Page', '', str_replace('Extend_', '', get_class($this))));
 
 		global $ee_menu_slugs;
 		$ee_menu_slugs = (array) $ee_menu_slugs;
 
-		if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) return FALSE;
+		if (( ! $this->_current_page || ! isset($ee_menu_slugs[$this->_current_page])) && ! defined('DOING_AJAX')) return FALSE;
 
 
 		// becuz WP List tables have two duplicate select inputs for choosing bulk actions, we need to copy the action from the second to the first
-		if ( isset( $this->_req_data['action2'] ) && $this->_req_data['action'] == -1 ) {
-			$this->_req_data['action'] = ! empty( $this->_req_data['action2'] ) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action'];
+		if (isset($this->_req_data['action2']) && $this->_req_data['action'] == -1) {
+			$this->_req_data['action'] = ! empty($this->_req_data['action2']) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action'];
 		}
 		// then set blank or -1 action values to 'default'
-		$this->_req_action = isset( $this->_req_data['action'] ) && ! empty( $this->_req_data['action'] ) && $this->_req_data['action'] != -1 ? sanitize_key( $this->_req_data['action'] ) : 'default';
+		$this->_req_action = isset($this->_req_data['action']) && ! empty($this->_req_data['action']) && $this->_req_data['action'] != -1 ? sanitize_key($this->_req_data['action']) : 'default';
 
 		//if action is 'default' after the above BUT we have  'route' var set, then let's use the route as the action.  This covers cases where we're coming in from a list table that isn't on the default route.
-		$this->_req_action = $this->_req_action == 'default' && isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : $this->_req_action;
+		$this->_req_action = $this->_req_action == 'default' && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action;
 
 		//however if we are doing_ajax and we've got a 'route' set then that's what the req_action will be
 		$this->_req_action = defined('DOING_AJAX') && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action;
 
 		$this->_current_view = $this->_req_action;
-		$this->_req_nonce = $this->_req_action . '_nonce';
+		$this->_req_nonce = $this->_req_action.'_nonce';
 		$this->_define_page_props();
 
-		$this->_current_page_view_url = add_query_arg( array( 'page' => $this->_current_page, 'action' => $this->_current_view ),  $this->_admin_base_url );
+		$this->_current_page_view_url = add_query_arg(array('page' => $this->_current_page, 'action' => $this->_current_view), $this->_admin_base_url);
 
 		//default things
-		$this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box' );
+		$this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box');
 
 		//set page configs
 		$this->_set_page_routes();
 		$this->_set_page_config();
 
 		//let's include any referrer data in our default_query_args for this route for "stickiness".
-		if ( isset( $this->_req_data['wp_referer'] ) ) {
+		if (isset($this->_req_data['wp_referer'])) {
 			$this->_default_route_query_args['wp_referer'] = $this->_req_data['wp_referer'];
 		}
 
 		//for caffeinated and other extended functionality.  If there is a _extend_page_config method then let's run that to modify the all the various page configuration arrays
-		if ( method_exists( $this, '_extend_page_config' ) )
+		if (method_exists($this, '_extend_page_config'))
 			$this->_extend_page_config();
 
 		//for CPT and other extended functionality. If there is an _extend_page_config_for_cpt then let's run that to modify all the various page configuration arrays.
-		if ( method_exists( $this, '_extend_page_config_for_cpt' ) )
+		if (method_exists($this, '_extend_page_config_for_cpt'))
 			$this->_extend_page_config_for_cpt();
 
 		//filter routes and page_config so addons can add their stuff. Filtering done per class
-		$this->_page_routes = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_routes', $this->_page_routes, $this );
-		$this->_page_config = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_config', $this->_page_config, $this );
+		$this->_page_routes = apply_filters('FHEE__'.get_class($this).'__page_setup__page_routes', $this->_page_routes, $this);
+		$this->_page_config = apply_filters('FHEE__'.get_class($this).'__page_setup__page_config', $this->_page_config, $this);
 
 
 		//if AHEE__EE_Admin_Page__route_admin_request_$this->_current_view method is present then we call it hooked into the AHEE__EE_Admin_Page__route_admin_request action
-		if ( method_exists( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ) ) {
-			add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ), 10, 2 );
+		if (method_exists($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view)) {
+			add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view), 10, 2);
 		}
 
 
 		//next route only if routing enabled
-		if ( $this->_routing && !defined('DOING_AJAX') ) {
+		if ($this->_routing && ! defined('DOING_AJAX')) {
 
 			$this->_verify_routes();
 
 			//next let's just check user_access and kill if no access
 			$this->check_user_access();
 
-			if ( $this->_is_UI_request ) {
+			if ($this->_is_UI_request) {
 				//admin_init stuff - global, all views for this page class, specific view
-				add_action( 'admin_init', array( $this, 'admin_init' ), 10 );
-				if ( method_exists( $this, 'admin_init_' . $this->_current_view )) {
-					add_action( 'admin_init', array( $this, 'admin_init_' . $this->_current_view ), 15 );
+				add_action('admin_init', array($this, 'admin_init'), 10);
+				if (method_exists($this, 'admin_init_'.$this->_current_view)) {
+					add_action('admin_init', array($this, 'admin_init_'.$this->_current_view), 15);
 				}
 
 			} else {
 				//hijack regular WP loading and route admin request immediately
-				@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+				@ini_set('memory_limit', apply_filters('admin_memory_limit', WP_MAX_MEMORY_LIMIT));
 				$this->route_admin_request();
 			}
 		}
@@ -575,18 +575,18 @@ 
 	 * @return void
 	 */
 	private function _do_other_page_hooks() {
-		$registered_pages = apply_filters( 'FHEE_do_other_page_hooks_' . $this->page_slug, array() );
+		$registered_pages = apply_filters('FHEE_do_other_page_hooks_'.$this->page_slug, array());
 
-		foreach ( $registered_pages as $page ) {
+		foreach ($registered_pages as $page) {
 
 			//now let's setup the file name and class that should be present
 			$classname = str_replace('.class.php', '', $page);
 
 			//autoloaders should take care of loading file
-			if ( !class_exists( $classname ) ) {
-				$error_msg[] = sprintf( __('Something went wrong with loading the %s admin hooks page.', 'event_espresso' ), $page);
-				$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname );
-				throw new EE_Error( implode( '||', $error_msg ));
+			if ( ! class_exists($classname)) {
+				$error_msg[] = sprintf(__('Something went wrong with loading the %s admin hooks page.', 'event_espresso'), $page);
+				$error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname);
+				throw new EE_Error(implode('||', $error_msg));
 			}
 
 			$a = new ReflectionClass($classname);
@@ -601,7 +601,7 @@ 
 	public function load_page_dependencies() {
 		try {
 			$this->_load_page_dependencies();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -619,16 +619,16 @@ 
 		$this->_current_screen = get_current_screen();
 
 		//load admin_notices - global, page class, and view specific
-		add_action( 'admin_notices', array( $this, 'admin_notices_global'), 5 );
-		add_action( 'admin_notices', array( $this, 'admin_notices' ), 10 );
-		if ( method_exists( $this, 'admin_notices_' . $this->_current_view ) ) {
-			add_action( 'admin_notices', array( $this, 'admin_notices_' . $this->_current_view ), 15 );
+		add_action('admin_notices', array($this, 'admin_notices_global'), 5);
+		add_action('admin_notices', array($this, 'admin_notices'), 10);
+		if (method_exists($this, 'admin_notices_'.$this->_current_view)) {
+			add_action('admin_notices', array($this, 'admin_notices_'.$this->_current_view), 15);
 		}
 
 		//load network admin_notices - global, page class, and view specific
-		add_action( 'network_admin_notices', array( $this, 'network_admin_notices_global'), 5 );
-		if ( method_exists( $this, 'network_admin_notices_' . $this->_current_view ) ) {
-			add_action( 'network_admin_notices', array( $this, 'network_admin_notices_' . $this->_current_view ) );
+		add_action('network_admin_notices', array($this, 'network_admin_notices_global'), 5);
+		if (method_exists($this, 'network_admin_notices_'.$this->_current_view)) {
+			add_action('network_admin_notices', array($this, 'network_admin_notices_'.$this->_current_view));
 		}
 
 		//this will save any per_page screen options if they are present
@@ -644,8 +644,8 @@ 
 		//add screen options - global, page child class, and view specific
 		$this->_add_global_screen_options();
 		$this->_add_screen_options();
-		if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) );
+		if (method_exists($this, '_add_screen_options_'.$this->_current_view))
+			call_user_func(array($this, '_add_screen_options_'.$this->_current_view));
 
 
 		//add help tab(s) and tours- set via page_config and qtips.
@@ -656,33 +656,33 @@ 
 		//add feature_pointers - global, page child class, and view specific
 		$this->_add_feature_pointers();
 		$this->_add_global_feature_pointers();
-		if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) );
+		if (method_exists($this, '_add_feature_pointer_'.$this->_current_view))
+			call_user_func(array($this, '_add_feature_pointer_'.$this->_current_view));
 
 		//enqueue scripts/styles - global, page class, and view specific
-		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5 );
-		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10 );
-		if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) )
-			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 );
+		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5);
+		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10);
+		if (method_exists($this, 'load_scripts_styles_'.$this->_current_view))
+			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_'.$this->_current_view), 15);
 
-		add_action('admin_enqueue_scripts', array( $this, 'admin_footer_scripts_eei18n_js_strings' ), 100 );
+		add_action('admin_enqueue_scripts', array($this, 'admin_footer_scripts_eei18n_js_strings'), 100);
 
 		//admin_print_footer_scripts - global, page child class, and view specific.  NOTE, despite the name, whenever possible, scripts should NOT be loaded using this.  In most cases that's doing_it_wrong().  But adding hidden container elements etc. is a good use case. Notice the late priority we're giving these
-		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_global' ), 99 );
-		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts' ), 100 );
-		if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) )
-			add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 );
+		add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_global'), 99);
+		add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts'), 100);
+		if (method_exists($this, 'admin_footer_scripts_'.$this->_current_view))
+			add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_'.$this->_current_view), 101);
 
 		//admin footer scripts
-		add_action('admin_footer', array( $this, 'admin_footer_global' ), 99 );
-		add_action('admin_footer', array( $this, 'admin_footer'), 100 );
-		if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) )
-			add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 );
+		add_action('admin_footer', array($this, 'admin_footer_global'), 99);
+		add_action('admin_footer', array($this, 'admin_footer'), 100);
+		if (method_exists($this, 'admin_footer_'.$this->_current_view))
+			add_action('admin_footer', array($this, 'admin_footer_'.$this->_current_view), 101);
 
 
-		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug );
+		do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug);
 		//targeted hook
-		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load__' . $this->page_slug . '__' . $this->_req_action );
+		do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load__'.$this->page_slug.'__'.$this->_req_action);
 
 	}
 
@@ -697,7 +697,7 @@ 
 	private function _set_defaults() {
 		$this->_current_screen = $this->_admin_page_title = $this->_req_action = $this->_req_nonce = $this->_event = $this->_template_path = $this->_column_template_path = NULL;
 
-		$this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config =  $this->_default_route_query_args = array();
+		$this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config = $this->_default_route_query_args = array();
 
 		$this->default_nav_tab_name = 'overview';
 
@@ -724,7 +724,7 @@ 
 	public function route_admin_request() {
 		try {
 			$this->_route_admin_request();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -735,7 +735,7 @@ 
 		$this->_wp_page_slug = $wp_page_slug;
 
 		//if in network admin then we need to append "-network" to the page slug. Why? Because that's how WP rolls...
-		if ( is_network_admin() ) {
+		if (is_network_admin()) {
 			$this->_wp_page_slug .= '-network';
 		}
 	}
@@ -748,53 +748,53 @@ 
 	 * @return void
 	 */
 	protected function _verify_routes() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		if ( !$this->_current_page && !defined( 'DOING_AJAX')) return FALSE;
+		if ( ! $this->_current_page && ! defined('DOING_AJAX')) return FALSE;
 
 		$this->_route = FALSE;
 		$func = FALSE;
 		$args = array();
 
 		// check that the page_routes array is not empty
-		if ( empty( $this->_page_routes )) {
+		if (empty($this->_page_routes)) {
 			// user error msg
-			$error_msg = sprintf( __('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title );
+			$error_msg = sprintf(__('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . __( ' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso' );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.__(' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso');
+			throw new EE_Error($error_msg);
 		}
 
 		// and that the requested page route exists
-		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
-			$this->_route = $this->_page_routes[ $this->_req_action ];
+		if (array_key_exists($this->_req_action, $this->_page_routes)) {
+			$this->_route = $this->_page_routes[$this->_req_action];
 			$this->_route_config = isset($this->_page_config[$this->_req_action]) ? $this->_page_config[$this->_req_action] : array();
 		} else {
 			// user error msg
-			$error_msg =  sprintf( __( 'The requested page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('The requested page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . sprintf( __( ' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso' ), $this->_req_action );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.sprintf(__(' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso'), $this->_req_action);
+			throw new EE_Error($error_msg);
 		}
 
 		// and that a default route exists
-		if ( ! array_key_exists( 'default', $this->_page_routes )) {
+		if ( ! array_key_exists('default', $this->_page_routes)) {
 			// user error msg
-			$error_msg = sprintf( __( 'A default page route has not been set for the % admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('A default page route has not been set for the % admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . __( ' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso' );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.__(' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso');
+			throw new EE_Error($error_msg);
 		}
 
 
 		//first lets' catch if the UI request has EVER been set.
-		if ( $this->_is_UI_request === NULL ) {
+		if ($this->_is_UI_request === NULL) {
 			//lets set if this is a UI request or not.
-			$this->_is_UI_request = ( ! isset( $this->_req_data['noheader'] ) || $this->_req_data['noheader'] !== TRUE ) ? TRUE : FALSE;
+			$this->_is_UI_request = ( ! isset($this->_req_data['noheader']) || $this->_req_data['noheader'] !== TRUE) ? TRUE : FALSE;
 
 
 			//wait a minute... we might have a noheader in the route array
-			$this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader'] ) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request;
+			$this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader']) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request;
 		}
 
 		$this->_set_current_labels();
@@ -809,15 +809,15 @@ 
 	 * @param  string $route the route name we're verifying
 	 * @return mixed  (bool|Exception)      we'll throw an exception if this isn't a valid route.
 	 */
-	protected function _verify_route( $route ) {
-		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
+	protected function _verify_route($route) {
+		if (array_key_exists($this->_req_action, $this->_page_routes)) {
 			return true;
 		} else {
 			// user error msg
-			$error_msg =  sprintf( __( 'The given page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('The given page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . sprintf( __( ' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso' ), $route );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.sprintf(__(' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso'), $route);
+			throw new EE_Error($error_msg);
 		}
 	}
 
@@ -831,18 +831,18 @@ 
 	 * @param  string $nonce_ref The nonce reference string (name0)
 	 * @return mixed (bool|die)
 	 */
-	protected function _verify_nonce( $nonce, $nonce_ref ) {
+	protected function _verify_nonce($nonce, $nonce_ref) {
 		// verify nonce against expected value
-		if ( ! wp_verify_nonce( $nonce, $nonce_ref) ) {
+		if ( ! wp_verify_nonce($nonce, $nonce_ref)) {
 			// these are not the droids you are looking for !!!
-			$msg = sprintf(__('%sNonce Fail.%s' , 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>' );
-			if ( WP_DEBUG ) {
-				$msg .= "\n  " . sprintf( __('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso' ), __CLASS__  );
+			$msg = sprintf(__('%sNonce Fail.%s', 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>');
+			if (WP_DEBUG) {
+				$msg .= "\n  ".sprintf(__('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso'), __CLASS__);
 			}
-			if ( ! defined( 'DOING_AJAX' )) {
-				wp_die( $msg );
+			if ( ! defined('DOING_AJAX')) {
+				wp_die($msg);
 			} else {
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 				$this->_return_json();
 			}
 		}
@@ -860,63 +860,63 @@ 
 	 * @return void
 	 */
 	protected function _route_admin_request() {
-		if (  ! $this->_is_UI_request )
+		if ( ! $this->_is_UI_request)
 			$this->_verify_routes();
 
-		$nonce_check = isset( $this->_route_config['require_nonce'] ) ? $this->_route_config['require_nonce'] : TRUE;
+		$nonce_check = isset($this->_route_config['require_nonce']) ? $this->_route_config['require_nonce'] : TRUE;
 
-		if ( $this->_req_action != 'default' && $nonce_check ) {
+		if ($this->_req_action != 'default' && $nonce_check) {
 			// set nonce from post data
-			$nonce = isset($this->_req_data[ $this->_req_nonce  ]) ? sanitize_text_field( $this->_req_data[ $this->_req_nonce  ] ) : '';
-			$this->_verify_nonce( $nonce, $this->_req_nonce );
+			$nonce = isset($this->_req_data[$this->_req_nonce]) ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : '';
+			$this->_verify_nonce($nonce, $this->_req_nonce);
 		}
 		//set the nav_tabs array but ONLY if this is  UI_request
-		if ( $this->_is_UI_request )
+		if ($this->_is_UI_request)
 			$this->_set_nav_tabs();
 
 		// grab callback function
-		$func = is_array( $this->_route ) ? $this->_route['func'] : $this->_route;
+		$func = is_array($this->_route) ? $this->_route['func'] : $this->_route;
 
 		// check if callback has args
-		$args = is_array( $this->_route ) && isset( $this->_route['args'] ) ? $this->_route['args'] : array();
+		$args = is_array($this->_route) && isset($this->_route['args']) ? $this->_route['args'] : array();
 
 		$error_msg = '';
 
 		//action right before calling route (hook is something like 'AHEE__Registrations_Admin_Page__route_admin_request')
-		if ( !did_action('AHEE__EE_Admin_Page__route_admin_request')) {
-			do_action( 'AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this );
+		if ( ! did_action('AHEE__EE_Admin_Page__route_admin_request')) {
+			do_action('AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this);
 		}
 
 		//right before calling the route, let's remove _wp_http_referer from the $_SERVER[REQUEST_URI] global (its now in _req_data for route processing).
-		$_SERVER['REQUEST_URI'] = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+		$_SERVER['REQUEST_URI'] = remove_query_arg('_wp_http_referer', wp_unslash($_SERVER['REQUEST_URI']));
 
-		if ( ! empty( $func )) {
+		if ( ! empty($func)) {
 			$base_call = $addon_call = FALSE;
 			//try to access page route via this class
-			if ( ! is_array( $func ) && method_exists( $this, $func ) && ( $base_call = call_user_func_array( array( $this, &$func  ), $args ) ) === FALSE ) {
+			if ( ! is_array($func) && method_exists($this, $func) && ($base_call = call_user_func_array(array($this, &$func), $args)) === FALSE) {
 				// user error msg
-				$error_msg =  __( 'An error occurred. The  requested page route could not be found.', 'event_espresso' );
+				$error_msg = __('An error occurred. The  requested page route could not be found.', 'event_espresso');
 				// developer error msg
-				$error_msg .= '||' . sprintf( __( 'Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso' ), $func );
+				$error_msg .= '||'.sprintf(__('Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso'), $func);
 			}
 
 			//for pluggability by addons first let's see if just the function exists (this will also work in the case where $func is an array indicating class/method)
 			$args['admin_page_object'] = $this; //send along this admin page object for access by addons.
 
-			if ( $base_call === FALSE && ( $addon_call = call_user_func_array( $func, $args ) )=== FALSE ) {
-				$error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso' );
-				$error_msg .= '||' . sprintf( __('Page route "%s" could not be called.  Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func );
+			if ($base_call === FALSE && ($addon_call = call_user_func_array($func, $args)) === FALSE) {
+				$error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso');
+				$error_msg .= '||'.sprintf(__('Page route "%s" could not be called.  Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func);
 			}
 
 
-			if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE )
-				throw new EE_Error( $error_msg );
+			if ( ! empty($error_msg) && $base_call === FALSE && $addon_call === FALSE)
+				throw new EE_Error($error_msg);
 		}
 
 		//if we've routed and this route has a no headers route AND a sent_headers_route, then we need to reset the routing properties to the new route.
 		//now if UI request is FALSE and noheader is true AND we have a headers_sent_route in the route array then let's set UI_request to true because the no header route has a second func after headers have been sent.
-		if ( $this->_is_UI_request === FALSE && is_array( $this->_route) && ! empty( $this->_route['headers_sent_route'] ) ) {
-			$this->_reset_routing_properties( $this->_route['headers_sent_route'] );
+		if ($this->_is_UI_request === FALSE && is_array($this->_route) && ! empty($this->_route['headers_sent_route'])) {
+			$this->_reset_routing_properties($this->_route['headers_sent_route']);
 		}
 	}
 
@@ -932,7 +932,7 @@ 
 	 * @param  string    $new_route   New (non header) route to redirect to.
 	 * @return   void
 	 */
-	protected function _reset_routing_properties( $new_route ) {
+	protected function _reset_routing_properties($new_route) {
 		$this->_is_UI_request = TRUE;
 		//now we set the current route to whatever the headers_sent_route is set at
 		$this->_req_data['action'] = $new_route;
@@ -978,24 +978,24 @@ 
 	 * @param   bool    $exclude_nonce  If true, the the nonce will be excluded from the generated nonce.
 	 * 	@return string
 	 */
-	public static function add_query_args_and_nonce( $args = array(), $url = false, $sticky = false, $exclude_nonce = false ) {
+	public static function add_query_args_and_nonce($args = array(), $url = false, $sticky = false, $exclude_nonce = false) {
 		EE_Registry::instance()->load_helper('URL');
 
 		//if there is a _wp_http_referer include the values from the request but only if sticky = true
-		if ( $sticky ) {
+		if ($sticky) {
 			$request = $_REQUEST;
-			unset( $request['_wp_http_referer'] );
-			unset( $request['wp_referer'] );
-			foreach ( $request as $key => $value ) {
+			unset($request['_wp_http_referer']);
+			unset($request['wp_referer']);
+			foreach ($request as $key => $value) {
 				//do not add nonces
-				if ( strpos( $key, 'nonce' ) !== false ) {
+				if (strpos($key, 'nonce') !== false) {
 					continue;
 				}
-				$args['wp_referer[' . $key . ']'] = $value;
+				$args['wp_referer['.$key.']'] = $value;
 			}
 		}
 
-		return EEH_URL::add_query_args_and_nonce( $args, $url, $exclude_nonce );
+		return EEH_URL::add_query_args_and_nonce($args, $url, $exclude_nonce);
 	}
 
 
@@ -1011,8 +1011,8 @@ 
 	 * @uses EEH_Template::get_help_tab_link()
 	 * @return string              generated link
 	 */
-	protected function _get_help_tab_link( $help_tab_id, $icon_style = FALSE, $help_text = FALSE ) {
-		return EEH_Template::get_help_tab_link( $help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text );
+	protected function _get_help_tab_link($help_tab_id, $icon_style = FALSE, $help_text = FALSE) {
+		return EEH_Template::get_help_tab_link($help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text);
 	}
 
 
@@ -1029,30 +1029,30 @@ 
 	 */
 	protected function _add_help_tabs() {
 		$tour_buttons = '';
-		if ( isset( $this->_page_config[$this->_req_action] ) ) {
+		if (isset($this->_page_config[$this->_req_action])) {
 			$config = $this->_page_config[$this->_req_action];
 
 			//is there a help tour for the current route?  if there is let's setup the tour buttons
-			if ( isset( $this->_help_tour[$this->_req_action]) ) {
+			if (isset($this->_help_tour[$this->_req_action])) {
 				$tb = array();
 				$tour_buttons = '<div class="ee-abs-container"><div class="ee-help-tour-restart-buttons">';
-				foreach ( $this->_help_tour['tours'] as $tour ) {
+				foreach ($this->_help_tour['tours'] as $tour) {
 					//if this is the end tour then we don't need to setup a button
-					if ( $tour instanceof EE_Help_Tour_final_stop )
+					if ($tour instanceof EE_Help_Tour_final_stop)
 						continue;
-					$tb[] = '<button id="trigger-tour-' . $tour->get_slug() . '" class="button-primary trigger-ee-help-tour">' . $tour->get_label() . '</button>';
+					$tb[] = '<button id="trigger-tour-'.$tour->get_slug().'" class="button-primary trigger-ee-help-tour">'.$tour->get_label().'</button>';
 				}
 				$tour_buttons .= implode('<br />', $tb);
 				$tour_buttons .= '</div></div>';
 			}
 
 			// let's see if there is a help_sidebar set for the current route and we'll set that up for usage as well.
-			if ( is_array( $config ) && isset( $config['help_sidebar'] ) ) {
+			if (is_array($config) && isset($config['help_sidebar'])) {
 				//check that the callback given is valid
-				if ( !method_exists($this, $config['help_sidebar'] ) )
-					throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) );
+				if ( ! method_exists($this, $config['help_sidebar']))
+					throw new EE_Error(sprintf(__('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this)));
 
-				$content = apply_filters( 'FHEE__' . get_class($this) . '__add_help_tabs__help_sidebar', call_user_func( array( $this, $config['help_sidebar'] ) ) );
+				$content = apply_filters('FHEE__'.get_class($this).'__add_help_tabs__help_sidebar', call_user_func(array($this, $config['help_sidebar'])));
 
 				$content .= $tour_buttons; //add help tour buttons.
 
@@ -1061,49 +1061,49 @@ 
 			}
 
 			//if we DON'T have config help sidebar and there ARE toure buttons then we'll just add the tour buttons to the sidebar.
-			if ( !isset( $config['help_sidebar'] ) && !empty( $tour_buttons ) ) {
+			if ( ! isset($config['help_sidebar']) && ! empty($tour_buttons)) {
 				$this->_current_screen->set_help_sidebar($tour_buttons);
 			}
 
 			//handle if no help_tabs are set so the sidebar will still show for the help tour buttons
-			if ( !isset( $config['help_tabs'] ) && !empty($tour_buttons) ) {
+			if ( ! isset($config['help_tabs']) && ! empty($tour_buttons)) {
 				$_ht['id'] = $this->page_slug;
 				$_ht['title'] = __('Help Tours', 'event_espresso');
-				$_ht['content'] = '<p>' . __('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso') . '</p>';
+				$_ht['content'] = '<p>'.__('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso').'</p>';
 				$this->_current_screen->add_help_tab($_ht);
 				}/**/
 
 
-			if ( !isset( $config['help_tabs'] ) ) return; //no help tabs for this route
+			if ( ! isset($config['help_tabs'])) return; //no help tabs for this route
 
-			foreach ( (array) $config['help_tabs'] as $tab_id => $cfg ) {
+			foreach ((array) $config['help_tabs'] as $tab_id => $cfg) {
 				//we're here so there ARE help tabs!
 
 				//make sure we've got what we need
-				if ( !isset( $cfg['title'] ) )
-					throw new EE_Error( __('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso') );
+				if ( ! isset($cfg['title']))
+					throw new EE_Error(__('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso'));
 
 
-				if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) )
-					throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') );
+				if ( ! isset($cfg['filename']) && ! isset($cfg['callback']) && ! isset($cfg['content']))
+					throw new EE_Error(__('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso'));
 
 
 
 				//first priority goes to content.
-				if ( !empty($cfg['content'] ) ) {
-					$content = !empty($cfg['content']) ? $cfg['content'] : NULL;
+				if ( ! empty($cfg['content'])) {
+					$content = ! empty($cfg['content']) ? $cfg['content'] : NULL;
 
 				//second priority goes to filename
-				} else if ( !empty($cfg['filename'] ) ) {
-					$file_path = $this->_get_dir() . '/help_tabs/' . $cfg['filename'] . '.help_tab.php';
+				} else if ( ! empty($cfg['filename'])) {
+					$file_path = $this->_get_dir().'/help_tabs/'.$cfg['filename'].'.help_tab.php';
 
 
 					//it's possible that the file is located on decaf route (and above sets up for caf route, if this is the case then lets check decaf route too)
-					$file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tabs/' . $cfg['filename'] . '.help_tab.php' : $file_path;
+					$file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()).'/help_tabs/'.$cfg['filename'].'.help_tab.php' : $file_path;
 
 					//if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error.
-					if ( !is_readable($file_path) && !isset($cfg['callback']) ) {
-						EE_Error::add_error( sprintf( __('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content.  Please check that the string you set for the help tab on this route (%s) is the correct spelling.  The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path ), __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! is_readable($file_path) && ! isset($cfg['callback'])) {
+						EE_Error::add_error(sprintf(__('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content.  Please check that the string you set for the help tab on this route (%s) is the correct spelling.  The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path), __FILE__, __FUNCTION__, __LINE__);
 						return;
 					}
 					$template_args['admin_page_obj'] = $this;
@@ -1114,21 +1114,21 @@ 
 
 
 				//check if callback is valid
-				if ( empty($content) && ( !isset($cfg['callback']) || !method_exists( $this, $cfg['callback'] ) ) ) {
-					EE_Error::add_error( sprintf( __('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content.  Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title'] ), __FILE__, __FUNCTION__, __LINE__ );
+				if (empty($content) && ( ! isset($cfg['callback']) || ! method_exists($this, $cfg['callback']))) {
+					EE_Error::add_error(sprintf(__('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content.  Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title']), __FILE__, __FUNCTION__, __LINE__);
 					return;
 				}
 
 				//setup config array for help tab method
-				$id = $this->page_slug . '-' . $this->_req_action . '-' . $tab_id;
+				$id = $this->page_slug.'-'.$this->_req_action.'-'.$tab_id;
 				$_ht = array(
 					'id' => $id,
 					'title' => $cfg['title'],
-					'callback' => isset( $cfg['callback'] ) && empty($content) ? array( $this, $cfg['callback'] ) : NULL,
+					'callback' => isset($cfg['callback']) && empty($content) ? array($this, $cfg['callback']) : NULL,
 					'content' => $content
 					);
 
-				$this->_current_screen->add_help_tab( $_ht );
+				$this->_current_screen->add_help_tab($_ht);
 			}
 		}
 	}
@@ -1148,49 +1148,49 @@ 
 		$this->_help_tour = array();
 
 		//exit early if help tours are turned off globally
-		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) )
+		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || (defined('EE_DISABLE_HELP_TOURS') && EE_DISABLE_HELP_TOURS))
 			return;
 
 		//loop through _page_config to find any help_tour defined
-		foreach ( $this->_page_config as $route => $config ) {
+		foreach ($this->_page_config as $route => $config) {
 			//we're only going to set things up for this route
-			if ( $route !== $this->_req_action )
+			if ($route !== $this->_req_action)
 				continue;
 
-			if ( isset( $config['help_tour'] ) ) {
+			if (isset($config['help_tour'])) {
 
-				foreach( $config['help_tour'] as $tour ) {
-					$file_path = $this->_get_dir() . '/help_tours/' . $tour . '.class.php';
+				foreach ($config['help_tour'] as $tour) {
+					$file_path = $this->_get_dir().'/help_tours/'.$tour.'.class.php';
 					//let's see if we can get that file... if not its possible this is a decaf route not set in caffienated so lets try and get the caffeinated equivalent
-					$file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tours/' . $tour . '.class.php' : $file_path;
+					$file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()).'/help_tours/'.$tour.'.class.php' : $file_path;
 
 					//if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error.
-					if ( !is_readable($file_path) ) {
-						EE_Error::add_error( sprintf( __('The file path given for the help tour (%s) is not a valid path.  Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour ), __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! is_readable($file_path)) {
+						EE_Error::add_error(sprintf(__('The file path given for the help tour (%s) is not a valid path.  Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour), __FILE__, __FUNCTION__, __LINE__);
 						return;
 					}
 
 					require_once $file_path;
-					if ( !class_exists( $tour ) ) {
-						$error_msg[] = sprintf( __('Something went wrong with loading the %s Help Tour Class.', 'event_espresso' ), $tour);
-						$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this) );
-						throw new EE_Error( implode( '||', $error_msg ));
+					if ( ! class_exists($tour)) {
+						$error_msg[] = sprintf(__('Something went wrong with loading the %s Help Tour Class.', 'event_espresso'), $tour);
+						$error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this));
+						throw new EE_Error(implode('||', $error_msg));
 					}
 					$a = new ReflectionClass($tour);
 					$tour_obj = $a->newInstance($this->_is_caf);
 
 					$tours[] = $tour_obj;
-					$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $tour_obj );
+					$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($tour_obj);
 				}
 
 				//let's inject the end tour stop element common to all pages... this will only get seen once per machine.
 				$end_stop_tour = new EE_Help_Tour_final_stop($this->_is_caf);
 				$tours[] = $end_stop_tour;
-				$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $end_stop_tour );
+				$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($end_stop_tour);
 			}
 		}
 
-		if ( !empty( $tours ) )
+		if ( ! empty($tours))
 			$this->_help_tour['tours'] = $tours;
 
 		//thats it!  Now that the $_help_tours property is set (or not) the scripts and html should be taken care of automatically.
@@ -1206,13 +1206,13 @@ 
 	 * @return void
 	 */
 	protected function _add_qtips() {
-		if ( isset( $this->_route_config['qtips'] ) ) {
+		if (isset($this->_route_config['qtips'])) {
 			$qtips = (array) $this->_route_config['qtips'];
 			//load qtip loader
 			EE_Registry::instance()->load_helper('Qtip_Loader', array(), TRUE);
 			$path = array(
-				$this->_get_dir() . '/qtips/',
-				EE_ADMIN_PAGES . basename($this->_get_dir()) . '/qtips/'
+				$this->_get_dir().'/qtips/',
+				EE_ADMIN_PAGES.basename($this->_get_dir()).'/qtips/'
 				);
 			EEH_Qtip_Loader::instance()->register($qtips, $path);
 		}
@@ -1229,41 +1229,41 @@ 
 	 * @return void
 	 */
 	protected function _set_nav_tabs() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$i = 0;
-		foreach ( $this->_page_config as $slug => $config ) {
-			if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) )
+		foreach ($this->_page_config as $slug => $config) {
+			if ( ! is_array($config) || (is_array($config) && (isset($config['nav']) && ! $config['nav']) || ! isset($config['nav'])))
 				continue; //no nav tab for this config
 
 			//check for persistent flag
-			if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action )
+			if (isset($config['nav']['persistent']) && ! $config['nav']['persistent'] && $slug !== $this->_req_action)
 				continue; //nav tab is only to appear when route requested.
 
-			if ( ! $this->check_user_access( $slug, TRUE ) )
+			if ( ! $this->check_user_access($slug, TRUE))
 				continue; //no nav tab becasue current user does not have access.
 
-			$css_class = isset( $config['css_class'] ) ? $config['css_class'] . ' ' : '';
+			$css_class = isset($config['css_class']) ? $config['css_class'].' ' : '';
 			$this->_nav_tabs[$slug] = array(
-				'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce( array( 'action'=>$slug ), $this->_admin_base_url ),
-				'link_text' => isset( $config['nav']['label'] ) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug ) ),
-				'css_class' => $this->_req_action == $slug ? $css_class . 'nav-tab-active' : $css_class,
-				'order' => isset( $config['nav']['order'] ) ? $config['nav']['order'] : $i
+				'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce(array('action'=>$slug), $this->_admin_base_url),
+				'link_text' => isset($config['nav']['label']) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug)),
+				'css_class' => $this->_req_action == $slug ? $css_class.'nav-tab-active' : $css_class,
+				'order' => isset($config['nav']['order']) ? $config['nav']['order'] : $i
 				);
 			$i++;
 		}
 
 		//if $this->_nav_tabs is empty then lets set the default
-		if ( empty( $this->_nav_tabs ) ) {
+		if (empty($this->_nav_tabs)) {
 			$this->_nav_tabs[$this->default_nav_tab_name] = array(
 				'url' => $this->admin_base_url,
-				'link_text' => ucwords( str_replace( '_', ' ', $this->default_nav_tab_name ) ),
+				'link_text' => ucwords(str_replace('_', ' ', $this->default_nav_tab_name)),
 				'css_class' => 'nav-tab-active',
 				'order' => 10
 				);
 		}
 
 		//now let's sort the tabs according to order
-		usort( $this->_nav_tabs, array($this, '_sort_nav_tabs' ));
+		usort($this->_nav_tabs, array($this, '_sort_nav_tabs'));
 
 	}
 
@@ -1279,10 +1279,10 @@ 
 	 * @return void
 	 */
 	private function _set_current_labels() {
-		if ( is_array($this->_route_config) && isset($this->_route_config['labels']) ) {
-			foreach ( $this->_route_config['labels'] as $label => $text ) {
-				if ( is_array($text) ) {
-					foreach ( $text as $sublabel => $subtext ) {
+		if (is_array($this->_route_config) && isset($this->_route_config['labels'])) {
+			foreach ($this->_route_config['labels'] as $label => $text) {
+				if (is_array($text)) {
+					foreach ($text as $sublabel => $subtext) {
 						$this->_labels[$label][$sublabel] = $subtext;
 					}
 				} else {
@@ -1303,24 +1303,24 @@ 
 	 * 		@param bool   $verify_only Default is FALSE which means if user check fails then wp_die().  Otherwise just return false if verify fail.
 	*		@return 		BOOL|wp_die()
 	*/
-	public function check_user_access( $route_to_check = '', $verify_only = FALSE ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$route_to_check = empty( $route_to_check ) ? $this->_req_action : $route_to_check;
-		$capability = ! empty( $route_to_check ) && isset( $this->_page_routes[$route_to_check] ) && is_array( $this->_page_routes[$route_to_check] ) && ! empty( $this->_page_routes[$route_to_check]['capability'] ) ? $this->_page_routes[$route_to_check]['capability'] : NULL;
+	public function check_user_access($route_to_check = '', $verify_only = FALSE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$route_to_check = empty($route_to_check) ? $this->_req_action : $route_to_check;
+		$capability = ! empty($route_to_check) && isset($this->_page_routes[$route_to_check]) && is_array($this->_page_routes[$route_to_check]) && ! empty($this->_page_routes[$route_to_check]['capability']) ? $this->_page_routes[$route_to_check]['capability'] : NULL;
 
-		if ( empty( $capability ) && empty( $route_to_check )  ) {
-			$capability = is_array( $this->_route ) && empty( $this->_route['capability'] ) ? 'manage_options' : $this->_route['capability'];
+		if (empty($capability) && empty($route_to_check)) {
+			$capability = is_array($this->_route) && empty($this->_route['capability']) ? 'manage_options' : $this->_route['capability'];
 		} else {
-			$capability = empty( $capability ) ? 'manage_options' : $capability;
+			$capability = empty($capability) ? 'manage_options' : $capability;
 		}
 
-		$id = is_array( $this->_route ) && ! empty( $this->_route['obj_id'] ) ? $this->_route['obj_id'] : 0;
+		$id = is_array($this->_route) && ! empty($this->_route['obj_id']) ? $this->_route['obj_id'] : 0;
 
-		if (( ! function_exists( 'is_admin' ) || ! EE_Registry::instance()->CAP->current_user_can( $capability, $this->page_slug . '_' . $route_to_check, $id ) ) && ! defined( 'DOING_AJAX')) {
-			if ( $verify_only ) {
+		if (( ! function_exists('is_admin') || ! EE_Registry::instance()->CAP->current_user_can($capability, $this->page_slug.'_'.$route_to_check, $id)) && ! defined('DOING_AJAX')) {
+			if ($verify_only) {
 				return FALSE;
 			} else {
-				wp_die( __('You do not have access to this route.', 'event_espresso' ) );
+				wp_die(__('You do not have access to this route.', 'event_espresso'));
 			}
 		}
 		return TRUE;
@@ -1397,7 +1397,7 @@ 
 		$this->_add_admin_page_overlay();
 
 		//if metaboxes are present we need to add the nonce field
-		if ( ( isset($this->_route_config['metaboxes']) || ( isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes'] ) || isset($this->_route_config['list_table']) ) ) {
+		if ((isset($this->_route_config['metaboxes']) || (isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes']) || isset($this->_route_config['list_table']))) {
 			wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
 			wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
 		}
@@ -1416,20 +1416,20 @@ 
 	 */
 	public function admin_footer_global() {
 		//dialog container for dialog helper
-		$d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">' . "\n";
+		$d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">'."\n";
 		$d_cont .= '<div class="ee-notices"></div>';
 		$d_cont .= '<div class="ee-admin-dialog-container-inner-content"></div>';
 		$d_cont .= '</div>';
 		echo $d_cont;
 
 		//help tour stuff?
-		if ( isset( $this->_help_tour[$this->_req_action] ) ) {
+		if (isset($this->_help_tour[$this->_req_action])) {
 			echo implode('<br />', $this->_help_tour[$this->_req_action]);
 		}
 
 		//current set timezone for timezone js
 		EE_Registry::instance()->load_helper('DTT_Helper');
-		echo '<span id="current_timezone" class="hidden">' . EEH_DTT_Helper::get_timezone() . '</span>';
+		echo '<span id="current_timezone" class="hidden">'.EEH_DTT_Helper::get_timezone().'</span>';
 	}
 
 
@@ -1453,18 +1453,18 @@ 
 	 * @access protected
 	 * @return string content
 	 */
-	protected function _set_help_popup_content( $help_array = array(), $display = FALSE ) {
+	protected function _set_help_popup_content($help_array = array(), $display = FALSE) {
 		$content = '';
 
-		$help_array = empty( $help_array ) ? $this->_get_help_content() : $help_array;
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_help_popup.template.php';
+		$help_array = empty($help_array) ? $this->_get_help_content() : $help_array;
+		$template_path = EE_ADMIN_TEMPLATE.'admin_help_popup.template.php';
 
 
 		//loop through the array and setup content
-		foreach ( $help_array as $trigger => $help ) {
+		foreach ($help_array as $trigger => $help) {
 			//make sure the array is setup properly
-			if ( !isset($help['title']) || !isset($help['content'] ) ) {
-				throw new EE_Error( __('Does not look like the popup content array has been setup correctly.  Might want to double check that.  Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso') );
+			if ( ! isset($help['title']) || ! isset($help['content'])) {
+				throw new EE_Error(__('Does not look like the popup content array has been setup correctly.  Might want to double check that.  Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso'));
 			}
 
 			//we're good so let'd setup the template vars and then assign parsed template content to our content.
@@ -1474,10 +1474,10 @@ 
 				'help_popup_content' => $help['content']
 				);
 
-			$content .= EEH_Template::display_template( $template_path, $template_args, TRUE );
+			$content .= EEH_Template::display_template($template_path, $template_args, TRUE);
 		}
 
-		if ( $display )
+		if ($display)
 			echo $content;
 		else
 			return $content;
@@ -1494,18 +1494,18 @@ 
 	 */
 	private function _get_help_content() {
 		//what is the method we're looking for?
-		$method_name = '_help_popup_content_' . $this->_req_action;
+		$method_name = '_help_popup_content_'.$this->_req_action;
 
 		//if method doesn't exist let's get out.
-		if ( !method_exists( $this, $method_name ) )
+		if ( ! method_exists($this, $method_name))
 			return array();
 
 		//k we're good to go let's retrieve the help array
-		$help_array = call_user_func( array( $this, $method_name ) );
+		$help_array = call_user_func(array($this, $method_name));
 
 		//make sure we've got an array!
-		if ( !is_array($help_array) ) {
-			throw new EE_Error( __('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso' ) );
+		if ( ! is_array($help_array)) {
+			throw new EE_Error(__('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso'));
 		}
 
 		return $help_array;
@@ -1527,27 +1527,27 @@ 
 	 * @param array $dimensions an array of dimensions for the box (array(h,w))
 	 * @return string
 	 */
-	protected function _set_help_trigger( $trigger_id, $display = TRUE, $dimensions = array( '400', '640') ) {
+	protected function _set_help_trigger($trigger_id, $display = TRUE, $dimensions = array('400', '640')) {
 
-		if ( defined('DOING_AJAX') ) return;
+		if (defined('DOING_AJAX')) return;
 
 		//let's check and see if there is any content set for this popup.  If there isn't then we'll include a default title and content so that developers know something needs to be corrected
 		$help_array = $this->_get_help_content();
 		$help_content = '';
 
-		if ( empty( $help_array ) || !isset( $help_array[$trigger_id] ) ) {
+		if (empty($help_array) || ! isset($help_array[$trigger_id])) {
 			$help_array[$trigger_id] = array(
 				'title' => __('Missing Content', 'event_espresso'),
 				'content' => __('A trigger has been set that doesn\'t have any corresponding content. Make sure you have set the help content. (see the "_set_help_popup_content" method in the EE_Admin_Page for instructions.)', 'event_espresso')
 				);
-			$help_content = $this->_set_help_popup_content( $help_array, FALSE );
+			$help_content = $this->_set_help_popup_content($help_array, FALSE);
 		}
 
 		//let's setup the trigger
-		$content = '<a class="ee-dialog" href="?height='. $dimensions[0] . '&width=' . $dimensions[1] . '&inlineId=' . $trigger_id . '" target="_blank"><span class="question ee-help-popup-question"></span></a>';
-		$content = $content . $help_content;
+		$content = '<a class="ee-dialog" href="?height='.$dimensions[0].'&width='.$dimensions[1].'&inlineId='.$trigger_id.'" target="_blank"><span class="question ee-help-popup-question"></span></a>';
+		$content = $content.$help_content;
 
-		if ( $display )
+		if ($display)
 			echo $content;
 		else
 			return $content;
@@ -1604,15 +1604,15 @@ 
 	public function load_global_scripts_styles() {
 		/** STYLES **/
 		// add debugging styles
-		if ( WP_DEBUG ) {
-			add_action('admin_head', array( $this, 'add_xdebug_style' ));
+		if (WP_DEBUG) {
+			add_action('admin_head', array($this, 'add_xdebug_style'));
 		}
 
 		//register all styles
-		wp_register_style( 'espresso-ui-theme', EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(),EVENT_ESPRESSO_VERSION );
-		wp_register_style('ee-admin-css', EE_ADMIN_URL . 'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_register_style('espresso-ui-theme', EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_register_style('ee-admin-css', EE_ADMIN_URL.'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
 		//helpers styles
-		wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION);
 		//enqueue global styles
 		wp_enqueue_style('ee-admin-css');
 
@@ -1620,66 +1620,66 @@ 
 		/** SCRIPTS **/
 
 		//register all scripts
-		wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script('ee-dialog', EE_ADMIN_URL . 'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script('ee_admin_js', EE_ADMIN_URL . 'assets/ee-admin-page.js', array( 'espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true );
+		wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-dialog', EE_ADMIN_URL.'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee_admin_js', EE_ADMIN_URL.'assets/ee-admin-page.js', array('espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true);
 
-		wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL . 'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true );
+		wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL.'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true);
 		// register jQuery Validate - see /includes/functions/wp_hooks.php
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
+		add_filter('FHEE_load_jquery_validate', '__return_true');
 		add_filter('FHEE_load_joyride', '__return_true');
 
 		//script for sorting tables
-		wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL . "assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL."assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
 		//script for parsing uri's
-		wp_register_script( 'ee-parse-uri', EE_GLOBAL_ASSETS_URL . 'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-parse-uri', EE_GLOBAL_ASSETS_URL.'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE);
 		//and parsing associative serialized form elements
-		wp_register_script( 'ee-serialize-full-array', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-serialize-full-array', EE_GLOBAL_ASSETS_URL.'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		//helpers scripts
-		wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-moment-core', EE_THIRD_PARTY_URL . 'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-moment', EE_THIRD_PARTY_URL . 'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-datepicker', EE_ADMIN_URL . 'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon','ee-moment'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-moment-core', EE_THIRD_PARTY_URL.'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-moment', EE_THIRD_PARTY_URL.'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-datepicker', EE_ADMIN_URL.'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon', 'ee-moment'), EVENT_ESPRESSO_VERSION, TRUE);
 
 		//google charts
-		wp_register_script( 'google-charts', 'https://www.gstatic.com/charts/loader.js', array(), EVENT_ESPRESSO_VERSION, false );
+		wp_register_script('google-charts', 'https://www.gstatic.com/charts/loader.js', array(), EVENT_ESPRESSO_VERSION, false);
 
 		//enqueue global scripts
 
 		//taking care of metaboxes
-		if ( ( isset($this->_route_config['metaboxes'] ) || isset($this->_route_config['has_metaboxes']) ) && empty( $this->_cpt_route) ) {
+		if ((isset($this->_route_config['metaboxes']) || isset($this->_route_config['has_metaboxes'])) && empty($this->_cpt_route)) {
 			wp_enqueue_script('dashboard');
 		}
 
 		//enqueue thickbox for ee help popups.  default is to enqueue unless its explicitly set to false since we're assuming all EE pages will have popups
-		if ( ! isset( $this->_route_config['has_help_popups']) || ( isset( $this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'] ) ) {
+		if ( ! isset($this->_route_config['has_help_popups']) || (isset($this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'])) {
 			wp_enqueue_script('ee_admin_js');
 			wp_enqueue_style('ee-admin-css');
 		}
 
 
 		//localize script for ajax lazy loading
-		$lazy_loader_container_ids = apply_filters( 'FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content') );
-		wp_localize_script( 'ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids);
+		$lazy_loader_container_ids = apply_filters('FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content'));
+		wp_localize_script('ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids);
 
 
 		/**
 		 * help tour stuff
 		 */
-		if ( !empty( $this->_help_tour ) ) {
+		if ( ! empty($this->_help_tour)) {
 
 			//register the js for kicking things off
-			wp_enqueue_script('ee-help-tour', EE_ADMIN_URL . 'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE );
+			wp_enqueue_script('ee-help-tour', EE_ADMIN_URL.'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE);
 
 			//setup tours for the js tour object
-			foreach ( $this->_help_tour['tours'] as $tour ) {
+			foreach ($this->_help_tour['tours'] as $tour) {
 				$tours[] = array(
 					'id' => $tour->get_slug(),
 					'options' => $tour->get_options()
 					);
 			}
 
-			wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours ) );
+			wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours));
 
 			//admin_footer_global will take care of making sure our help_tour skeleton gets printed via the info stored in $this->_help_tour
 		}
@@ -1697,52 +1697,52 @@ 
 	public function admin_footer_scripts_eei18n_js_strings() {
 
 		EE_Registry::$i18n_js_strings['ajax_url'] = WP_AJAX_URL;
-		EE_Registry::$i18n_js_strings['confirm_delete'] = __( 'Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA associated with this item!!!\nThis can NOT be undone!!!', 'event_espresso' );
-
-		EE_Registry::$i18n_js_strings['January'] = __( 'January', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['February'] = __( 'February', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['March'] = __( 'March', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['April'] = __( 'April', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['June'] = __( 'June', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['July'] = __( 'July', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['August'] = __( 'August', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['September'] = __( 'September', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['October'] = __( 'October', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['November'] = __( 'November', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['December'] = __( 'December', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jan'] = __( 'Jan', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Feb'] = __( 'Feb', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Mar'] = __( 'Mar', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Apr'] = __( 'Apr', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jun'] = __( 'Jun', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jul'] = __( 'Jul', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Aug'] = __( 'Aug', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sep'] = __( 'Sep', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Oct'] = __( 'Oct', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Nov'] = __( 'Nov', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Dec'] = __( 'Dec', 'event_espresso' );
-
-		EE_Registry::$i18n_js_strings['Sunday'] = __( 'Sunday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Monday'] = __( 'Monday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Tuesday'] = __( 'Tuesday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Wednesday'] = __( 'Wednesday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Thursday'] = __( 'Thursday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Friday'] = __( 'Friday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Saturday'] = __( 'Saturday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sun'] = __( 'Sun', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Mon'] = __( 'Mon', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Tue'] = __( 'Tue', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Wed'] = __( 'Wed', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Thu'] = __( 'Thu', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Fri'] = __( 'Fri', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sat'] = __( 'Sat', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['confirm_delete'] = __('Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA associated with this item!!!\nThis can NOT be undone!!!', 'event_espresso');
+
+		EE_Registry::$i18n_js_strings['January'] = __('January', 'event_espresso');
+		EE_Registry::$i18n_js_strings['February'] = __('February', 'event_espresso');
+		EE_Registry::$i18n_js_strings['March'] = __('March', 'event_espresso');
+		EE_Registry::$i18n_js_strings['April'] = __('April', 'event_espresso');
+		EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso');
+		EE_Registry::$i18n_js_strings['June'] = __('June', 'event_espresso');
+		EE_Registry::$i18n_js_strings['July'] = __('July', 'event_espresso');
+		EE_Registry::$i18n_js_strings['August'] = __('August', 'event_espresso');
+		EE_Registry::$i18n_js_strings['September'] = __('September', 'event_espresso');
+		EE_Registry::$i18n_js_strings['October'] = __('October', 'event_espresso');
+		EE_Registry::$i18n_js_strings['November'] = __('November', 'event_espresso');
+		EE_Registry::$i18n_js_strings['December'] = __('December', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jan'] = __('Jan', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Feb'] = __('Feb', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Mar'] = __('Mar', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Apr'] = __('Apr', 'event_espresso');
+		EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jun'] = __('Jun', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jul'] = __('Jul', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Aug'] = __('Aug', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sep'] = __('Sep', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Oct'] = __('Oct', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Nov'] = __('Nov', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Dec'] = __('Dec', 'event_espresso');
+
+		EE_Registry::$i18n_js_strings['Sunday'] = __('Sunday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Monday'] = __('Monday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Tuesday'] = __('Tuesday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Wednesday'] = __('Wednesday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Thursday'] = __('Thursday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Friday'] = __('Friday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Saturday'] = __('Saturday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sun'] = __('Sun', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Mon'] = __('Mon', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Tue'] = __('Tue', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Wed'] = __('Wed', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Thu'] = __('Thu', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Fri'] = __('Fri', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sat'] = __('Sat', 'event_espresso');
 
 		//setting on espresso_core instead of ee_admin_js because espresso_core is enqueued by the maintenance
 		//admin page when in maintenance mode and ee_admin_js is not loaded then.  This works everywhere else because
 		//espresso_core is listed as a dependency of ee_admin_js.
-		wp_localize_script( 'espresso_core', 'eei18n', EE_Registry::$i18n_js_strings );
+		wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
 
 	}
 
@@ -1776,23 +1776,23 @@ 
 	protected function _set_list_table() {
 
 		//first is this a list_table view?
-		if ( !isset($this->_route_config['list_table']) )
+		if ( ! isset($this->_route_config['list_table']))
 			return; //not a list_table view so get out.
 
 		//list table functions are per view specific (because some admin pages might have more than one listtable!)
 
-		if ( call_user_func( array( $this, '_set_list_table_views_' . $this->_req_action ) ) === FALSE ) {
+		if (call_user_func(array($this, '_set_list_table_views_'.$this->_req_action)) === FALSE) {
 			//user error msg
-			$error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso' );
+			$error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso');
 			//developer error msg
-			$error_msg .= '||' . sprintf( __('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso' ), $this->_req_action, '_set_list_table_views_' . $this->_req_action );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.sprintf(__('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso'), $this->_req_action, '_set_list_table_views_'.$this->_req_action);
+			throw new EE_Error($error_msg);
 		}
 
 		//let's provide the ability to filter the views per PAGE AND ROUTE, per PAGE, and globally
-		$this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug . '_' . $this->_req_action, $this->_views );
-		$this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug, $this->_views );
-		$this->_views = apply_filters( 'FHEE_list_table_views', $this->_views );
+		$this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug.'_'.$this->_req_action, $this->_views);
+		$this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug, $this->_views);
+		$this->_views = apply_filters('FHEE_list_table_views', $this->_views);
 
 		$this->_set_list_table_view();
 		$this->_set_list_table_object();
@@ -1814,14 +1814,14 @@ 
 	*		@return array
 	*/
 	protected function _set_list_table_view() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 
 		// looking at active items or dumpster diving ?
-		if ( ! isset( $this->_req_data['status'] ) || ! array_key_exists( $this->_req_data['status'], $this->_views )) {
-			$this->_view = isset( $this->_views['in_use'] ) ? 'in_use' : 'all';
+		if ( ! isset($this->_req_data['status']) || ! array_key_exists($this->_req_data['status'], $this->_views)) {
+			$this->_view = isset($this->_views['in_use']) ? 'in_use' : 'all';
 		} else {
-			$this->_view = sanitize_key( $this->_req_data['status'] );
+			$this->_view = sanitize_key($this->_req_data['status']);
 		}
 	}
 
@@ -1832,9 +1832,9 @@ 
 	 * WP_List_Table objects need to be loaded fairly early so automatic stuff WP does is taken care of.
 	 */
 	protected function _set_list_table_object() {
-		if ( isset($this->_route_config['list_table'] ) ) {
-			if ( !class_exists( $this->_route_config['list_table'] ) )
-				throw new EE_Error( sprintf( __('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this) ) );
+		if (isset($this->_route_config['list_table'])) {
+			if ( ! class_exists($this->_route_config['list_table']))
+				throw new EE_Error(sprintf(__('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this)));
 			$a = new ReflectionClass($this->_route_config['list_table']);
 			$this->_list_table_object = $a->newInstance($this);
 		}
@@ -1853,27 +1853,27 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_list_table_view_RLs( $extra_query_args = array() ) {
+	public function get_list_table_view_RLs($extra_query_args = array()) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		if ( empty( $this->_views )) {
+		if (empty($this->_views)) {
 			$this->_views = array();
 		}
 
 		// cycle thru views
-		foreach ( $this->_views as $key => $view ) {
+		foreach ($this->_views as $key => $view) {
 			$query_args = array();
 			// check for current view
-			$this->_views[ $key ]['class'] = $this->_view == $view['slug'] ? 'current' : '';
+			$this->_views[$key]['class'] = $this->_view == $view['slug'] ? 'current' : '';
 			$query_args['action'] = $this->_req_action;
-			$query_args[$this->_req_action.'_nonce'] = wp_create_nonce( $query_args['action'] . '_nonce' );
+			$query_args[$this->_req_action.'_nonce'] = wp_create_nonce($query_args['action'].'_nonce');
 			$query_args['status'] = $view['slug'];
 			//merge any other arguments sent in.
-			if ( isset( $extra_query_args[$view['slug']] ) ) {
-				$query_args = array_merge( $query_args, $extra_query_args[$view['slug']] );
+			if (isset($extra_query_args[$view['slug']])) {
+				$query_args = array_merge($query_args, $extra_query_args[$view['slug']]);
 			}
-			$this->_views[ $key ]['url'] = EE_Admin_Page::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
+			$this->_views[$key]['url'] = EE_Admin_Page::add_query_args_and_nonce($query_args, $this->_admin_base_url);
 		}
 
 		return $this->_views;
@@ -1890,15 +1890,15 @@ 
 	 * @param int $max_entries total number of rows in the table
 	 * @return string
 	*/
-	protected function _entries_per_page_dropdown( $max_entries = FALSE ) {
+	protected function _entries_per_page_dropdown($max_entries = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$values = array( 10, 25, 50, 100 );
-		$per_page = ( ! empty( $this->_req_data['per_page'] )) ? absint( $this->_req_data['per_page'] ) : 10;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$values = array(10, 25, 50, 100);
+		$per_page = ( ! empty($this->_req_data['per_page'])) ? absint($this->_req_data['per_page']) : 10;
 
-		if ( $max_entries ) {
+		if ($max_entries) {
 			$values[] = $max_entries;
-			sort( $values );
+			sort($values);
 		}
 
 		$entries_per_page_dropdown = '
@@ -1907,15 +1907,15 @@ 
 					Show
 					<select id="entries-per-page-slct" name="entries-per-page-slct">';
 
-		foreach ( $values as $value ) {
-			if ( $value < $max_entries ) {
-				$selected = $value == $per_page ?  ' selected="' . $per_page . '"' : '';
+		foreach ($values as $value) {
+			if ($value < $max_entries) {
+				$selected = $value == $per_page ? ' selected="'.$per_page.'"' : '';
 				$entries_per_page_dropdown .= '
 						<option value="'.$value.'"'.$selected.'>'.$value.'&nbsp;&nbsp;</option>';
 			}
 		}
 
-		$selected = $max_entries == $per_page ?  ' selected="' . $per_page . '"' : '';
+		$selected = $max_entries == $per_page ? ' selected="'.$per_page.'"' : '';
 		$entries_per_page_dropdown .= '
 						<option value="'.$max_entries.'"'.$selected.'>All&nbsp;&nbsp;</option>';
 
@@ -1938,8 +1938,8 @@ 
 	*		@return 		void
 	*/
 	public function _set_search_attributes() {
-		$this->_template_args['search']['btn_label'] = sprintf( __( 'Search %s', 'event_espresso' ), empty( $this->_search_btn_label ) ? $this->page_label : $this->_search_btn_label );
-		$this->_template_args['search']['callback'] = 'search_' . $this->page_slug;
+		$this->_template_args['search']['btn_label'] = sprintf(__('Search %s', 'event_espresso'), empty($this->_search_btn_label) ? $this->page_label : $this->_search_btn_label);
+		$this->_template_args['search']['callback'] = 'search_'.$this->page_slug;
 	}
 
 	/*** END LIST TABLE METHODS **/
@@ -1958,20 +1958,20 @@ 
 	 * @return void
 	*/
 	private function _add_registered_meta_boxes() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//we only add meta boxes if the page_route calls for it
-		if ( is_array($this->_route_config) && isset( $this->_route_config['metaboxes'] ) && is_array($this->_route_config['metaboxes']) ) {
+		if (is_array($this->_route_config) && isset($this->_route_config['metaboxes']) && is_array($this->_route_config['metaboxes'])) {
 
 
 			//this simply loops through the callbacks provided and checks if there is a corresponding callback registered by the child - if there is then we go ahead and process the metabox loader.
-			foreach ( $this->_route_config['metaboxes'] as $metabox_callback ) {
-				if ( call_user_func( array($this, &$metabox_callback) ) === FALSE ) {
+			foreach ($this->_route_config['metaboxes'] as $metabox_callback) {
+				if (call_user_func(array($this, &$metabox_callback)) === FALSE) {
 					// user error msg
-				$error_msg =  __( 'An error occurred. The  requested metabox could not be found.', 'event_espresso' );
+				$error_msg = __('An error occurred. The  requested metabox could not be found.', 'event_espresso');
 				// developer error msg
-				$error_msg .= '||' . sprintf( __( 'The metabox with the string "%s" could not be called. Check that the spelling for method names and actions in the "_page_config[\'metaboxes\']" array are all correct.', 'event_espresso' ), $metabox_callback );
-				throw new EE_Error( $error_msg );
+				$error_msg .= '||'.sprintf(__('The metabox with the string "%s" could not be called. Check that the spelling for method names and actions in the "_page_config[\'metaboxes\']" array are all correct.', 'event_espresso'), $metabox_callback);
+				throw new EE_Error($error_msg);
 				}
 			}
 		}
@@ -1988,17 +1988,17 @@ 
 	 * @return void
 	 */
 	private function _add_screen_columns() {
-		if ( is_array($this->_route_config) && isset( $this->_route_config['columns'] ) && is_array($this->_route_config['columns']) && count( $this->_route_config['columns'] == 2 ) ) {
+		if (is_array($this->_route_config) && isset($this->_route_config['columns']) && is_array($this->_route_config['columns']) && count($this->_route_config['columns'] == 2)) {
 
-			add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1] ) );
+			add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1]));
 			$this->_template_args['num_columns'] = $this->_route_config['columns'][0];
 			$screen_id = $this->_current_screen->id;
 			$screen_columns = (int) get_user_option("screen_layout_$screen_id");
-			$total_columns = !empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1];
-			$this->_template_args['current_screen_widget_class'] = 'columns-' . $total_columns;
+			$total_columns = ! empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1];
+			$this->_template_args['current_screen_widget_class'] = 'columns-'.$total_columns;
 			$this->_template_args['current_page'] = $this->_wp_page_slug;
 			$this->_template_args['screen'] = $this->_current_screen;
-			$this->_column_template_path = EE_ADMIN_TEMPLATE . 'admin_details_metabox_column_wrapper.template.php';
+			$this->_column_template_path = EE_ADMIN_TEMPLATE.'admin_details_metabox_column_wrapper.template.php';
 
 			//finally if we don't have has_metaboxes set in the route config let's make sure it IS set other wise the necessary hidden fields for this won't be loaded.
 			$this->_route_config['has_metaboxes'] = TRUE;
@@ -2015,11 +2015,11 @@ 
 	 */
 
 	private function _espresso_news_post_box() {
-		$news_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __( 'New @ Event Espresso', 'event_espresso' ) );
-		add_meta_box( 'espresso_news_post_box', $news_box_title, array(
+		$news_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('New @ Event Espresso', 'event_espresso'));
+		add_meta_box('espresso_news_post_box', $news_box_title, array(
 			$this,
 			'espresso_news_post_box'
-		), $this->_wp_page_slug, 'side' );
+		), $this->_wp_page_slug, 'side');
 	}
 
 
@@ -2027,14 +2027,14 @@ 
 	 * Code for setting up espresso ratings request metabox.
 	 */
 	protected function _espresso_ratings_request() {
-		if ( ! apply_filters( 'FHEE_show_ratings_request_meta_box', true ) ) {
+		if ( ! apply_filters('FHEE_show_ratings_request_meta_box', true)) {
 			return '';
 		}
-		$ratings_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso') );
-		add_meta_box( 'espresso_ratings_request', $ratings_box_title, array(
+		$ratings_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso'));
+		add_meta_box('espresso_ratings_request', $ratings_box_title, array(
 			$this,
 			'espresso_ratings_request'
-		), $this->_wp_page_slug, 'side' );
+		), $this->_wp_page_slug, 'side');
 	}
 
 
@@ -2042,35 +2042,35 @@ 
 	 * Code for setting up espresso ratings request metabox content.
 	 */
 	public function espresso_ratings_request() {
-		$template_path = EE_ADMIN_TEMPLATE . 'espresso_ratings_request_content.template.php';
-		EE_Registry::instance()->load_helper( 'Template' );
-		EEH_Template::display_template( $template_path, array() );
+		$template_path = EE_ADMIN_TEMPLATE.'espresso_ratings_request_content.template.php';
+		EE_Registry::instance()->load_helper('Template');
+		EEH_Template::display_template($template_path, array());
 	}
 
 
 
 
-	public static function cached_rss_display( $rss_id, $url ) {
-		$loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>';
-		$doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
-		$pre = '<div class="espresso-rss-display">' . "\n\t";
-		$pre .= '<span id="' . $rss_id . '_url" class="hidden">' . $url . '</span>';
-		$post = '</div>' . "\n";
+	public static function cached_rss_display($rss_id, $url) {
+		$loading = '<p class="widget-loading hide-if-no-js">'.__('Loading&#8230;').'</p><p class="hide-if-js">'.__('This widget requires JavaScript.').'</p>';
+		$doing_ajax = (defined('DOING_AJAX') && DOING_AJAX);
+		$pre = '<div class="espresso-rss-display">'."\n\t";
+		$pre .= '<span id="'.$rss_id.'_url" class="hidden">'.$url.'</span>';
+		$post = '</div>'."\n";
 
-		$cache_key = 'ee_rss_' . md5( $rss_id );
-		if ( FALSE != ( $output = get_transient( $cache_key ) ) ) {
-			echo $pre . $output . $post;
+		$cache_key = 'ee_rss_'.md5($rss_id);
+		if (FALSE != ($output = get_transient($cache_key))) {
+			echo $pre.$output.$post;
 			return TRUE;
 		}
 
-		if ( ! $doing_ajax ) {
-			echo $pre . $loading . $post;
+		if ( ! $doing_ajax) {
+			echo $pre.$loading.$post;
 			return FALSE;
 		}
 
 		ob_start();
-		wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5) );
-		set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS );
+		wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5));
+		set_transient($cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS);
 		return TRUE;
 
 	}
@@ -2082,13 +2082,13 @@ 
 	  	<div id="espresso_news_post_box_content" class="infolinks">
 	  		<?php
 	  		// Get RSS Feed(s)
-	  		$feed_url = apply_filters( 'FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/' );
+	  		$feed_url = apply_filters('FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/');
 	  		$url = urlencode($feed_url);
-	  		self::cached_rss_display( 'espresso_news_post_box_content', $url );
+	  		self::cached_rss_display('espresso_news_post_box_content', $url);
 
 	  		?>
 	  	</div>
-	  	<?php do_action( 'AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?>
+	  	<?php do_action('AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?>
 	  </div>
 		<?php
 	}
@@ -2109,32 +2109,32 @@ 
 
 	protected function _espresso_sponsors_post_box() {
 
-		$show_sponsors = apply_filters( 'FHEE_show_sponsors_meta_box', TRUE );
-		if ( $show_sponsors )
-			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
+		$show_sponsors = apply_filters('FHEE_show_sponsors_meta_box', TRUE);
+		if ($show_sponsors)
+			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array($this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
 	}
 
 
 	public function espresso_sponsors_post_box() {
-		$templatepath = EE_ADMIN_TEMPLATE . 'admin_general_metabox_contents_espresso_sponsors.template.php';
-		EEH_Template::display_template( $templatepath );
+		$templatepath = EE_ADMIN_TEMPLATE.'admin_general_metabox_contents_espresso_sponsors.template.php';
+		EEH_Template::display_template($templatepath);
 	}
 
 
 
 	private function _publish_post_box() {
-		$meta_box_ref = 'espresso_' . $this->page_slug . '_editor_overview';
+		$meta_box_ref = 'espresso_'.$this->page_slug.'_editor_overview';
 
 		//if there is a array('label' => array('publishbox' => 'some title') ) present in the _page_config array then we'll use that for the metabox label.  Otherwise we'll just use publish (publishbox itself could be an array of labels indexed by routes)
-		if ( !empty( $this->_labels['publishbox'] ) ) {
-			$box_label = is_array( $this->_labels['publishbox'] ) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
+		if ( ! empty($this->_labels['publishbox'])) {
+			$box_label = is_array($this->_labels['publishbox']) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
 		} else {
 			$box_label = __('Publish', 'event_espresso');
 		}
 
-		$box_label = apply_filters( 'FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this );
+		$box_label = apply_filters('FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this);
 
-		add_meta_box( $meta_box_ref, $box_label, array( $this, 'editor_overview' ), $this->_current_screen->id, 'side', 'high' );
+		add_meta_box($meta_box_ref, $box_label, array($this, 'editor_overview'), $this->_current_screen->id, 'side', 'high');
 
 	}
 
@@ -2142,9 +2142,9 @@ 
 
 	public function editor_overview() {
 		//if we have extra content set let's add it in if not make sure its empty
-		$this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : '';
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_details_publish_metabox.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : '';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_details_publish_metabox.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 	}
 
 
@@ -2160,8 +2160,8 @@ 
 	 * @see $this->_set_publish_post_box_vars for param details
 	 * @since 4.6.0
 	 */
-	public function set_publish_post_box_vars( $name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true ) {
-		$this->_set_publish_post_box_vars( $name, $id, $delete, $save_close_redirect_URL, $both_btns );
+	public function set_publish_post_box_vars($name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true) {
+		$this->_set_publish_post_box_vars($name, $id, $delete, $save_close_redirect_URL, $both_btns);
 	}
 
 
@@ -2180,24 +2180,24 @@ 
 	 * @param	string	$post_save_redirect_URL	custom URL to redirect to after Save & Close has been completed
 	 * @param	boolean	$both_btns	whether to display BOTH the "Save & Close" and "Save" buttons or just the Save button
 	 */
-	protected function _set_publish_post_box_vars( $name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE ) {
+	protected function _set_publish_post_box_vars($name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE) {
 
 		// if Save & Close, use a custom redirect URL or default to the main page?
-		$save_close_redirect_URL = ! empty( $save_close_redirect_URL ) ? $save_close_redirect_URL : $this->_admin_base_url;
+		$save_close_redirect_URL = ! empty($save_close_redirect_URL) ? $save_close_redirect_URL : $this->_admin_base_url;
 		// create the Save & Close and Save buttons
-		$this->_set_save_buttons( $both_btns, array(), array(), $save_close_redirect_URL );
+		$this->_set_save_buttons($both_btns, array(), array(), $save_close_redirect_URL);
 		//if we have extra content set let's add it in if not make sure its empty
-		$this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : '';
+		$this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : '';
 
 
-		if ( $delete && ! empty( $id )  ) {
+		if ($delete && ! empty($id)) {
 			$delete = is_bool($delete) ? 'delete' : $delete; //make sure we have a default if just true is sent.
-			$delete_link_args = array( $name => $id );
-			$delete = $this->get_action_link_or_button( $delete, $delete, $delete_link_args, 'submitdelete deletion');
+			$delete_link_args = array($name => $id);
+			$delete = $this->get_action_link_or_button($delete, $delete, $delete_link_args, 'submitdelete deletion');
 		}
 
-		$this->_template_args['publish_delete_link'] = !empty( $id ) ? $delete : '';
-		if ( ! empty( $name ) && ! empty( $id ) ) {
+		$this->_template_args['publish_delete_link'] = ! empty($id) ? $delete : '';
+		if ( ! empty($name) && ! empty($id)) {
 			$hidden_field_arr[$name] = array(
 				'type' => 'hidden',
 				'value' => $id
@@ -2207,7 +2207,7 @@ 
 			$hf = '';
 		}
 		// add hidden field
-		$this->_template_args['publish_hidden_fields'] = ! empty( $hf ) ? $hf[$name]['field'] : $hf;
+		$this->_template_args['publish_hidden_fields'] = ! empty($hf) ? $hf[$name]['field'] : $hf;
 
 	}
 
@@ -2224,8 +2224,8 @@ 
 		<noscript>
 			<div id="no-js-message" class="error">
 				<p style="font-size:1.3em;">
-					<span style="color:red;"><?php _e( 'Warning!', 'event_espresso' ); ?></span>
-					<?php _e( 'Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso' ); ?>
+					<span style="color:red;"><?php _e('Warning!', 'event_espresso'); ?></span>
+					<?php _e('Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso'); ?>
 				</p>
 			</div>
 		</noscript>
@@ -2245,7 +2245,7 @@ 
 	*		@return 		string
 	*/
 	private function _display_espresso_notices() {
-		$notices = $this->_get_transient( TRUE );
+		$notices = $this->_get_transient(TRUE);
 		echo stripslashes($notices);
 	}
 
@@ -2297,11 +2297,11 @@ 
 	 * @param string  $priority      give this metabox a priority (using accepted priorities for wp meta boxes)
 	 * @param boolean $create_func   default is true.  Basically we can say we don't WANT to have the runtime function created but just set our own callback for wp's add_meta_box.
 	 */
-	public function _add_admin_page_meta_box( $action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, $callback );
+	public function _add_admin_page_meta_box($action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, $callback);
 
 		//if we have empty callback args and we want to automatically create the metabox callback then we need to make sure the callback args are generated.
-		if ( empty( $callback_args ) && $create_func ) {
+		if (empty($callback_args) && $create_func) {
 			$callback_args = array(
 				'template_path' => $this->_template_path,
 				'template_args' => $this->_template_args,
@@ -2311,7 +2311,7 @@ 
 		//if $create_func is true (default) then we automatically create the function for displaying the actual meta box.  If false then we take the $callback reference passed through and use it instead (so callers can define their own callback function/method if they wish)
 		$call_back_func = $create_func ? create_function('$post, $metabox', 'do_action( "AHEE_log", __FILE__, __FUNCTION__, ""); echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );') : $callback;
 
-		add_meta_box( str_replace( '_', '-', $action ) . '-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args );
+		add_meta_box(str_replace('_', '-', $action).'-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args);
 	}
 
 
@@ -2324,7 +2324,7 @@ 
 	 */
 	public function display_admin_page_with_metabox_columns() {
 		$this->_template_args['post_body_content'] = $this->_template_args['admin_page_content'];
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $this->_column_template_path, $this->_template_args, TRUE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_column_template_path, $this->_template_args, TRUE);
 
 		//the final wrapper
 		$this->admin_page_wrapper();
@@ -2367,7 +2367,7 @@ 
 	 * @return void
 	 */
 	public function display_about_admin_page() {
-		$this->_display_admin_page( FALSE, TRUE );
+		$this->_display_admin_page(FALSE, TRUE);
 	}
 
 
@@ -2383,26 +2383,26 @@ 
 	 * @return html           admin_page
 	 */
 	private function _display_admin_page($sidebar = false, $about = FALSE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//custom remove metaboxes hook to add or remove any metaboxes to/from Admin pages.
-		do_action( 'AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes' );
+		do_action('AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes');
 
 		// set current wp page slug - looks like: event-espresso_page_event_categories
 		// keep in mind "event-espresso" COULD be something else if the top level menu label has been translated.
 		$this->_template_args['current_page'] = $this->_wp_page_slug;
 
-		$template_path = $sidebar ?  EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar.template.php';
+		$template_path = $sidebar ?  EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar.template.php';
 
-		if ( defined('DOING_AJAX' ) )
-			$template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php';
+		if (defined('DOING_AJAX'))
+			$template_path = EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar_ajax.template.php';
 
-		$template_path = !empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
+		$template_path = ! empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
 
-		$this->_template_args['post_body_content'] = isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : '';
+		$this->_template_args['post_body_content'] = isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : '';
 		$this->_template_args['before_admin_page_content'] = isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : '';
 		$this->_template_args['after_admin_page_content'] = isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : '';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 
 		// the final template wrapper
@@ -2422,7 +2422,7 @@ 
 	 * @param bool   $display_sidebar whether to use the sidebar template or the full template for the page.  TRUE = SHOW sidebar, FALSE = no sidebar. Default no sidebar.
 	 * @return void
 	 */
-	public function display_admin_caf_preview_page( $utm_campaign_source = '', $display_sidebar = TRUE ) {
+	public function display_admin_caf_preview_page($utm_campaign_source = '', $display_sidebar = TRUE) {
 		//let's generate a default preview action button if there isn't one already present.
 		$this->_labels['buttons']['buy_now'] = __('Upgrade Now', 'event_espresso');
 		$buy_now_url = add_query_arg(
@@ -2435,10 +2435,10 @@ 
 			),
 		'http://eventespresso.com/pricing/'
 		);
-		$this->_template_args['preview_action_button'] = ! isset( $this->_template_args['preview_action_button'] ) ? $this->get_action_link_or_button( '', 'buy_now', array(), 'button-primary button-large', $buy_now_url, true ) : $this->_template_args['preview_action_button'];
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_caf_full_page_preview.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
-		$this->_display_admin_page( $display_sidebar );
+		$this->_template_args['preview_action_button'] = ! isset($this->_template_args['preview_action_button']) ? $this->get_action_link_or_button('', 'buy_now', array(), 'button-primary button-large', $buy_now_url, true) : $this->_template_args['preview_action_button'];
+		$template_path = EE_ADMIN_TEMPLATE.'admin_caf_full_page_preview.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
+		$this->_display_admin_page($display_sidebar);
 	}
 
 
@@ -2472,41 +2472,41 @@ 
 	 * @param boolean $sidebar whether to display with sidebar or not.
 	 * @return html
 	 */
-	private function _display_admin_list_table_page( $sidebar = false ) {
+	private function _display_admin_list_table_page($sidebar = false) {
 		//setup search attributes
 		$this->_set_search_attributes();
 		$this->_template_args['current_page'] = $this->_wp_page_slug;
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_list_wrapper.template.php';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_list_wrapper.template.php';
 
-		$this->_template_args['table_url'] = defined( 'DOING_AJAX') ? add_query_arg( array( 'noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url ) : add_query_arg( array( 'route' => $this->_req_action), $this->_admin_base_url);
+		$this->_template_args['table_url'] = defined('DOING_AJAX') ? add_query_arg(array('noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url) : add_query_arg(array('route' => $this->_req_action), $this->_admin_base_url);
 		$this->_template_args['list_table'] = $this->_list_table_object;
 		$this->_template_args['current_route'] = $this->_req_action;
-		$this->_template_args['list_table_class'] = get_class( $this->_list_table_object );
+		$this->_template_args['list_table_class'] = get_class($this->_list_table_object);
 
 		$ajax_sorting_callback = $this->_list_table_object->get_ajax_sorting_callback();
-		if( ! empty( $ajax_sorting_callback )) {
-			$sortable_list_table_form_fields = wp_nonce_field( $ajax_sorting_callback . '_nonce', $ajax_sorting_callback . '_nonce', FALSE, FALSE );
+		if ( ! empty($ajax_sorting_callback)) {
+			$sortable_list_table_form_fields = wp_nonce_field($ajax_sorting_callback.'_nonce', $ajax_sorting_callback.'_nonce', FALSE, FALSE);
 //			$reorder_action = 'espresso_' . $ajax_sorting_callback . '_nonce';
 //			$sortable_list_table_form_fields = wp_nonce_field( $reorder_action, 'ajax_table_sort_nonce', FALSE, FALSE );
-			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="' . $this->page_slug .'" />';
-			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="' . $ajax_sorting_callback . '" />';
+			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="'.$this->page_slug.'" />';
+			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="'.$ajax_sorting_callback.'" />';
 		} else {
 			$sortable_list_table_form_fields = '';
 		}
 
 		$this->_template_args['sortable_list_table_form_fields'] = $sortable_list_table_form_fields;
-		$hidden_form_fields = isset( $this->_template_args['list_table_hidden_fields'] ) ? $this->_template_args['list_table_hidden_fields'] : '';
-		$nonce_ref = $this->_req_action . '_nonce';
-		$hidden_form_fields .= '<input type="hidden" name="' . $nonce_ref . '" value="' . wp_create_nonce( $nonce_ref ) . '">';
+		$hidden_form_fields = isset($this->_template_args['list_table_hidden_fields']) ? $this->_template_args['list_table_hidden_fields'] : '';
+		$nonce_ref = $this->_req_action.'_nonce';
+		$hidden_form_fields .= '<input type="hidden" name="'.$nonce_ref.'" value="'.wp_create_nonce($nonce_ref).'">';
 		$this->_template_args['list_table_hidden_fields'] = $hidden_form_fields;
 
 		//display message about search results?
-		$this->_template_args['before_list_table'] .= apply_filters( 'FHEE__EE_Admin_Page___display_admin_list_table_page__before_list_table__template_arg', !empty( $this->_req_data['s'] ) ? '<p class="ee-search-results">' . sprintf( __('Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso'), trim($this->_req_data['s'], '%') ) . '</p>' : '', $this->page_slug, $this->_req_data, $this->_req_action );
+		$this->_template_args['before_list_table'] .= apply_filters('FHEE__EE_Admin_Page___display_admin_list_table_page__before_list_table__template_arg', ! empty($this->_req_data['s']) ? '<p class="ee-search-results">'.sprintf(__('Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso'), trim($this->_req_data['s'], '%')).'</p>' : '', $this->page_slug, $this->_req_data, $this->_req_action);
 
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		// the final template wrapper
-		if ( $sidebar )
+		if ($sidebar)
 			$this->display_admin_page_with_sidebar();
 		else
 			$this->display_admin_page_with_no_sidebar();
@@ -2529,9 +2529,9 @@ 
 	 * @param  array $items  see above for format of array
 	 * @return string        html string of legend
 	 */
-	protected function _display_legend( $items ) {
-		$template_args['items'] = apply_filters( 'FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this );
-		$legend_template = EE_ADMIN_TEMPLATE . 'admin_details_legend.template.php';
+	protected function _display_legend($items) {
+		$template_args['items'] = apply_filters('FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this);
+		$legend_template = EE_ADMIN_TEMPLATE.'admin_details_legend.template.php';
 		return EEH_Template::display_template($legend_template, $template_args, TRUE);
 	}
 
@@ -2556,31 +2556,31 @@ 
 	 *
 	 * @return json object
 	 */
-	protected function _return_json( $sticky_notices = FALSE ) {
+	protected function _return_json($sticky_notices = FALSE) {
 
 		//make sure any EE_Error notices have been handled.
-		$this->_process_notices( array(), TRUE, $sticky_notices );
+		$this->_process_notices(array(), TRUE, $sticky_notices);
 
 
-		$data = isset( $this->_template_args['data'] ) ? $this->_template_args['data'] : array();
+		$data = isset($this->_template_args['data']) ? $this->_template_args['data'] : array();
 		unset($this->_template_args['data']);
 		$json = array(
-			'error' => isset( $this->_template_args['error'] ) ? $this->_template_args['error'] : FALSE,
-			'success' => isset( $this->_template_args['success'] ) ? $this->_template_args['success'] : FALSE,
+			'error' => isset($this->_template_args['error']) ? $this->_template_args['error'] : FALSE,
+			'success' => isset($this->_template_args['success']) ? $this->_template_args['success'] : FALSE,
 			'notices' => EE_Error::get_notices(),
-			'content' => isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : '',
-			'data' => array_merge( $data, array('template_args' => $this->_template_args ) ),
+			'content' => isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : '',
+			'data' => array_merge($data, array('template_args' => $this->_template_args)),
 			'isEEajax' => TRUE //special flag so any ajax.Success methods in js can identify this return package as a EEajax package.
 			);
 
 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
-		if ( NULL === error_get_last() || ! headers_sent() )
+		if (NULL === error_get_last() || ! headers_sent())
 			header('Content-Type: application/json; charset=UTF-8');
-                if( function_exists( 'wp_json_encode' ) ) {
-                    echo wp_json_encode( $json );
+                if (function_exists('wp_json_encode')) {
+                    echo wp_json_encode($json);
                 } else {
-                    echo json_encode( $json );
+                    echo json_encode($json);
                 }
 		exit();
 	}
@@ -2592,11 +2592,11 @@ 
 	 * @return json_obj|EE_Error
 	 */
 	public function return_json() {
-		if ( defined('DOING_AJAX') && DOING_AJAX )
+		if (defined('DOING_AJAX') && DOING_AJAX)
 			$this->_return_json();
 
 		else {
-			throw new EE_Error( sprintf( __('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__ ) );
+			throw new EE_Error(sprintf(__('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__));
 		}
 	}
 
@@ -2611,7 +2611,7 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function set_hook_object( EE_Admin_Hooks $hook_obj ) {
+	public function set_hook_object(EE_Admin_Hooks $hook_obj) {
 		$this->_hook_obj = $hook_obj;
 	}
 
@@ -2627,33 +2627,33 @@ 
 	*/
 	public function admin_page_wrapper($about = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$this->_nav_tabs = $this->_get_main_nav_tabs();
 
 		$this->_template_args['nav_tabs'] = $this->_nav_tabs;
 		$this->_template_args['admin_page_title'] = $this->_admin_page_title;
 
-		$this->_template_args['before_admin_page_content'] = apply_filters( 'FHEE_before_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['before_admin_page_content'] ) ? $this->_template_args['before_admin_page_content'] : '');
-		$this->_template_args['after_admin_page_content'] = apply_filters( 'FHEE_after_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['after_admin_page_content'] ) ? $this->_template_args['after_admin_page_content'] : '');
+		$this->_template_args['before_admin_page_content'] = apply_filters('FHEE_before_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : '');
+		$this->_template_args['after_admin_page_content'] = apply_filters('FHEE_after_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : '');
 
 		$this->_template_args['after_admin_page_content'] .= $this->_set_help_popup_content();
 
 
 
 		// load settings page wrapper template
-		$template_path = !defined( 'DOING_AJAX' ) ? EE_ADMIN_TEMPLATE . 'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_wrapper_ajax.template.php';
+		$template_path = ! defined('DOING_AJAX') ? EE_ADMIN_TEMPLATE . 'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_wrapper_ajax.template.php';
 
 		//about page?
 		$template_path = $about ? EE_ADMIN_TEMPLATE . 'about_admin_wrapper.template.php' : $template_path;
 
 
-		if ( defined( 'DOING_AJAX' ) ) {
-			$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		if (defined('DOING_AJAX')) {
+			$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 			$this->_return_json();
 		} else {
-			EEH_Template::display_template( $template_path, $this->_template_args );
+			EEH_Template::display_template($template_path, $this->_template_args);
 		}
 
 	}
@@ -2666,7 +2666,7 @@ 
 	 */
 	protected function _get_main_nav_tabs() {
 		//let's generate the html using the EEH_Tabbed_Content helper.  We do this here so that it's possible for child classes to add in nav tabs dynamically at the last minute (rather than setting in the page_routes array)
-		EE_Registry::instance()->load_helper( 'Tabbed_Content' );
+		EE_Registry::instance()->load_helper('Tabbed_Content');
 		return EEH_Tabbed_Content::display_admin_nav_tabs($this->_nav_tabs);
 	}
 
@@ -2682,7 +2682,7 @@ 
 	*		@access public
 	*		@return void
 	*/
-	private function _sort_nav_tabs( $a, $b ) {
+	private function _sort_nav_tabs($a, $b) {
 		if ($a['order'] == $b['order']) {
 	        return 0;
 	    }
@@ -2703,8 +2703,8 @@ 
 	 * 	@uses EEH_Form_Fields::get_form_fields (/helper/EEH_Form_Fields.helper.php)
 	 * 	@uses EEH_Form_Fields::get_form_fields_array (/helper/EEH_Form_Fields.helper.php)
 	 */
-	protected function _generate_admin_form_fields( $input_vars = array(), $generator = 'string', $id = FALSE ) {
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+	protected function _generate_admin_form_fields($input_vars = array(), $generator = 'string', $id = FALSE) {
+		EE_Registry::instance()->load_helper('Form_Fields');
 		$content = $generator == 'string' ? EEH_Form_Fields::get_form_fields($input_vars, $id) : EEH_Form_Fields::get_form_fields_array($input_vars);
 		return $content;
 	}
@@ -2726,25 +2726,25 @@ 
 	 * @param array $actions if included allows us to set the actions that each button will carry out (i.e. via the "name" value in the button).  We can also use this to just dump default actions by submitting some other value.
 	 * @param bool|string|null $referrer if false then we just do the default action on save and close.  Other wise it will use the $referrer string. IF null, then we don't do ANYTHING on save and close (normal form handling).
 	 */
-	protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL ) {
+	protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL) {
 		//make sure $text and $actions are in an array
 		$text = (array) $text;
 		$actions = (array) $actions;
 		$referrer_url = empty($referrer) ? '' : $referrer;
-		$referrer_url = !$referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $_SERVER['REQUEST_URI'] .'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $referrer .'" />';
+		$referrer_url = ! $referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$_SERVER['REQUEST_URI'].'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$referrer.'" />';
 
-		$button_text = !empty($text) ? $text : array( __('Save', 'event_espresso'), __('Save and Close', 'event_espresso') );
-		$default_names = array( 'save', 'save_and_close' );
+		$button_text = ! empty($text) ? $text : array(__('Save', 'event_espresso'), __('Save and Close', 'event_espresso'));
+		$default_names = array('save', 'save_and_close');
 
 		//add in a hidden index for the current page (so save and close redirects properly)
 		$this->_template_args['save_buttons'] = $referrer_url;
 
-		foreach ( $button_text as $key => $button ) {
+		foreach ($button_text as $key => $button) {
 			$ref = $default_names[$key];
-			$id = $this->_current_view . '_' . $ref;
-			$name = !empty($actions) ? $actions[$key] : $ref;
-			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary ' . $ref . '" value="' . $button . '" name="' . $name . '" id="' . $id . '" />';
-			if ( !$both ) break;
+			$id = $this->_current_view.'_'.$ref;
+			$name = ! empty($actions) ? $actions[$key] : $ref;
+			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary '.$ref.'" value="'.$button.'" name="'.$name.'" id="'.$id.'" />';
+			if ( ! $both) break;
 		}
 
 	}
@@ -2757,8 +2757,8 @@ 
 	 * @since 4.6.0
 	 *
 	 */
-	public function set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) {
-		$this->_set_add_edit_form_tags( $route, $additional_hidden_fields );
+	public function set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) {
+		$this->_set_add_edit_form_tags($route, $additional_hidden_fields);
 	}
 
 
@@ -2771,30 +2771,30 @@ 
 	 * @param array $additional_hidden_fields any additional hidden fields required in the form header
 	 * @return void
 	 */
-	protected function _set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) {
+	protected function _set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) {
 
-		if ( empty( $route )) {
+		if (empty($route)) {
 			$user_msg = __('An error occurred. No action was set for this page\'s form.', 'event_espresso');
-			$dev_msg = $user_msg . "\n" . sprintf( __('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__ );
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$dev_msg = $user_msg."\n".sprintf(__('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__);
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// open form
-		$this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="' . $this->_admin_base_url . '" id="' . $route . '_event_form" >';
+		$this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="'.$this->_admin_base_url.'" id="'.$route.'_event_form" >';
 		// add nonce
-		$nonce = wp_nonce_field( $route . '_nonce', $route . '_nonce', FALSE, FALSE );
+		$nonce = wp_nonce_field($route.'_nonce', $route.'_nonce', FALSE, FALSE);
 //		$nonce = wp_nonce_field( $route . '_nonce', '_wpnonce', FALSE, FALSE );
-		$this->_template_args['before_admin_page_content'] .= "\n\t" . $nonce;
+		$this->_template_args['before_admin_page_content'] .= "\n\t".$nonce;
 		// add REQUIRED form action
 		$hidden_fields = array(
-				'action' => array( 'type' => 'hidden', 'value' => $route ),
+				'action' => array('type' => 'hidden', 'value' => $route),
 			);
 		// merge arrays
-		$hidden_fields = is_array( $additional_hidden_fields) ? array_merge( $hidden_fields, $additional_hidden_fields ) : $hidden_fields;
+		$hidden_fields = is_array($additional_hidden_fields) ? array_merge($hidden_fields, $additional_hidden_fields) : $hidden_fields;
 		// generate form fields
-		$form_fields = $this->_generate_admin_form_fields( $hidden_fields, 'array' );
+		$form_fields = $this->_generate_admin_form_fields($hidden_fields, 'array');
 		// add fields to form
-		foreach ( $form_fields as $field_name => $form_field ) {
-			$this->_template_args['before_admin_page_content'] .= "\n\t" . $form_field['field'];
+		foreach ($form_fields as $field_name => $form_field) {
+			$this->_template_args['before_admin_page_content'] .= "\n\t".$form_field['field'];
 		}
 
 		// close form
@@ -2811,8 +2811,8 @@ 
 	 * @see EE_Admin_Page::_redirect_after_action() for params.
 	 * @since 4.5.0
 	 */
-	public function redirect_after_action( $success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) {
-		$this->_redirect_after_action( $success, $what, $action_desc, $query_args, $override_overwrite );
+	public function redirect_after_action($success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) {
+		$this->_redirect_after_action($success, $what, $action_desc, $query_args, $override_overwrite);
 	}
 
 
@@ -2827,32 +2827,32 @@ 
 	 *	@access protected
 	 *	@return void
 	 */
-	protected function _redirect_after_action( $success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) {
+	protected function _redirect_after_action($success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//class name for actions/filters.
 		$classname = get_class($this);
 
 		//set redirect url. Note if there is a "page" index in the $query_args then we go with vanilla admin.php route, otherwise we go with whatever is set as the _admin_base_url
-		$redirect_url = isset( $query_args['page'] ) ? admin_url('admin.php') : $this->_admin_base_url;
-		$notices = EE_Error::get_notices( FALSE );
+		$redirect_url = isset($query_args['page']) ? admin_url('admin.php') : $this->_admin_base_url;
+		$notices = EE_Error::get_notices(FALSE);
 
 		// overwrite default success messages //BUT ONLY if overwrite not overridden
-		if ( ! $override_overwrite || ! empty( $notices['errors'] )) {
+		if ( ! $override_overwrite || ! empty($notices['errors'])) {
 			EE_Error::overwrite_success();
 		}
 		// how many records affected ? more than one record ? or just one ?
-		if ( $success > 1 && empty( $notices['errors'] )) {
+		if ($success > 1 && empty($notices['errors'])) {
 			// set plural msg
-			EE_Error::add_success( sprintf( __('The "%s" have been successfully %s.', 'event_espresso'), $what, $action_desc ), __FILE__, __FUNCTION__, __LINE__);
-		} else if ( $success == 1 && empty( $notices['errors'] )) {
+			EE_Error::add_success(sprintf(__('The "%s" have been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__);
+		} else if ($success == 1 && empty($notices['errors'])) {
 			// set singular msg
-			EE_Error::add_success( sprintf( __('The "%s" has been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_success(sprintf(__('The "%s" has been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__);
 		}
 
 		// check that $query_args isn't something crazy
-		if ( ! is_array( $query_args )) {
+		if ( ! is_array($query_args)) {
 			$query_args = array();
 		}
 
@@ -2865,36 +2865,36 @@ 
 		 * @param array $query_args   The original query_args array coming into the
 		 *                          		method.
 		 */
-		do_action( 'AHEE__' . $classname . '___redirect_after_action__before_redirect_modification_' . $this->_req_action, $query_args );
+		do_action('AHEE__'.$classname.'___redirect_after_action__before_redirect_modification_'.$this->_req_action, $query_args);
 
 		//calculate where we're going (if we have a "save and close" button pushed)
-		if ( isset($this->_req_data['save_and_close'] ) && isset($this->_req_data['save_and_close_referrer'] ) ) {
+		if (isset($this->_req_data['save_and_close']) && isset($this->_req_data['save_and_close_referrer'])) {
 			// even though we have the save_and_close referrer, we need to parse the url for the action in order to generate a nonce
-			$parsed_url = parse_url( $this->_req_data['save_and_close_referrer'] );
+			$parsed_url = parse_url($this->_req_data['save_and_close_referrer']);
 			// regenerate query args array from refferer URL
-			parse_str( $parsed_url['query'], $query_args );
+			parse_str($parsed_url['query'], $query_args);
 			// correct page and action will be in the query args now
-			$redirect_url = admin_url( 'admin.php' );
+			$redirect_url = admin_url('admin.php');
 		}
 
 		//merge any default query_args set in _default_route_query_args property
-		if ( ! empty( $this->_default_route_query_args ) && ! $this->_is_UI_request ) {
+		if ( ! empty($this->_default_route_query_args) && ! $this->_is_UI_request) {
 			$args_to_merge = array();
-			foreach ( $this->_default_route_query_args as $query_param => $query_value ) {
+			foreach ($this->_default_route_query_args as $query_param => $query_value) {
 				//is there a wp_referer array in our _default_route_query_args property?
-				if ( $query_param == 'wp_referer'  ) {
+				if ($query_param == 'wp_referer') {
 					$query_value = (array) $query_value;
-					foreach ( $query_value as $reference => $value ) {
-						if ( strpos( $reference, 'nonce' ) !== false ) {
+					foreach ($query_value as $reference => $value) {
+						if (strpos($reference, 'nonce') !== false) {
 							continue;
 						}
 
 						//finally we will override any arguments in the referer with
 						//what might be set on the _default_route_query_args array.
-						if ( isset( $this->_default_route_query_args[$reference] ) ) {
-							$args_to_merge[$reference] = urlencode( $this->_default_route_query_args[$reference] );
+						if (isset($this->_default_route_query_args[$reference])) {
+							$args_to_merge[$reference] = urlencode($this->_default_route_query_args[$reference]);
 						} else {
-							$args_to_merge[$reference] = urlencode( $value );
+							$args_to_merge[$reference] = urlencode($value);
 						}
 					}
 					continue;
@@ -2905,7 +2905,7 @@ 
 
 			//now let's merge these arguments but override with what was specifically sent in to the
 			//redirect.
-			$query_args = array_merge( $args_to_merge, $query_args );
+			$query_args = array_merge($args_to_merge, $query_args);
 		}
 
 		$this->_process_notices($query_args);
@@ -2914,19 +2914,19 @@ 
 		// generate redirect url
 
 		// if redirecting to anything other than the main page, add a nonce
-		if ( isset( $query_args['action'] )) {
+		if (isset($query_args['action'])) {
 			// manually generate wp_nonce and merge that with the query vars becuz the wp_nonce_url function wrecks havoc on some vars
-			$query_args['_wpnonce'] = wp_create_nonce( $query_args['action'] . '_nonce' );
+			$query_args['_wpnonce'] = wp_create_nonce($query_args['action'].'_nonce');
 		}
 
 		//we're adding some hooks and filters in here for processing any things just before redirects (example: an admin page has done an insert or update and we want to run something after that).
-		do_action( 'AHEE_redirect_' . $classname . $this->_req_action, $query_args );
+		do_action('AHEE_redirect_'.$classname.$this->_req_action, $query_args);
 
-		$redirect_url = apply_filters( 'FHEE_redirect_' . $classname . $this->_req_action, self::add_query_args_and_nonce( $query_args, $redirect_url ), $query_args );
+		$redirect_url = apply_filters('FHEE_redirect_'.$classname.$this->_req_action, self::add_query_args_and_nonce($query_args, $redirect_url), $query_args);
 
 
 		// check if we're doing ajax.  If we are then lets just return the results and js can handle how it wants.
-		if ( defined('DOING_AJAX' ) ) {
+		if (defined('DOING_AJAX')) {
 			$default_data = array(
 				'close' => TRUE,
 				'redirect_url' => $redirect_url,
@@ -2935,11 +2935,11 @@ 
 				);
 
 			$this->_template_args['success'] = $success;
-			$this->_template_args['data'] = !empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data'] ): $default_data;
+			$this->_template_args['data'] = ! empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data']) : $default_data;
 			$this->_return_json();
 		}
 
-		wp_safe_redirect( $redirect_url );
+		wp_safe_redirect($redirect_url);
 		exit();
 	}
 
@@ -2955,14 +2955,14 @@ 
 	 * @param bool    $sticky_notices      This is used to flag that regardless of whether this is doing_ajax or not, we still save a transient for the notice.
 	 * @return void
 	 */
-	protected function _process_notices( $query_args = array(), $skip_route_verify = FALSE , $sticky_notices = TRUE ) {
+	protected function _process_notices($query_args = array(), $skip_route_verify = FALSE, $sticky_notices = TRUE) {
 
 		$this->_template_args['notices'] = EE_Error::get_notices();
 
 		//IF this isn't ajax we need to create a transient for the notices using the route (however, overridden if $sticky_notices == true)
-		if ( ! defined( 'DOING_AJAX' ) || $sticky_notices ) {
-			$route = isset( $query_args['action'] ) ? $query_args['action'] : 'default';
-			$this->_add_transient( $route, $this->_template_args['notices'], TRUE, $skip_route_verify );
+		if ( ! defined('DOING_AJAX') || $sticky_notices) {
+			$route = isset($query_args['action']) ? $query_args['action'] : 'default';
+			$this->_add_transient($route, $this->_template_args['notices'], TRUE, $skip_route_verify);
 		}
 	}
 
@@ -2984,32 +2984,32 @@ 
 	 *
 	 * @return string html for button
 	 */
-	public function get_action_link_or_button($action, $type = 'add', $extra_request = array(), $class = 'button-primary', $base_url = FALSE, $exclude_nonce = false ) {
+	public function get_action_link_or_button($action, $type = 'add', $extra_request = array(), $class = 'button-primary', $base_url = FALSE, $exclude_nonce = false) {
 		//first let's validate the action (if $base_url is FALSE otherwise validation will happen further along)
-		if ( !isset($this->_page_routes[$action]) && !$base_url )
-			throw new EE_Error( sprintf( __('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action) );
+		if ( ! isset($this->_page_routes[$action]) && ! $base_url)
+			throw new EE_Error(sprintf(__('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action));
 
-		if ( !isset( $this->_labels['buttons'][$type] ) )
-			throw new EE_Error( sprintf( __('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type) );
+		if ( ! isset($this->_labels['buttons'][$type]))
+			throw new EE_Error(sprintf(__('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type));
 
 		//finally check user access for this button.
-		$has_access = $this->check_user_access( $action, TRUE );
-		if ( ! $has_access ) {
+		$has_access = $this->check_user_access($action, TRUE);
+		if ( ! $has_access) {
 			return '';
 		}
 
-		$_base_url = !$base_url ? $this->_admin_base_url : $base_url;
+		$_base_url = ! $base_url ? $this->_admin_base_url : $base_url;
 
 		$query_args = array(
 			'action' => $action  );
 
 		//merge extra_request args but make sure our original action takes precedence and doesn't get overwritten.
-		if ( !empty($extra_request) )
-			$query_args = array_merge( $extra_request, $query_args );
+		if ( ! empty($extra_request))
+			$query_args = array_merge($extra_request, $query_args);
 
-		$url = self::add_query_args_and_nonce( $query_args, $_base_url, false, $exclude_nonce );
+		$url = self::add_query_args_and_nonce($query_args, $_base_url, false, $exclude_nonce);
 
-		$button = EEH_Template::get_button_or_link( $url, $this->_labels['buttons'][$type], $class );
+		$button = EEH_Template::get_button_or_link($url, $this->_labels['buttons'][$type], $class);
 
 		return $button;
 	}
@@ -3029,11 +3029,11 @@ 
 		$args = array(
 			'label' => $this->_admin_page_title,
 			'default' => 10,
-			'option' => $this->_current_page . '_' . $this->_current_view . '_per_page'
+			'option' => $this->_current_page.'_'.$this->_current_view.'_per_page'
 			);
 		//ONLY add the screen option if the user has access to it.
-		if ( $this->check_user_access( $this->_current_view, true ) ) {
-			add_screen_option( $option, $args );
+		if ($this->check_user_access($this->_current_view, true)) {
+			add_screen_option($option, $args);
 		}
 	}
 
@@ -3049,36 +3049,36 @@ 
 	 * @return void
 	 */
 	private function _set_per_page_screen_options() {
-		if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
-			check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
+		if (isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options'])) {
+			check_admin_referer('screen-options-nonce', 'screenoptionnonce');
 
-			if ( !$user = wp_get_current_user() )
+			if ( ! $user = wp_get_current_user())
 			return;
 			$option = $_POST['wp_screen_options']['option'];
 			$value = $_POST['wp_screen_options']['value'];
 
-			if ( $option != sanitize_key( $option ) )
+			if ($option != sanitize_key($option))
 				return;
 
 			$map_option = $option;
 
 			$option = str_replace('-', '_', $option);
 
-			switch ( $map_option ) {
-				case $this->_current_page . '_' .  $this->_current_view . '_per_page':
+			switch ($map_option) {
+				case $this->_current_page.'_'.$this->_current_view.'_per_page':
 					$value = (int) $value;
-					if ( $value < 1 || $value > 999 )
+					if ($value < 1 || $value > 999)
 						return;
 					break;
 				default:
-					$value = apply_filters( 'FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value );
-					if ( false === $value )
+					$value = apply_filters('FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value);
+					if (false === $value)
 						return;
 					break;
 			}
 
 			update_user_meta($user->ID, $option, $value);
-			wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
+			wp_safe_redirect(remove_query_arg(array('pagenum', 'apage', 'paged'), wp_get_referer()));
 			exit;
 		}
 	}
@@ -3089,8 +3089,8 @@ 
 	 * This just allows for setting the $_template_args property if it needs to be set outside the object
 	 * @param array $data array that will be assigned to template args.
 	 */
-	public function set_template_args( $data ) {
-		$this->_template_args = array_merge( $this->_template_args, (array) $data );
+	public function set_template_args($data) {
+		$this->_template_args = array_merge($this->_template_args, (array) $data);
 	}
 
 
@@ -3106,26 +3106,26 @@ 
 	 * @param bool $skip_route_verify Used to indicate we want to skip route verification.  This is usually ONLY used when we are adding a transient before page_routes have been defined.
 	 * @return void
 	 */
-	protected function _add_transient( $route, $data, $notices = FALSE, $skip_route_verify = FALSE ) {
+	protected function _add_transient($route, $data, $notices = FALSE, $skip_route_verify = FALSE) {
 		$user_id = get_current_user_id();
 
-		if ( !$skip_route_verify )
+		if ( ! $skip_route_verify)
 			$this->_verify_route($route);
 
 
 		//now let's set the string for what kind of transient we're setting
-		$transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id;
-		$data = $notices ? array( 'notices' => $data ) : $data;
+		$transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id;
+		$data = $notices ? array('notices' => $data) : $data;
 		//is there already a transient for this route?  If there is then let's ADD to that transient
-		$existing = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient );
-		if ( $existing ) {
-			$data = array_merge( (array) $data, (array) $existing );
+		$existing = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient);
+		if ($existing) {
+			$data = array_merge((array) $data, (array) $existing);
 		}
 
-		if ( is_multisite() && is_network_admin() ) {
-			set_site_transient( $transient, $data, 8 );
+		if (is_multisite() && is_network_admin()) {
+			set_site_transient($transient, $data, 8);
 		} else {
-			set_transient( $transient, $data, 8 );
+			set_transient($transient, $data, 8);
 		}
 	}
 
@@ -3137,18 +3137,18 @@ 
 	 * @param bool $notices true we get notices transient. False we just return normal route transient
 	 * @return mixed data
 	 */
-	protected function _get_transient( $notices = FALSE, $route = FALSE ) {
+	protected function _get_transient($notices = FALSE, $route = FALSE) {
 		$user_id = get_current_user_id();
-		$route = !$route ? $this->_req_action : $route;
-		$transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id;
-		$data = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient );
+		$route = ! $route ? $this->_req_action : $route;
+		$transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id;
+		$data = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient);
 		//delete transient after retrieval (just in case it hasn't expired);
-		if ( is_multisite() && is_network_admin() ) {
-			delete_site_transient( $transient );
+		if (is_multisite() && is_network_admin()) {
+			delete_site_transient($transient);
 		} else {
-			delete_transient( $transient );
+			delete_transient($transient);
 		}
-		return $notices && isset( $data['notices'] ) ? $data['notices'] : $data;
+		return $notices && isset($data['notices']) ? $data['notices'] : $data;
 	}
 
 
@@ -3165,12 +3165,12 @@ 
 
 		//retrieve all existing transients
 		$query = "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%rte_tx_%' OR option_name LIKE '%rte_n_tx_%'";
-		if ( $results = $wpdb->get_results( $query ) ) {
-			foreach ( $results as $result ) {
-				$transient = str_replace( '_transient_', '', $result->option_name );
-				get_transient( $transient );
-				if ( is_multisite() && is_network_admin() ) {
-					get_site_transient( $transient );
+		if ($results = $wpdb->get_results($query)) {
+			foreach ($results as $result) {
+				$transient = str_replace('_transient_', '', $result->option_name);
+				get_transient($transient);
+				if (is_multisite() && is_network_admin()) {
+					get_site_transient($transient);
 				}
 			}
 		}
@@ -3294,23 +3294,23 @@ 
 	 * @param string $line	line no where error occurred
 	 * @return boolean
 	 */
-	protected function _update_espresso_configuration( $tab, $config, $file = '', $func = '', $line = '' ) {
+	protected function _update_espresso_configuration($tab, $config, $file = '', $func = '', $line = '') {
 
 		//remove any options that are NOT going to be saved with the config settings.
-		if ( isset( $config->core->ee_ueip_optin ) ) {
+		if (isset($config->core->ee_ueip_optin)) {
 			$config->core->ee_ueip_has_notified = TRUE;
 			// TODO: remove the following two lines and make sure values are migrated from 3.1
-			update_option( 'ee_ueip_optin', $config->core->ee_ueip_optin);
-			update_option( 'ee_ueip_has_notified', TRUE );
+			update_option('ee_ueip_optin', $config->core->ee_ueip_optin);
+			update_option('ee_ueip_has_notified', TRUE);
 		}
 		// and save it (note we're also doing the network save here)
-		$net_saved = is_main_site() ? EE_Network_Config::instance()->update_config( FALSE, FALSE ) : TRUE;
-		$config_saved = EE_Config::instance()->update_espresso_config( FALSE, FALSE );
-		if ( $config_saved && $net_saved ) {
-			EE_Error::add_success( sprintf( __('"%s" have been successfully updated.', 'event_espresso'), $tab ));
+		$net_saved = is_main_site() ? EE_Network_Config::instance()->update_config(FALSE, FALSE) : TRUE;
+		$config_saved = EE_Config::instance()->update_espresso_config(FALSE, FALSE);
+		if ($config_saved && $net_saved) {
+			EE_Error::add_success(sprintf(__('"%s" have been successfully updated.', 'event_espresso'), $tab));
 			return TRUE;
 		} else {
-			EE_Error::add_error( sprintf( __('The "%s" were not updated.', 'event_espresso'), $tab ), $file, $func, $line  );
+			EE_Error::add_error(sprintf(__('The "%s" were not updated.', 'event_espresso'), $tab), $file, $func, $line);
 			return FALSE;
 		}
 	}
@@ -3323,7 +3323,7 @@ 
 	 * Returns an array to be used for EE_FOrm_Fields.helper.php's select_input as the $values argument.
 	 * @return array
 	 */
-	public function get_yes_no_values(){
+	public function get_yes_no_values() {
 		return $this->_yes_no_values;
 	}
 
@@ -3345,8 +3345,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _next_link( $url, $class = 'dashicons dashicons-arrow-right' ) {
-		return '<a class="' . $class . '" href="' . $url . '"></a>';
+	protected function _next_link($url, $class = 'dashicons dashicons-arrow-right') {
+		return '<a class="'.$class.'" href="'.$url.'"></a>';
 	}
 
 
@@ -3360,8 +3360,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _previous_link( $url, $class = 'dashicons dashicons-arrow-left' ) {
-		return '<a class="' . $class . '" href="' . $url . '"></a>';
+	protected function _previous_link($url, $class = 'dashicons dashicons-arrow-left') {
+		return '<a class="'.$class.'" href="'.$url.'"></a>';
 	}
 
 
@@ -3380,8 +3380,8 @@ 
 	 * @return bool success/fail
 	 */
 	protected function _process_resend_registration() {
-		$this->_template_args['success'] = EED_Messages::process_resend( $this->_req_data );
-		do_action( 'AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data );
+		$this->_template_args['success'] = EED_Messages::process_resend($this->_req_data);
+		do_action('AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data);
 		return $this->_template_args['success'];
 	}
 
@@ -3394,9 +3394,9 @@ 
 	 * @param \EE_Payment $payment
 	 * @return bool success/fail
 	 */
-	protected function _process_payment_notification( EE_Payment $payment ) {
-		add_filter( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', '__return_true' );
-		$success = apply_filters( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', FALSE, $payment );
+	protected function _process_payment_notification(EE_Payment $payment) {
+		add_filter('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', '__return_true');
+		$success = apply_filters('FHEE__EE_Admin_Page___process_admin_payment_notification__success', FALSE, $payment);
 		$this->_template_args['success'] = $success;
 		return $success;
 	}

admin_pages/general_settings/General_Settings_Admin_Page.core.php

Spacing +284 added lines, -285 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -40,8 +40,8 @@ 
 
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -57,10 +57,10 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_display_country_settings', array( $this, 'display_country_settings'));
-		add_action('wp_ajax_espresso_display_country_states', array( $this, 'display_country_states'));
-		add_action('wp_ajax_espresso_delete_state', array( $this, 'delete_state'), 10, 3 );
-		add_action('wp_ajax_espresso_add_new_state', array( $this, 'add_new_state'));
+		add_action('wp_ajax_espresso_display_country_settings', array($this, 'display_country_settings'));
+		add_action('wp_ajax_espresso_display_country_states', array($this, 'display_country_states'));
+		add_action('wp_ajax_espresso_delete_state', array($this, 'delete_state'), 10, 3);
+		add_action('wp_ajax_espresso_add_new_state', array($this, 'add_new_state'));
 	}
 
 
@@ -153,14 +153,14 @@ 
 					'label' => __('Critical Pages', 'event_espresso'),
 					'order' => 50
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
                			'help_tabs' => array(
 					'general_settings_critical_pages_help_tab' => array(
 						'title' => __('Critical Pages', 'event_espresso'),
 						'filename' => 'general_settings_critical_pages'
 						)
 					),
-				'help_tour' => array( 'Critical_Pages_Help_Tour' ),
+				'help_tour' => array('Critical_Pages_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			'default' => array(
@@ -174,8 +174,8 @@ 
 						'filename' => 'general_settings_your_organization'
 						)
 					),
-				'help_tour' => array( 'Your_Organization_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'help_tour' => array('Your_Organization_Help_Tour'),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'require_nonce' => FALSE
 				),
 			'admin_option_settings' => array(
@@ -183,14 +183,14 @@ 
 					'label' => __('Admin Options', 'event_espresso'),
 					'order' => 60
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
                 			'help_tabs' => array(
 					'general_settings_admin_options_help_tab' => array(
 						'title' => __('Admin Options', 'event_espresso'),
 						'filename' => 'general_settings_admin_options'
 						)
 					),
-				'help_tour' => array( 'Admin_Options_Help_Tour' ),
+				'help_tour' => array('Admin_Options_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			'country_settings' => array(
@@ -204,7 +204,7 @@ 
 						'filename' => 'general_settings_countries'
 						)
 					),
-				'help_tour' => array( 'Countries_Help_Tour' ),
+				'help_tour' => array('Countries_Help_Tour'),
 				'require_nonce' => FALSE
 				)
 			);
@@ -222,11 +222,11 @@ 
 	}
 
 	public function admin_init() {
-		EE_Registry::$i18n_js_strings[ 'invalid_server_response' ] = __( 'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings[ 'error_occurred' ] = __( 'An error occurred! Please refresh the page and try again.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings[ 'confirm_delete_state' ] = __( 'Are you sure you want to delete this State / Province?', 'event_espresso' );
-		$protocol = isset( $_SERVER[ 'HTTPS' ] ) ? 'https://' : 'http://';
-		EE_Registry::$i18n_js_strings[ 'ajax_url' ] = admin_url( 'admin-ajax.php?page=espresso_general_settings', $protocol );
+		EE_Registry::$i18n_js_strings['invalid_server_response'] = __('An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['error_occurred'] = __('An error occurred! Please refresh the page and try again.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['confirm_delete_state'] = __('Are you sure you want to delete this State / Province?', 'event_espresso');
+		$protocol = isset($_SERVER['HTTPS']) ? 'https://' : 'http://';
+		EE_Registry::$i18n_js_strings['ajax_url'] = admin_url('admin-ajax.php?page=espresso_general_settings', $protocol);
 	}
 
 	public function admin_notices() {}
@@ -239,21 +239,21 @@ 
 		//scripts
 		wp_enqueue_script('media-upload');
 		wp_enqueue_script('thickbox');
-		wp_register_script( 'organization_settings', GEN_SET_ASSETS_URL . 'your_organization_settings.js', array( 'jquery','media-upload','thickbox' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_style( 'organization-css', GEN_SET_ASSETS_URL . 'organization.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_script( 'organization_settings' );
-		wp_enqueue_style( 'organization-css' );
-		$confirm_image_delete = array( 'text' => __('Do you really want to delete this image? Please remember to save your settings to complete the removal.', 'event_espresso'));
-		wp_localize_script( 'organization_settings', 'confirm_image_delete', $confirm_image_delete );
+		wp_register_script('organization_settings', GEN_SET_ASSETS_URL.'your_organization_settings.js', array('jquery', 'media-upload', 'thickbox'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('organization_settings');
+		wp_enqueue_style('organization-css');
+		$confirm_image_delete = array('text' => __('Do you really want to delete this image? Please remember to save your settings to complete the removal.', 'event_espresso'));
+		wp_localize_script('organization_settings', 'confirm_image_delete', $confirm_image_delete);
 
 	}
 
 	public function load_scripts_styles_country_settings() {
 		//scripts
-		wp_register_script( 'gen_settings_countries', GEN_SET_ASSETS_URL . 'gen_settings_countries.js', array( 'ee_admin_js' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_style( 'organization-css', GEN_SET_ASSETS_URL . 'organization.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_script( 'gen_settings_countries' );
-		wp_enqueue_style( 'organization-css' );
+		wp_register_script('gen_settings_countries', GEN_SET_ASSETS_URL.'gen_settings_countries.js', array('ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('gen_settings_countries');
+		wp_enqueue_style('organization-css');
 
 	}
 
@@ -265,37 +265,37 @@ 
 
 		// Check to make sure all of the main pages are setup properly,
 		// if not create the default pages and display an admin notice
-		EE_Registry::instance()->load_helper( 'Activation' );
+		EE_Registry::instance()->load_helper('Activation');
 		EEH_Activation::verify_default_pages_exist();
 
 		$this->_transient_garbage_collection();
 		$this->_template_args['values'] = $this->_yes_no_values;
 
-		$this->_template_args['reg_page_id'] = isset(EE_Registry::instance()->CFG->core->reg_page_id ) ?EE_Registry::instance()->CFG->core->reg_page_id : NULL;
-		$this->_template_args['reg_page_obj'] = isset(EE_Registry::instance()->CFG->core->reg_page_id ) ? get_page(EE_Registry::instance()->CFG->core->reg_page_id ) : FALSE;
+		$this->_template_args['reg_page_id'] = isset(EE_Registry::instance()->CFG->core->reg_page_id) ?EE_Registry::instance()->CFG->core->reg_page_id : NULL;
+		$this->_template_args['reg_page_obj'] = isset(EE_Registry::instance()->CFG->core->reg_page_id) ? get_page(EE_Registry::instance()->CFG->core->reg_page_id) : FALSE;
 
 		$this->_template_args['txn_page_id'] = isset(EE_Registry::instance()->CFG->core->txn_page_id) ?EE_Registry::instance()->CFG->core->txn_page_id : NULL;
-		$this->_template_args['txn_page_obj'] = isset(EE_Registry::instance()->CFG->core->txn_page_id ) ? get_page(EE_Registry::instance()->CFG->core->txn_page_id ) : FALSE;
+		$this->_template_args['txn_page_obj'] = isset(EE_Registry::instance()->CFG->core->txn_page_id) ? get_page(EE_Registry::instance()->CFG->core->txn_page_id) : FALSE;
 
-		$this->_template_args['thank_you_page_id'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id ) ?EE_Registry::instance()->CFG->core->thank_you_page_id : NULL;
-		$this->_template_args['thank_you_page_obj'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id ) ? get_page(EE_Registry::instance()->CFG->core->thank_you_page_id ) : FALSE;
+		$this->_template_args['thank_you_page_id'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id) ?EE_Registry::instance()->CFG->core->thank_you_page_id : NULL;
+		$this->_template_args['thank_you_page_obj'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id) ? get_page(EE_Registry::instance()->CFG->core->thank_you_page_id) : FALSE;
 
-		$this->_template_args['cancel_page_id'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id ) ?EE_Registry::instance()->CFG->core->cancel_page_id : NULL;
-		$this->_template_args['cancel_page_obj'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id ) ? get_page(EE_Registry::instance()->CFG->core->cancel_page_id ) : FALSE;
+		$this->_template_args['cancel_page_id'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id) ?EE_Registry::instance()->CFG->core->cancel_page_id : NULL;
+		$this->_template_args['cancel_page_obj'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id) ? get_page(EE_Registry::instance()->CFG->core->cancel_page_id) : FALSE;
 
-		$this->_set_add_edit_form_tags( 'update_espresso_page_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_espresso_page_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'espresso_page_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 
 	}
 
 	protected function _update_espresso_page_settings() {
 		// capture incoming request data
-		$reg_page_id = isset( $this->_req_data['reg_page_id'] ) ? absint( $this->_req_data['reg_page_id'] ) : EE_Registry::instance()->CFG->core->reg_page_id;
-		$txn_page_id = isset( $this->_req_data['txn_page_id'] ) ? absint( $this->_req_data['txn_page_id'] ) : EE_Registry::instance()->CFG->core->txn_page_id;
-		$thank_you_page_id = isset( $this->_req_data['thank_you_page_id'] ) ? absint( $this->_req_data['thank_you_page_id'] ) : EE_Registry::instance()->CFG->core->thank_you_page_id;
-		$cancel_page_id = isset( $this->_req_data['cancel_page_id'] ) ? absint( $this->_req_data['cancel_page_id'] ) : EE_Registry::instance()->CFG->core->cancel_page_id;
+		$reg_page_id = isset($this->_req_data['reg_page_id']) ? absint($this->_req_data['reg_page_id']) : EE_Registry::instance()->CFG->core->reg_page_id;
+		$txn_page_id = isset($this->_req_data['txn_page_id']) ? absint($this->_req_data['txn_page_id']) : EE_Registry::instance()->CFG->core->txn_page_id;
+		$thank_you_page_id = isset($this->_req_data['thank_you_page_id']) ? absint($this->_req_data['thank_you_page_id']) : EE_Registry::instance()->CFG->core->thank_you_page_id;
+		$cancel_page_id = isset($this->_req_data['cancel_page_id']) ? absint($this->_req_data['cancel_page_id']) : EE_Registry::instance()->CFG->core->cancel_page_id;
 		// pack critical_pages into an array
 		$critical_pages = array(
 			'reg_page_id' 				=> $reg_page_id,
@@ -303,17 +303,17 @@ 
 			'thank_you_page_id' 	=> $thank_you_page_id,
 			'cancel_page_id' 		=> $cancel_page_id
 		);
-		foreach ( $critical_pages as $critical_page_name => $critical_page_id ) {
+		foreach ($critical_pages as $critical_page_name => $critical_page_id) {
 			// has the page changed ?
-			if ( EE_Registry::instance()->CFG->core->{$critical_page_name} != $critical_page_id ) {
+			if (EE_Registry::instance()->CFG->core->{$critical_page_name} != $critical_page_id) {
 				// grab post object for old page
-				$post = get_post( EE_Registry::instance()->CFG->core->{$critical_page_name} );
+				$post = get_post(EE_Registry::instance()->CFG->core->{$critical_page_name} );
 				// update post shortcodes for old page
-				EE_Admin::parse_post_content_on_save( $critical_page_id, $post );
+				EE_Admin::parse_post_content_on_save($critical_page_id, $post);
 				// grab post object for new page
-				$post = get_post( $critical_page_id );
+				$post = get_post($critical_page_id);
 				// update post shortcodes for new page
-				EE_Admin::parse_post_content_on_save( $critical_page_id, $post );
+				EE_Admin::parse_post_content_on_save($critical_page_id, $post);
 			}
 		}
 		// set page IDs
@@ -322,14 +322,14 @@ 
 		EE_Registry::instance()->CFG->core->thank_you_page_id = $thank_you_page_id;
 		EE_Registry::instance()->CFG->core->cancel_page_id = $cancel_page_id;
 
-		EE_Registry::instance()->CFG->core = apply_filters( 'FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core', EE_Registry::instance()->CFG->core, $this->_req_data );
+		EE_Registry::instance()->CFG->core = apply_filters('FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core', EE_Registry::instance()->CFG->core, $this->_req_data);
 
 		$what = __('Critical Pages & Shortcodes', 'event_espresso');
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG->core, __FILE__, __FUNCTION__, __LINE__ );
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->core, __FILE__, __FUNCTION__, __LINE__);
 		$query_args = array(
 			'action' => 'critical_pages'
 			);
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 
 	}
 
@@ -344,35 +344,35 @@ 
 
 	protected function _your_organization_settings() {
 
-		$this->_template_args['site_license_key'] = isset( EE_Registry::instance()->NET_CFG->core->site_license_key ) ? EE_Registry::instance()->NET_CFG->core->get_pretty( 'site_license_key' ) : '';
-		$this->_template_args['organization_name'] = isset( EE_Registry::instance()->CFG->organization->name ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) : '';
-		$this->_template_args['organization_address_1'] = isset( EE_Registry::instance()->CFG->organization->address_1 ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'address_1' ) : '';
-		$this->_template_args['organization_address_2'] = isset( EE_Registry::instance()->CFG->organization->address_2 ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'address_2' ) : '';
-		$this->_template_args['organization_city'] = isset( EE_Registry::instance()->CFG->organization->city ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'city' ) : '';
-		$this->_template_args['organization_zip'] = isset( EE_Registry::instance()->CFG->organization->zip ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'zip' ) : '';
-		$this->_template_args['organization_email'] = isset( EE_Registry::instance()->CFG->organization->email ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'email' ) : '';
-		$this->_template_args['organization_phone'] = isset( EE_Registry::instance()->CFG->organization->phone ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'phone' ) : '';
-		$this->_template_args['organization_vat'] = isset( EE_Registry::instance()->CFG->organization->vat ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'vat' ) : '';
-		$this->_template_args['currency_sign'] = isset( EE_Registry::instance()->CFG->currency->sign ) ? EE_Registry::instance()->CFG->currency->get_pretty( 'sign' ) : '$';
-		$this->_template_args['organization_logo_url'] = isset( EE_Registry::instance()->CFG->organization->logo_url ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' ) : FALSE;
-		$this->_template_args['organization_facebook'] = isset( EE_Registry::instance()->CFG->organization->facebook ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' ) : '';
-		$this->_template_args['organization_twitter'] = isset( EE_Registry::instance()->CFG->organization->twitter ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' ) : '';
-		$this->_template_args['organization_linkedin'] = isset( EE_Registry::instance()->CFG->organization->linkedin ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' ) : '';
-		$this->_template_args['organization_pinterest'] = isset( EE_Registry::instance()->CFG->organization->pinterest ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' ) : '';
-		$this->_template_args['organization_google'] = isset( EE_Registry::instance()->CFG->organization->google ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'google' ) : '';
-		$this->_template_args['organization_instagram'] = isset( EE_Registry::instance()->CFG->organization->instagram ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' ) : '';
+		$this->_template_args['site_license_key'] = isset(EE_Registry::instance()->NET_CFG->core->site_license_key) ? EE_Registry::instance()->NET_CFG->core->get_pretty('site_license_key') : '';
+		$this->_template_args['organization_name'] = isset(EE_Registry::instance()->CFG->organization->name) ? EE_Registry::instance()->CFG->organization->get_pretty('name') : '';
+		$this->_template_args['organization_address_1'] = isset(EE_Registry::instance()->CFG->organization->address_1) ? EE_Registry::instance()->CFG->organization->get_pretty('address_1') : '';
+		$this->_template_args['organization_address_2'] = isset(EE_Registry::instance()->CFG->organization->address_2) ? EE_Registry::instance()->CFG->organization->get_pretty('address_2') : '';
+		$this->_template_args['organization_city'] = isset(EE_Registry::instance()->CFG->organization->city) ? EE_Registry::instance()->CFG->organization->get_pretty('city') : '';
+		$this->_template_args['organization_zip'] = isset(EE_Registry::instance()->CFG->organization->zip) ? EE_Registry::instance()->CFG->organization->get_pretty('zip') : '';
+		$this->_template_args['organization_email'] = isset(EE_Registry::instance()->CFG->organization->email) ? EE_Registry::instance()->CFG->organization->get_pretty('email') : '';
+		$this->_template_args['organization_phone'] = isset(EE_Registry::instance()->CFG->organization->phone) ? EE_Registry::instance()->CFG->organization->get_pretty('phone') : '';
+		$this->_template_args['organization_vat'] = isset(EE_Registry::instance()->CFG->organization->vat) ? EE_Registry::instance()->CFG->organization->get_pretty('vat') : '';
+		$this->_template_args['currency_sign'] = isset(EE_Registry::instance()->CFG->currency->sign) ? EE_Registry::instance()->CFG->currency->get_pretty('sign') : '$';
+		$this->_template_args['organization_logo_url'] = isset(EE_Registry::instance()->CFG->organization->logo_url) ? EE_Registry::instance()->CFG->organization->get_pretty('logo_url') : FALSE;
+		$this->_template_args['organization_facebook'] = isset(EE_Registry::instance()->CFG->organization->facebook) ? EE_Registry::instance()->CFG->organization->get_pretty('facebook') : '';
+		$this->_template_args['organization_twitter'] = isset(EE_Registry::instance()->CFG->organization->twitter) ? EE_Registry::instance()->CFG->organization->get_pretty('twitter') : '';
+		$this->_template_args['organization_linkedin'] = isset(EE_Registry::instance()->CFG->organization->linkedin) ? EE_Registry::instance()->CFG->organization->get_pretty('linkedin') : '';
+		$this->_template_args['organization_pinterest'] = isset(EE_Registry::instance()->CFG->organization->pinterest) ? EE_Registry::instance()->CFG->organization->get_pretty('pinterest') : '';
+		$this->_template_args['organization_google'] = isset(EE_Registry::instance()->CFG->organization->google) ? EE_Registry::instance()->CFG->organization->get_pretty('google') : '';
+		$this->_template_args['organization_instagram'] = isset(EE_Registry::instance()->CFG->organization->instagram) ? EE_Registry::instance()->CFG->organization->get_pretty('instagram') : '';
 		//UXIP settings
-		$this->_template_args['ee_ueip_optin'] = isset( EE_Registry::instance()->CFG->core->ee_ueip_optin ) ? EE_Registry::instance()->CFG->core->get_pretty( 'ee_ueip_optin' ) : TRUE;
+		$this->_template_args['ee_ueip_optin'] = isset(EE_Registry::instance()->CFG->core->ee_ueip_optin) ? EE_Registry::instance()->CFG->core->get_pretty('ee_ueip_optin') : TRUE;
 
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
-		$STA_ID = isset( EE_Registry::instance()->CFG->organization->STA_ID ) ? EE_Registry::instance()->CFG->organization->STA_ID : 4;
+		EE_Registry::instance()->load_helper('Form_Fields');
+		$STA_ID = isset(EE_Registry::instance()->CFG->organization->STA_ID) ? EE_Registry::instance()->CFG->organization->STA_ID : 4;
 		$this->_template_args['states'] = new EE_Question_Form_Input(
-				EE_Question::new_instance ( array(
+				EE_Question::new_instance(array(
 					'QST_ID'=> 0,
 					'QST_display_text'=> __('State/Province', 'event_espresso'),
 					'QST_system'=>'admin-state'
 				)),
-				EE_Answer::new_instance ( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $STA_ID
 				)),
@@ -384,14 +384,14 @@ 
 				)
 			);
 
-		$CNT_ISO = isset( EE_Registry::instance()->CFG->organization->CNT_ISO ) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
+		$CNT_ISO = isset(EE_Registry::instance()->CFG->organization->CNT_ISO) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
 		$this->_template_args['countries'] = new EE_Question_Form_Input(
-				EE_Question::new_instance ( array(
+				EE_Question::new_instance(array(
 					'QST_ID'=> 0,
 					'QST_display_text'=> __('Country', 'event_espresso'),
 					'QST_system'=>'admin-country'
 				)),
-				EE_Answer::new_instance ( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $CNT_ISO
 				)),
@@ -403,51 +403,51 @@ 
 				)
 			);
 
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'country_form_field_label_wrap' ), 10, 2 );
-		add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'country_form_field_input__wrap' ), 10, 2 );
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
 
 		//PUE verification stuff
-		$ver_option_key = 'puvererr_' . basename( EE_PLUGIN_BASENAME );
-		$verify_fail = get_option( $ver_option_key );
-		$this->_template_args['site_license_key_verified'] = $verify_fail || !empty( $verify_fail ) || ( empty( $this->_template_args['site_license_key'] ) && empty( $verify_fail ) )? '<span class="dashicons dashicons-admin-network ee-icon-color-ee-red ee-icon-size-20"></span>' : '<span class="dashicons dashicons-admin-network ee-icon-color-ee-green ee-icon-size-20"></span>';
+		$ver_option_key = 'puvererr_'.basename(EE_PLUGIN_BASENAME);
+		$verify_fail = get_option($ver_option_key);
+		$this->_template_args['site_license_key_verified'] = $verify_fail || ! empty($verify_fail) || (empty($this->_template_args['site_license_key']) && empty($verify_fail)) ? '<span class="dashicons dashicons-admin-network ee-icon-color-ee-red ee-icon-size-20"></span>' : '<span class="dashicons dashicons-admin-network ee-icon-color-ee-green ee-icon-size-20"></span>';
 
-		$this->_set_add_edit_form_tags( 'update_your_organization_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'your_organization_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_your_organization_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'your_organization_settings.template.php', $this->_template_args, TRUE);
 
 		$this->display_admin_page_with_sidebar();
 	}
 
 	protected function _update_your_organization_settings() {
-		if ( is_main_site() )
-			EE_Registry::instance()->NET_CFG->core->site_license_key = isset( $this->_req_data['site_license_key'] ) ? sanitize_text_field( $this->_req_data['site_license_key'] ) : EE_Registry::instance()->NET_CFG->core->site_license_key;
-		EE_Registry::instance()->CFG->organization->name = isset( $this->_req_data['organization_name'] ) ? sanitize_text_field( $this->_req_data['organization_name'] ) : EE_Registry::instance()->CFG->organization->name;
-		EE_Registry::instance()->CFG->organization->address_1 = isset( $this->_req_data['organization_address_1'] ) ? sanitize_text_field( $this->_req_data['organization_address_1'] ) : EE_Registry::instance()->CFG->organization->address_1;
-		EE_Registry::instance()->CFG->organization->address_2 = isset( $this->_req_data['organization_address_2'] ) ? sanitize_text_field( $this->_req_data['organization_address_2'] ) : EE_Registry::instance()->CFG->organization->address_2;
-		EE_Registry::instance()->CFG->organization->city = isset( $this->_req_data['organization_city'] ) ? sanitize_text_field( $this->_req_data['organization_city'] ) : EE_Registry::instance()->CFG->organization->city;
-		EE_Registry::instance()->CFG->organization->STA_ID = isset( $this->_req_data['organization_state'] ) ? absint( $this->_req_data['organization_state'] ) : EE_Registry::instance()->CFG->organization->STA_ID;
-		EE_Registry::instance()->CFG->organization->CNT_ISO = isset( $this->_req_data['organization_country'] ) ? sanitize_text_field( $this->_req_data['organization_country'] ) : EE_Registry::instance()->CFG->organization->CNT_ISO;
-		EE_Registry::instance()->CFG->organization->zip = isset( $this->_req_data['organization_zip'] ) ? sanitize_text_field( $this->_req_data['organization_zip'] ) : EE_Registry::instance()->CFG->organization->zip;
-		EE_Registry::instance()->CFG->organization->email = isset( $this->_req_data['organization_email'] ) ? sanitize_email( $this->_req_data['organization_email'] ) : EE_Registry::instance()->CFG->organization->email;
-		EE_Registry::instance()->CFG->organization->vat = isset( $this->_req_data['organization_vat'] ) ? sanitize_text_field( $this->_req_data['organization_vat'] ) : EE_Registry::instance()->CFG->organization->vat;
-		EE_Registry::instance()->CFG->organization->phone = isset( $this->_req_data['organization_phone'] ) ? sanitize_text_field( $this->_req_data['organization_phone'] ) : EE_Registry::instance()->CFG->organization->phone;
-		EE_Registry::instance()->CFG->organization->logo_url = isset( $this->_req_data['organization_logo_url'] ) ? esc_url_raw( $this->_req_data['organization_logo_url'] ) : EE_Registry::instance()->CFG->organization->logo_url;
-		EE_Registry::instance()->CFG->organization->facebook = isset( $this->_req_data['organization_facebook'] ) ? esc_url_raw( $this->_req_data['organization_facebook'] ) : EE_Registry::instance()->CFG->organization->facebook;
-		EE_Registry::instance()->CFG->organization->twitter = isset( $this->_req_data['organization_twitter'] ) ? esc_url_raw( $this->_req_data['organization_twitter'] ) : EE_Registry::instance()->CFG->organization->twitter;
-		EE_Registry::instance()->CFG->organization->linkedin = isset( $this->_req_data['organization_linkedin'] ) ? esc_url_raw( $this->_req_data['organization_linkedin'] ) : EE_Registry::instance()->CFG->organization->linkedin;
-		EE_Registry::instance()->CFG->organization->pinterest = isset( $this->_req_data['organization_pinterest'] ) ? esc_url_raw( $this->_req_data['organization_pinterest'] ) : EE_Registry::instance()->CFG->organization->pinterest;
-		EE_Registry::instance()->CFG->organization->google = isset( $this->_req_data['organization_google'] ) ? esc_url_raw( $this->_req_data['organization_google'] ) : EE_Registry::instance()->CFG->organization->google;
-		EE_Registry::instance()->CFG->organization->instagram = isset( $this->_req_data['organization_instagram'] ) ? esc_url_raw( $this->_req_data['organization_instagram'] ) : EE_Registry::instance()->CFG->organization->instagram;
-		EE_Registry::instance()->CFG->core->ee_ueip_optin = isset( $this->_req_data['ueip_optin'] ) && !empty( $this->_req_data['ueip_optin'] ) ? $this->_req_data['ueip_optin'] : EE_Registry::instance()->CFG->core->ee_ueip_optin;
-
-		EE_Registry::instance()->CFG->currency = new EE_Currency_Config( EE_Registry::instance()->CFG->organization->CNT_ISO );
-
-		EE_Registry::instance()->CFG = apply_filters( 'FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG', EE_Registry::instance()->CFG );
+		if (is_main_site())
+			EE_Registry::instance()->NET_CFG->core->site_license_key = isset($this->_req_data['site_license_key']) ? sanitize_text_field($this->_req_data['site_license_key']) : EE_Registry::instance()->NET_CFG->core->site_license_key;
+		EE_Registry::instance()->CFG->organization->name = isset($this->_req_data['organization_name']) ? sanitize_text_field($this->_req_data['organization_name']) : EE_Registry::instance()->CFG->organization->name;
+		EE_Registry::instance()->CFG->organization->address_1 = isset($this->_req_data['organization_address_1']) ? sanitize_text_field($this->_req_data['organization_address_1']) : EE_Registry::instance()->CFG->organization->address_1;
+		EE_Registry::instance()->CFG->organization->address_2 = isset($this->_req_data['organization_address_2']) ? sanitize_text_field($this->_req_data['organization_address_2']) : EE_Registry::instance()->CFG->organization->address_2;
+		EE_Registry::instance()->CFG->organization->city = isset($this->_req_data['organization_city']) ? sanitize_text_field($this->_req_data['organization_city']) : EE_Registry::instance()->CFG->organization->city;
+		EE_Registry::instance()->CFG->organization->STA_ID = isset($this->_req_data['organization_state']) ? absint($this->_req_data['organization_state']) : EE_Registry::instance()->CFG->organization->STA_ID;
+		EE_Registry::instance()->CFG->organization->CNT_ISO = isset($this->_req_data['organization_country']) ? sanitize_text_field($this->_req_data['organization_country']) : EE_Registry::instance()->CFG->organization->CNT_ISO;
+		EE_Registry::instance()->CFG->organization->zip = isset($this->_req_data['organization_zip']) ? sanitize_text_field($this->_req_data['organization_zip']) : EE_Registry::instance()->CFG->organization->zip;
+		EE_Registry::instance()->CFG->organization->email = isset($this->_req_data['organization_email']) ? sanitize_email($this->_req_data['organization_email']) : EE_Registry::instance()->CFG->organization->email;
+		EE_Registry::instance()->CFG->organization->vat = isset($this->_req_data['organization_vat']) ? sanitize_text_field($this->_req_data['organization_vat']) : EE_Registry::instance()->CFG->organization->vat;
+		EE_Registry::instance()->CFG->organization->phone = isset($this->_req_data['organization_phone']) ? sanitize_text_field($this->_req_data['organization_phone']) : EE_Registry::instance()->CFG->organization->phone;
+		EE_Registry::instance()->CFG->organization->logo_url = isset($this->_req_data['organization_logo_url']) ? esc_url_raw($this->_req_data['organization_logo_url']) : EE_Registry::instance()->CFG->organization->logo_url;
+		EE_Registry::instance()->CFG->organization->facebook = isset($this->_req_data['organization_facebook']) ? esc_url_raw($this->_req_data['organization_facebook']) : EE_Registry::instance()->CFG->organization->facebook;
+		EE_Registry::instance()->CFG->organization->twitter = isset($this->_req_data['organization_twitter']) ? esc_url_raw($this->_req_data['organization_twitter']) : EE_Registry::instance()->CFG->organization->twitter;
+		EE_Registry::instance()->CFG->organization->linkedin = isset($this->_req_data['organization_linkedin']) ? esc_url_raw($this->_req_data['organization_linkedin']) : EE_Registry::instance()->CFG->organization->linkedin;
+		EE_Registry::instance()->CFG->organization->pinterest = isset($this->_req_data['organization_pinterest']) ? esc_url_raw($this->_req_data['organization_pinterest']) : EE_Registry::instance()->CFG->organization->pinterest;
+		EE_Registry::instance()->CFG->organization->google = isset($this->_req_data['organization_google']) ? esc_url_raw($this->_req_data['organization_google']) : EE_Registry::instance()->CFG->organization->google;
+		EE_Registry::instance()->CFG->organization->instagram = isset($this->_req_data['organization_instagram']) ? esc_url_raw($this->_req_data['organization_instagram']) : EE_Registry::instance()->CFG->organization->instagram;
+		EE_Registry::instance()->CFG->core->ee_ueip_optin = isset($this->_req_data['ueip_optin']) && ! empty($this->_req_data['ueip_optin']) ? $this->_req_data['ueip_optin'] : EE_Registry::instance()->CFG->core->ee_ueip_optin;
+
+		EE_Registry::instance()->CFG->currency = new EE_Currency_Config(EE_Registry::instance()->CFG->organization->CNT_ISO);
+
+		EE_Registry::instance()->CFG = apply_filters('FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG', EE_Registry::instance()->CFG);
 
 		$what = 'Your Organization Settings';
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__ );
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__);
 
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'default' ) );
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'default'));
 
 	}
 
@@ -458,36 +458,36 @@ 
 	protected function _admin_option_settings() {
 
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['use_personnel_manager'] = isset( EE_Registry::instance()->CFG->admin->use_personnel_manager ) ? absint( EE_Registry::instance()->CFG->admin->use_personnel_manager ) : FALSE;
-		$this->_template_args['use_dashboard_widget'] = isset( EE_Registry::instance()->CFG->admin->use_dashboard_widget ) ? absint( EE_Registry::instance()->CFG->admin->use_dashboard_widget ) : TRUE;
-		$this->_template_args['events_in_dashboard'] = isset( EE_Registry::instance()->CFG->admin->events_in_dashboard ) ? absint( EE_Registry::instance()->CFG->admin->events_in_dashboard ) : 30;
-		$this->_template_args['use_event_timezones'] = isset( EE_Registry::instance()->CFG->admin->use_event_timezones ) ? absint( EE_Registry::instance()->CFG->admin->use_event_timezones ) : FALSE;
-		$this->_template_args['show_reg_footer'] = isset( EE_Registry::instance()->CFG->admin->show_reg_footer ) ? absint( EE_Registry::instance()->CFG->admin->show_reg_footer ) : TRUE;
-		$this->_template_args['affiliate_id'] = isset( EE_Registry::instance()->CFG->admin->affiliate_id ) ? EE_Registry::instance()->CFG->admin->get_pretty('affiliate_id') : '';
-		$this->_template_args['help_tour_activation'] = isset( EE_Registry::instance()->CFG->admin->help_tour_activation ) ? absint( EE_Registry::instance()->CFG->admin->help_tour_activation ): 1;
-
-		$this->_set_add_edit_form_tags( 'update_admin_option_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
+		$this->_template_args['use_personnel_manager'] = isset(EE_Registry::instance()->CFG->admin->use_personnel_manager) ? absint(EE_Registry::instance()->CFG->admin->use_personnel_manager) : FALSE;
+		$this->_template_args['use_dashboard_widget'] = isset(EE_Registry::instance()->CFG->admin->use_dashboard_widget) ? absint(EE_Registry::instance()->CFG->admin->use_dashboard_widget) : TRUE;
+		$this->_template_args['events_in_dashboard'] = isset(EE_Registry::instance()->CFG->admin->events_in_dashboard) ? absint(EE_Registry::instance()->CFG->admin->events_in_dashboard) : 30;
+		$this->_template_args['use_event_timezones'] = isset(EE_Registry::instance()->CFG->admin->use_event_timezones) ? absint(EE_Registry::instance()->CFG->admin->use_event_timezones) : FALSE;
+		$this->_template_args['show_reg_footer'] = isset(EE_Registry::instance()->CFG->admin->show_reg_footer) ? absint(EE_Registry::instance()->CFG->admin->show_reg_footer) : TRUE;
+		$this->_template_args['affiliate_id'] = isset(EE_Registry::instance()->CFG->admin->affiliate_id) ? EE_Registry::instance()->CFG->admin->get_pretty('affiliate_id') : '';
+		$this->_template_args['help_tour_activation'] = isset(EE_Registry::instance()->CFG->admin->help_tour_activation) ? absint(EE_Registry::instance()->CFG->admin->help_tour_activation) : 1;
+
+		$this->_set_add_edit_form_tags('update_admin_option_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
 		$this->_template_args['template_args'] = $this->_template_args;
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'admin_option_settings.template.php', $this->_template_args, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'admin_option_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
 	protected function _update_admin_option_settings() {
-		EE_Registry::instance()->CFG->admin->use_personnel_manager = isset( $this->_req_data['use_personnel_manager'] ) ? absint( $this->_req_data['use_personnel_manager'] ) : EE_Registry::instance()->CFG->admin->use_personnel_manager;
-		EE_Registry::instance()->CFG->admin->use_dashboard_widget = isset( $this->_req_data['use_dashboard_widget'] ) ? absint( $this->_req_data['use_dashboard_widget'] ) : EE_Registry::instance()->CFG->admin->use_dashboard_widget;
-		EE_Registry::instance()->CFG->admin->events_in_dashboard = isset( $this->_req_data['events_in_dashboard'] ) ? absint( $this->_req_data['events_in_dashboard'] ) : EE_Registry::instance()->CFG->admin->events_in_dashboard;
-		EE_Registry::instance()->CFG->admin->use_event_timezones = isset( $this->_req_data['use_event_timezones'] ) ? absint( $this->_req_data['use_event_timezones'] ) : EE_Registry::instance()->CFG->admin->use_event_timezones;
-		EE_Registry::instance()->CFG->admin->show_reg_footer = isset( $this->_req_data['show_reg_footer'] ) ? absint( $this->_req_data['show_reg_footer'] ) : EE_Registry::instance()->CFG->admin->show_reg_footer;
-		EE_Registry::instance()->CFG->admin->affiliate_id = isset( $this->_req_data['affiliate_id'] ) ? sanitize_text_field( $this->_req_data['affiliate_id'] ) : EE_Registry::instance()->CFG->admin->affiliate_id;
-		EE_Registry::instance()->CFG->admin->help_tour_activation = isset( $this->_req_data['help_tour_activation'] ) ? absint( $this->_req_data['help_tour_activation'] ) : EE_Registry::instance()->CFG->admin->help_tour_activation;
+		EE_Registry::instance()->CFG->admin->use_personnel_manager = isset($this->_req_data['use_personnel_manager']) ? absint($this->_req_data['use_personnel_manager']) : EE_Registry::instance()->CFG->admin->use_personnel_manager;
+		EE_Registry::instance()->CFG->admin->use_dashboard_widget = isset($this->_req_data['use_dashboard_widget']) ? absint($this->_req_data['use_dashboard_widget']) : EE_Registry::instance()->CFG->admin->use_dashboard_widget;
+		EE_Registry::instance()->CFG->admin->events_in_dashboard = isset($this->_req_data['events_in_dashboard']) ? absint($this->_req_data['events_in_dashboard']) : EE_Registry::instance()->CFG->admin->events_in_dashboard;
+		EE_Registry::instance()->CFG->admin->use_event_timezones = isset($this->_req_data['use_event_timezones']) ? absint($this->_req_data['use_event_timezones']) : EE_Registry::instance()->CFG->admin->use_event_timezones;
+		EE_Registry::instance()->CFG->admin->show_reg_footer = isset($this->_req_data['show_reg_footer']) ? absint($this->_req_data['show_reg_footer']) : EE_Registry::instance()->CFG->admin->show_reg_footer;
+		EE_Registry::instance()->CFG->admin->affiliate_id = isset($this->_req_data['affiliate_id']) ? sanitize_text_field($this->_req_data['affiliate_id']) : EE_Registry::instance()->CFG->admin->affiliate_id;
+		EE_Registry::instance()->CFG->admin->help_tour_activation = isset($this->_req_data['help_tour_activation']) ? absint($this->_req_data['help_tour_activation']) : EE_Registry::instance()->CFG->admin->help_tour_activation;
 
-		EE_Registry::instance()->CFG->admin = apply_filters( 'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin', EE_Registry::instance()->CFG->admin );
+		EE_Registry::instance()->CFG->admin = apply_filters('FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin', EE_Registry::instance()->CFG->admin);
 
 		$what = 'Admin Options';
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG->admin, __FILE__, __FUNCTION__, __LINE__ );
-		$success = apply_filters( 'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', $success );
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'admin_option_settings' ) );
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->admin, __FILE__, __FUNCTION__, __LINE__);
+		$success = apply_filters('FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', $success);
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'admin_option_settings'));
 
 	}
 
@@ -500,21 +500,21 @@ 
 
 	protected function _country_settings() {
 
-		$CNT_ISO = isset( EE_Registry::instance()->CFG->organization->CNT_ISO ) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
-		$CNT_ISO = isset( $this->_req_data['country'] ) ? strtoupper( sanitize_text_field( $this->_req_data['country'] )) : $CNT_ISO;
+		$CNT_ISO = isset(EE_Registry::instance()->CFG->organization->CNT_ISO) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
+		$CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : $CNT_ISO;
 
 		//load field generator helper
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 
 		$this->_template_args['values'] = $this->_yes_no_values;
 
 		$this->_template_args['countries'] = new EE_Question_Form_Input(
-				EE_Question::new_instance ( array(
+				EE_Question::new_instance(array(
 					'QST_ID'=> 0,
 					'QST_display_text'=> __('Select Country', 'event_espresso'),
 					'QST_system'=>'admin-country'
 				)),
-				EE_Answer::new_instance ( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $CNT_ISO
 				)),
@@ -527,14 +527,14 @@ 
 			);
 //		EEH_Debug_Tools::printr( $this->_template_args['countries'], 'countries  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'country_form_field_label_wrap' ), 10, 2 );
-		add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'country_form_field_input__wrap' ), 10, 2 );
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
 		$this->_template_args['country_details_settings'] = $this->display_country_settings();
 		$this->_template_args['country_states_settings'] = $this->display_country_states();
 
-		$this->_set_add_edit_form_tags( 'update_country_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'countries_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_country_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'countries_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_no_sidebar();
 	}
 
@@ -547,44 +547,44 @@ 
 	 * 		@param 	string 		$CNT_ISO
 	 * 		@return 		mixed		string | array
 	 */
-	public function display_country_settings( $CNT_ISO = '' ) {
+	public function display_country_settings($CNT_ISO = '') {
 
-		$CNT_ISO = isset( $this->_req_data['country'] ) ? strtoupper( sanitize_text_field( $this->_req_data['country'] )) : $CNT_ISO;
-		if ( ! $CNT_ISO ) {
+		$CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : $CNT_ISO;
+		if ( ! $CNT_ISO) {
 			return '';
 		}
 
 		// for ajax
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
-		remove_all_filters( 'FHEE__EEH_Form_Fields__label_html' );
-		remove_all_filters( 'FHEE__EEH_Form_Fields__input_html' );
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'country_form_field_label_wrap' ), 10, 2 );
-		add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'country_form_field_input__wrap' ), 10, 2 );
-		$country = EEM_Country::instance()->get_one_by_ID( $CNT_ISO );
+		EE_Registry::instance()->load_helper('Form_Fields');
+		remove_all_filters('FHEE__EEH_Form_Fields__label_html');
+		remove_all_filters('FHEE__EEH_Form_Fields__input_html');
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
+		$country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
 		//EEH_Debug_Tools::printr( $country, '$country  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		$country_input_types = array(
-			'CNT_active' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE  ),
-			'CNT_ISO' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ),
-			'CNT_ISO3' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ),
-			'RGN_ID' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ),
-			'CNT_name' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'regular-text' ),
-			'CNT_cur_code' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ),
-			'CNT_cur_single' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'medium-text' ),
-			'CNT_cur_plural' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'medium-text' ),
-			'CNT_cur_sign' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text', 'htmlentities' => FALSE ),
-			'CNT_cur_sign_b4' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE ),
-			'CNT_cur_dec_plc' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => array( array( 'id' => 0, 'text' => '' ), array( 'id' => 1, 'text' => '' ), array( 'id' => 2, 'text' => '' ), array( 'id' => 3, 'text' => '' ))),
-			'CNT_cur_dec_mrk' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => array( array( 'id' => ',', 'text' => __(', (comma)', 'event_espresso')), array( 'id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE ),
-			'CNT_cur_thsnds' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => array( array( 'id' => ',', 'text' => __(', (comma)', 'event_espresso')), array( 'id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE ),
-			'CNT_tel_code' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ),
-			'CNT_is_EU' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE  )
+			'CNT_active' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE),
+			'CNT_ISO' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'),
+			'CNT_ISO3' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'),
+			'RGN_ID' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'),
+			'CNT_name' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'regular-text'),
+			'CNT_cur_code' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'),
+			'CNT_cur_single' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'medium-text'),
+			'CNT_cur_plural' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'medium-text'),
+			'CNT_cur_sign' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text', 'htmlentities' => FALSE),
+			'CNT_cur_sign_b4' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE),
+			'CNT_cur_dec_plc' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => array(array('id' => 0, 'text' => ''), array('id' => 1, 'text' => ''), array('id' => 2, 'text' => ''), array('id' => 3, 'text' => ''))),
+			'CNT_cur_dec_mrk' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => array(array('id' => ',', 'text' => __(', (comma)', 'event_espresso')), array('id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE),
+			'CNT_cur_thsnds' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => array(array('id' => ',', 'text' => __(', (comma)', 'event_espresso')), array('id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE),
+			'CNT_tel_code' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'),
+			'CNT_is_EU' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE)
 		);
-		$this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object( $country, $country_input_types );
-		$country_details_settings = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'country_details_settings.template.php', $this->_template_args, TRUE );
+		$this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object($country, $country_input_types);
+		$country_details_settings = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'country_details_settings.template.php', $this->_template_args, TRUE);
 
-		if ( defined( 'DOING_AJAX' )) {
-			$notices = EE_Error::get_notices( FALSE, FALSE, FALSE );
-			echo json_encode( array( 'return_data' => $country_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors'] ));
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(FALSE, FALSE, FALSE);
+			echo json_encode(array('return_data' => $country_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors']));
 			die();
 		} else {
 			return $country_details_settings;
@@ -602,50 +602,50 @@ 
 	 * 		@param 	string 		$CNT_ISO
 	 * 		@return 		string
 	 */
-	public function display_country_states( $CNT_ISO = '' ) {
+	public function display_country_states($CNT_ISO = '') {
 
-		$CNT_ISO = isset( $this->_req_data['country'] ) ? sanitize_text_field( $this->_req_data['country'] ) : $CNT_ISO;
+		$CNT_ISO = isset($this->_req_data['country']) ? sanitize_text_field($this->_req_data['country']) : $CNT_ISO;
 
-		if ( ! $CNT_ISO ) {
+		if ( ! $CNT_ISO) {
 			return '';
 		}
 		// for ajax
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
-		remove_all_filters( 'FHEE__EEH_Form_Fields__label_html' );
-		remove_all_filters( 'FHEE__EEH_Form_Fields__input_html' );
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'state_form_field_label_wrap' ), 10, 2 );
-		add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'state_form_field_input__wrap' ), 10, 2 );
-		$states = EEM_State::instance()->get_all_states_for_these_countries( array( $CNT_ISO => $CNT_ISO ));
+		EE_Registry::instance()->load_helper('Form_Fields');
+		remove_all_filters('FHEE__EEH_Form_Fields__label_html');
+		remove_all_filters('FHEE__EEH_Form_Fields__input_html');
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'state_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'state_form_field_input__wrap'), 10, 2);
+		$states = EEM_State::instance()->get_all_states_for_these_countries(array($CNT_ISO => $CNT_ISO));
 
 //			echo '<h4>$CNT_ISO : ' . $CNT_ISO . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //			global $wpdb;
 //			echo '<h4>' . $wpdb->last_query . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //			EEH_Debug_Tools::printr( $states, '$states  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( $states ) {
-			foreach ( $states as $STA_ID => $state ) {
-				if ( $state instanceof EE_State ) {
+		if ($states) {
+			foreach ($states as $STA_ID => $state) {
+				if ($state instanceof EE_State) {
 					//STA_abbrev 	STA_name 	STA_active
 					$state_input_types = array(
-						'STA_abbrev' => array( 'type' => 'TEXT', 'input_name' => 'states[' . $STA_ID . ']', 'class' => 'mid-text' ),
-						'STA_name'   => array( 'type'       => 'TEXT', 'input_name' => 'states[' . $STA_ID . ']', 'class' => 'regular-text' ),
-						'STA_active' => array( 'type' => 'RADIO_BTN', 'input_name' => 'states[' . $STA_ID . ']', 'options' => $this->_yes_no_values, 'use_desc_4_label' => true )
+						'STA_abbrev' => array('type' => 'TEXT', 'input_name' => 'states['.$STA_ID.']', 'class' => 'mid-text'),
+						'STA_name'   => array('type'       => 'TEXT', 'input_name' => 'states['.$STA_ID.']', 'class' => 'regular-text'),
+						'STA_active' => array('type' => 'RADIO_BTN', 'input_name' => 'states['.$STA_ID.']', 'options' => $this->_yes_no_values, 'use_desc_4_label' => true)
 					);
-					$this->_template_args[ 'states' ][ $STA_ID ][ 'inputs' ] = EE_Question_Form_Input::generate_question_form_inputs_for_object( $state, $state_input_types );
-					$query_args = array( 'action'     => 'delete_state', 'STA_ID' => $STA_ID, 'CNT_ISO' => $CNT_ISO, 'STA_abbrev' => $state->abbrev() );
-					$this->_template_args[ 'states' ][ $STA_ID ][ 'delete_state_url' ] = EE_Admin_Page::add_query_args_and_nonce( $query_args, GEN_SET_ADMIN_URL );
+					$this->_template_args['states'][$STA_ID]['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object($state, $state_input_types);
+					$query_args = array('action'     => 'delete_state', 'STA_ID' => $STA_ID, 'CNT_ISO' => $CNT_ISO, 'STA_abbrev' => $state->abbrev());
+					$this->_template_args['states'][$STA_ID]['delete_state_url'] = EE_Admin_Page::add_query_args_and_nonce($query_args, GEN_SET_ADMIN_URL);
 				}
 			}
 		} else {
 			$this->_template_args['states'] = FALSE;
 		}
 //		EEH_Debug_Tools::printr( $this->_template_args['states'], 'states  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'add_new_state' ),  GEN_SET_ADMIN_URL );
+		$this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'add_new_state'), GEN_SET_ADMIN_URL);
 
-		$state_details_settings = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'state_details_settings.template.php', $this->_template_args, TRUE );
+		$state_details_settings = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'state_details_settings.template.php', $this->_template_args, TRUE);
 
-		if ( defined( 'DOING_AJAX' )) {
-			$notices = EE_Error::get_notices( FALSE, FALSE, FALSE );
-			echo json_encode( array( 'return_data' => $state_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors'] ));
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(FALSE, FALSE, FALSE);
+			echo json_encode(array('return_data' => $state_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors']));
 			die();
 		} else {
 			return $state_details_settings;
@@ -666,40 +666,39 @@ 
 
 		$success = TRUE;
 
-		$CNT_ISO = isset( $this->_req_data['CNT_ISO'] ) ? strtoupper( sanitize_text_field( $this->_req_data['CNT_ISO'] )) : FALSE;
-		if ( ! $CNT_ISO ) {
-			EE_Error::add_error( __( 'No Country ISO code or an invalid Country ISO code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$CNT_ISO = isset($this->_req_data['CNT_ISO']) ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO'])) : FALSE;
+		if ( ! $CNT_ISO) {
+			EE_Error::add_error(__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
-		$STA_abbrev = isset( $this->_req_data['STA_abbrev'] ) ? sanitize_text_field( $this->_req_data['STA_abbrev'] ) : FALSE;
-		if ( ! $STA_abbrev ) {
-			EE_Error::add_error( __( 'No State ISO code or an invalid State ISO code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$STA_abbrev = isset($this->_req_data['STA_abbrev']) ? sanitize_text_field($this->_req_data['STA_abbrev']) : FALSE;
+		if ( ! $STA_abbrev) {
+			EE_Error::add_error(__('No State ISO code or an invalid State ISO code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
-		$STA_name = isset( $this->_req_data['STA_name'] ) ?  sanitize_text_field( $this->_req_data['STA_name'] ) :
-			FALSE;
-		if ( ! $STA_name ) {
-			EE_Error::add_error( __( 'No State name or an invalid State name was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$STA_name = isset($this->_req_data['STA_name']) ?  sanitize_text_field($this->_req_data['STA_name']) : FALSE;
+		if ( ! $STA_name) {
+			EE_Error::add_error(__('No State name or an invalid State name was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
 
-		if ( $success ) {
+		if ($success) {
 			$cols_n_values = array(
 				'CNT_ISO' => $CNT_ISO,
 				'STA_abbrev' => $STA_abbrev,
 				'STA_name' => $STA_name,
 				'STA_active' => TRUE
 			);
-			$success = EEM_State::instance()->insert ( $cols_n_values );
-			EE_Error::add_success( __( 'The State was added successfully.', 'event_espresso' ) );
+			$success = EEM_State::instance()->insert($cols_n_values);
+			EE_Error::add_success(__('The State was added successfully.', 'event_espresso'));
 		}
 
-		if ( defined( 'DOING_AJAX' )) {
-			$notices = EE_Error::get_notices( FALSE, FALSE, FALSE );
-			echo json_encode( array_merge( $notices, array( 'return_data' => $CNT_ISO ) ) );
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(FALSE, FALSE, FALSE);
+			echo json_encode(array_merge($notices, array('return_data' => $CNT_ISO)));
 			die();
 		} else {
-			$this->_redirect_after_action( $success, 'State', 'added', array( 'action' => 'country_settings' ) );
+			$this->_redirect_after_action($success, 'State', 'added', array('action' => 'country_settings'));
 		}
 	}
 
@@ -712,25 +711,25 @@ 
 	 * 		@return 		boolean | void
 	 */
 	public function delete_state() {
-		$CNT_ISO = isset( $this->_req_data['CNT_ISO'] ) ? strtoupper( sanitize_text_field( $this->_req_data['CNT_ISO'] )) : FALSE;
-		$STA_ID = isset( $this->_req_data['STA_ID'] ) ? sanitize_text_field( $this->_req_data['STA_ID'] ) : FALSE;
-		$STA_abbrev = isset( $this->_req_data['STA_abbrev'] ) ? sanitize_text_field( $this->_req_data['STA_abbrev'] ) : FALSE;
-		if ( ! $STA_ID ) {
-			EE_Error::add_error( __( 'No State ID or an invalid State ID was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$CNT_ISO = isset($this->_req_data['CNT_ISO']) ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO'])) : FALSE;
+		$STA_ID = isset($this->_req_data['STA_ID']) ? sanitize_text_field($this->_req_data['STA_ID']) : FALSE;
+		$STA_abbrev = isset($this->_req_data['STA_abbrev']) ? sanitize_text_field($this->_req_data['STA_abbrev']) : FALSE;
+		if ( ! $STA_ID) {
+			EE_Error::add_error(__('No State ID or an invalid State ID was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		$success = EEM_State::instance()->delete_by_ID( $STA_ID );
-		if ( $success !== FALSE ) {
-			do_action( 'AHEE__General_Settings_Admin_Page__delete_state__state_deleted', $CNT_ISO, $STA_ID, array( 'STA_abbrev' => $STA_abbrev ));
-			EE_Error::add_success( __( 'The State was deleted successfully.', 'event_espresso' ));
+		$success = EEM_State::instance()->delete_by_ID($STA_ID);
+		if ($success !== FALSE) {
+			do_action('AHEE__General_Settings_Admin_Page__delete_state__state_deleted', $CNT_ISO, $STA_ID, array('STA_abbrev' => $STA_abbrev));
+			EE_Error::add_success(__('The State was deleted successfully.', 'event_espresso'));
 		}
-		if ( defined( 'DOING_AJAX' )) {
-			$notices = EE_Error::get_notices( FALSE, FALSE );
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(FALSE, FALSE);
 			$notices['return_data'] = TRUE;
-			echo json_encode( $notices );
+			echo json_encode($notices);
 			die();
 		} else {
-			$this->_redirect_after_action( $success, 'State', 'deleted', array( 'action' => 'country_settings' ) );
+			$this->_redirect_after_action($success, 'State', 'deleted', array('action' => 'country_settings'));
 		}
 	}
 
@@ -746,63 +745,63 @@ 
 	protected function _update_country_settings() {
 //		EEH_Debug_Tools::printr( $this->_req_data, '$this->_req_data  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// grab the country ISO code
-		$CNT_ISO = isset( $this->_req_data['country'] ) ? strtoupper( sanitize_text_field( $this->_req_data['country'] )) : FALSE;
-		if ( ! $CNT_ISO ) {
-			EE_Error::add_error( __( 'No Country ISO code or an invalid Country ISO code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : FALSE;
+		if ( ! $CNT_ISO) {
+			EE_Error::add_error(__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		$cols_n_values = array();
-		$cols_n_values['CNT_ISO3'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3'] ) ? strtoupper( sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3'] )) : FALSE;
-		$cols_n_values['RGN_ID'] = isset( $this->_req_data['cntry'][$CNT_ISO]['RGN_ID'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['RGN_ID'] ) : NULL;
-		$cols_n_values['CNT_name'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_name'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_name'] ) : NULL;
-		$cols_n_values['CNT_cur_code'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code'] ) ? strtoupper( sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code'] )) : 'USD';
-		$cols_n_values['CNT_cur_single'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single'] ) : 'dollar';
-		$cols_n_values['CNT_cur_plural'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural'] ) : 'dollars';
-		$cols_n_values['CNT_cur_sign'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign'] ) : '$';
-		$cols_n_values['CNT_cur_sign_b4'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4'] ) : TRUE;
-		$cols_n_values['CNT_cur_dec_plc'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc'] ) : 2;
-		$cols_n_values['CNT_cur_dec_mrk'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk'] ) : '.';
-		$cols_n_values['CNT_cur_thsnds'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds'] ) : ',';
-		$cols_n_values['CNT_tel_code'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code'] ) : NULL;
-		$cols_n_values['CNT_is_EU'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU'] ) : FALSE;
-		$cols_n_values['CNT_active'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_active'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_active'] ) : FALSE;
+		$cols_n_values['CNT_ISO3'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3']) ? strtoupper(sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3'])) : FALSE;
+		$cols_n_values['RGN_ID'] = isset($this->_req_data['cntry'][$CNT_ISO]['RGN_ID']) ? absint($this->_req_data['cntry'][$CNT_ISO]['RGN_ID']) : NULL;
+		$cols_n_values['CNT_name'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_name']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_name']) : NULL;
+		$cols_n_values['CNT_cur_code'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code']) ? strtoupper(sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code'])) : 'USD';
+		$cols_n_values['CNT_cur_single'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single']) : 'dollar';
+		$cols_n_values['CNT_cur_plural'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural']) : 'dollars';
+		$cols_n_values['CNT_cur_sign'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign']) : '$';
+		$cols_n_values['CNT_cur_sign_b4'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4']) : TRUE;
+		$cols_n_values['CNT_cur_dec_plc'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc']) : 2;
+		$cols_n_values['CNT_cur_dec_mrk'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk']) : '.';
+		$cols_n_values['CNT_cur_thsnds'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds']) : ',';
+		$cols_n_values['CNT_tel_code'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code']) : NULL;
+		$cols_n_values['CNT_is_EU'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU']) : FALSE;
+		$cols_n_values['CNT_active'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_active']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_active']) : FALSE;
 		// allow filtering of country data
-		$cols_n_values = apply_filters( 'FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values', $cols_n_values );
+		$cols_n_values = apply_filters('FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values', $cols_n_values);
 		//EEH_Debug_Tools::printr( $cols_n_values, '$cols_n_values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// where values
-		$where_cols_n_values = array( array( 'CNT_ISO' => $CNT_ISO ));
+		$where_cols_n_values = array(array('CNT_ISO' => $CNT_ISO));
 		// run the update
-		$success = EEM_Country::instance()->update( $cols_n_values, $where_cols_n_values );
+		$success = EEM_Country::instance()->update($cols_n_values, $where_cols_n_values);
 //		global $wpdb;
 //		echo '<h4>' . $wpdb->last_query . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //		echo '<h4>$success : ' . $success . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
-		if ( isset( $this->_req_data['states'] ) && is_array( $this->_req_data['states'] ) && $success !== FALSE ) {
+		if (isset($this->_req_data['states']) && is_array($this->_req_data['states']) && $success !== FALSE) {
 			// allow filtering of states data
-			$states = apply_filters( 'FHEE__General_Settings_Admin_Page___update_country_settings__states', $this->_req_data['states'] );
+			$states = apply_filters('FHEE__General_Settings_Admin_Page___update_country_settings__states', $this->_req_data['states']);
 //			EEH_Debug_Tools::printr( $states, '$states  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 			// loop thru state data ( looks like : states[75][STA_name] )
-			foreach( $states as $STA_ID => $state ) {
+			foreach ($states as $STA_ID => $state) {
 				$cols_n_values = array(
 					'CNT_ISO' 		=> $CNT_ISO,
-					'STA_abbrev' => sanitize_text_field( $state['STA_abbrev'] ),
-					'STA_name' 	=> sanitize_text_field( $state['STA_name'] ),
-					'STA_active' 	=> (bool)absint( $state['STA_active'] )
+					'STA_abbrev' => sanitize_text_field($state['STA_abbrev']),
+					'STA_name' 	=> sanitize_text_field($state['STA_name']),
+					'STA_active' 	=> (bool) absint($state['STA_active'])
 				);
 				// where values
-				$where_cols_n_values = array( array( 'STA_ID' => $STA_ID ));
+				$where_cols_n_values = array(array('STA_ID' => $STA_ID));
 				// run the update
-				$success = EEM_State::instance()->update( $cols_n_values, $where_cols_n_values );
-				if ( $success !== FALSE ) {
-					do_action( 'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', $CNT_ISO, $STA_ID, $cols_n_values );
+				$success = EEM_State::instance()->update($cols_n_values, $where_cols_n_values);
+				if ($success !== FALSE) {
+					do_action('AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', $CNT_ISO, $STA_ID, $cols_n_values);
 				}
 			}
 		}
 		// check if country being edited matches org option country, and if so, then  update EE_Config with new settings
-		if ( isset( EE_Registry::instance()->CFG->organization->CNT_ISO ) && $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO ) {
-			EE_Registry::instance()->CFG->currency = new EE_Currency_Config( $CNT_ISO );
+		if (isset(EE_Registry::instance()->CFG->organization->CNT_ISO) && $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO) {
+			EE_Registry::instance()->CFG->currency = new EE_Currency_Config($CNT_ISO);
 			EE_Registry::instance()->CFG->update_espresso_config();
 		}
-		$this->_redirect_after_action( $success, 'Countries', 'updated', array( 'action' => 'country_settings', 'country' => $CNT_ISO ));
+		$this->_redirect_after_action($success, 'Countries', 'updated', array('action' => 'country_settings', 'country' => $CNT_ISO));
 	}
 
 
@@ -816,11 +815,11 @@ 
 	 * 		@param 		string 		$label
 	 * 		@return 		string
 	 */
-	public function country_form_field_label_wrap( $label, $required_text ) {
+	public function country_form_field_label_wrap($label, $required_text) {
 		return '
 			<tr>
 				<th>
-					' . $label  . '
+					' . $label.'
 				</th>';
 	}
 
@@ -834,10 +833,10 @@ 
 	 * 		@param 		string 		$label
 	 * 		@return 		string
 	 */
-	public function country_form_field_input__wrap( $input, $label ) {
+	public function country_form_field_input__wrap($input, $label) {
 		return '
 				<td class="general-settings-country-input-td">
-					' . $input . '
+					' . $input.'
 				</td>
 			</tr>';
 	}
@@ -853,7 +852,7 @@ 
 	 * 		@param 		string 		$required_text
 	 * 		@return 		string
 	 */
-	public function state_form_field_label_wrap( $label, $required_text  ) {
+	public function state_form_field_label_wrap($label, $required_text) {
 		return $required_text;
 	}
 
@@ -867,10 +866,10 @@ 
 	 * 		@param 		string 		$label
 	 * 		@return 		string
 	 */
-	public function state_form_field_input__wrap( $input, $label ) {
+	public function state_form_field_input__wrap($input, $label) {
 		return '
 				<td class="general-settings-country-state-input-td">
-					' . $input . '
+					' . $input.'
 				</td>';
 
 	}
@@ -893,10 +892,10 @@ 
 	 * @param int $ee_page_id
 	 * @return string
 	 */
-	public static function edit_view_links( $ee_page_id ) {
-		$links = '<a href="' . add_query_arg( array( 'post' => $ee_page_id, 'action' => 'edit' ),  admin_url( 'post.php' )) . '" >' . __('Edit', 'event_espresso') . '</a>';
+	public static function edit_view_links($ee_page_id) {
+		$links = '<a href="'.add_query_arg(array('post' => $ee_page_id, 'action' => 'edit'), admin_url('post.php')).'" >'.__('Edit', 'event_espresso').'</a>';
 		$links .= ' &nbsp;|&nbsp; ';
-		$links .= '<a href="' . get_permalink( $ee_page_id ) . '" >' . __('View', 'event_espresso') . '</a>';
+		$links .= '<a href="'.get_permalink($ee_page_id).'" >'.__('View', 'event_espresso').'</a>';
 		return $links;
 	}
 
@@ -909,27 +908,27 @@ 
 	 * @param WP page object $ee_page
 	 * @return string
 	 */
-	public static function page_and_shortcode_status( $ee_page, $shortcode ) {
+	public static function page_and_shortcode_status($ee_page, $shortcode) {
 
 		// page status
-		if ( isset( $ee_page->post_status ) && $ee_page->post_status == 'publish') {
+		if (isset($ee_page->post_status) && $ee_page->post_status == 'publish') {
 			$pg_colour = 'green';
-			$pg_status = sprintf( __('Page%sStatus%sOK', 'event_espresso'), '&nbsp;' , '&nbsp;' );
+			$pg_status = sprintf(__('Page%sStatus%sOK', 'event_espresso'), '&nbsp;', '&nbsp;');
 		 } else {
 			$pg_colour = 'red';
-			$pg_status = sprintf( __('Page%sVisibility%sProblem', 'event_espresso'), '&nbsp;', '&nbsp;'  );
+			$pg_status = sprintf(__('Page%sVisibility%sProblem', 'event_espresso'), '&nbsp;', '&nbsp;');
 		}
 
 		// shortcode status
-		if ( isset( $ee_page->post_content ) && strpos( $ee_page->post_content, $shortcode ) !== FALSE ) {
+		if (isset($ee_page->post_content) && strpos($ee_page->post_content, $shortcode) !== FALSE) {
 			$sc_colour = 'green';
-			$sc_status = sprintf( __('Shortcode%sOK', 'event_espresso'), '&nbsp;' );
+			$sc_status = sprintf(__('Shortcode%sOK', 'event_espresso'), '&nbsp;');
 		 } else {
 			$sc_colour = 'red';
-			$sc_status = sprintf( __('Shortcode%sProblem', 'event_espresso'), '&nbsp;' );
+			$sc_status = sprintf(__('Shortcode%sProblem', 'event_espresso'), '&nbsp;');
 		}
 
-		return '<span style="color:' . $pg_colour . '; margin-right:2em;"><strong>' . $pg_status . '</strong></span><span style="color:' . $sc_colour . '"><strong>' . $sc_status . '</strong></span>';
+		return '<span style="color:'.$pg_colour.'; margin-right:2em;"><strong>'.$pg_status.'</strong></span><span style="color:'.$sc_colour.'"><strong>'.$sc_status.'</strong></span>';
 
 	}
 
@@ -944,20 +943,20 @@ 
 	 * @param unknown_type $level
 	 * @return unknown
 	 */
-	public static function page_settings_dropdown( $default = 0, $parent = 0, $level = 0 ) {
+	public static function page_settings_dropdown($default = 0, $parent = 0, $level = 0) {
 		global $wpdb;
-		$items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order", $parent) );
+		$items = $wpdb->get_results($wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order", $parent));
 
-		if ( $items ) {
-			foreach ( $items as $item ) {
-				$pad = str_repeat( '&nbsp;', $level * 3 );
-				if ( $item->ID == $default)
+		if ($items) {
+			foreach ($items as $item) {
+				$pad = str_repeat('&nbsp;', $level * 3);
+				if ($item->ID == $default)
 					$current = ' selected="selected"';
 				else
 					$current = '';
 
-				echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad " . esc_html($item->post_title) . "</option>";
-				parent_dropdown( $default, $item->ID, $level +1 );
+				echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad ".esc_html($item->post_title)."</option>";
+				parent_dropdown($default, $item->ID, $level + 1);
 			}
 		} else {
 			return false;