eventespresso / event-espresso-core

caffeinated/modules/events_archive_caff/templates/admin-event-list-settings.template.php

Spacing +22 added lines, -22 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-$values = EEH_Form_Fields::prep_answer_options( array(
-	array( 'id' => 1, 'text' => __('Yes', 'event_espresso')),
-	array( 'id' => 0, 'text' => __('No', 'event_espresso'))
+$values = EEH_Form_Fields::prep_answer_options(array(
+	array('id' => 1, 'text' => __('Yes', 'event_espresso')),
+	array('id' => 0, 'text' => __('No', 'event_espresso'))
 ));
 
-$description = EEH_Form_Fields::prep_answer_options( array(
-	array( 'id' => 0, 'text' => __('none', 'event_espresso')),
-	array( 'id' => 1, 'text' => __('excerpt (short desc)', 'event_espresso')),
-	array( 'id' => 2, 'text' => __('full description', 'event_espresso'))
+$description = EEH_Form_Fields::prep_answer_options(array(
+	array('id' => 0, 'text' => __('none', 'event_espresso')),
+	array('id' => 1, 'text' => __('excerpt (short desc)', 'event_espresso')),
+	array('id' => 2, 'text' => __('full description', 'event_espresso'))
 ));
 
-add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' ); 
+add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string'); 
 ?>
 
 
@@ -24,11 +24,11 @@ 
 			<tr>
 				<th>
 					<label for="event_listings_url">
-						<?php _e('Event Listings URL', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('event_listings_url_info');?>
+						<?php _e('Event Listings URL', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('event_listings_url_info'); ?>
 					</label>
 				</th>
 				<td>
-					<a id="event_listings_url" class="ee-admin-settings-hdr-lnk small-text" href="<?php echo home_url('/') . __('events', 'event_espresso'); ?>"><?php  echo home_url('/') . __('events', 'event_espresso'); ?></a>
+					<a id="event_listings_url" class="ee-admin-settings-hdr-lnk small-text" href="<?php echo home_url('/').__('events', 'event_espresso'); ?>"><?php  echo home_url('/').__('events', 'event_espresso'); ?></a>
 				</td>
 			</tr>
 
@@ -39,7 +39,7 @@ 
 					</label>
 				</th>
 				<td>
-				<?php echo EEH_Form_Fields::select( 'display_status_banner', $display_status_banner, $values, 'EED_Events_Archive_display_status_banner', 'EED_Events_Archive_display_status_banner' );?>
+				<?php echo EEH_Form_Fields::select('display_status_banner', $display_status_banner, $values, 'EED_Events_Archive_display_status_banner', 'EED_Events_Archive_display_status_banner'); ?>
 					<p class="description"><?php _e('Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.', 'event_espresso'); ?></p>
 				</td>
 			</tr>
@@ -47,55 +47,55 @@ 
 			<tr>
 				<th>
 					<label for="EED_Events_Archive_display_description">
-						<?php _e('Display Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_description_info');?>
+						<?php _e('Display Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_description_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'description', $display_description, $description, 'EED_Events_Archive_display_description', 'EED_Events_Archive_display_description' );?>
+					<?php echo EEH_Form_Fields::select('description', $display_description, $description, 'EED_Events_Archive_display_description', 'EED_Events_Archive_display_description'); ?>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="EED_Events_Archive_display_ticket_selector">
-						<?php _e('Display Ticket Selector', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_ticket_selector_info');?>
+						<?php _e('Display Ticket Selector', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_ticket_selector_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'ticket_selector', $display_ticket_selector, $values, 'EED_Events_Archive_display_ticket_selector', 'EED_Events_Archive_display_ticket_selector' );?>
+					<?php echo EEH_Form_Fields::select('ticket_selector', $display_ticket_selector, $values, 'EED_Events_Archive_display_ticket_selector', 'EED_Events_Archive_display_ticket_selector'); ?>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="EED_Events_Archive_display_datetimes">
-						<?php _e('Display Datetimes', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_datetimes_info');?>
+						<?php _e('Display Datetimes', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_datetimes_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'venue_details', $display_datetimes, $values, 'EED_Events_Archive_display_datetimes', 'EED_Events_Archive_display_datetimes' );?>
+					<?php echo EEH_Form_Fields::select('venue_details', $display_datetimes, $values, 'EED_Events_Archive_display_datetimes', 'EED_Events_Archive_display_datetimes'); ?>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="EED_Events_Archive_display_venue">
-						<?php _e('Display Venue Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_venue_details_info');?>
+						<?php _e('Display Venue Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_venue_details_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'display_venue', $display_venue, $values, 'EED_Events_Archive_display_venue', 'EED_Events_Archive_display_venue' );?>
+					<?php echo EEH_Form_Fields::select('display_venue', $display_venue, $values, 'EED_Events_Archive_display_venue', 'EED_Events_Archive_display_venue'); ?>
 				</td>
 			</tr>
 
 			<tr>
 				<th>
 					<label for="EED_Events_Archive_display_expired_events">
-						<?php _e('Display Expired Events', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_expired_events_info');?>
+						<?php _e('Display Expired Events', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_expired_events_info'); ?>
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select( 'expired_events', $display_expired_events, $values, 'EED_Events_Archive_display_expired_events', 'EED_Events_Archive_display_expired_events' );?>
+					<?php echo EEH_Form_Fields::select('expired_events', $display_expired_events, $values, 'EED_Events_Archive_display_expired_events', 'EED_Events_Archive_display_expired_events'); ?>
 				</td>
 			</tr>
 			
@@ -106,7 +106,7 @@ 
 				</label>
 			</th>
 			<td>
-				<?php echo EEH_Form_Fields::select( 'reset_event_list_settings', 0, $values, 'EED_Events_Archive_reset_event_list_settings', 'EED_Events_Archive_reset_event_list_settings' );?>
+				<?php echo EEH_Form_Fields::select('reset_event_list_settings', 0, $values, 'EED_Events_Archive_reset_event_list_settings', 'EED_Events_Archive_reset_event_list_settings'); ?>
 			</td>
 		</tr>
 

caffeinated/modules/recaptcha/recaptchalib.php

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
 /**
  * A ReCaptchaResponse is returned from checkAnswer().
  */
-if ( ! class_exists( 'ReCaptchaResponse' )) {
+if ( ! class_exists('ReCaptchaResponse')) {
 	class ReCaptchaResponse
 	{
 		public $success;
@@ -58,9 +58,9 @@ 
 	{
 		if ($secret == null || $secret == "") {
 			die("To use reCAPTCHA you must get an API key from <a href='"
-				. self::$_signupUrl . "'>" . self::$_signupUrl . "</a>");
+				. self::$_signupUrl."'>".self::$_signupUrl."</a>");
 		}
-		$this->_secret=$secret;
+		$this->_secret = $secret;
 	}
 
 	/**
@@ -74,11 +74,11 @@ 
 	{
 		$req = "";
 		foreach ($data as $key => $value) {
-			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+			$req .= $key.'='.urlencode(stripslashes($value)).'&';
 		}
 
 		// Cut the last '&'
-		$req=substr($req, 0, strlen($req)-1);
+		$req = substr($req, 0, strlen($req) - 1);
 		return $req;
 	}
 
@@ -93,7 +93,7 @@ 
 	private function _submitHTTPGet($path, $data)
 	{
 		$req = $this->_encodeQS($data);
-		$response = file_get_contents($path . $req);
+		$response = file_get_contents($path.$req);
 		return $response;
 	}
 
@@ -118,7 +118,7 @@ 
 
 		$getResponse = $this->_submitHttpGet(
 			self::$_siteVerifyUrl,
-			array (
+			array(
 				'secret' => $this->_secret,
 				'remoteip' => $remoteIp,
 				'v' => self::$_version,

caffeinated/payment_methods/Mijireh/EE_PMT_Mijireh.pm.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Mijireh extends EE_PMT_Base{
+class EE_PMT_Mijireh extends EE_PMT_Base {
 
 
 
@@ -38,9 +38,9 @@ 
 		require_once($this->file_folder().'EEG_Mijireh.gateway.php');
 		$this->_gateway = new EEG_Mijireh();
 		$this->_pretty_name = __("Mijireh", 'event_espresso');
-		$this->_default_description = __( 'After clicking "Finalize Registration", you will be able to enter your billing information and complete your payment.', 'event_espresso' );
+		$this->_default_description = __('After clicking "Finalize Registration", you will be able to enter your billing information and complete your payment.', 'event_espresso');
 		parent::__construct($pm_instance);
-		$this->_default_button_url = $this->file_url() . 'lib' . DS . 'mijireh-checkout-logo.png';
+		$this->_default_button_url = $this->file_url().'lib'.DS.'mijireh-checkout-logo.png';
 	}
 
 
@@ -50,7 +50,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 						'title' => __('Mijireh Settings', 'event_espresso'),
@@ -69,14 +69,14 @@ 
 		$form = new EE_Payment_Method_Form(array(
 			'extra_meta_inputs'=>array(
 				'access_key'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Mijireh Access Key %s", 'event_espresso'),  $this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Mijireh Access Key %s", 'event_espresso'), $this->get_help_tab_link()),
 					'required' => true
 				)),
 			),
 			'exclude'=>array('PMD_debug_mode'),
 		));
-		$form->add_subsections( array(
-			'slurper_area' => new EE_Form_Section_HTML_From_Template( $this->file_folder().DS.'templates'.DS.'mijireh_settings_after_form.template.php' )
+		$form->add_subsections(array(
+			'slurper_area' => new EE_Form_Section_HTML_From_Template($this->file_folder().DS.'templates'.DS.'mijireh_settings_after_form.template.php')
 		));
 		return $form;
 	}
@@ -88,7 +88,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return NULL
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
 		return NULL;
 	}
 

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso

core/EE_Cart.core.php

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );/**
  *
  * Event Espresso
@@ -64,7 +66,7 @@ 
 		// check if class object is instantiated
 		if( ! empty( $grand_total ) ){
 			self::$_instance = new self( $grand_total );
-		}elseif ( ! self::$_instance instanceof EE_Cart) {
+		} elseif ( ! self::$_instance instanceof EE_Cart) {
 			//try getting the cart out of the session
 			$saved_cart = EE_Registry::instance()->SSN->cart();
 			self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self( $grand_total );

Spacing +38 added lines, -38 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );/**
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, ''); /**
  *
  * Event Espresso
  *
@@ -59,20 +59,20 @@ 
 	  * @param EE_Line_Item $grand_total
 	  * @return \EE_Cart
 	  */
-	public static function instance( EE_Line_Item $grand_total = NULL ) {
+	public static function instance(EE_Line_Item $grand_total = NULL) {
 		EE_Registry::instance()->load_helper('Line_Item');
 		// check if class object is instantiated
-		if( ! empty( $grand_total ) ){
-			self::$_instance = new self( $grand_total );
+		if ( ! empty($grand_total)) {
+			self::$_instance = new self($grand_total);
 		}elseif ( ! self::$_instance instanceof EE_Cart) {
 			//try getting the cart out of the session
 			$saved_cart = EE_Registry::instance()->SSN->cart();
-			self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self( $grand_total );
-			unset( $saved_cart );
+			self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self($grand_total);
+			unset($saved_cart);
 		}
 
 		// once everything is all said and done, save the cart to the EE_Session
-		add_action( 'shutdown', array( self::$_instance, 'save_cart' ), 90 );
+		add_action('shutdown', array(self::$_instance, 'save_cart'), 90);
 		return self::$_instance;
 	}
 
@@ -85,13 +85,13 @@ 
 	  * @param EE_Line_Item $grand_total
 	  * @return \EE_Cart
 	  */
-	 private function __construct( EE_Line_Item $grand_total = NULL ) {
-		 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		 if ( ! defined( 'ESPRESSO_CART' )) {
-			 define( 'ESPRESSO_CART', TRUE );
+	 private function __construct(EE_Line_Item $grand_total = NULL) {
+		 do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		 if ( ! defined('ESPRESSO_CART')) {
+			 define('ESPRESSO_CART', TRUE);
 		 }
-		 if ( $grand_total instanceof EE_Line_Item ) {
-			 $this->set_grand_total_line_item( $grand_total );
+		 if ($grand_total instanceof EE_Line_Item) {
+			 $this->set_grand_total_line_item($grand_total);
 		 }
 		 $this->get_grand_total();
 	 }
@@ -103,11 +103,11 @@ 
 	 * @param EE_Line_Item $grand_total
 	 * @return EE_Cart
 	 */
-	public static function reset( EE_Line_Item $grand_total = NULL ){
-		remove_action( 'shutdown', array( self::$_instance, 'save_cart'), 90 );
+	public static function reset(EE_Line_Item $grand_total = NULL) {
+		remove_action('shutdown', array(self::$_instance, 'save_cart'), 90);
 		EE_Registry::instance()->SSN->reset_cart();
 		self::$_instance = NULL;
-		return self::instance( $grand_total );
+		return self::instance($grand_total);
 	}
 
 
@@ -118,11 +118,11 @@ 
 	  * @param EE_Transaction $transaction
 	  * @return \EE_Cart
 	  */
-	public static function get_cart_from_txn( EE_Transaction $transaction ) {
+	public static function get_cart_from_txn(EE_Transaction $transaction) {
 		$grand_total = $transaction->total_line_item();
 		$grand_total->get_items();
 		$grand_total->tax_descendants();
-		return EE_Cart::instance( $grand_total );
+		return EE_Cart::instance($grand_total);
 	}
 
 
@@ -131,7 +131,7 @@ 
 	 * Creates the total line item, and ensures it has its 'tickets' and 'taxes' sub-items
 	 * @return EE_Line_Item
 	 */
-	private function _create_grand_total(){
+	private function _create_grand_total() {
 		$this->_grand_total = EEH_Line_Item::create_default_total_line_item();
 		return $this->_grand_total;
 	}
@@ -144,7 +144,7 @@ 
 	 *	@return \EE_Line_Item[]
 	 */
 	public function get_tickets() {
-		return EEH_Line_Item::get_items_subtotal( $this->_grand_total )->children();
+		return EEH_Line_Item::get_items_subtotal($this->_grand_total)->children();
 	}
 
 
@@ -157,11 +157,11 @@ 
 	 */
 	public function all_ticket_quantity_count() {
 		$tickets = $this->get_tickets();
-		if ( empty( $tickets )) {
+		if (empty($tickets)) {
 			return 0;
 		}
 		$count = 0;
-		foreach ( $tickets as $ticket ) {
+		foreach ($tickets as $ticket) {
 			$count = $count + $ticket->get('LIN_quantity');
 		}
 		return $count;
@@ -173,8 +173,8 @@ 
 	 *  Gets all tha tax line items
 	 * @return \EE_Line_Item[]
 	 */
-	public function get_taxes(){
-		return EEH_Line_Item::get_taxes_subtotal( $this->_grand_total )->children();
+	public function get_taxes() {
+		return EEH_Line_Item::get_taxes_subtotal($this->_grand_total)->children();
 	}
 
 
@@ -183,7 +183,7 @@ 
 	 * Gets the total line item (which is a parent of all other line items) on this cart
 	 * @return EE_Line_Item
 	 */
-	public function get_grand_total(){
+	public function get_grand_total() {
 		return $this->_grand_total instanceof EE_Line_Item ? $this->_grand_total : $this->_create_grand_total();
 	}
 
@@ -196,8 +196,8 @@ 
 	 *	@param int $qty
 	 *	@return TRUE on success, FALSE on fail
 	 */
-	public function add_ticket_to_cart( EE_Ticket $ticket, $qty = 1 ) {
-		EEH_Line_Item::add_ticket_purchase( $this->_grand_total, $ticket, $qty );
+	public function add_ticket_to_cart(EE_Ticket $ticket, $qty = 1) {
+		EEH_Line_Item::add_ticket_purchase($this->_grand_total, $ticket, $qty);
 		return $this->save_cart() ? TRUE : FALSE;
 	}
 
@@ -220,7 +220,7 @@ 
 	 *	@return float
 	 */
 	public function get_applied_taxes() {
-		return EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
+		return EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
 	}
 
 
@@ -231,7 +231,7 @@ 
 	 *	@return float
 	 */
 	public function get_cart_grand_total() {
-		EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
+		EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
 		return $this->get_grand_total()->total();
 	}
 
@@ -243,10 +243,10 @@ 
 	 *	@param mixed - string or array - line_item_ids
 	 *	@return int on success, FALSE on fail
 	 */
-	public function delete_items( $line_item_codes = FALSE ) {
+	public function delete_items($line_item_codes = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes);
 
 	}
 
@@ -258,9 +258,9 @@ 
 	 *	@return void
 	 */
 	public function empty_cart() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_grand_total = $this->_create_grand_total();
-		$this->save_cart( TRUE );
+		$this->save_cart(TRUE);
 	}
 
 
@@ -270,7 +270,7 @@ 
 	 *  know the grand total line item on it
 	 * @param EE_Line_Item $line_item
 	 */
-	public function set_grand_total_line_item( EE_Line_Item $line_item ) {
+	public function set_grand_total_line_item(EE_Line_Item $line_item) {
 		$this->_grand_total = $line_item;
 	}
 
@@ -282,8 +282,8 @@ 
 	 *	@return TRUE on success, FALSE on fail
 	 */
 	public function save_cart() {
-		EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
-		return EE_Registry::instance()->SSN->set_cart( $this );
+		EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
+		return EE_Registry::instance()->SSN->set_cart($this);
 	}
 
 

core/admin/templates/admin_details_legend.template.php

Spacing +5 added lines, -5 removed lines

@@ -8,16 +8,16 @@
 <div class="ee-list-table-legend-container">
 	<h4><?php _e('Legend', 'event_espresso'); ?></h4>
 	<dl class="alignleft ee-list-table-legend">
-		<?php foreach ( $items as $item => $details ) : ?>
-			<?php if ( $per_col < $count ) : ?>
+		<?php foreach ($items as $item => $details) : ?>
+			<?php if ($per_col < $count) : ?>
 				</dl>
 				<dl class="alignleft ee-list-table-legend">
 			<?php $count = 1; endif; ?>
 			<dt id="ee-legend-item-<?php echo $item; ?>">
-				<?php $class = !empty($details['class']) ? $details['class'] : 'ee-legend-img-container'; ?>
+				<?php $class = ! empty($details['class']) ? $details['class'] : 'ee-legend-img-container'; ?>
 				<span class="<?php echo $class; ?>">
-					<?php if ( !empty($details['icon']) ) : ?>
-					<img src="<?php echo $details['icon']; ?>" class="ee-legend-icon" alt="<?php echo esc_attr( $details['desc'] ); ?>" />
+					<?php if ( ! empty($details['icon'])) : ?>
+					<img src="<?php echo $details['icon']; ?>" class="ee-legend-icon" alt="<?php echo esc_attr($details['desc']); ?>" />
 					<?php endif; ?>
 				</span>
 				<span class="ee-legend-description"><?php echo $details['desc']; ?></span>

core/db_classes/EE_Base_Class.class.php

Indentation +15 added lines, -15 removed lines

@@ -47,25 +47,25 @@
 
 
 	/**
-    *	date format
-	*
-    *	pattern or format for displaying dates
-	*
-	*	@access	protected
-    *	@var string
-    */
+	 *	date format
+	 *
+	 *	pattern or format for displaying dates
+	 *
+	 *	@access	protected
+	 *	@var string
+	 */
 	protected $_dt_frmt;
 
 
 
-    /**
-    *	time format
-	*
-    *	pattern or format for displaying time
-	*
-	*	@access	protected
-    *	@var string
-    */
+	/**
+	 *	time format
+	 *
+	 *	pattern or format for displaying time
+	 *
+	 *	@access	protected
+	 *	@var string
+	 */
 	protected $_tm_frmt;
 
 

Braces +72 added lines, -64 removed lines

@@ -1,4 +1,6 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 do_action( 'AHEE_log', __FILE__, ' FILE LOADED', '' );
 /**
  *
@@ -133,7 +135,7 @@ 
 			foreach($fieldValues as $field_name => $field_value_from_db){
 				$this->set_from_db($field_name,$field_value_from_db);
 			}
-		}else{
+		} else{
 			//we're constructing a brand
 			//new instance of the model object. Generally, this means we'll need to do more field validation
 			foreach($model_fields as $fieldName => $field_obj){
@@ -153,7 +155,7 @@ 
 		foreach($this->get_model()->relation_settings() as $relation_name=>$relation_obj){
 			if($relation_obj instanceof EE_Belongs_To_Relation){
 				$this->_model_relations[$relation_name] = NULL;
-			}else{
+			} else{
 				$this->_model_relations[$relation_name] = array();
 			}
 		}
@@ -177,7 +179,7 @@ 
 		if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) &&
 				$field_settings = $this->get_Model()->field_settings_for( $field_name )){
 			return $field_settings->prepare_for_get( $this->_props_n_values_provided_in_constructor[ $field_name ] );
-		}else{
+		} else{
 			return NULL;
 		}
 	}
@@ -209,7 +211,7 @@ 
 			$holder_of_value = $field_obj->prepare_for_set($field_value);
 			if( ($field_value === NULL || $holder_of_value === NULL || $holder_of_value ==='') && $use_default){
 				$this->_fields[$field_name] = $field_obj->get_default_value();
-			}else{
+			} else{
 				$this->_fields[$field_name] = $holder_of_value;
 			}
 
@@ -237,7 +239,7 @@ 
 			}
 			//let's unset any cache for this field_name from the $_cached_properties property.
 			$this->_clear_cached_property( $field_name );
-		}else{
+		} else{
 			echo "\r\n\r\nSAAAY WHAT?? $field_name doesnt have a field???";
 		}
 
@@ -434,8 +436,9 @@ 
 	 * @return void
 	 */
 	protected function _clear_cached_property( $property_name ) {
-		if ( isset( $this->_cached_properties[ $property_name ] ) )
-			unset( $this->_cached_properties[ $property_name ] );
+		if ( isset( $this->_cached_properties[ $property_name ] ) ) {
+					unset( $this->_cached_properties[ $property_name ] );
+		}
 	}
 
 
@@ -475,10 +478,10 @@ 
 		if($clear_all){
 			$obj_removed = true;
 			$this->_model_relations[$relationName]  = null;
-		}elseif($relationship_to_model instanceof EE_Belongs_To_Relation){
+		} elseif($relationship_to_model instanceof EE_Belongs_To_Relation){
 			$obj_removed = $this->_model_relations[$relationName];
 			$this->_model_relations[$relationName]  = null;
-		}else{
+		} else{
 			if($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()){
 				$index_in_cache = $object_to_remove_or_index_into_array->ID();
 				if( is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])){
@@ -492,20 +495,20 @@ 
 					}
 					if($index_found_at){
 						$index_in_cache = $index_found_at;
-					}else{
+					} else{
 						//it wasn't found. huh. well obviously it doesn't need to be removed from teh cache
 						//if it wasn't in it to begin with. So we're done
 						return $object_to_remove_or_index_into_array;
 					}
 				}
-			}elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){
+			} elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){
 				//so they provided a model object, but it's not yet saved to the DB... so let's go hunting for it!
 				foreach($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want){
 					if($potentially_obj_we_want == $object_to_remove_or_index_into_array){
 						$index_in_cache = $index;
 					}
 				}
-			}else{
+			} else{
 				$index_in_cache = $object_to_remove_or_index_into_array;
 			}
 			//supposedly we've found it. But it could just be that the client code
@@ -514,7 +517,7 @@ 
 					isset( $this->_model_relations[$relationName][$index_in_cache])){
 				$obj_removed = $this->_model_relations[$relationName][$index_in_cache];
 				unset($this->_model_relations[$relationName][$index_in_cache]);
-			}else{
+			} else{
 				//that thing was never cached anyways.
 				$obj_removed = NULL;
 			}
@@ -570,7 +573,7 @@ 
 		$cached_array_or_object =  $this->_model_relations[$relationName];
 		if(is_array($cached_array_or_object)){
 			return array_shift($cached_array_or_object);
-		}else{
+		} else{
 			return $cached_array_or_object;
 		}
 	}
@@ -589,10 +592,10 @@ 
 		$cached_array_or_object =  $this->_model_relations[$relationName];
 		if(is_array($cached_array_or_object)){
 			$objects = $cached_array_or_object;
-		}elseif($cached_array_or_object){
+		} elseif($cached_array_or_object){
 			//if the result is not an array, but exists, make it an array
 			$objects = array($cached_array_or_object);
-		}else{
+		} else{
 			//if nothing was found, return an empty array
 			$objects = array();
 		}
@@ -607,7 +610,7 @@ 
 				if( $model_object->ID() ){
 					$model->add_to_entity_map( $model_object );
 				}
-			}else{
+			} else{
 				throw new EE_Error( sprintf( __( 'Error retrieving related model objects. Either $1%s is not a model or $2%s is not a model object', 'event_espresso' ), $relationName, gettype( $model_object )));
 			}
 		}
@@ -730,7 +733,7 @@ 
 			//are null! yikes! so when we find one like that, use defaults for its meta columns
 			if($field_value_from_db === NULL && ! $field_obj->is_nullable()){
 				$field_value = $field_obj->get_default_value();
-			}else{
+			} else{
 				$field_value = $field_value_from_db;
 			}
 			$this->_fields[$field_name] = $field_obj->prepare_for_set_from_db($field_value);
@@ -821,18 +824,20 @@ 
 		if ( $dt_frmt !== NULL ) {
 			$this->_clear_cached_property( $field_name, $date_or_time );
 		}
-		if ( $echo )
-			$field->set_pretty_date_format( $in_dt_frmt );
-		else
-			$field->set_date_format( $in_dt_frmt );
+		if ( $echo ) {
+					$field->set_pretty_date_format( $in_dt_frmt );
+		} else {
+					$field->set_date_format( $in_dt_frmt );
+		}
 
 		if ( $tm_frmt !== NULL ) {
 			$this->_clear_cached_property( $field_name, $date_or_time );
 		}
-		if ( $echo )
-			$field->set_pretty_time_format( $in_tm_frmt );
-		else
-			$field->set_time_format( $in_tm_frmt );
+		if ( $echo ) {
+					$field->set_pretty_time_format( $in_tm_frmt );
+		} else {
+					$field->set_time_format( $in_tm_frmt );
+		}
 
 		//set timezone in field object
 		$field->set_timezone( $this->_timezone );
@@ -1050,8 +1055,9 @@ 
 		EE_Registry::instance()->load_helper('DTT_Helper');
 		$timezone = EEH_DTT_Helper::get_timezone();
 
-		if ( $timezone == $this->_timezone )
-			return '';
+		if ( $timezone == $this->_timezone ) {
+					return '';
+		}
 
 		$original_timezone = $this->_timezone;
 		$this->set_timezone( $timezone );
@@ -1059,8 +1065,9 @@ 
 		$fn = (array) $field_name;
 		$args = array_merge( $fn, (array) $args );
 
-		if ( !method_exists( $this, $callback ) )
-			throw new EE_Error(sprintf( __('The method named "%s" given as the callback param in "display_in_my_timezone" does not exist.  Please check your spelling', 'event_espresso'), $callback ) );
+		if ( !method_exists( $this, $callback ) ) {
+					throw new EE_Error(sprintf( __('The method named "%s" given as the callback param in "display_in_my_timezone" does not exist.  Please check your spelling', 'event_espresso'), $callback ) );
+		}
 		$args = (array) $args;
 		$return =  $prepend . call_user_func_array( array( $this, $callback ), $args ) . $append;
 
@@ -1102,7 +1109,7 @@ 
 		$model=$this->get_model();
 		if($model instanceof EEM_Soft_Delete_Base){
 			$result=$model->delete_permanently_by_ID($this->ID());
-		}else{
+		} else{
 			$result = $this->delete();
 		}
 		return $result ? true : false;
@@ -1168,7 +1175,7 @@ 
 						$this->_update_cached_related_model_objs_fks();
 					}
 				}
-			}else{//PK is NOT auto-increment
+			} else{//PK is NOT auto-increment
 				//so check if one like it already exists in the db
 				if( $this->get_model()->exists_by_ID( $this->ID() ) ){
 					if( ! $this->in_entity_map() && WP_DEBUG ){
@@ -1183,12 +1190,12 @@ 
 						);
 					}
 					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
-				}else{
+				} else{
 					$results = $this->get_model()->insert($save_cols_n_values);
 					$this->_update_cached_related_model_objs_fks();
 				}
 			}
-		}else{//there is NO primary key
+		} else{//there is NO primary key
 			$already_in_db = false;
 			foreach($this->get_model()->unique_indexes() as $index){
 				$uniqueness_where_params = array_intersect_key($save_cols_n_values, $index->fields());
@@ -1199,7 +1206,7 @@ 
 			if( $already_in_db ){
 				$combined_pk_fields_n_values = array_intersect_key( $save_cols_n_values, $this->get_model()->get_combined_primary_key_fields() );
 				$results = $this->get_model()->update( $save_cols_n_values,$combined_pk_fields_n_values );
-			}else{
+			} else{
 				$results = $this->get_model()->insert( $save_cols_n_values );
 			}
 		}
@@ -1251,7 +1258,7 @@ 
 		//make sure this has been saved
 		if( ! $this->ID()){
 			$id = $this->save();
-		}else{
+		} else{
 			$id = $this->ID();
 		}
 		//now save all the NEW cached model objects  (ie they don't exist in the DB)
@@ -1270,7 +1277,7 @@ 
 						$this->_add_relation_to($related_model_obj, $relationName);
 						$related_model_obj->save_new_cached_related_model_objs();
 //					}
-				}else{
+				} else{
 					foreach($this->_model_relations[$relationName] as $related_model_obj){
 						//add a relation to that relation type (which saves the appropriate thing in the process)
 						//but ONLY if it DOES NOT exist in the DB
@@ -1329,13 +1336,13 @@ 
 
 			if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) {
 				$existing = self::_get_model( $classname, $timezone )->get_one_by_ID( $props_n_values[$primary_id_ref] );
-			}else{
+			} else{
 				$existing = null;
 			}
-		}elseif( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields(  $props_n_values ) ){
+		} elseif( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields(  $props_n_values ) ){
 			//no primary key on this model, but there's still a matching item in the DB
 				$existing = self::_get_model($classname, $timezone)->get_one_by_ID( self::_get_model($classname, $timezone)->get_index_primary_key_string( $props_n_values ) );
-		}else{
+		} else{
 			$existing = null;
 		}
 		if ( $existing ) {
@@ -1393,7 +1400,7 @@ 
 	private static function _get_model_classname( $model_name = null){
 		if(strpos($model_name,"EE_")===0){
 			$model_classname=str_replace("EE_","EEM_",$model_name);
-		}else{
+		} else{
 			$model_classname = "EEM_".$model_name;
 		}
 		return $model_classname;
@@ -1427,7 +1434,7 @@ 
 		//now that we know the name of the variable, use a variable variable to get its value and return its
 		if( $this->get_model()->has_primary_key_field() ) {
 			return $this->_fields[self::_get_primary_key_name( get_class($this) )];
-		}else{
+		} else{
 			return $this->get_model()->get_index_primary_key_string( $this->_fields );
 		}
 	}
@@ -1485,7 +1492,7 @@ 
 		if($this->ID()){//if this exists in the DB, save the relation change to the DB too
 			$otherObject = $this->get_model()->remove_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $where_query );
 			$this->clear_cache($relationName, $otherObject);
-		}else{//this doesn't exist in the DB, just remove it from the cache
+		} else{//this doesn't exist in the DB, just remove it from the cache
 			$otherObject = $this->clear_cache($relationName,$otherObjectModelObjectOrID);
 		}
 		return $otherObject;
@@ -1501,7 +1508,7 @@ 
 		if($this->ID()){//if this exists in the DB, save the relation change to the DB too
 			$otherObjects = $this->get_model()->remove_relations($this, $relationName, $where_query_params );
 			$this->clear_cache($relationName,null,true);
-		}else{//this doesn't exist in the DB, just remove it from the cache
+		} else{//this doesn't exist in the DB, just remove it from the cache
 			$otherObjects = $this->clear_cache($relationName,null,true);
 		}
 		return $otherObjects;
@@ -1523,7 +1530,7 @@ 
 			//if there are query parameters, forget about caching the related model objects.
 			if( $query_params ){
 				$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
-			}else{
+			} else{
 				//did we already cache the result of this query?
 				$cached_results = $this->get_all_from_cache($relationName);
 				if ( ! $cached_results ){
@@ -1533,11 +1540,11 @@ 
 					foreach($related_model_objects as $related_model_object){
 						$this->cache($relationName, $related_model_object);
 					}
-				}else{
+				} else{
 					$related_model_objects = $cached_results;
 				}
 			}
-		}else{//this doesn't exist itn eh DB, so just get the related things from the cache
+		} else{//this doesn't exist itn eh DB, so just get the related things from the cache
 			$related_model_objects = $this->get_all_from_cache($relationName);
 		}
 		return $related_model_objects;
@@ -1589,22 +1596,22 @@ 
 			//on a relation which should have an array of objects (because the cache might have an array of objects)
 			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
 				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
-			}else{
+			} else{
 				//first, check if we've already cached the result of this query
 				$cached_result = $this->get_one_from_cache($relationName);
 				if ( ! $cached_result ){
 
 					$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
 					$this->cache($relationName,$related_model_object);
-				}else{
+				} else{
 					$related_model_object = $cached_result;
 				}
 			}
-		}else{
+		} else{
 			//this doesn't exist in the Db, but maybe the relation is of type belongs to, and so the related thing might
 			if( $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
 				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
-			}else{
+			} else{
 				$related_model_object = null;
 			}
 			//this doesn't exist in the DB and apparently the thing it belongs to doesn't either, just get what's cached on this object
@@ -1630,7 +1637,7 @@ 
 	public function delete_related($relationName,$query_params = array()){
 		if($this->ID()){
 			$count =  $this->get_model()->delete_related($this, $relationName, $query_params);
-		}else{
+		} else{
 			$count = count($this->get_all_from_cache($relationName));
 			$this->clear_cache($relationName,NULL,TRUE);
 		}
@@ -1650,7 +1657,7 @@ 
 	public function delete_related_permanently($relationName,$query_params = array()){
 		if($this->ID()){
 			$count =  $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
-		}else{
+		} else{
 			$count = count($this->get_all_from_cache($relationName));
 		}
 		$this->clear_cache($relationName,NULL,TRUE);
@@ -1685,8 +1692,9 @@ 
 
 		foreach ( (array) $properties as $property_name ) {
 			//first make sure this property exists
-			if ( ! $this->_fields[ $property_name ] )
-				throw new EE_Error( sprintf( __('Trying to retrieve a non-existent property (%s).  Double check the spelling please', 'event_espresso'), $property_name ) );
+			if ( ! $this->_fields[ $property_name ] ) {
+							throw new EE_Error( sprintf( __('Trying to retrieve a non-existent property (%s).  Double check the spelling please', 'event_espresso'), $property_name ) );
+			}
 		}
 
 		return TRUE;
@@ -1766,7 +1774,7 @@ 
 		$existing_rows_like_that = EEM_Extra_Meta::instance()->get_all($query_params);
 		if( ! $existing_rows_like_that){
 			return $this->add_extra_meta($meta_key, $meta_value);
-		}else{
+		} else{
 			foreach( $existing_rows_like_that as $existing_row){
 				$existing_row->save( array( 'EXM_value' => $meta_value ) );
 			}
@@ -1832,10 +1840,10 @@ 
 			$result = $this->get_first_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
 			if ( $result instanceof EE_Extra_Meta ){
 				return $result->value();
-			}else{
+			} else{
 				return $default;
 			}
-		}else{
+		} else{
 			$results =  $this->get_many_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
 			if($results){
 				$values = array();
@@ -1845,7 +1853,7 @@ 
 					}
 				}
 				return $values;
-			}else{
+			} else{
 				return $default;
 			}
 		}
@@ -1869,7 +1877,7 @@ 
 			foreach($extra_meta_objs as $extra_meta_obj){
 				$return_array[$extra_meta_obj->key()] = $extra_meta_obj->value();
 			}
-		}else{
+		} else{
 			$extra_meta_objs = $this->get_many_related('Extra_Meta');
 			foreach($extra_meta_objs as $extra_meta_obj){
 				if( ! isset($return_array[$extra_meta_obj->key()])){
@@ -1889,7 +1897,7 @@ 
 		$field_we_can_use = $this->get_model()->get_a_field_of_type('EE_Text_Field_Base');
 		if($field_we_can_use){
 			return $this->get($field_we_can_use->get_name());
-		}else{
+		} else{
 			$first_few_properties = $this->model_field_array();
 			$first_few_properties = array_slice($first_few_properties,0,3);
 			$name_parts = array();
@@ -1909,7 +1917,7 @@ 
 		if( $this->ID() && $this->get_model()->get_from_entity_map( $this->ID() ) === $this ) {
 			//well, if we looked, did we find it in the entity map?
 			return TRUE;
-		}else{
+		} else{
 			return FALSE;
 		}
 	}
@@ -1923,7 +1931,7 @@ 
 	public function refresh_from_db(){
 		if( $this->ID() && $this->in_entity_map() ){
 			$this->get_model()->refresh_entity_map_from_db( $this->ID() );
-		}else{
+		} else{
 			//if it doesn't have ID, you shouldn't be asking to refresh it from teh database (because its not in the database)
 			//if it has an ID but it's not in the map, and you're asking me to refresh it
 			//that's kinda dangerous. You should just use what's in the entity map, or add this to the entity map if there's

Spacing +399 added lines, -399 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, ' FILE LOADED', '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, ' FILE LOADED', '');
 /**
  *
  * Event Espresso
@@ -24,7 +24,7 @@ 
  * ------------------------------------------------------------------------
  */
 
-abstract class EE_Base_Class{
+abstract class EE_Base_Class {
 
 	/**
 	 * This is an array of the original properties and values provided during construction
@@ -105,39 +105,39 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Base_Class
 	 */
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '' ){
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '') {
 
-		$className=get_class($this);
+		$className = get_class($this);
 		//set default formats for date and time
-		$this->_dt_frmt = EE_Base_Class::fix_date_format_for_use_with_strtotime( get_option( 'date_format' ));
-		$this->_tm_frmt = get_option( 'time_format' );
+		$this->_dt_frmt = EE_Base_Class::fix_date_format_for_use_with_strtotime(get_option('date_format'));
+		$this->_tm_frmt = get_option('time_format');
 
 
-		do_action("AHEE__{$className}__construct",$this,$fieldValues);
-		$model=$this->get_model();
-		$model_fields = $model->field_settings( FALSE );
+		do_action("AHEE__{$className}__construct", $this, $fieldValues);
+		$model = $this->get_model();
+		$model_fields = $model->field_settings(FALSE);
 		// ensure $fieldValues is an array
-		$fieldValues = is_array( $fieldValues ) ? $fieldValues : array( $fieldValues );
+		$fieldValues = is_array($fieldValues) ? $fieldValues : array($fieldValues);
 		// EEH_Debug_Tools::printr( $fieldValues, '$fieldValues  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// verify client code has not passed any invalid field names
-		foreach($fieldValues as $field_name=> $field_value){
-			if( ! isset( $model_fields[ $field_name] ) ){
-				throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"),$field_name,get_class($this),implode(", ",array_keys($model_fields))));
+		foreach ($fieldValues as $field_name=> $field_value) {
+			if ( ! isset($model_fields[$field_name])) {
+				throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"), $field_name, get_class($this), implode(", ", array_keys($model_fields))));
 			}
 		}
 		// EEH_Debug_Tools::printr( $model_fields, '$model_fields  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
 		//if db model is instantiating
-		if( $bydb ){
+		if ($bydb) {
 			//client code has indicated these field values are from the database
-			foreach($fieldValues as $field_name => $field_value_from_db){
-				$this->set_from_db($field_name,$field_value_from_db);
+			foreach ($fieldValues as $field_name => $field_value_from_db) {
+				$this->set_from_db($field_name, $field_value_from_db);
 			}
-		}else{
+		} else {
 			//we're constructing a brand
 			//new instance of the model object. Generally, this means we'll need to do more field validation
-			foreach($model_fields as $fieldName => $field_obj){
-				$this->set($fieldName,isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null ,true);
+			foreach ($model_fields as $fieldName => $field_obj) {
+				$this->set($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null, true);
 			}
 		}
 
@@ -146,14 +146,14 @@ 
 		//remember what values were passed to this constructor
 		$this->_props_n_values_provided_in_constructor = $fieldValues;
 		//remember in entity mapper
-		if($model->has_primary_key_field() && $this->ID() && ! $bydb ){
+		if ($model->has_primary_key_field() && $this->ID() && ! $bydb) {
 			$model->add_to_entity_map($this);
 		}
 		//setup all the relations
-		foreach($this->get_model()->relation_settings() as $relation_name=>$relation_obj){
-			if($relation_obj instanceof EE_Belongs_To_Relation){
+		foreach ($this->get_model()->relation_settings() as $relation_name=>$relation_obj) {
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
 				$this->_model_relations[$relation_name] = NULL;
-			}else{
+			} else {
 				$this->_model_relations[$relation_name] = array();
 			}
 		}
@@ -161,7 +161,7 @@ 
 		 * Action done at the end of each model object construction
 		 * @param EE_Base_Class $this the model object just created
 		 */
-		do_action( 'AHEE__EE_Base_Class__construct__finished', $this );
+		do_action('AHEE__EE_Base_Class__construct__finished', $this);
 	}
 
 
@@ -173,11 +173,11 @@ 
 	 * @param string $field_name
 	 * @return mixed|null
 	 */
-	public function get_original( $field_name ){
-		if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) &&
-				$field_settings = $this->get_Model()->field_settings_for( $field_name )){
-			return $field_settings->prepare_for_get( $this->_props_n_values_provided_in_constructor[ $field_name ] );
-		}else{
+	public function get_original($field_name) {
+		if (isset($this->_props_n_values_provided_in_constructor[$field_name]) &&
+				$field_settings = $this->get_Model()->field_settings_for($field_name)) {
+			return $field_settings->prepare_for_get($this->_props_n_values_provided_in_constructor[$field_name]);
+		} else {
 			return NULL;
 		}
 	}
@@ -187,7 +187,7 @@ 
 	 * @param EE_Base_Class $obj
 	 * @return string
 	 */
-	public function get_class($obj){
+	public function get_class($obj) {
 		return get_class($obj);
 	}
 
@@ -200,24 +200,24 @@ 
 	 * @param	mixed 	$field_value
 	 * @param bool 	$use_default
 	 */
-	public function set( $field_name, $field_value, $use_default = FALSE ){
-		$field_obj = $this->get_model()->field_settings_for( $field_name );
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
-			if ( method_exists( $field_obj, 'set_timezone' )) {
-				$field_obj->set_timezone( $this->_timezone );
+	public function set($field_name, $field_value, $use_default = FALSE) {
+		$field_obj = $this->get_model()->field_settings_for($field_name);
+		if ($field_obj instanceof EE_Model_Field_Base) {
+			if (method_exists($field_obj, 'set_timezone')) {
+				$field_obj->set_timezone($this->_timezone);
 			}
 			$holder_of_value = $field_obj->prepare_for_set($field_value);
-			if( ($field_value === NULL || $holder_of_value === NULL || $holder_of_value ==='') && $use_default){
+			if (($field_value === NULL || $holder_of_value === NULL || $holder_of_value === '') && $use_default) {
 				$this->_fields[$field_name] = $field_obj->get_default_value();
-			}else{
+			} else {
 				$this->_fields[$field_name] = $holder_of_value;
 			}
 
 			//if we're not in the constructor...
 			//now check if what we set was a primary key
-			if($this->_props_n_values_provided_in_constructor && //note: props_n_values_provided_in_constructor is only set at the END of the constructor
+			if ($this->_props_n_values_provided_in_constructor && //note: props_n_values_provided_in_constructor is only set at the END of the constructor
 				$field_name == $this->_get_primary_key_name(get_class($this)) &&
-				$field_value){
+				$field_value) {
 				//if so, we want all this object's fields to be filled either with
 				//what we've explicitly set on this model
 				//or what we have in the db
@@ -225,19 +225,19 @@ 
 				$fields_on_model = $this->_get_model(get_class($this))->field_settings();
 
 				$obj_in_db = $this->_get_model(get_class($this))->get_one_by_ID($field_value);
-				foreach($fields_on_model as $field_obj){
-					if( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor)
-						&& $field_obj->get_name() != $field_name ){
+				foreach ($fields_on_model as $field_obj) {
+					if ( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor)
+						&& $field_obj->get_name() != $field_name) {
 
-						$this->set($field_obj->get_name(),$obj_in_db->get($field_obj->get_name()));
+						$this->set($field_obj->get_name(), $obj_in_db->get($field_obj->get_name()));
 					}
 				}
 				//oh this model object has an ID? well make sure its in the entity mapper
 				$this->get_model()->add_to_entity_map($this);
 			}
 			//let's unset any cache for this field_name from the $_cached_properties property.
-			$this->_clear_cached_property( $field_name );
-		}else{
+			$this->_clear_cached_property($field_name);
+		} else {
 			echo "\r\n\r\nSAAAY WHAT?? $field_name doesnt have a field???";
 		}
 
@@ -253,17 +253,17 @@ 
 	 * @param string $timezone A valid timezone string as described by @link http://www.php.net/manual/en/timezones.php
 	 * @return void
 	 */
-	public function set_timezone( $timezone = '' ) {
-		$timezone = empty( $timezone ) ? get_option( 'timezone_string' ) : $timezone;
+	public function set_timezone($timezone = '') {
+		$timezone = empty($timezone) ? get_option('timezone_string') : $timezone;
 
 		//if timezone is STILL empty then let's get the GMT offset and then set the timezone_string using our converter
-		if ( empty( $timezone ) ) {
+		if (empty($timezone)) {
 			//let's get a the WordPress UTC offset
 			$offset = get_option('gmt_offset');
-			$timezone = EE_Datetime_Field::timezone_convert_to_string_from_offset( $offset );
+			$timezone = EE_Datetime_Field::timezone_convert_to_string_from_offset($offset);
 		}
 
-		EE_Datetime_Field::validate_timezone( $timezone ); //just running validation on the timezone.
+		EE_Datetime_Field::validate_timezone($timezone); //just running validation on the timezone.
 		$this->_timezone = $timezone;
 		//make sure we clear all cached properties because they won't be relevant now
 		$this->_clear_cached_properties();
@@ -294,11 +294,11 @@ 
 	 * @param string $dt_frmt
 	 * @return string
 	 */
-	public static function fix_date_format_for_use_with_strtotime( $dt_frmt ) {
+	public static function fix_date_format_for_use_with_strtotime($dt_frmt) {
 		// if the date format is d/m/y
-		if ( strpos( $dt_frmt, 'd/' )=== 0 ) {
+		if (strpos($dt_frmt, 'd/') === 0) {
 			// change it to d-m-y, or else strtotime() will think it is m/d/y
-			$dt_frmt = str_replace( '/', '-', $dt_frmt );
+			$dt_frmt = str_replace('/', '-', $dt_frmt);
 		}
 		return $dt_frmt;
 	}
@@ -316,17 +316,17 @@ 
 	 * @throws EE_Error
 	 * @return mixed    index into cache, or just TRUE if the relation is of type Belongs_To (because there's only one related thing, no array)
 	 */
-	public function cache( $relationName = '', $object_to_cache = NULL, $cache_id = NULL ){
+	public function cache($relationName = '', $object_to_cache = NULL, $cache_id = NULL) {
 		// its entirely possible that there IS no related object yet in which case there is nothing to cache.
-		if ( ! $object_to_cache instanceof EE_Base_Class ) {
+		if ( ! $object_to_cache instanceof EE_Base_Class) {
 			return FALSE;
 		}
 		// also get "how" the object is related, or throw an error
-		if( ! $relationship_to_model = $this->get_model()->related_settings_for( $relationName )) {
-			throw new EE_Error( sprintf( __( 'There is no relationship to %s on a %s. Cannot cache it', 'event_espresso' ), $relationName, get_class( $this )));
+		if ( ! $relationship_to_model = $this->get_model()->related_settings_for($relationName)) {
+			throw new EE_Error(sprintf(__('There is no relationship to %s on a %s. Cannot cache it', 'event_espresso'), $relationName, get_class($this)));
 		}
 		// how many things are related ?
-		if( $relationship_to_model instanceof EE_Belongs_To_Relation ){
+		if ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 			// if it's a "belongs to" relationship, then there's only one related model object  eg, if this is a registration, there's only 1 attendee for it
 			// so for these model objects just set it to be cached
 			$this->_model_relations[$relationName] = $object_to_cache;
@@ -334,26 +334,26 @@ 
 		} else {
 			// otherwise, this is the "many" side of a one to many relationship, so we'll add the object to the array of related objects for that type.
 			// eg: if this is an event, there are many registrations for that event, so we cache the registrations in an array
-			if( ! is_array( $this->_model_relations[$relationName] )) {
+			if ( ! is_array($this->_model_relations[$relationName])) {
 				// if for some reason, the cached item is a model object, then stick that in the array, otherwise start with an empty array
-				$this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array( $this->_model_relations[$relationName] ) : array();
+				$this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array($this->_model_relations[$relationName]) : array();
 			}
 			// first check for a cache_id which is normally empty
-			if ( ! empty( $cache_id )) {
+			if ( ! empty($cache_id)) {
 				// if the cache_id exists, then it means we are purposely trying to cache this with a known key that can then be used to retrieve the object later on
-				$this->_model_relations[$relationName][ $cache_id ] = $object_to_cache;
+				$this->_model_relations[$relationName][$cache_id] = $object_to_cache;
 				$return = $cache_id;
-			} elseif ( $object_to_cache->ID() ) {
+			} elseif ($object_to_cache->ID()) {
 				// OR the cached object originally came from the db, so let's just use it's PK for an ID
-				$this->_model_relations[$relationName][ $object_to_cache->ID() ] = $object_to_cache;
+				$this->_model_relations[$relationName][$object_to_cache->ID()] = $object_to_cache;
 				$return = $object_to_cache->ID();
 			} else {
 				// OR it's a new object with no ID, so just throw it in the array with an auto-incremented ID
 				$this->_model_relations[$relationName][] = $object_to_cache;
 				  // move the internal pointer to the end of the array
-				end( $this->_model_relations[$relationName] );
+				end($this->_model_relations[$relationName]);
 				// and grab the key so that we can return it
-				$return = key( $this->_model_relations[$relationName] );
+				$return = key($this->_model_relations[$relationName]);
 			}
 
 		}
@@ -371,11 +371,11 @@ 
 	 * @param null   $cache_type
 	 * @return void
 	 */
-	protected function _set_cached_property( $fieldname, $value, $cache_type = NULL ) {
+	protected function _set_cached_property($fieldname, $value, $cache_type = NULL) {
 		//first make sure this property exists
 		$this->get_model()->field_settings_for($fieldname);
 
-		$cache_type = empty( $cache_type ) ? 'standard' : $cache_type;
+		$cache_type = empty($cache_type) ? 'standard' : $cache_type;
 		$this->_cached_properties[$fieldname][$cache_type] = $value;
 	}
 
@@ -390,24 +390,24 @@ 
 	 *                                 It can also accept certain pre-defined "schema" strings to define how to output the property. see the field's prepare_for_pretty_echoing for what strings can be used
 	 * @return mixed                whatever the value for the property is we're retrieving
 	 */
-	protected function _get_cached_property( $fieldname, $pretty = FALSE, $extra_cache_ref = NULL ) {
+	protected function _get_cached_property($fieldname, $pretty = FALSE, $extra_cache_ref = NULL) {
 		//verify the field exists
 		$this->get_model()->field_settings_for($fieldname);
 
 		$cache_type = $pretty ? 'pretty' : 'standard';
-		$cache_type .= !empty( $extra_cache_ref ) ? '_' . $extra_cache_ref : '';
+		$cache_type .= ! empty($extra_cache_ref) ? '_'.$extra_cache_ref : '';
 
-		if ( isset( $this->_cached_properties[$fieldname][$cache_type] ) ) {
+		if (isset($this->_cached_properties[$fieldname][$cache_type])) {
 			return $this->_cached_properties[$fieldname][$cache_type];
 		}
 
 		$field_obj = $this->get_model()->field_settings_for($fieldname);
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
-			if( ! isset($this->_fields[$fieldname])){
+		if ($field_obj instanceof EE_Model_Field_Base) {
+			if ( ! isset($this->_fields[$fieldname])) {
 				$this->_fields[$fieldname] = NULL;
 			}
-			$value = $pretty ? $field_obj->prepare_for_pretty_echoing($this->_fields[$fieldname], $extra_cache_ref) : $field_obj->prepare_for_get($this->_fields[$fieldname] );
-			$this->_set_cached_property( $fieldname, $value, $cache_type );
+			$value = $pretty ? $field_obj->prepare_for_pretty_echoing($this->_fields[$fieldname], $extra_cache_ref) : $field_obj->prepare_for_get($this->_fields[$fieldname]);
+			$this->_set_cached_property($fieldname, $value, $cache_type);
 			return $value;
 		}
 		return FALSE;
@@ -433,9 +433,9 @@ 
 	 * @param  string $property_name the property to remove if it exists (from the _cached_properties array)
 	 * @return void
 	 */
-	protected function _clear_cached_property( $property_name ) {
-		if ( isset( $this->_cached_properties[ $property_name ] ) )
-			unset( $this->_cached_properties[ $property_name ] );
+	protected function _clear_cached_property($property_name) {
+		if (isset($this->_cached_properties[$property_name]))
+			unset($this->_cached_properties[$property_name]);
 	}
 
 
@@ -446,7 +446,7 @@ 
 	 * @param string $model_name name of the related thing, eg 'Attendee',
 	 * @return EE_Base_Class
 	 */
-	protected function ensure_related_thing_is_model_obj($object_or_id,$model_name){
+	protected function ensure_related_thing_is_model_obj($object_or_id, $model_name) {
 		$other_model_instance = self::_get_model_instance_with_name(self::_get_model_classname($model_name), $this->_timezone);
 		$model_obj = $other_model_instance->ensure_is_obj($object_or_id);
 		return $model_obj;
@@ -466,55 +466,55 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class from which was cleared from the cache, or true if we requested to remove a relation from all
 	 */
-	public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE){
+	public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE) {
 		$relationship_to_model = $this->get_model()->related_settings_for($relationName);
 		$index_in_cache = '';
-		if( ! $relationship_to_model){
-			throw new EE_Error(sprintf(__("There is no relationship to %s on a %s. Cannot clear that cache",'event_espresso'),$relationName,get_class($this)));
+		if ( ! $relationship_to_model) {
+			throw new EE_Error(sprintf(__("There is no relationship to %s on a %s. Cannot clear that cache", 'event_espresso'), $relationName, get_class($this)));
 		}
-		if($clear_all){
+		if ($clear_all) {
 			$obj_removed = true;
 			$this->_model_relations[$relationName]  = null;
-		}elseif($relationship_to_model instanceof EE_Belongs_To_Relation){
+		}elseif ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 			$obj_removed = $this->_model_relations[$relationName];
 			$this->_model_relations[$relationName]  = null;
-		}else{
-			if($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()){
+		} else {
+			if ($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()) {
 				$index_in_cache = $object_to_remove_or_index_into_array->ID();
-				if( is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])){
+				if (is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])) {
 					$index_found_at = NULL;
 					//find this object in the array even though it has a different key
-					foreach($this->_model_relations[$relationName] as $index=>$obj){
-						if( $obj instanceof EE_Base_Class && ( $obj == $object_to_remove_or_index_into_array || $obj->ID() == $object_to_remove_or_index_into_array->ID() )) {
+					foreach ($this->_model_relations[$relationName] as $index=>$obj) {
+						if ($obj instanceof EE_Base_Class && ($obj == $object_to_remove_or_index_into_array || $obj->ID() == $object_to_remove_or_index_into_array->ID())) {
 							$index_found_at = $index;
 							break;
 						}
 					}
-					if($index_found_at){
+					if ($index_found_at) {
 						$index_in_cache = $index_found_at;
-					}else{
+					} else {
 						//it wasn't found. huh. well obviously it doesn't need to be removed from teh cache
 						//if it wasn't in it to begin with. So we're done
 						return $object_to_remove_or_index_into_array;
 					}
 				}
-			}elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){
+			}elseif ($object_to_remove_or_index_into_array instanceof EE_Base_Class) {
 				//so they provided a model object, but it's not yet saved to the DB... so let's go hunting for it!
-				foreach($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want){
-					if($potentially_obj_we_want == $object_to_remove_or_index_into_array){
+				foreach ($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want) {
+					if ($potentially_obj_we_want == $object_to_remove_or_index_into_array) {
 						$index_in_cache = $index;
 					}
 				}
-			}else{
+			} else {
 				$index_in_cache = $object_to_remove_or_index_into_array;
 			}
 			//supposedly we've found it. But it could just be that the client code
 			//provided a bad index/object
-			if(isset( $this->_model_relations[$relationName]) &&
-					isset( $this->_model_relations[$relationName][$index_in_cache])){
+			if (isset($this->_model_relations[$relationName]) &&
+					isset($this->_model_relations[$relationName][$index_in_cache])) {
 				$obj_removed = $this->_model_relations[$relationName][$index_in_cache];
 				unset($this->_model_relations[$relationName][$index_in_cache]);
-			}else{
+			} else {
 				//that thing was never cached anyways.
 				$obj_removed = NULL;
 			}
@@ -533,24 +533,24 @@ 
 	 * @param string                $current_cache_id   - the ID that was used when originally caching the object
 	 * @return boolean TRUE on success, FALSE on fail
 	 */
-	public function update_cache_after_object_save( $relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') {
+	public function update_cache_after_object_save($relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') {
 		// verify that incoming object is of the correct type
-		$obj_class = 'EE_' . $relationName;
-		if ( $newly_saved_object instanceof $obj_class ) {
+		$obj_class = 'EE_'.$relationName;
+		if ($newly_saved_object instanceof $obj_class) {
 			/* @type EE_Base_Class $newly_saved_object*/
 			// now get the type of relation
-			$relationship_to_model = $this->get_model()->related_settings_for( $relationName );
+			$relationship_to_model = $this->get_model()->related_settings_for($relationName);
 			// if this is a 1:1 relationship
-			if( $relationship_to_model instanceof EE_Belongs_To_Relation ) {
+			if ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 				// then just replace the cached object with the newly saved object
 				$this->_model_relations[$relationName] = $newly_saved_object;
 				return TRUE;
 			// or if it's some kind of sordid feral polyamorous relationship...
-			} elseif ( is_array( $this->_model_relations[$relationName] ) && isset( $this->_model_relations[$relationName][ $current_cache_id ] )) {
+			} elseif (is_array($this->_model_relations[$relationName]) && isset($this->_model_relations[$relationName][$current_cache_id])) {
 				// then remove the current cached item
-				unset( $this->_model_relations[$relationName][ $current_cache_id ] );
+				unset($this->_model_relations[$relationName][$current_cache_id]);
 				// and cache the newly saved object using it's new ID
-				$this->_model_relations[$relationName][ $newly_saved_object->ID() ] = $newly_saved_object;
+				$this->_model_relations[$relationName][$newly_saved_object->ID()] = $newly_saved_object;
 				return TRUE;
 			}
 		}
@@ -566,11 +566,11 @@ 
 	 * @param string $relationName
 	 * @return EE_Base_Class
 	 */
-	public function get_one_from_cache($relationName){
-		$cached_array_or_object =  $this->_model_relations[$relationName];
-		if(is_array($cached_array_or_object)){
+	public function get_one_from_cache($relationName) {
+		$cached_array_or_object = $this->_model_relations[$relationName];
+		if (is_array($cached_array_or_object)) {
 			return array_shift($cached_array_or_object);
-		}else{
+		} else {
 			return $cached_array_or_object;
 		}
 	}
@@ -585,14 +585,14 @@ 
 	 * @throws \EE_Error
 	 * @return EE_Base_Class[]
 	 */
-	public function get_all_from_cache($relationName){
-		$cached_array_or_object =  $this->_model_relations[$relationName];
-		if(is_array($cached_array_or_object)){
+	public function get_all_from_cache($relationName) {
+		$cached_array_or_object = $this->_model_relations[$relationName];
+		if (is_array($cached_array_or_object)) {
 			$objects = $cached_array_or_object;
-		}elseif($cached_array_or_object){
+		}elseif ($cached_array_or_object) {
 			//if the result is not an array, but exists, make it an array
 			$objects = array($cached_array_or_object);
-		}else{
+		} else {
 			//if nothing was found, return an empty array
 			$objects = array();
 		}
@@ -600,15 +600,15 @@ 
 		//basically, if this model object was stored in the session, and these cached model objects
 		//already have IDs, let's make sure they're in their model's entity mapper
 		//otherwise we will have duplicates next time we call EE_Registry::instance()->load_model( $relationName )->get_one_by_ID( $result->ID() );
-		foreach( $objects as $model_object ){
-			$model = EE_Registry::instance()->load_model( $relationName );
-			if( $model instanceof EEM_Base && $model_object instanceof EE_Base_Class ){
+		foreach ($objects as $model_object) {
+			$model = EE_Registry::instance()->load_model($relationName);
+			if ($model instanceof EEM_Base && $model_object instanceof EE_Base_Class) {
 				//ensure its in the map if it has an ID; otherwise it will be added to the map when its saved
-				if( $model_object->ID() ){
-					$model->add_to_entity_map( $model_object );
+				if ($model_object->ID()) {
+					$model->add_to_entity_map($model_object);
 				}
-			}else{
-				throw new EE_Error( sprintf( __( 'Error retrieving related model objects. Either $1%s is not a model or $2%s is not a model object', 'event_espresso' ), $relationName, gettype( $model_object )));
+			} else {
+				throw new EE_Error(sprintf(__('Error retrieving related model objects. Either $1%s is not a model or $2%s is not a model object', 'event_espresso'), $relationName, gettype($model_object)));
 			}
 		}
 		return $objects;
@@ -622,20 +622,20 @@ 
 	 * @param string $field_name
 	 * @param mixed  $field_value_from_db
 	 */
-	public function set_from_db($field_name,$field_value_from_db){
+	public function set_from_db($field_name, $field_value_from_db) {
 		$field_obj = $this->get_model()->field_settings_for($field_name);
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
+		if ($field_obj instanceof EE_Model_Field_Base) {
 			//you would think the DB has no NULLs for non-null label fields right? wrong!
 			//eg, a CPT model object could have an entry in the posts table, but no
 			//entry in the meta table. Meaning that all its columns in the meta table
 			//are null! yikes! so when we find one like that, use defaults for its meta columns
-			if($field_value_from_db === NULL && ! $field_obj->is_nullable()){
+			if ($field_value_from_db === NULL && ! $field_obj->is_nullable()) {
 				$field_value = $field_obj->get_default_value();
-			}else{
+			} else {
 				$field_value = $field_value_from_db;
 			}
 			$this->_fields[$field_name] = $field_obj->prepare_for_set_from_db($field_value);
-			$this->_clear_cached_property( $field_name );
+			$this->_clear_cached_property($field_name);
 		}
 	}
 
@@ -647,8 +647,8 @@ 
 	 * @param string $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.)
 	 * @return boolean
 	 */
-	public function get($field_name, $extra_cache_ref = NULL ){
-		return $this->_get_cached_property( $field_name, FALSE, $extra_cache_ref );
+	public function get($field_name, $extra_cache_ref = NULL) {
+		return $this->_get_cached_property($field_name, FALSE, $extra_cache_ref);
 	}
 
 
@@ -673,7 +673,7 @@ 
 	 * @param string         $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.)
 	 * @return void
 	 */
-	public function e($field_name, $extra_cache_ref = NULL){
+	public function e($field_name, $extra_cache_ref = NULL) {
 		echo $this->get_pretty($field_name, $extra_cache_ref);
 	}
 	/**
@@ -682,8 +682,8 @@ 
 	 * @param string $field_name
 	 * @return void
 	 */
-	public function f($field_name){
-		$this->e($field_name,'form_input');
+	public function f($field_name) {
+		$this->e($field_name, 'form_input');
 	}
 
 	/**
@@ -692,8 +692,8 @@ 
 	 * @param string         $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.)
 	 * @return mixed
 	 */
-	public function get_pretty($field_name, $extra_cache_ref = NULL){
-		return  $this->_get_cached_property( $field_name, TRUE, $extra_cache_ref );
+	public function get_pretty($field_name, $extra_cache_ref = NULL) {
+		return  $this->_get_cached_property($field_name, TRUE, $extra_cache_ref);
 	}
 
 
@@ -710,36 +710,36 @@ 
 	 * @param  boolean $echo         Whether the dtt is echoing using pretty echoing or just returned using vanilla get
 	 * @return void | string | bool | EE_Error string on success, FALSE on fail, or EE_Error Exception is thrown if field is not a valid dtt field, or void if echoing
 	 */
-	protected function _get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE ) {
+	protected function _get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE) {
 
-		$in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt : EE_Base_Class::fix_date_format_for_use_with_strtotime( $dt_frmt );
+		$in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt : EE_Base_Class::fix_date_format_for_use_with_strtotime($dt_frmt);
 		$in_tm_frmt = empty($tm_frmt) ? $this->_tm_frmt : $tm_frmt;
 
 
 		//validate field for datetime and returns field settings if valid.
-		$field = $this->_get_dtt_field_settings( $field_name );
+		$field = $this->_get_dtt_field_settings($field_name);
 
-		if ( $dt_frmt !== NULL ) {
-			$this->_clear_cached_property( $field_name, $date_or_time );
+		if ($dt_frmt !== NULL) {
+			$this->_clear_cached_property($field_name, $date_or_time);
 		}
-		if ( $echo )
-			$field->set_pretty_date_format( $in_dt_frmt );
+		if ($echo)
+			$field->set_pretty_date_format($in_dt_frmt);
 		else
-			$field->set_date_format( $in_dt_frmt );
+			$field->set_date_format($in_dt_frmt);
 
-		if ( $tm_frmt !== NULL ) {
-			$this->_clear_cached_property( $field_name, $date_or_time );
+		if ($tm_frmt !== NULL) {
+			$this->_clear_cached_property($field_name, $date_or_time);
 		}
-		if ( $echo )
-			$field->set_pretty_time_format( $in_tm_frmt );
+		if ($echo)
+			$field->set_pretty_time_format($in_tm_frmt);
 		else
-			$field->set_time_format( $in_tm_frmt );
+			$field->set_time_format($in_tm_frmt);
 
 		//set timezone in field object
-		$field->set_timezone( $this->_timezone );
+		$field->set_timezone($this->_timezone);
 
 		//set the output returned
-		switch ( $date_or_time ) {
+		switch ($date_or_time) {
 
 			case 'D' :
 				$field->set_date_time_output('date');
@@ -754,11 +754,11 @@ 
 		}
 
 
-		if ( $echo ) {
-			$this->e( $field_name, $date_or_time );
+		if ($echo) {
+			$this->e($field_name, $date_or_time);
 			return '';
 		 }
-		return $this->get( $field_name, $date_or_time );
+		return $this->get($field_name, $date_or_time);
 	}
 
 
@@ -768,8 +768,8 @@ 
 	 * @param  string $format     format for the date returned (if NULL we use default in dt_frmt property)
 	 * @return string            datetime value formatted
 	 */
-	public function get_date( $field_name, $format = NULL ) {
-		return $this->_get_datetime( $field_name, $format, NULL, 'D' );
+	public function get_date($field_name, $format = NULL) {
+		return $this->_get_datetime($field_name, $format, NULL, 'D');
 	}
 
 
@@ -778,8 +778,8 @@ 
 	 * @param      $field_name
 	 * @param null $format
 	 */
-	public function e_date( $field_name, $format = NULL ) {
-		$this->_get_datetime( $field_name, $format, NULL, 'D', TRUE );
+	public function e_date($field_name, $format = NULL) {
+		$this->_get_datetime($field_name, $format, NULL, 'D', TRUE);
 	}
 
 
@@ -789,8 +789,8 @@ 
 	 * @param  string $format     format for the time returned ( if NULL we use default in tm_frmt property)
 	 * @return string             datetime value formatted
 	 */
-	public function get_time( $field_name, $format = NULL ) {
-		return $this->_get_datetime( $field_name, NULL, $format, 'T' );
+	public function get_time($field_name, $format = NULL) {
+		return $this->_get_datetime($field_name, NULL, $format, 'T');
 	}
 
 
@@ -799,8 +799,8 @@ 
 	 * @param      $field_name
 	 * @param null $format
 	 */
-	public function e_time( $field_name, $format = NULL ) {
-		$this->_get_datetime( $field_name, NULL, $format, 'T', TRUE );
+	public function e_time($field_name, $format = NULL) {
+		$this->_get_datetime($field_name, NULL, $format, 'T', TRUE);
 	}
 
 
@@ -813,8 +813,8 @@ 
 	 * @param  string $tm_frmt    format for the time returned (if NULL we use default in tm_frmt property)
 	 * @return string             datetime value formatted
 	 */
-	public function get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) {
-		return $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt );
+	public function get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) {
+		return $this->_get_datetime($field_name, $dt_frmt, $tm_frmt);
 	}
 
 
@@ -824,8 +824,8 @@ 
 	 * @param null $dt_frmt
 	 * @param null $tm_frmt
 	 */
-	public function e_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) {
-		$this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, NULL, TRUE);
+	public function e_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) {
+		$this->_get_datetime($field_name, $dt_frmt, $tm_frmt, NULL, TRUE);
 	}
 
 
@@ -839,9 +839,9 @@ 
 	 *
 	 * @return string Date and time string in set locale.
 	 */
-	public function get_i18n_datetime( $field_name, $format = NULL ) {
-		$format = empty( $format ) ? $this->_dt_frmt . ' ' . $this->_tm_frmt : $format;
-		return date_i18n( $format, strtotime( $this->_get_datetime( $field_name, NULL, NULL, NULL, false ) ) );
+	public function get_i18n_datetime($field_name, $format = NULL) {
+		$format = empty($format) ? $this->_dt_frmt.' '.$this->_tm_frmt : $format;
+		return date_i18n($format, strtotime($this->_get_datetime($field_name, NULL, NULL, NULL, false)));
 	}
 
 
@@ -852,14 +852,14 @@ 
 	 * @throws EE_Error
 	 * @return EE_Datetime_Field
 	 */
-	protected function _get_dtt_field_settings( $field_name ) {
+	protected function _get_dtt_field_settings($field_name) {
 		$field = $this->get_model()->field_settings_for($field_name);
 
 		//check if field is dtt
-		if ( $field instanceof EE_Datetime_Field ) {
+		if ($field instanceof EE_Datetime_Field) {
 			return $field;
 		} else {
-			throw new EE_Error( sprintf( __('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field.  Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname( get_class($this) ) ) );
+			throw new EE_Error(sprintf(__('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field.  Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname(get_class($this))));
 		}
 	}
 
@@ -880,8 +880,8 @@ 
 	 * @param string $time      a valid time string for php datetime functions
 	 * @param string $fieldname the name of the field the time is being set on (must match a EE_Datetime_Field)
 	 */
-	protected function _set_time_for( $time, $fieldname ) {
-		$this->_set_date_time( 'T', $time, $fieldname );
+	protected function _set_time_for($time, $fieldname) {
+		$this->_set_date_time('T', $time, $fieldname);
 	}
 
 
@@ -895,8 +895,8 @@ 
 	 * @param string $date      a valid date string for php datetime functions
 	 * @param string $fieldname the name of the field the date is being set on (must match a EE_Datetime_Field)
 	 */
-	protected function _set_date_for( $date, $fieldname ) {
-		$this->_set_date_time( 'D', $date, $fieldname );
+	protected function _set_date_for($date, $fieldname) {
+		$this->_set_date_time('D', $date, $fieldname);
 	}
 
 
@@ -912,19 +912,19 @@ 
 	 * @param string $datetime_value A valid Date or Time string
 	 * @param string $fieldname     the name of the field the date OR time is being set on (must match a EE_Datetime_Field property)
 	 */
-	protected function _set_date_time( $what = 'T', $datetime_value, $fieldname ) {
-		$field = $this->_get_dtt_field_settings( $fieldname );
-		$field->set_timezone( $this->_timezone );
+	protected function _set_date_time($what = 'T', $datetime_value, $fieldname) {
+		$field = $this->_get_dtt_field_settings($fieldname);
+		$field->set_timezone($this->_timezone);
 
-		switch ( $what ) {
+		switch ($what) {
 			case 'T' :
-				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_time( $datetime_value, $this->_fields[$fieldname] );
+				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_time($datetime_value, $this->_fields[$fieldname]);
 				break;
 			case 'D' :
-				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_date( $datetime_value, $this->_fields[$fieldname] );
+				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_date($datetime_value, $this->_fields[$fieldname]);
 				break;
 			case 'B' :
-				$this->_fields[$fieldname] = $field->prepare_for_set( $datetime_value );
+				$this->_fields[$fieldname] = $field->prepare_for_set($datetime_value);
 				break;
 		}
 
@@ -947,25 +947,25 @@ 
 	 * @throws EE_Error
 	 * @return string timestamp
 	 */
-	public function display_in_my_timezone( $field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '' ) {
+	public function display_in_my_timezone($field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '') {
 		EE_Registry::instance()->load_helper('DTT_Helper');
 		$timezone = EEH_DTT_Helper::get_timezone();
 
-		if ( $timezone == $this->_timezone )
+		if ($timezone == $this->_timezone)
 			return '';
 
 		$original_timezone = $this->_timezone;
-		$this->set_timezone( $timezone );
+		$this->set_timezone($timezone);
 
 		$fn = (array) $field_name;
-		$args = array_merge( $fn, (array) $args );
+		$args = array_merge($fn, (array) $args);
 
-		if ( !method_exists( $this, $callback ) )
-			throw new EE_Error(sprintf( __('The method named "%s" given as the callback param in "display_in_my_timezone" does not exist.  Please check your spelling', 'event_espresso'), $callback ) );
+		if ( ! method_exists($this, $callback))
+			throw new EE_Error(sprintf(__('The method named "%s" given as the callback param in "display_in_my_timezone" does not exist.  Please check your spelling', 'event_espresso'), $callback));
 		$args = (array) $args;
-		$return =  $prepend . call_user_func_array( array( $this, $callback ), $args ) . $append;
+		$return = $prepend.call_user_func_array(array($this, $callback), $args).$append;
 
-		$this->set_timezone( $original_timezone );
+		$this->set_timezone($original_timezone);
 		return $return;
 	}
 
@@ -976,20 +976,20 @@ 
 	 * Deletes this model object. That may mean just 'soft deleting' it though.
 	 * @return boolean | int
 	 */
-	public function delete(){
+	public function delete() {
 		/**
 		 * Called just before deleting a model object
 		 *
 		 * @param EE_Base_Class $model_object about to be 'deleted'
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete__before', $this );
-		$result = $this->get_model()->delete_by_ID( $this->ID() );
+		do_action('AHEE__EE_Base_Class__delete__before', $this);
+		$result = $this->get_model()->delete_by_ID($this->ID());
 		/**
 		 * Called just after deleting a model object
 		 * @param EE_Base_Class $model_object that was just 'deleted'
 		 * @param boolean $result
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete__end', $this, $result );
+		do_action('AHEE__EE_Base_Class__delete__end', $this, $result);
 		return $result;
 	}
 
@@ -999,11 +999,11 @@ 
 	 * Deletes this model object permanently from db (but keep in mind related models my block the delete and return an error)
 	 * @return bool
 	 */
-	public function delete_permanently(){
-		$model=$this->get_model();
-		if($model instanceof EEM_Soft_Delete_Base){
-			$result=$model->delete_permanently_by_ID($this->ID());
-		}else{
+	public function delete_permanently() {
+		$model = $this->get_model();
+		if ($model instanceof EEM_Soft_Delete_Base) {
+			$result = $model->delete_permanently_by_ID($this->ID());
+		} else {
 			$result = $this->delete();
 		}
 		return $result ? true : false;
@@ -1021,17 +1021,17 @@ 
 	 * @throws \EE_Error
 	 * @return int , 1 on a successful update, the ID of the new entry on insert; 0 on failure
 	 */
-	public function save($set_cols_n_values=array()) {
+	public function save($set_cols_n_values = array()) {
 		/**
 		 * Filters the fields we're about to save on the model object
 		 *
 		 * @param array $set_cols_n_values
 		 * @param EE_Base_Class $model_object
 		 */
-		$set_cols_n_values = apply_filters( 'FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this  );
+		$set_cols_n_values = apply_filters('FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this);
 		//set attributes as provided in $set_cols_n_values
-		foreach($set_cols_n_values as $column=>$value){
-			$this->set($column,$value);
+		foreach ($set_cols_n_values as $column=>$value) {
+			$this->set($column, $value);
 		}
 		/**
 		 * Saving a model object.
@@ -1039,7 +1039,7 @@ 
 		 * Before we perform a save, this action is fired.
 		 * @param EE_Base_Class $model_object the model object about to be saved.
 		 */
-		do_action( 'AHEE__EE_Base_Class__save__begin', $this );
+		do_action('AHEE__EE_Base_Class__save__begin', $this);
 		//now get current attribute values
 		$save_cols_n_values = $this->_fields;
 		//if the object already has an ID, update it. Otherwise, insert it
@@ -1047,61 +1047,61 @@ 
 		$old_assumption_concerning_value_preparation = $this->get_model()->get_assumption_concerning_values_already_prepared_by_model_object();
 		$this->get_model()->assume_values_already_prepared_by_model_object(true);
 		//does this model have an autoincrement PK?
-		if($this->get_model()->has_primary_key_field()){
-			if($this->get_model()->get_primary_key_field()->is_auto_increment()){
+		if ($this->get_model()->has_primary_key_field()) {
+			if ($this->get_model()->get_primary_key_field()->is_auto_increment()) {
 				//ok check if it's set, if so: update; if not, insert
-				if ( ! empty( $save_cols_n_values[self::_get_primary_key_name( get_class($this) )] ) ){
-					$results = $this->get_model()->update_by_ID ( $save_cols_n_values, $this->ID() );
+				if ( ! empty($save_cols_n_values[self::_get_primary_key_name(get_class($this))])) {
+					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
 				} else {
-					unset($save_cols_n_values[self::_get_primary_key_name( get_class( $this) )]);
-					$results = $this->get_model()->insert( $save_cols_n_values, true);
-					if($results){
+					unset($save_cols_n_values[self::_get_primary_key_name(get_class($this))]);
+					$results = $this->get_model()->insert($save_cols_n_values, true);
+					if ($results) {
 						//if successful, set the primary key
 						//but don't use the normal SET method, because it will check if
 						//an item with the same ID exists in the mapper & db, then
 						//will find it in the db (because we just added it) and THAT object
 						//will get added to the mapper before we can add this one!
 						//but if we just avoid using the SET method, all that headache can be avoided
-						$pk_field_name =self::_get_primary_key_name( get_class($this));
+						$pk_field_name = self::_get_primary_key_name(get_class($this));
 						$this->_fields[$pk_field_name] = $results;
 						$this->_clear_cached_property($pk_field_name);
-						$this->get_model()->add_to_entity_map( $this );
+						$this->get_model()->add_to_entity_map($this);
 						$this->_update_cached_related_model_objs_fks();
 					}
 				}
-			}else{//PK is NOT auto-increment
+			} else {//PK is NOT auto-increment
 				//so check if one like it already exists in the db
-				if( $this->get_model()->exists_by_ID( $this->ID() ) ){
-					if( ! $this->in_entity_map() && WP_DEBUG ){
+				if ($this->get_model()->exists_by_ID($this->ID())) {
+					if ( ! $this->in_entity_map() && WP_DEBUG) {
 						throw new EE_Error(
 							sprintf(
-								__( 'Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso' ),
+								__('Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso'),
 								get_class($this),
-								get_class( $this->get_model() ) . '::instance()->add_to_entity_map()',
-								get_class( $this->get_model() ) . '::instance()->get_one_by_ID()',
+								get_class($this->get_model()).'::instance()->add_to_entity_map()',
+								get_class($this->get_model()).'::instance()->get_one_by_ID()',
 								'<br />'
 							)
 						);
 					}
 					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
-				}else{
+				} else {
 					$results = $this->get_model()->insert($save_cols_n_values);
 					$this->_update_cached_related_model_objs_fks();
 				}
 			}
-		}else{//there is NO primary key
+		} else {//there is NO primary key
 			$already_in_db = false;
-			foreach($this->get_model()->unique_indexes() as $index){
+			foreach ($this->get_model()->unique_indexes() as $index) {
 				$uniqueness_where_params = array_intersect_key($save_cols_n_values, $index->fields());
-				if($this->get_model()->exists(array($uniqueness_where_params))){
+				if ($this->get_model()->exists(array($uniqueness_where_params))) {
 					$already_in_db = true;
 				}
 			}
-			if( $already_in_db ){
-				$combined_pk_fields_n_values = array_intersect_key( $save_cols_n_values, $this->get_model()->get_combined_primary_key_fields() );
-				$results = $this->get_model()->update( $save_cols_n_values,$combined_pk_fields_n_values );
-			}else{
-				$results = $this->get_model()->insert( $save_cols_n_values );
+			if ($already_in_db) {
+				$combined_pk_fields_n_values = array_intersect_key($save_cols_n_values, $this->get_model()->get_combined_primary_key_fields());
+				$results = $this->get_model()->update($save_cols_n_values, $combined_pk_fields_n_values);
+			} else {
+				$results = $this->get_model()->insert($save_cols_n_values);
 			}
 		}
 		//restore the old assumption about values being prepared by the model object
@@ -1114,7 +1114,7 @@ 
 		 * @param boolean|int $results if it were updated, TRUE or FALSE; if it were newly inserted
 		 * the new ID (or 0 if an error occurred and it wasn't updated)
 		 */
-		do_action( 'AHEE__EE_Base_Class__save__end', $this, $results );
+		do_action('AHEE__EE_Base_Class__save__end', $this, $results);
 		return $results;
 	}
 
@@ -1126,13 +1126,13 @@ 
 	 * and we want to let its cached relations with foreign keys to it know about that change. Eg: we've created a transaction but haven't saved it to the db. We also create a registration and don't save it to the DB, but we DO cache it on the transaction. Now, when we save the transaction, the registration's TXN_ID will be automatically updated, whether or not they exist in the DB (if they do, their DB records will be automatically updated)
 	 * @return void
 	 */
-	protected function _update_cached_related_model_objs_fks(){
-		foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ){
-			if( $relation_obj instanceof EE_Has_Many_Relation ){
-				foreach( $this->get_all_from_cache( $relation_name ) as $related_model_obj_in_cache) {
-					$fk_to_this = $related_model_obj_in_cache->get_model()->get_foreign_key_to( $this->get_model()->get_this_model_name() );
-					$related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID() );
-					if( $related_model_obj_in_cache->ID() ){
+	protected function _update_cached_related_model_objs_fks() {
+		foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
+			if ($relation_obj instanceof EE_Has_Many_Relation) {
+				foreach ($this->get_all_from_cache($relation_name) as $related_model_obj_in_cache) {
+					$fk_to_this = $related_model_obj_in_cache->get_model()->get_foreign_key_to($this->get_model()->get_this_model_name());
+					$related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID());
+					if ($related_model_obj_in_cache->ID()) {
 						$related_model_obj_in_cache->save();
 					}
 				}
@@ -1148,21 +1148,21 @@ 
 	 * and this object and properly setup
 	 * @return int ID of new model object on save; 0 on failure+
 	 */
-	public function save_new_cached_related_model_objs(){
+	public function save_new_cached_related_model_objs() {
 		//make sure this has been saved
-		if( ! $this->ID()){
+		if ( ! $this->ID()) {
 			$id = $this->save();
-		}else{
+		} else {
 			$id = $this->ID();
 		}
 		//now save all the NEW cached model objects  (ie they don't exist in the DB)
-		foreach($this->get_model()->relation_settings() as $relationName => $relationObj){
+		foreach ($this->get_model()->relation_settings() as $relationName => $relationObj) {
 
 
-			if($this->_model_relations[$relationName]){
+			if ($this->_model_relations[$relationName]) {
 				//is this a relation where we should expect just ONE related object (ie, EE_Belongs_To_relation)
 				//or MANY related objects (ie, EE_HABTM_Relation or EE_Has_Many_Relation)?
-				if($relationObj instanceof EE_Belongs_To_Relation){
+				if ($relationObj instanceof EE_Belongs_To_Relation) {
 					//add a relation to that relation type (which saves the appropriate thing in the process)
 					//but ONLY if it DOES NOT exist in the DB
 					/* @var $related_model_obj EE_Base_Class */
@@ -1171,8 +1171,8 @@ 
 						$this->_add_relation_to($related_model_obj, $relationName);
 						$related_model_obj->save_new_cached_related_model_objs();
 //					}
-				}else{
-					foreach($this->_model_relations[$relationName] as $related_model_obj){
+				} else {
+					foreach ($this->_model_relations[$relationName] as $related_model_obj) {
 						//add a relation to that relation type (which saves the appropriate thing in the process)
 						//but ONLY if it DOES NOT exist in the DB
 //						if( ! $related_model_obj->ID()){
@@ -1193,8 +1193,8 @@ 
 	 * @return \EEM_Base | \EEM_CPT_Base
 	 */
 	public function get_model() {
-		$modelName = self::_get_model_classname( get_class($this) );
-		return self::_get_model_instance_with_name($modelName, $this->_timezone );
+		$modelName = self::_get_model_classname(get_class($this));
+		return self::_get_model_instance_with_name($modelName, $this->_timezone);
 	}
 
 
@@ -1204,10 +1204,10 @@ 
 	 * @param $classname
 	 * @return mixed bool|EE_Base_Class|EEM_CPT_Base
 	 */
-	protected static function _get_object_from_entity_mapper($props_n_values, $classname){
+	protected static function _get_object_from_entity_mapper($props_n_values, $classname) {
 		//TODO: will not work for Term_Relationships because they have no PK!
-		$primary_id_ref = self::_get_primary_key_name( $classname );
-		if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) {
+		$primary_id_ref = self::_get_primary_key_name($classname);
+		if (array_key_exists($primary_id_ref, $props_n_values) && ! empty($props_n_values[$primary_id_ref])) {
 			$id = $props_n_values[$primary_id_ref];
 			return self::_get_model($classname)->get_from_entity_map($id);
 		}
@@ -1224,24 +1224,24 @@ 
 	 * @param null    $timezone
 	 * @return mixed (EE_Base_Class|bool)
 	 */
-	protected static function _check_for_object( $props_n_values, $classname, $timezone = NULL ) {
-		if( self::_get_model( $classname )->has_primary_key_field()){
-			$primary_id_ref = self::_get_primary_key_name( $classname );
+	protected static function _check_for_object($props_n_values, $classname, $timezone = NULL) {
+		if (self::_get_model($classname)->has_primary_key_field()) {
+			$primary_id_ref = self::_get_primary_key_name($classname);
 
-			if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) {
-				$existing = self::_get_model( $classname, $timezone )->get_one_by_ID( $props_n_values[$primary_id_ref] );
-			}else{
+			if (array_key_exists($primary_id_ref, $props_n_values) && ! empty($props_n_values[$primary_id_ref])) {
+				$existing = self::_get_model($classname, $timezone)->get_one_by_ID($props_n_values[$primary_id_ref]);
+			} else {
 				$existing = null;
 			}
-		}elseif( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields(  $props_n_values ) ){
+		}elseif (self::_get_model($classname, $timezone)->has_all_combined_primary_key_fields($props_n_values)) {
 			//no primary key on this model, but there's still a matching item in the DB
-				$existing = self::_get_model($classname, $timezone)->get_one_by_ID( self::_get_model($classname, $timezone)->get_index_primary_key_string( $props_n_values ) );
-		}else{
+				$existing = self::_get_model($classname, $timezone)->get_one_by_ID(self::_get_model($classname, $timezone)->get_index_primary_key_string($props_n_values));
+		} else {
 			$existing = null;
 		}
-		if ( $existing ) {
-			foreach ( $props_n_values as $property => $field_value ) {
-				$existing->set( $property, $field_value );
+		if ($existing) {
+			foreach ($props_n_values as $property => $field_value) {
+				$existing->set($property, $field_value);
 			}
 			return $existing;
 		} else {
@@ -1259,13 +1259,13 @@ 
 	 * @throws EE_Error
 	 * @return EEM_Base
 	 */
-	protected static function  _get_model( $classname, $timezone = NULL ){
+	protected static function  _get_model($classname, $timezone = NULL) {
 		//find model for this class
-		if( ! $classname ){
-			throw new EE_Error(sprintf(__("What were you thinking calling _get_model(%s)?? You need to specify the class name", "event_espresso"),$classname));
+		if ( ! $classname) {
+			throw new EE_Error(sprintf(__("What were you thinking calling _get_model(%s)?? You need to specify the class name", "event_espresso"), $classname));
 		}
-		$modelName=self::_get_model_classname($classname);
-		return self::_get_model_instance_with_name($modelName, $timezone );
+		$modelName = self::_get_model_classname($classname);
+		return self::_get_model_instance_with_name($modelName, $timezone);
 	}
 
 
@@ -1276,10 +1276,10 @@ 
 	 * @param null   $timezone
 	 * @return EEM_Base
 	 */
-	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){
-		$model_classname = str_replace( 'EEM_', '', $model_classname );
-		$model = EE_Registry::instance()->load_model( $model_classname );
-		$model->set_timezone( $timezone );
+	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL) {
+		$model_classname = str_replace('EEM_', '', $model_classname);
+		$model = EE_Registry::instance()->load_model($model_classname);
+		$model->set_timezone($timezone);
 		return $model;
 	}
 
@@ -1291,10 +1291,10 @@ 
 	 * @param null $model_name
 	 * @return string like EEM_Attendee
 	 */
-	private static function _get_model_classname( $model_name = null){
-		if(strpos($model_name,"EE_")===0){
-			$model_classname=str_replace("EE_","EEM_",$model_name);
-		}else{
+	private static function _get_model_classname($model_name = null) {
+		if (strpos($model_name, "EE_") === 0) {
+			$model_classname = str_replace("EE_", "EEM_", $model_name);
+		} else {
 			$model_classname = "EEM_".$model_name;
 		}
 		return $model_classname;
@@ -1308,11 +1308,11 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	protected static function _get_primary_key_name( $classname = NULL ){
-		if( ! $classname){
-			throw new EE_Error(sprintf(__("What were you thinking calling _get_primary_key_name(%s)", "event_espresso"),$classname));
+	protected static function _get_primary_key_name($classname = NULL) {
+		if ( ! $classname) {
+			throw new EE_Error(sprintf(__("What were you thinking calling _get_primary_key_name(%s)", "event_espresso"), $classname));
 		}
-		return self::_get_model( $classname )->get_primary_key_field()->get_name();
+		return self::_get_model($classname)->get_primary_key_field()->get_name();
 	}
 
 
@@ -1324,12 +1324,12 @@ 
 	 * Usually defaults for integer primary keys are 0; string primary keys are usually NULL).
 	 * @return mixed, if the primary key is of type INT it'll be an int. Otherwise it could be a string
 	 */
-	public function ID(){
+	public function ID() {
 		//now that we know the name of the variable, use a variable variable to get its value and return its
-		if( $this->get_model()->has_primary_key_field() ) {
-			return $this->_fields[self::_get_primary_key_name( get_class($this) )];
-		}else{
-			return $this->get_model()->get_index_primary_key_string( $this->_fields );
+		if ($this->get_model()->has_primary_key_field()) {
+			return $this->_fields[self::_get_primary_key_name(get_class($this))];
+		} else {
+			return $this->get_model()->get_index_primary_key_string($this->_fields);
 		}
 	}
 
@@ -1347,24 +1347,24 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class the object the relation was added to
 	 */
-	public function _add_relation_to( $otherObjectModelObjectOrID,$relationName, $where_query = array(), $cache_id = NULL ){
+	public function _add_relation_to($otherObjectModelObjectOrID, $relationName, $where_query = array(), $cache_id = NULL) {
 		//if this thing exists in the DB, save the relation to the DB
-		if( $this->ID() ){
-			$otherObject = $this->get_model()->add_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $where_query );
+		if ($this->ID()) {
+			$otherObject = $this->get_model()->add_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $where_query);
 			//clear cache so future get_many_related and get_first_related() return new results.
-			$this->clear_cache( $relationName, $otherObject, TRUE );
+			$this->clear_cache($relationName, $otherObject, TRUE);
 		} else {
 			//this thing doesn't exist in the DB,  so just cache it
-			if( ! $otherObjectModelObjectOrID instanceof EE_Base_Class){
-				throw new EE_Error( sprintf(
-					__( 'Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso' ),
+			if ( ! $otherObjectModelObjectOrID instanceof EE_Base_Class) {
+				throw new EE_Error(sprintf(
+					__('Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso'),
 					$otherObjectModelObjectOrID,
-					get_class( $this )
+					get_class($this)
 				));
 			} else {
 				$otherObject = $otherObjectModelObjectOrID;
 			}
-			$this->cache( $relationName, $otherObjectModelObjectOrID, $cache_id );
+			$this->cache($relationName, $otherObjectModelObjectOrID, $cache_id);
 		}
 
 
@@ -1382,12 +1382,12 @@ 
 	 * @param array  $where_query You can optionally include an array of key=>value pairs that allow you to further constrict the relation to being added.  However, keep in mind that the columns (keys) given must match a column on the JOIN table and currently only the HABTM models accept these additional conditions.  Also remember that if an exact match isn't found for these extra cols/val pairs, then a NEW row is created in the join table.
 	 * @return EE_Base_Class the relation was removed from
 	 */
-	public function _remove_relation_to($otherObjectModelObjectOrID,$relationName, $where_query = array() ){
-		if($this->ID()){//if this exists in the DB, save the relation change to the DB too
-			$otherObject = $this->get_model()->remove_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $where_query );
+	public function _remove_relation_to($otherObjectModelObjectOrID, $relationName, $where_query = array()) {
+		if ($this->ID()) {//if this exists in the DB, save the relation change to the DB too
+			$otherObject = $this->get_model()->remove_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $where_query);
 			$this->clear_cache($relationName, $otherObject);
-		}else{//this doesn't exist in the DB, just remove it from the cache
-			$otherObject = $this->clear_cache($relationName,$otherObjectModelObjectOrID);
+		} else {//this doesn't exist in the DB, just remove it from the cache
+			$otherObject = $this->clear_cache($relationName, $otherObjectModelObjectOrID);
 		}
 		return $otherObject;
 	}
@@ -1398,12 +1398,12 @@ 
 	 * @param array $where_query_params like EEM_Base::get_all's $query_params[0] (where conditions)
 	 * @return EE_Base_Class
 	 */
-	public function _remove_relations($relationName,$where_query_params = array()){
-		if($this->ID()){//if this exists in the DB, save the relation change to the DB too
-			$otherObjects = $this->get_model()->remove_relations($this, $relationName, $where_query_params );
-			$this->clear_cache($relationName,null,true);
-		}else{//this doesn't exist in the DB, just remove it from the cache
-			$otherObjects = $this->clear_cache($relationName,null,true);
+	public function _remove_relations($relationName, $where_query_params = array()) {
+		if ($this->ID()) {//if this exists in the DB, save the relation change to the DB too
+			$otherObjects = $this->get_model()->remove_relations($this, $relationName, $where_query_params);
+			$this->clear_cache($relationName, null, true);
+		} else {//this doesn't exist in the DB, just remove it from the cache
+			$otherObjects = $this->clear_cache($relationName, null, true);
 		}
 		return $otherObjects;
 	}
@@ -1419,26 +1419,26 @@ 
 	 * @param array  $query_params  like EEM_Base::get_all
 	 * @return EE_Base_Class[]
 	 */
-	public function get_many_related($relationName,$query_params = array()){
-		if($this->ID()){//this exists in the DB, so get the related things from either the cache or the DB
+	public function get_many_related($relationName, $query_params = array()) {
+		if ($this->ID()) {//this exists in the DB, so get the related things from either the cache or the DB
 			//if there are query parameters, forget about caching the related model objects.
-			if( $query_params ){
+			if ($query_params) {
 				$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
-			}else{
+			} else {
 				//did we already cache the result of this query?
 				$cached_results = $this->get_all_from_cache($relationName);
-				if ( ! $cached_results ){
+				if ( ! $cached_results) {
 					$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
 					//if no query parameters were passed, then we got all the related model objects
 					//for that relation. We can cache them then.
-					foreach($related_model_objects as $related_model_object){
+					foreach ($related_model_objects as $related_model_object) {
 						$this->cache($relationName, $related_model_object);
 					}
-				}else{
+				} else {
 					$related_model_objects = $cached_results;
 				}
 			}
-		}else{//this doesn't exist itn eh DB, so just get the related things from the cache
+		} else {//this doesn't exist itn eh DB, so just get the related things from the cache
 			$related_model_objects = $this->get_all_from_cache($relationName);
 		}
 		return $related_model_objects;
@@ -1455,8 +1455,8 @@ 
 	 * @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
 	 */
-	public function count_related($relation_name, $query_params =array(),$field_to_count = NULL, $distinct = FALSE){
-		return $this->get_model()->count_related($this,$relation_name,$query_params,$field_to_count,$distinct);
+	public function count_related($relation_name, $query_params = array(), $field_to_count = NULL, $distinct = FALSE) {
+		return $this->get_model()->count_related($this, $relation_name, $query_params, $field_to_count, $distinct);
 	}
 
 
@@ -1470,7 +1470,7 @@ 
 	 * 						By default, uses primary key (which doesn't make much sense, so you should probably change it)
 	 * @return int
 	 */
-	public function sum_related($relation_name, $query_params = array(), $field_to_sum = null){
+	public function sum_related($relation_name, $query_params = array(), $field_to_sum = null) {
 		return $this->get_model()->sum_related($this, $relation_name, $query_params, $field_to_sum);
 	}
 
@@ -1482,34 +1482,34 @@ 
 	 * @param array  $query_params  like EEM_Base::get_all
 	 * @return EE_Base_Class (not an array, a single object)
 	 */
-	public function get_first_related($relationName,$query_params = array()){
-		if($this->ID()){//this exists in the DB, get from the cache OR the DB
+	public function get_first_related($relationName, $query_params = array()) {
+		if ($this->ID()) {//this exists in the DB, get from the cache OR the DB
 
 			//if they've provided some query parameters, don't bother trying to cache the result
 			//also make sure we're not caching the result of get_first_related
 			//on a relation which should have an array of objects (because the cache might have an array of objects)
-			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
-				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
-			}else{
+			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) {
+				$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
+			} else {
 				//first, check if we've already cached the result of this query
 				$cached_result = $this->get_one_from_cache($relationName);
-				if ( ! $cached_result ){
+				if ( ! $cached_result) {
 
 					$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
-					$this->cache($relationName,$related_model_object);
-				}else{
+					$this->cache($relationName, $related_model_object);
+				} else {
 					$related_model_object = $cached_result;
 				}
 			}
-		}else{
+		} else {
 			//this doesn't exist in the Db, but maybe the relation is of type belongs to, and so the related thing might
-			if( $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
-				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
-			}else{
+			if ($this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) {
+				$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
+			} else {
 				$related_model_object = null;
 			}
 			//this doesn't exist in the DB and apparently the thing it belongs to doesn't either, just get what's cached on this object
-			if( ! $related_model_object){
+			if ( ! $related_model_object) {
 				$related_model_object = $this->get_one_from_cache($relationName);
 			}
 
@@ -1528,12 +1528,12 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int how many deleted
 	 */
-	public function delete_related($relationName,$query_params = array()){
-		if($this->ID()){
-			$count =  $this->get_model()->delete_related($this, $relationName, $query_params);
-		}else{
+	public function delete_related($relationName, $query_params = array()) {
+		if ($this->ID()) {
+			$count = $this->get_model()->delete_related($this, $relationName, $query_params);
+		} else {
 			$count = count($this->get_all_from_cache($relationName));
-			$this->clear_cache($relationName,NULL,TRUE);
+			$this->clear_cache($relationName, NULL, TRUE);
 		}
 		return $count;
 	}
@@ -1548,13 +1548,13 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int how many deleted (including those soft deleted)
 	 */
-	public function delete_related_permanently($relationName,$query_params = array()){
-		if($this->ID()){
-			$count =  $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
-		}else{
+	public function delete_related_permanently($relationName, $query_params = array()) {
+		if ($this->ID()) {
+			$count = $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
+		} else {
 			$count = count($this->get_all_from_cache($relationName));
 		}
-		$this->clear_cache($relationName,NULL,TRUE);
+		$this->clear_cache($relationName, NULL, TRUE);
 		return $count;
 	}
 
@@ -1570,7 +1570,7 @@ 
 	 * @param  string $field_name property to check
 	 * @return bool            				  TRUE if existing,FALSE if not.
 	 */
-	public function is_set( $field_name ) {
+	public function is_set($field_name) {
 		return isset($this->_fields[$field_name]);
 	}
 
@@ -1582,12 +1582,12 @@ 
 	 * @throws EE_Error
 	 * @return bool                              TRUE if existing, throw EE_Error if not.
 	 */
-	protected function _property_exists( $properties ) {
+	protected function _property_exists($properties) {
 
-		foreach ( (array) $properties as $property_name ) {
+		foreach ((array) $properties as $property_name) {
 			//first make sure this property exists
-			if ( ! $this->_fields[ $property_name ] )
-				throw new EE_Error( sprintf( __('Trying to retrieve a non-existent property (%s).  Double check the spelling please', 'event_espresso'), $property_name ) );
+			if ( ! $this->_fields[$property_name])
+				throw new EE_Error(sprintf(__('Trying to retrieve a non-existent property (%s).  Double check the spelling please', 'event_espresso'), $property_name));
 		}
 
 		return TRUE;
@@ -1604,7 +1604,7 @@ 
 		$fields = $this->get_model()->field_settings(FALSE);
 		$properties = array();
 		//remove prepended underscore
-		foreach ( $fields as $field_name => $settings ) {
+		foreach ($fields as $field_name => $settings) {
 			$properties[$field_name] = $this->get($field_name);
 		}
 		return $properties;
@@ -1634,14 +1634,14 @@ 
 	 * @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)){
-			throw new EE_Error(sprintf(__("Method %s on class %s does not exist! You can create one with the following code in functions.php or in a plugin: add_filter('%s','my_callback',10,3);function my_callback(\$previousReturnValue,EE_Base_Class \$object, \$argsArray){/*function body*/return \$whatever;}","event_espresso"),
-										$methodName,$className,$tagName));
+	public function __call($methodName, $args) {
+		$className = get_class($this);
+		$tagName = "FHEE__{$className}__{$methodName}";
+		if ( ! has_filter($tagName)) {
+			throw new EE_Error(sprintf(__("Method %s on class %s does not exist! You can create one with the following code in functions.php or in a plugin: add_filter('%s','my_callback',10,3);function my_callback(\$previousReturnValue,EE_Base_Class \$object, \$argsArray){/*function body*/return \$whatever;}", "event_espresso"),
+										$methodName, $className, $tagName));
 		}
-		return apply_filters($tagName,null,$this,$args);
+		return apply_filters($tagName, null, $this, $args);
 	}
 
 
@@ -1656,22 +1656,22 @@ 
 	 * @return int records updated (or BOOLEAN if we actually ended up inserting the extra meta row)
 	 * NOTE: if the values haven't changed, returns 0
 	 */
-	public function update_extra_meta($meta_key,$meta_value,$previous_value = NULL){
-		$query_params  = array(array(
+	public function update_extra_meta($meta_key, $meta_value, $previous_value = NULL) {
+		$query_params = array(array(
 			'EXM_key'=>$meta_key,
 			'OBJ_ID'=>$this->ID(),
 			'EXM_type'=>$this->get_model()->get_this_model_name()));
-		if($previous_value !== NULL){
+		if ($previous_value !== NULL) {
 			$query_params[0]['EXM_value'] = $meta_value;
 		}
 		$existing_rows_like_that = EEM_Extra_Meta::instance()->get_all($query_params);
-		if( ! $existing_rows_like_that){
+		if ( ! $existing_rows_like_that) {
 			return $this->add_extra_meta($meta_key, $meta_value);
-		}else{
-			foreach( $existing_rows_like_that as $existing_row){
-				$existing_row->save( array( 'EXM_value' => $meta_value ) );
+		} else {
+			foreach ($existing_rows_like_that as $existing_row) {
+				$existing_row->save(array('EXM_value' => $meta_value));
 			}
-			return count( $existing_rows_like_that );
+			return count($existing_rows_like_that);
 		}
 	}
 
@@ -1684,10 +1684,10 @@ 
 	 * @param boolean $unique
 	 * @return boolean
 	 */
-	public function add_extra_meta($meta_key,$meta_value,$unique = false){
-		if($unique){
-			$existing_extra_meta = EEM_Extra_Meta::instance()->get_one(array(array('EXM_key'=>$meta_key,'OBJ_ID'=>$this->ID(),'EXM_type'=>$this->_get_model_classname(get_class($this)))));
-			if($existing_extra_meta){
+	public function add_extra_meta($meta_key, $meta_value, $unique = false) {
+		if ($unique) {
+			$existing_extra_meta = EEM_Extra_Meta::instance()->get_one(array(array('EXM_key'=>$meta_key, 'OBJ_ID'=>$this->ID(), 'EXM_type'=>$this->_get_model_classname(get_class($this)))));
+			if ($existing_extra_meta) {
 				return false;
 			}
 		}
@@ -1707,12 +1707,12 @@ 
 	 * @param string $meta_value
 	 * @return int number of extra meta rows deleted
 	 */
-	public function delete_extra_meta($meta_key,$meta_value = NULL){
-		$query_params  = array(array(
+	public function delete_extra_meta($meta_key, $meta_value = NULL) {
+		$query_params = array(array(
 			'EXM_key'=>$meta_key,
 			'OBJ_ID'=>$this->ID(),
 			'EXM_type'=>$this->get_model()->get_this_model_name()));
-		if($meta_value !== NULL){
+		if ($meta_value !== NULL) {
 			$query_params[0]['EXM_value'] = $meta_value;
 		}
 		$count_deleted = EEM_Extra_Meta::instance()->delete($query_params);
@@ -1728,25 +1728,25 @@ 
 	 * @param mixed $default if we don't find anything, what should we return?
 	 * @return mixed single value if $single; array if ! $single
 	 */
-	public function get_extra_meta($meta_key,$single = FALSE,$default = NULL){
-		if($single){
-			$result = $this->get_first_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
-			if ( $result instanceof EE_Extra_Meta ){
+	public function get_extra_meta($meta_key, $single = FALSE, $default = NULL) {
+		if ($single) {
+			$result = $this->get_first_related('Extra_Meta', array(array('EXM_key'=>$meta_key)));
+			if ($result instanceof EE_Extra_Meta) {
 				return $result->value();
-			}else{
+			} else {
 				return $default;
 			}
-		}else{
-			$results =  $this->get_many_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
-			if($results){
+		} else {
+			$results = $this->get_many_related('Extra_Meta', array(array('EXM_key'=>$meta_key)));
+			if ($results) {
 				$values = array();
-				foreach($results as $result){
-					if ( $result instanceof EE_Extra_Meta ){
+				foreach ($results as $result) {
+					if ($result instanceof EE_Extra_Meta) {
 						$values[$result->ID()] = $result->value();
 					}
 				}
 				return $values;
-			}else{
+			} else {
 				return $default;
 			}
 		}
@@ -1763,17 +1763,17 @@ 
 	 * @param boolean $one_of_each_key
 	 * @return array
 	 */
-	public function all_extra_meta_array($one_of_each_key = true){
+	public function all_extra_meta_array($one_of_each_key = true) {
 		$return_array = array();
-		if($one_of_each_key){
+		if ($one_of_each_key) {
 			$extra_meta_objs = $this->get_many_related('Extra_Meta', array('group_by'=>'EXM_key'));
-			foreach($extra_meta_objs as $extra_meta_obj){
+			foreach ($extra_meta_objs as $extra_meta_obj) {
 				$return_array[$extra_meta_obj->key()] = $extra_meta_obj->value();
 			}
-		}else{
+		} else {
 			$extra_meta_objs = $this->get_many_related('Extra_Meta');
-			foreach($extra_meta_objs as $extra_meta_obj){
-				if( ! isset($return_array[$extra_meta_obj->key()])){
+			foreach ($extra_meta_objs as $extra_meta_obj) {
+				if ( ! isset($return_array[$extra_meta_obj->key()])) {
 					$return_array[$extra_meta_obj->key()] = array();
 				}
 				$return_array[$extra_meta_obj->key()][$extra_meta_obj->ID()] = $extra_meta_obj->value();
@@ -1785,19 +1785,19 @@ 
 	 * Gets a pretty nice displayable nice for this model object. Often overriden
 	 * @return string
 	 */
-	public function name(){
+	public function name() {
 		//find a field that's not a text field
 		$field_we_can_use = $this->get_model()->get_a_field_of_type('EE_Text_Field_Base');
-		if($field_we_can_use){
+		if ($field_we_can_use) {
 			return $this->get($field_we_can_use->get_name());
-		}else{
+		} else {
 			$first_few_properties = $this->model_field_array();
-			$first_few_properties = array_slice($first_few_properties,0,3);
+			$first_few_properties = array_slice($first_few_properties, 0, 3);
 			$name_parts = array();
-			foreach( $first_few_properties as $name=> $value ){
+			foreach ($first_few_properties as $name=> $value) {
 				$name_parts[] = "$name:$value";
 			}
-			return implode(",",$name_parts);
+			return implode(",", $name_parts);
 		}
 	}
 
@@ -1806,11 +1806,11 @@ 
 	 * Checks if this model object has been proven to already be in the entity map
 	 * @return boolean
 	 */
-	public function in_entity_map(){
-		if( $this->ID() && $this->get_model()->get_from_entity_map( $this->ID() ) === $this ) {
+	public function in_entity_map() {
+		if ($this->ID() && $this->get_model()->get_from_entity_map($this->ID()) === $this) {
 			//well, if we looked, did we find it in the entity map?
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -1821,21 +1821,21 @@ 
 	 * @throws EE_Error if this model object isn't in the entity mapper (because then you should
 	 * just use what's in the entity mapper and refresh it) and WP_DEBUG is TRUE
 	 */
-	public function refresh_from_db(){
-		if( $this->ID() && $this->in_entity_map() ){
-			$this->get_model()->refresh_entity_map_from_db( $this->ID() );
-		}else{
+	public function refresh_from_db() {
+		if ($this->ID() && $this->in_entity_map()) {
+			$this->get_model()->refresh_entity_map_from_db($this->ID());
+		} else {
 			//if it doesn't have ID, you shouldn't be asking to refresh it from teh database (because its not in the database)
 			//if it has an ID but it's not in the map, and you're asking me to refresh it
 			//that's kinda dangerous. You should just use what's in the entity map, or add this to the entity map if there's
 			//absolutely nothing in it for this ID
-			if( WP_DEBUG ) {
+			if (WP_DEBUG) {
 				throw new EE_Error(
 					sprintf(
-						__( 'Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso' ),
+						__('Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso'),
 						$this->ID(),
-						get_class( $this->get_model() ) . '::instance()->add_to_entity_map()',
-						get_class( $this->get_model() ) . '::instance()->refresh_entity_map()'
+						get_class($this->get_model()).'::instance()->add_to_entity_map()',
+						get_class($this->get_model()).'::instance()->refresh_entity_map()'
 					)
 				);
 			}

core/db_models/relations/EE_HABTM_Relation.php

Spacing +30 added lines, -30 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
-class EE_HABTM_Relation extends EE_Model_Relation_Base{
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
+class EE_HABTM_Relation extends EE_Model_Relation_Base {
 	/**
 	 * Model whicih defines the relation between two other models. Eg, the EE_Event_Question_Group model,
 	 * which joins EE_Event and EE_Question_Group
@@ -18,7 +18,7 @@ 
 	 * @param boolean $block_deletes for this type of relation, we block by default for now. if there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param type $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	function __construct($joining_model_name,$block_deletes = true, $blocking_delete_error_message =''){
+	function __construct($joining_model_name, $block_deletes = true, $blocking_delete_error_message = '') {
 		$this->_joining_model_name = $joining_model_name;
 		parent::__construct($block_deletes, $blocking_delete_error_message);
 	}
@@ -26,7 +26,7 @@ 
 	 * Gets the joining model's object
 	 * @return EEM_Base
 	 */
-	function get_join_model(){
+	function get_join_model() {
 		return $this->_get_model($this->_joining_model_name);
 	}
 	/**
@@ -34,21 +34,21 @@ 
 	 * @param string $model_relation_chain like 'Event.Event_Venue.Venue'
 	 * @return string of SQL
 	 */
-	function get_join_to_intermediate_model_statement($model_relation_chain){
+	function get_join_to_intermediate_model_statement($model_relation_chain) {
 		//create sql like
 		//LEFT JOIN join_table AS join_table_alias ON this_table_alias.this_table_pk = join_table_alias.join_table_fk_to_this
 		//LEFT JOIN other_table AS other_table_alias ON join_table_alias.join_table_fk_to_other = other_table_alias.other_table_pk
 		//remember the model relation chain to the JOIN model, because we'll
 		//need it for get_join_statement()
 		$this->_model_relation_chain_to_join_model = $model_relation_chain;
-		$this_table_pk_field = $this->get_this_model()->get_primary_key_field();//get_foreign_key_to($this->get_other_model()->get_this_model_name());
+		$this_table_pk_field = $this->get_this_model()->get_primary_key_field(); //get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		$join_table_fk_field_to_this_table = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_pk_field->get_table_alias();
+		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_pk_field->get_table_alias();
 
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
 		$join_table = $this->get_join_model()->get_table_for_alias($join_table_alias);
 		//phew! ok, we have all the info we need, now we can create the SQL join string
-		$SQL = $this->_left_join($join_table, $join_table_alias, $join_table_fk_field_to_this_table->get_table_column(), $this_table_alias, $this_table_pk_field->get_table_column()) . $this->get_join_model()->_construct_internal_join_to_table_with_alias($join_table_alias);
+		$SQL = $this->_left_join($join_table, $join_table_alias, $join_table_fk_field_to_this_table->get_table_column(), $this_table_alias, $this_table_pk_field->get_table_column()).$this->get_join_model()->_construct_internal_join_to_table_with_alias($join_table_alias);
 
 		return $SQL;
 	}
@@ -60,18 +60,18 @@ 
 	 * @param string $model_relation_chain like 'Event.Event_Venue.Venue'
 	 * @return string of SQL
 	 */
-	function get_join_statement($model_relation_chain){
-		if( $this->_model_relation_chain_to_join_model === NULL ){
-			throw new EE_Error( sprintf( __( 'When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso' )));
+	function get_join_statement($model_relation_chain) {
+		if ($this->_model_relation_chain_to_join_model === NULL) {
+			throw new EE_Error(sprintf(__('When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso')));
 		}
 		$join_table_fk_field_to_this_table = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
 		$join_table_fk_field_to_other_table = $this->get_join_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_pk_field->get_table_alias();
+		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_pk_field->get_table_alias();
 		$other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
 
-		$SQL = $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $join_table_alias, $join_table_fk_field_to_other_table->get_table_column()) . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
+		$SQL = $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $join_table_alias, $join_table_fk_field_to_other_table->get_table_column()).$this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
 		return $SQL;
 	}
 
@@ -84,36 +84,36 @@ 
 	 * @param array             $where_query col=>val pairs that are used as extra conditions for checking existing values and for setting new rows if no exact matches.
 	 * @return EE_Base_Class
 	 */
-	 function add_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array() ){
+	 function add_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//check if such a relationship already exists
 		 $join_model_fk_to_this_model = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
 		 $join_model_fk_to_other_model = $this->get_join_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 
-		 $cols_n_values =  array(
+		 $cols_n_values = array(
 				 $join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
 				 $join_model_fk_to_other_model->get_name() => $other_model_obj->ID());
 
 		 //if $where_query exists lets add them to the query_params.
-		 if ( !empty( $where_query ) ) {
+		 if ( ! empty($where_query)) {
 		 	//make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
 		 	//make sure we strip THIS models name from the query param
-		 	foreach ( $where_query as $query_param => $val ) {
-				$query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
+		 	foreach ($where_query as $query_param => $val) {
+				$query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
 				$parsed_query[$query_param] = $val;
 			}
-		 	$cols_n_values = array_merge( $cols_n_values, $parsed_query );
+		 	$cols_n_values = array_merge($cols_n_values, $parsed_query);
 		 }
 
-		 $query_params = array( $cols_n_values );
+		 $query_params = array($cols_n_values);
 
 
 		 $existing_entry_in_join_table = $this->get_join_model()->get_one($query_params);
 		//if there is already an entry in the join table, indicating a relationship, we're done
 		 //again, if you want more sophisticated logic or insertions (handling more columns than just 2 foreign keys to
 		 //the other tables, use the joining model directly!
-		 if( ! $existing_entry_in_join_table ){
+		 if ( ! $existing_entry_in_join_table) {
 			$this->get_join_model()->insert($cols_n_values);
 		}
 		return $other_model_obj;
@@ -125,29 +125,29 @@ 
 	 * * @param array           $where_query col=>val pairs that are used as extra conditions for checking existing values and for removing existing rows if exact matches exist.
 	 * @return EE_Base_Class
 	 */
-	 function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array() ){
+	 function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
 		  $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//check if such a relationship already exists
 		 $join_model_fk_to_this_model = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
 		 $join_model_fk_to_other_model = $this->get_join_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 
-		 $cols_n_values =  array(
+		 $cols_n_values = array(
 				 $join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
 				 $join_model_fk_to_other_model->get_name() => $other_model_obj->ID());
 
 		//if $where_query exists lets add them to the query_params.
-		 if ( !empty( $where_query ) ) {
+		 if ( ! empty($where_query)) {
 		 	//make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
 		 	//make sure we strip THIS models name from the query param
-		 	foreach ( $where_query as $query_param => $val ) {
-				$query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
+		 	foreach ($where_query as $query_param => $val) {
+				$query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
 				$parsed_query[$query_param] = $val;
 			}
-		 	$cols_n_values = array_merge( $cols_n_values, $parsed_query );
+		 	$cols_n_values = array_merge($cols_n_values, $parsed_query);
 		 }
 
-		 $existing_entry_in_join_table = $this->get_join_model()->delete( array($cols_n_values) );
+		 $existing_entry_in_join_table = $this->get_join_model()->delete(array($cols_n_values));
 		return $other_model_obj;
 	 }
 }

core/db_models/relations/EE_Has_Many_Any_Relation.php

Spacing +8 added lines, -8 removed lines

@@ -7,16 +7,16 @@ 
  * ID 34 or Registration with ID 34? The EE_Any_Foreign_Model_name_Field specifies which of the two). 
  * 
  */
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
-class EE_Has_Many_Any_Relation extends EE_Has_Many_Relation{	
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
+class EE_Has_Many_Any_Relation extends EE_Has_Many_Relation {	
 	
-	function get_join_statement($model_relation_chain){
+	function get_join_statement($model_relation_chain) {
 		//create the sql string like
 		// LEFT JOIN other_table AS table_alias ON this_table_alias.pk = other_table_alias.fk extra_join_conditions
 		$this_table_pk_field = $this->get_this_model()->get_primary_key_field();
 		$other_table_fk_field = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		$pk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_pk_field->get_table_alias();
-		$fk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_fk_field->get_table_alias();
+		$pk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_pk_field->get_table_alias();
+		$fk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_fk_field->get_table_alias();
 		$fk_table = $this->get_other_model()->get_table_for_alias($fk_table_alias);
 		$field_with_model_name = $this->get_other_model()->get_field_containing_related_model_name();
 		
@@ -34,7 +34,7 @@ 
 	 * @param EE_Base_Class/int $other_obj_or_id
 	 * @return EE_Base_Class
 	 */
-	 function add_relation_to($this_obj_or_id, $other_obj_or_id ){
+	 function add_relation_to($this_obj_or_id, $other_obj_or_id) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		 
@@ -53,12 +53,12 @@ 
 	 * @param EE_Base_Class/int $other_obj_or_id
 	 * @return EE_Base_Class
 	 */
-	 function remove_relation_to($this_obj_or_id, $other_obj_or_id){
+	 function remove_relation_to($this_obj_or_id, $other_obj_or_id) {
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		 //find the field on th eother model which is a foreign key to this model
 		 $fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
 		 //set that field on the other model to this model's ID
-		 $other_model_obj->set($fk_field_on_other_model->get_name(),null, true);
+		 $other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
 		 $other_model_obj->set($this->get_other_model()->get_field_containing_related_model_name()->get_name(), null, true);
 		 $other_model_obj->save();
 		 return $other_model_obj;

core/libraries/form_sections/base/EE_Form_Section_Proper.form.php

Braces +6 added lines, -6 removed lines

@@ -209,7 +209,7 @@ 
 			if(isset($default_data[$subsection_name])){
 				if($subsection instanceof EE_Form_Input_Base){
 					$subsection->set_default($default_data[$subsection_name]);
-				}elseif($subsection instanceof EE_Form_Section_Proper){
+				} elseif($subsection instanceof EE_Form_Section_Proper){
 					$subsection->populate_defaults($default_data[$subsection_name]);
 				}
 			}
@@ -440,7 +440,7 @@ 
 		foreach($this->subsections() as $subsection){
 			if( $subsection instanceof EE_Form_Input_Base ){
 				$inputs[ $subsection->html_name() ] = $subsection;
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
+			} elseif($subsection instanceof EE_Form_Section_Proper ){
 				$inputs += $subsection->inputs_in_subsections();
 			}
 		}
@@ -548,7 +548,7 @@ 
 		foreach($this->get_validatable_subsections() as $subsection){
 			try{
 				$subsection->_normalize($req_data);
-			}catch( EE_Validation_Error $e ){
+			} catch( EE_Validation_Error $e ){
 				$subsection->add_validation_error( $e );
 			}
 		}
@@ -767,7 +767,7 @@ 
 			}
 			$subsections_after = array_diff_key($this->_subsections, $subsections_before);
 			$this->_subsections = array_merge($subsections_before,$subsections,$subsections_after);
-		}else{
+		} else{
 			//don't use array_merge because keys might be numeric and we want to preserve their keys
 			foreach( $subsections as $key => $subsection ){
 				$this->_subsections[ $key ] = $subsection;
@@ -840,7 +840,7 @@ 
 	public function html_name_prefix(){
 		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
 			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
-		}else{
+		} else{
 			return $this->name();
 		}
 	}
@@ -892,7 +892,7 @@ 
 				if( $subsection->form_data_present_in( $req_data ) ) {
 					return TRUE;
 				}
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
+			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
 				if( $subsection->form_data_present_in( $req_data ) ) {
 					return TRUE;
 				}

Spacing +150 added lines, -150 removed lines

@@ -7,7 +7,7 @@ 
  * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
  * However, you may output the form (usually by calling get_html_and_js) anywhere you like.
  */
-class EE_Form_Section_Proper extends EE_Form_Section_Validatable{
+class EE_Form_Section_Proper extends EE_Form_Section_Validatable {
 
 	/**
 	 * Subsections
@@ -68,37 +68,37 @@ 
 	 * } @see EE_Form_Section_Validatable::__construct()
 	 *
 	 */
-	public function __construct( $options_array = array() ){
+	public function __construct($options_array = array()) {
 		EE_Registry::instance()->load_helper('Formatter');
 		//call parent first, as it may be setting the name
 		parent::__construct($options_array);
 		//if they've included subsections in the constructor, add them now
-		if( isset( $options_array['include'] )){
+		if (isset($options_array['include'])) {
 			//we are going to make sure we ONLY have those subsections to include
 			//AND we are going to make sure they're in that specified order
 			$reordered_subsections = array();
-			foreach($options_array['include'] as $input_name){
-				if(isset($this->_subsections[$input_name])){
+			foreach ($options_array['include'] as $input_name) {
+				if (isset($this->_subsections[$input_name])) {
 					$reordered_subsections[$input_name] = $this->_subsections[$input_name];
 				}
 			}
 			$this->_subsections = $reordered_subsections;
 		}
-		if(isset($options_array['exclude'])){
+		if (isset($options_array['exclude'])) {
 			$exclude = $options_array['exclude'];
 			$this->_subsections = array_diff_key($this->_subsections, array_flip($exclude));
 		}
-		if(isset($options_array['layout_strategy'])){
+		if (isset($options_array['layout_strategy'])) {
 			$this->_layout_strategy = $options_array['layout_strategy'];
 		}
-		if( ! $this->_layout_strategy){
+		if ( ! $this->_layout_strategy) {
 			$this->_layout_strategy = new EE_Two_Column_Layout();
 		}
 		$this->_layout_strategy->_construct_finalize($this);
 
-		add_action( 'wp_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
-		add_action( 'admin_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
-		add_action( 'wp_footer', array( $this, 'ensure_scripts_localized' ), 1 );
+		add_action('wp_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
+		add_action('wp_footer', array($this, 'ensure_scripts_localized'), 1);
 
 
 	}
@@ -112,20 +112,20 @@ 
 	 * @param string                 $name
 	 * @throws \EE_Error
 	 */
-	public function _construct_finalize( $parent_form_section, $name ) {
+	public function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_name_if_empty();
 		$this->_set_default_html_id_if_empty();
-		foreach( $this->_subsections as $subsection_name => $subsection ){
-			if ( $subsection instanceof EE_Form_Section_Base ) {
-				$subsection->_construct_finalize( $this, $subsection_name );
+		foreach ($this->_subsections as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Section_Base) {
+				$subsection->_construct_finalize($this, $subsection_name);
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso' ),
+						__('Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso'),
 						$subsection_name,
 						get_class($this),
-						$subsection ? get_class($subsection) : __( 'NULL', 'event_espresso' )
+						$subsection ? get_class($subsection) : __('NULL', 'event_espresso')
 					)
 				);
 			}
@@ -138,7 +138,7 @@ 
 	 * Gets the layout strategy for this form section
 	 * @return EE_Form_Section_Layout_Base
 	 */
-	public function get_layout_strategy(){
+	public function get_layout_strategy() {
 		return $this->_layout_strategy;
 	}
 
@@ -150,7 +150,7 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function get_html_for_input($input){
+	public function get_html_for_input($input) {
 		return $this->_layout_strategy->layout_input($input);
 	}
 
@@ -163,7 +163,7 @@ 
 	 * @param null $form_data
 	 * @return boolean
 	 */
-	public function was_submitted($form_data = NULL){
+	public function was_submitted($form_data = NULL) {
 		return $this->form_data_present_in($form_data);
 	}
 
@@ -184,12 +184,12 @@ 
 	 * to skip this step.
 	 * @return void
 	 */
-	public function receive_form_submission($req_data = NULL, $validate = TRUE){
-		if( $req_data === NULL){
+	public function receive_form_submission($req_data = NULL, $validate = TRUE) {
+		if ($req_data === NULL) {
 			$req_data = $_REQUEST;
 		}
 		$this->_normalize($req_data);
-		if( $validate ){
+		if ($validate) {
 			$this->_validate();
 		}
 	}
@@ -204,12 +204,12 @@ 
 	 * the value being an array formatted in teh same way
 	 * @param array $default_data
 	 */
-	public function populate_defaults($default_data){
-		foreach($this->subsections() as $subsection_name => $subsection){
-			if(isset($default_data[$subsection_name])){
-				if($subsection instanceof EE_Form_Input_Base){
+	public function populate_defaults($default_data) {
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if (isset($default_data[$subsection_name])) {
+				if ($subsection instanceof EE_Form_Input_Base) {
 					$subsection->set_default($default_data[$subsection_name]);
-				}elseif($subsection instanceof EE_Form_Section_Proper){
+				}elseif ($subsection instanceof EE_Form_Section_Proper) {
 					$subsection->populate_defaults($default_data[$subsection_name]);
 				}
 			}
@@ -227,8 +227,8 @@ 
 	 * (realizing that the subsections' html names might not be set yet, etc.)
 	 * @return EE_Form_Section_Base
 	 */
-	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		if( $require_construction_to_be_finalized ){
+	public function get_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		if ($require_construction_to_be_finalized) {
 			$this->ensure_construct_finalized_called();
 		}
 		return isset($this->_subsections[$name]) ? $this->_subsections[$name] : NULL;
@@ -240,10 +240,10 @@ 
 	 * Gets all the validatable subsections of this form section
 	 * @return EE_Form_Section_Validatable[]
 	 */
-	public function get_validatable_subsections(){
+	public function get_validatable_subsections() {
 		$validatable_subsections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Validatable){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Validatable) {
 				$validatable_subsections[$name] = $obj;
 			}
 		}
@@ -263,10 +263,10 @@ 
 	 * @return EE_Form_Input_Base
 	 * @throws EE_Error
 	 */
-	public function get_input($name, $require_construction_to_be_finalized = TRUE ){
+	public function get_input($name, $require_construction_to_be_finalized = TRUE) {
 		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
-		if( ! $subsection instanceof EE_Form_Input_Base){
-			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'),$name, get_class($this),$subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
+		if ( ! $subsection instanceof EE_Form_Input_Base) {
+			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'), $name, get_class($this), $subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
 		}
 		return $subsection;
 	}
@@ -284,10 +284,10 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws EE_Error
 	 */
-	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		$subsection = $this->get_subsection( $name, $require_construction_to_be_finalized );
-		if( ! $subsection instanceof EE_Form_Section_Proper){
-			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'),$name, get_class($this)));
+	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
+		if ( ! $subsection instanceof EE_Form_Section_Proper) {
+			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'), $name, get_class($this)));
 		}
 		return $subsection;
 	}
@@ -300,7 +300,7 @@ 
 	 * @param string $name
 	 * @return mixed depending on the input's type and its normalization strategy
 	 */
-	public function get_input_value($name){
+	public function get_input_value($name) {
 		$input = $this->get_input($name);
 		return $input->normalized_value();
 	}
@@ -313,16 +313,16 @@ 
 	 * @return boolean
 	 */
 	public function is_valid() {
-		if( ! $this->has_received_submission()){
+		if ( ! $this->has_received_submission()) {
 			throw new EE_Error(sprintf(__("You cannot check if a form is valid before receiving the form submission using receive_form_submission", "event_espresso")));
 		}
-		if( ! parent::is_valid()){
+		if ( ! parent::is_valid()) {
 			return false;
 		}
 		//ok so no errors general to this entire form section. so let's check the subsections
-		foreach( $this->get_validatable_subsections() as $subsection ){
-			if( ! $subsection->is_valid() || $subsection->get_validation_error_string() != '' ){
-				$this->set_submission_error_message( $subsection->get_validation_error_string() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ( ! $subsection->is_valid() || $subsection->get_validation_error_string() != '') {
+				$this->set_submission_error_message($subsection->get_validation_error_string());
 				return false;
 			}
 		}
@@ -335,11 +335,11 @@ 
 	 * gets teh default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
 			$classname = get_class($this);
 			$default_name = str_replace("EE_", "", $classname);
-			$this->_name =  $default_name;
+			$this->_name = $default_name;
 		}
 	}
 
@@ -350,7 +350,7 @@ 
 	 * Also returns the HTML for the form, except for the form opening and closing tags
 	 * (as the form section doesn't know where you necessarily want to send the information to), and except for a submit button.
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		$this->enqueue_js();
 		return $this->get_html();
 	}
@@ -361,7 +361,7 @@ 
 	 * returns HTML for displaying this form section. recursively calls display_section() on all subsections
 	 * @return string
 	 */
-	public function get_html(){
+	public function get_html() {
 		$this->ensure_construct_finalized_called();
 		return $this->_layout_strategy->layout_form();
 	}
@@ -372,7 +372,7 @@ 
 	 * enqueues JS for the form
 	 * @return string
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		$this->_enqueue_and_localize_form_js();
 	}
 
@@ -387,9 +387,9 @@ 
 	 * could change until it's actually outputted)
 	 * @return void
 	 */
-	public static function wp_enqueue_scripts(){
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		wp_register_script( 'ee_form_section_validation', EE_GLOBAL_ASSETS_URL . 'scripts' . DS . 'form_section_validation.js', array( 'jquery-validate', 'jquery-ui-datepicker' ), EVENT_ESPRESSO_VERSION, TRUE );
+	public static function wp_enqueue_scripts() {
+		add_filter('FHEE_load_jquery_validate', '__return_true');
+		wp_register_script('ee_form_section_validation', EE_GLOBAL_ASSETS_URL.'scripts'.DS.'form_section_validation.js', array('jquery-validate', 'jquery-ui-datepicker'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 
@@ -399,14 +399,14 @@ 
 	 * This needs to be called AFTER we've called $this->_enqueue_jquery_validate_script,
 	 * but before the wordpress hook wp_loaded
 	 */
-	public function _enqueue_and_localize_form_js(){
+	public function _enqueue_and_localize_form_js() {
 		$this->ensure_construct_finalized_called();
 		//actually, we don't want to localize just yet. There may be other forms on the page.
 		//so we need to add our form section data to a static variable accessible by all form sections
 		//and localize it just before the footer
 		$this->localize_validation_rules();
-		add_action( 'wp_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ), 2 );
-		add_action( 'admin_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ) );
+		add_action('wp_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'), 2);
+		add_action('admin_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'));
 	}
 
 
@@ -415,11 +415,11 @@ 
 	 * add our form section data to a static variable accessible by all form sections
 	 * @return void
 	 */
-	public function localize_validation_rules(){
+	public function localize_validation_rules() {
 		// we only want to localize vars ONCE for the entire form, so if the form section doesn't have a parent, then it must be the top dog
-		if ( ! $this->parent_section() ) {
-			EE_Form_Section_Proper::$_js_localization['form_data'][ $this->html_id() ] = array(
-				'form_section_id'=> $this->html_id( TRUE ),
+		if ( ! $this->parent_section()) {
+			EE_Form_Section_Proper::$_js_localization['form_data'][$this->html_id()] = array(
+				'form_section_id'=> $this->html_id(TRUE),
 				'validation_rules'=> $this->get_jquery_validation_rules(),
 				'errors'=> $this->subsection_validation_errors_by_html_name()
 			);
@@ -434,12 +434,12 @@ 
 	 * Keys are their form names, and values are the inputs themselves
 	 * @return EE_Form_Input_Base
 	 */
-	public function inputs_in_subsections(){
+	public function inputs_in_subsections() {
 		$inputs = array();
-		foreach($this->subsections() as $subsection){
-			if( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection->html_name() ] = $subsection;
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection->html_name()] = $subsection;
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
 				$inputs += $subsection->inputs_in_subsections();
 			}
 		}
@@ -452,12 +452,12 @@ 
 	 * and values are a string of all their validation errors
 	 * @return string[]
 	 */
-	public function subsection_validation_errors_by_html_name(){
+	public function subsection_validation_errors_by_html_name() {
 		$inputs = $this->inputs();
 		$errors = array();
-		foreach( $inputs as $form_input ){
-			if ( $form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors() ){
-				$errors[ $form_input->html_name() ] = $form_input->get_validation_error_string();
+		foreach ($inputs as $form_input) {
+			if ($form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors()) {
+				$errors[$form_input->html_name()] = $form_input->get_validation_error_string();
 			}
 		}
 		return $errors;
@@ -469,12 +469,12 @@ 
 	 * passes all the form data required by the JS to the JS, and enqueues the few required JS files.
 	 * Should be setup by each form during the _enqueues_and_localize_form_js
 	 */
-	public static function localize_script_for_all_forms(){
+	public static function localize_script_for_all_forms() {
 		//allow inputs and stuff to hook in their JS and stuff here
 		do_action('AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin');
 		EE_Form_Section_Proper::$_js_localization['localized_error_messages'] = EE_Form_Section_Proper::_get_localized_error_messages();
-		wp_enqueue_script( 'ee_form_section_validation' );
-		wp_localize_script( 'ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization );
+		wp_enqueue_script('ee_form_section_validation');
+		wp_localize_script('ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization);
 	}
 
 
@@ -482,8 +482,8 @@ 
 	/**
 	 * ensure_scripts_localized
 	 */
-	public function ensure_scripts_localized(){
-		if ( ! EE_Form_Section_Proper::$_scripts_localized ) {
+	public function ensure_scripts_localized() {
+		if ( ! EE_Form_Section_Proper::$_scripts_localized) {
 			$this->_enqueue_and_localize_form_js();
 		}
 	}
@@ -495,7 +495,7 @@ 
 	 * is that the key here should be the same as the custom validation rule put in the JS file
 	 * @return array keys are custom validation rules, and values are internationalized strings
 	 */
-	private static function _get_localized_error_messages(){
+	private static function _get_localized_error_messages() {
 		return array(
 			'validUrl'=>  __("This is not a valid absolute URL. Eg, http://domain.com/monkey.jpg", "event_espresso")
 		);
@@ -525,10 +525,10 @@ 
 	 * Gets the JS to put inside the jquery validation rules for subsection of this form section. See parent function for more...
 	 * @return array
 	 */
-	function get_jquery_validation_rules(){
+	function get_jquery_validation_rules() {
 		$jquery_validation_rules = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			$jquery_validation_rules = array_merge( $jquery_validation_rules,  $subsection->get_jquery_validation_rules() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			$jquery_validation_rules = array_merge($jquery_validation_rules, $subsection->get_jquery_validation_rules());
 		}
 		return $jquery_validation_rules;
 	}
@@ -543,11 +543,11 @@ 
 	protected function _normalize($req_data) {
 		$this->_received_submission = TRUE;
 		$this->_validation_errors = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			try{
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			try {
 				$subsection->_normalize($req_data);
-			}catch( EE_Validation_Error $e ){
-				$subsection->add_validation_error( $e );
+			} catch (EE_Validation_Error $e) {
+				$subsection->add_validation_error($e);
 			}
 		}
 	}
@@ -561,9 +561,9 @@ 
 	 * calling parent::_validate() first.
 	 */
 	protected function _validate() {
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
-			if(method_exists($this,'_validate_'.$subsection_name)){
-				call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if (method_exists($this, '_validate_'.$subsection_name)) {
+				call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
 			}
 			$subsection->_validate();
 		}
@@ -575,13 +575,13 @@ 
 	 * Gets all the validated inputs for the form section
 	 * @return array
 	 */
-	public function valid_data(){
+	public function valid_data() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Section_Proper ) {
-				$inputs[ $subsection_name ] = $subsection->valid_data();
-			} else if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection->normalized_value();
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
+				$inputs[$subsection_name] = $subsection->valid_data();
+			} else if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection->normalized_value();
 			}
 		}
 		return $inputs;
@@ -593,11 +593,11 @@ 
 	 * Gets all the inputs on this form section
 	 * @return EE_Form_Input_Base[]
 	 */
-	public function inputs(){
+	public function inputs() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection;
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection;
 			}
 		}
 		return $inputs;
@@ -609,10 +609,10 @@ 
 	 * Gets all the subsections which are a proper form
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subforms(){
+	public function subforms() {
 		$form_sections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Proper){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Proper) {
 				$form_sections[$name] = $obj;
 			}
 		}
@@ -627,7 +627,7 @@ 
 	 * if you only want form inputs or proper form sections.
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subsections(){
+	public function subsections() {
 		$this->ensure_construct_finalized_called();
 		return $this->_subsections;
 	}
@@ -639,9 +639,9 @@ 
 	 * values. (Similar to calling get_input_value on inputs)
 	 * @return array
 	 */
-	public function input_values(){
+	public function input_values() {
 		$input_values = array();
-		foreach($this->inputs() as $name => $input_obj){
+		foreach ($this->inputs() as $name => $input_obj) {
 			$input_values[$name] = $input_obj->normalized_value();
 		}
 		return $input_values;
@@ -654,9 +654,9 @@ 
 	 * where keys are the input names, and values are their display values
 	 * @return array
 	 */
-	public function input_pretty_values(){
+	public function input_pretty_values() {
 		$input_values = array();
-		foreach($this->inputs() as $name => $input_obj){
+		foreach ($this->inputs() as $name => $input_obj) {
 			$input_values[$name] = $input_obj->pretty_value();
 		}
 		return $input_values;
@@ -669,7 +669,7 @@ 
 	 * (ie, had receive_form_submission called on it yet)
 	 * @return boolean
 	 */
-	public function has_received_submission(){
+	public function has_received_submission() {
 		$this->ensure_construct_finalized_called();
 		return $this->_received_submission;
 	}
@@ -682,8 +682,8 @@ 
 	 * @param array $inputs_to_exclude values are the input names
 	 * @return void
 	 */
-	public function exclude($inputs_to_exclude = array()){
-		foreach($inputs_to_exclude as $input_to_exclude_name){
+	public function exclude($inputs_to_exclude = array()) {
+		foreach ($inputs_to_exclude as $input_to_exclude_name) {
 			unset($this->_subsections[$input_to_exclude_name]);
 		}
 	}
@@ -693,8 +693,8 @@ 
 	/**
 	 * @param array $inputs_to_hide
 	 */
-	public function hide($inputs_to_hide= array()){
-		foreach($inputs_to_hide as $input_to_hide){
+	public function hide($inputs_to_hide = array()) {
+		foreach ($inputs_to_hide as $input_to_hide) {
 			$input = $this->get_input($input_to_hide);
 
 			$input->set_display_strategy(new EE_Hidden_Display_Strategy());
@@ -710,13 +710,13 @@ 
 	 * @param string $subsection_name_to_add_before name of the section to add these subsections in front of, or null to add at the very end
 	 * @return void
 	 */
-	public function add_subsections($subsections,$subsection_name_to_add_before = NULL){
-		foreach($subsections as $subsection_name => $subsection){
-			if( ! $subsection instanceof EE_Form_Section_Base){
+	public function add_subsections($subsections, $subsection_name_to_add_before = NULL) {
+		foreach ($subsections as $subsection_name => $subsection) {
+			if ( ! $subsection instanceof EE_Form_Section_Base) {
 				EE_Error::add_error(
 					sprintf(
 						__("Trying to add a %s as a subsection (it was named '%s') to the form section '%s'. It was removed.", "event_espresso"),
-						get_class( $subsection ),
+						get_class($subsection),
 						$subsection_name,
 						$this->name()
 					)
@@ -725,23 +725,23 @@ 
 			}
 		}
 		$subsections_before = array();
-		if( $subsection_name_to_add_before ){
-			foreach( $this->_subsections as $subsection_name => $subsection ) {
-				if ( $subsection_name == $subsection_name_to_add_before ) {
+		if ($subsection_name_to_add_before) {
+			foreach ($this->_subsections as $subsection_name => $subsection) {
+				if ($subsection_name == $subsection_name_to_add_before) {
 					break;
 				}
 				$subsections_before[$subsection_name] = $subsection;
 			}
 			$subsections_after = array_diff_key($this->_subsections, $subsections_before);
-			$this->_subsections = array_merge($subsections_before,$subsections,$subsections_after);
-		}else{
+			$this->_subsections = array_merge($subsections_before, $subsections, $subsections_after);
+		} else {
 			//don't use array_merge because keys might be numeric and we want to preserve their keys
-			foreach( $subsections as $key => $subsection ){
-				$this->_subsections[ $key ] = $subsection;
+			foreach ($subsections as $key => $subsection) {
+				$this->_subsections[$key] = $subsection;
 			}
 		}
-		if( $this->_construction_finalized ){
-			foreach($this->_subsections as $name => $subsection){
+		if ($this->_construction_finalized) {
+			foreach ($this->_subsections as $name => $subsection) {
 				$subsection->_construct_finalize($this, $name);
 			}
 		}
@@ -752,8 +752,8 @@ 
 	/**
 	 * Just gets all validatable subsections to clean their sensitive data
 	 */
-	public function clean_sensitive_data(){
-		foreach($this->get_validatable_subsections() as $subsection){
+	public function clean_sensitive_data() {
+		foreach ($this->get_validatable_subsections() as $subsection) {
 			$subsection->clean_sensitive_data();
 		}
 	}
@@ -763,8 +763,8 @@ 
 	/**
 	 * @param string $form_submission_error_message
 	 */
-	public function set_submission_error_message( $form_submission_error_message = '' ) {
-		$this->_form_submission_error_message .= ! empty( $form_submission_error_message ) ? $form_submission_error_message : __( 'Form submission failed due to errors', 'event_espresso' );
+	public function set_submission_error_message($form_submission_error_message = '') {
+		$this->_form_submission_error_message .= ! empty($form_submission_error_message) ? $form_submission_error_message : __('Form submission failed due to errors', 'event_espresso');
 	}
 
 
@@ -781,8 +781,8 @@ 
 	/**
 	 * @param string $form_submission_success_message
 	 */
-	public function set_submission_success_message( $form_submission_success_message ) {
-		$this->_form_submission_success_message .= ! empty( $form_submission_success_message ) ? $form_submission_success_message : __( 'Form submitted successfully', 'event_espresso' );
+	public function set_submission_success_message($form_submission_success_message) {
+		$this->_form_submission_success_message .= ! empty($form_submission_success_message) ? $form_submission_success_message : __('Form submitted successfully', 'event_espresso');
 	}
 
 
@@ -804,10 +804,10 @@ 
 	 * EE_Form_Input_Base::_set_default_html_name_if_empty
 	 * @return string
 	 */
-	public function html_name_prefix(){
-		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
-			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
-		}else{
+	public function html_name_prefix() {
+		if ($this->parent_section() instanceof EE_Form_Section_Proper) {
+			return $this->parent_section()->html_name_prefix().'['.$this->name().']';
+		} else {
 			return $this->name();
 		}
 	}
@@ -818,7 +818,7 @@ 
 	 * was set, which is probably nothing, or the classname)
 	 * @return string
 	 */
-	public function name(){
+	public function name() {
 		$this->ensure_construct_finalized_called();
 		return parent::name();
 	}
@@ -827,7 +827,7 @@ 
 	 *
 	 * @return EE_Form_Section_Proper
 	 */
-	public function parent_section(){
+	public function parent_section() {
 		$this->ensure_construct_finalized_called();
 		return parent::parent_section();
 	}
@@ -836,9 +836,9 @@ 
 	 * make sure construction finalized was called, otherwise children might not be ready
 	 * @return void
 	 */
-	public function ensure_construct_finalized_called(){
-		if( ! $this->_construction_finalized ){
-			$this->_construct_finalize($this->_parent_section, $this->_name );
+	public function ensure_construct_finalized_called() {
+		if ( ! $this->_construction_finalized) {
+			$this->_construct_finalize($this->_parent_section, $this->_name);
 		}
 	}
 
@@ -850,17 +850,17 @@ 
 	 * @param array $req_data
 	 * @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;
 		}
-		foreach( $this->subsections() as $subsection ) {
-			if($subsection instanceof EE_Form_Input_Base ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
 			}
@@ -877,14 +877,14 @@ 
 	 */
 	public function get_validation_errors_accumulated() {
 		$validation_errors = $this->get_validation_errors();
-		foreach($this->get_validatable_subsections() as $subsection ) {
-			if( $subsection instanceof EE_Form_Section_Proper ) {
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
 				$validation_errors_on_this_subsection = $subsection->get_validation_errors_accumulated();
 			} else {
-				$validation_errors_on_this_subsection =  $subsection->get_validation_errors();
+				$validation_errors_on_this_subsection = $subsection->get_validation_errors();
 			}
-			if( $validation_errors_on_this_subsection ){
-				$validation_errors = array_merge( $validation_errors, $validation_errors_on_this_subsection );
+			if ($validation_errors_on_this_subsection) {
+				$validation_errors = array_merge($validation_errors, $validation_errors_on_this_subsection);
 			}
 		}
 		return $validation_errors;