eventespresso / event-espresso-core

core/db_classes/EE_Answer.class.php

Doc Comments +4 added lines, -4 removed lines

@@ -77,7 +77,7 @@ 
 	 *    Set Answer value
 	 *
 	 * @access        public
-	 * @param mixed $ANS_value
+	 * @param string $ANS_value
 	 */
 	public function set_value( $ANS_value = '' ) {
 		$this->set( 'ANS_value', $ANS_value );
@@ -89,7 +89,7 @@ 
 	 *    get Attendee First Name
 	 *
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function registration_ID() {
 		return $this->get( 'REG_ID' );
@@ -101,7 +101,7 @@ 
 	 *    get Attendee Last Name
 	 *
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function question_ID() {
 		return $this->get( 'QST_ID' );
@@ -113,7 +113,7 @@ 
 	 *    get Attendee Address
 	 *
 	 * @access        public
-	 * @return        string
+	 * @return        boolean
 	 */
 	public function value() {
 		return $this->get( 'ANS_value' );

Spacing +22 added lines, -22 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -31,9 +31,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Answer
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Answer
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -55,8 +55,8 @@ 
 	 * @access        public
 	 * @param int $QST_ID
 	 */
-	public function set_question( $QST_ID = 0 ) {
-		$this->set( 'QST_ID', $QST_ID );
+	public function set_question($QST_ID = 0) {
+		$this->set('QST_ID', $QST_ID);
 	}
 
 
@@ -67,8 +67,8 @@ 
 	 * @access        public
 	 * @param int $REG_ID
 	 */
-	public function set_registration( $REG_ID = 0 ) {
-		$this->set( 'REG_ID', $REG_ID );
+	public function set_registration($REG_ID = 0) {
+		$this->set('REG_ID', $REG_ID);
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @access        public
 	 * @param mixed $ANS_value
 	 */
-	public function set_value( $ANS_value = '' ) {
-		$this->set( 'ANS_value', $ANS_value );
+	public function set_value($ANS_value = '') {
+		$this->set('ANS_value', $ANS_value);
 	}
 
 
@@ -92,7 +92,7 @@ 
 	 * @return        int
 	 */
 	public function registration_ID() {
-		return $this->get( 'REG_ID' );
+		return $this->get('REG_ID');
 	}
 
 
@@ -104,7 +104,7 @@ 
 	 * @return        int
 	 */
 	public function question_ID() {
-		return $this->get( 'QST_ID' );
+		return $this->get('QST_ID');
 	}
 
 
@@ -116,7 +116,7 @@ 
 	 * @return        string
 	 */
 	public function value() {
-		return $this->get( 'ANS_value' );
+		return $this->get('ANS_value');
 	}
 
 
@@ -126,8 +126,8 @@ 
 	 * @param null $schema
 	 * @return string
 	 */
-	public function pretty_value( $schema = NULL ) {
-		return $this->get_pretty( 'ANS_value', $schema );
+	public function pretty_value($schema = NULL) {
+		return $this->get_pretty('ANS_value', $schema);
 	}
 
 
@@ -136,8 +136,8 @@ 
 	 * Echoes out a pretty value (even for multi-choice options)
 	 * @param string $schema
 	 */
-	public function e_value( $schema = NULL ) {
-		$this->e( 'ANS_value', $schema );
+	public function e_value($schema = NULL) {
+		$this->e('ANS_value', $schema);
 	}
 
 
@@ -147,7 +147,7 @@ 
 	 * @return EE_Question
 	 */
 	public function question() {
-		return $this->get_first_related( 'Question' );
+		return $this->get_first_related('Question');
 	}
 
 
@@ -157,7 +157,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function registration() {
-		return $this->get_first_related( 'Registration' );
+		return $this->get_first_related('Registration');
 	}
 }
 

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package 		Event Espresso
- * @ author 		Event Espresso
- * @ copyright 	(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license 		{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link 				{@link http://www.eventespresso.com}
- * @ since 			4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package 		Event Espresso
+	 * @ author 		Event Espresso
+	 * @ copyright 	(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license 		{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link 				{@link http://www.eventespresso.com}
+	 * @ since 			4.0
+	 *
+	 */
 
 
 

core/db_classes/EE_Attendee.class.php

Doc Comments +13 added lines, -13 removed lines

@@ -216,7 +216,7 @@ 
 	 *
 	 * @since 4.5.0
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get( 'ATT_author' );
@@ -227,7 +227,7 @@ 
 	/**
 	 *        get Attendee First Name
 	 * @access        public
-	 * @return string
+	 * @return boolean
 	 */
 	public function fname() {
 		return $this->get( 'ATT_fname' );
@@ -260,7 +260,7 @@ 
 	/**
 	 *        get Attendee Last Name
 	 * @access        public
-	 * @return string
+	 * @return boolean
 	 */
 	public function lname() {
 		return $this->get( 'ATT_lname' );
@@ -305,7 +305,7 @@ 
 
 	/**
 	 *        get Attendee Address
-	 * @return string
+	 * @return boolean
 	 */
 	public function address() {
 		return $this->get( 'ATT_address' );
@@ -315,7 +315,7 @@ 
 
 	/**
 	 *        get Attendee Address2
-	 * @return string
+	 * @return boolean
 	 */
 	public function address2() {
 		return $this->get( 'ATT_address2' );
@@ -325,7 +325,7 @@ 
 
 	/**
 	 *        get Attendee City
-	 * @return string
+	 * @return boolean
 	 */
 	public function city() {
 		return $this->get( 'ATT_city' );
@@ -335,7 +335,7 @@ 
 
 	/**
 	 *        get Attendee State ID
-	 * @return string
+	 * @return boolean
 	 */
 	public function state_ID() {
 		return $this->get( 'STA_ID' );
@@ -392,7 +392,7 @@ 
 
 	/**
 	 *    get Attendee Country ISO Code
-	 * @return string
+	 * @return boolean
 	 */
 	public function country_ID() {
 		return $this->get( 'CNT_ISO' );
@@ -440,7 +440,7 @@ 
 
 	/**
 	 *        get Attendee Zip/Postal Code
-	 * @return string
+	 * @return boolean
 	 */
 	public function zip() {
 		return $this->get( 'ATT_zip' );
@@ -450,7 +450,7 @@ 
 
 	/**
 	 *        get Attendee Email Address
-	 * @return string
+	 * @return boolean
 	 */
 	public function email() {
 		return $this->get( 'ATT_email' );
@@ -460,7 +460,7 @@ 
 
 	/**
 	 *        get Attendee Phone #
-	 * @return string
+	 * @return boolean
 	 */
 	public function phone() {
 		return $this->get( 'ATT_phone' );
@@ -512,7 +512,7 @@ 
 
 	/**
 	 * returns any events attached to this attendee ($_Event property);
-	 * @return array
+	 * @return EE_Base_Class[]
 	 */
 	public function events() {
 		return $this->get_many_related( 'Event' );
@@ -522,7 +522,7 @@ 
 	 * Gets the billing info array where keys match espresso_reg_page_billing_inputs(),
 	 * and keys are their cleaned values. @see EE_Attendee::save_and_clean_billing_info_for_payment_method() which was used to save the billing info
 	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
-	 * @return EE_Form_Section_Proper
+	 * @return null|EE_Billing_Info_Form
 	 */
 	public function billing_info_for_payment_method($payment_method){
 		$pm_type = $payment_method->type_obj();

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package            Event Espresso
- * @ author                Seth Shoultes
- * @ copyright        (c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license            {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link                    {@link http://www.eventespresso.com}
- * @ since                4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package            Event Espresso
+	 * @ author                Seth Shoultes
+	 * @ copyright        (c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license            {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link                    {@link http://www.eventespresso.com}
+	 * @ since                4.0
+	 *
+	 */
 
 
 

Braces +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
 	public function construction_finalized(){
 		if( $this->_model instanceof EEM_Base  && $this->_action ){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -125,7 +125,7 @@ 
 	public function has_generated_cap_restrictions(){
 		if( $this->_cap_restrictions_generated === false ){
 			return false;
-		}else{
+		} else{
 			return true;
 		}
 	}
@@ -153,7 +153,7 @@ 
 		$caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities( 'administrator' );
 		if( in_array( self::get_cap_name( $model, $action ), $caps_for_admin ) ) {
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

Spacing +101 added lines, -101 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -33,20 +33,20 @@ 
 	 * @param string $timezone
 	 * @param array $date_formats
 	 */
-	protected function __construct( $fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array() ) {
-		if ( !isset( $fieldValues[ 'ATT_full_name' ] ) ) {
-			$fname = isset( $fieldValues[ 'ATT_fname' ] ) ? $fieldValues[ 'ATT_fname' ] . ' ' : '';
-			$lname = isset( $fieldValues[ 'ATT_lname' ] ) ? $fieldValues[ 'ATT_lname' ] : '';
-			$fieldValues[ 'ATT_full_name' ] = $fname . $lname;
+	protected function __construct($fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array()) {
+		if ( ! isset($fieldValues['ATT_full_name'])) {
+			$fname = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'].' ' : '';
+			$lname = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
+			$fieldValues['ATT_full_name'] = $fname.$lname;
 		}
-		if ( !isset( $fieldValues[ 'ATT_slug' ] ) ) {
+		if ( ! isset($fieldValues['ATT_slug'])) {
 			//			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
-			$fieldValues[ 'ATT_slug' ] = sanitize_title( $fieldValues[ 'ATT_full_name' ] );
+			$fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
 		}
-		if ( !isset( $fieldValues[ 'ATT_short_bio' ] ) && isset( $fieldValues[ 'ATT_bio' ] ) ) {
-			$fieldValues[ 'ATT_short_bio' ] = substr( $fieldValues[ 'ATT_bio' ], 0, 50 );
+		if ( ! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
+			$fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
 		}
-		parent::__construct( $fieldValues, $bydb, $timezone, $date_formats );
+		parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
 	}
 
 
@@ -60,9 +60,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -73,8 +73,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -85,8 +85,8 @@ 
 	 * @access        public
 	 * @param string $fname
 	 */
-	public function set_fname( $fname = '' ) {
-		$this->set( 'ATT_fname', $fname );
+	public function set_fname($fname = '') {
+		$this->set('ATT_fname', $fname);
 	}
 
 
@@ -97,8 +97,8 @@ 
 	 * @access        public
 	 * @param string $lname
 	 */
-	public function set_lname( $lname = '' ) {
-		$this->set( 'ATT_lname', $lname );
+	public function set_lname($lname = '') {
+		$this->set('ATT_lname', $lname);
 	}
 
 
@@ -109,8 +109,8 @@ 
 	 * @access        public
 	 * @param string $address
 	 */
-	public function set_address( $address = '' ) {
-		$this->set( 'ATT_address', $address );
+	public function set_address($address = '') {
+		$this->set('ATT_address', $address);
 	}
 
 
@@ -121,8 +121,8 @@ 
 	 * @access        public
 	 * @param        string $address2
 	 */
-	public function set_address2( $address2 = '' ) {
-		$this->set( 'ATT_address2', $address2 );
+	public function set_address2($address2 = '') {
+		$this->set('ATT_address2', $address2);
 	}
 
 
@@ -133,8 +133,8 @@ 
 	 * @access        public
 	 * @param        string $city
 	 */
-	public function set_city( $city = '' ) {
-		$this->set( 'ATT_city', $city );
+	public function set_city($city = '') {
+		$this->set('ATT_city', $city);
 	}
 
 
@@ -145,8 +145,8 @@ 
 	 * @access        public
 	 * @param        int $STA_ID
 	 */
-	public function set_state( $STA_ID = 0 ) {
-		$this->set( 'STA_ID', $STA_ID );
+	public function set_state($STA_ID = 0) {
+		$this->set('STA_ID', $STA_ID);
 	}
 
 
@@ -157,8 +157,8 @@ 
 	 * @access        public
 	 * @param        string $CNT_ISO
 	 */
-	public function set_country( $CNT_ISO = '' ) {
-		$this->set( 'CNT_ISO', $CNT_ISO );
+	public function set_country($CNT_ISO = '') {
+		$this->set('CNT_ISO', $CNT_ISO);
 	}
 
 
@@ -169,8 +169,8 @@ 
 	 * @access        public
 	 * @param        string $zip
 	 */
-	public function set_zip( $zip = '' ) {
-		$this->set( 'ATT_zip', $zip );
+	public function set_zip($zip = '') {
+		$this->set('ATT_zip', $zip);
 	}
 
 
@@ -181,8 +181,8 @@ 
 	 * @access        public
 	 * @param        string $email
 	 */
-	public function set_email( $email = '' ) {
-		$this->set( 'ATT_email', $email );
+	public function set_email($email = '') {
+		$this->set('ATT_email', $email);
 	}
 
 
@@ -193,8 +193,8 @@ 
 	 * @access        public
 	 * @param        string $phone
 	 */
-	public function set_phone( $phone = '' ) {
-		$this->set( 'ATT_phone', $phone );
+	public function set_phone($phone = '') {
+		$this->set('ATT_phone', $phone);
 	}
 
 
@@ -205,8 +205,8 @@ 
 	 * @access        public
 	 * @param        bool $ATT_deleted
 	 */
-	public function set_deleted( $ATT_deleted = FALSE ) {
-		$this->set( 'ATT_deleted', $ATT_deleted );
+	public function set_deleted($ATT_deleted = FALSE) {
+		$this->set('ATT_deleted', $ATT_deleted);
 	}
 
 
@@ -219,7 +219,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'ATT_author' );
+		return $this->get('ATT_author');
 	}
 
 
@@ -230,7 +230,7 @@ 
 	 * @return string
 	 */
 	public function fname() {
-		return $this->get( 'ATT_fname' );
+		return $this->get('ATT_fname');
 	}
 
 
@@ -250,9 +250,9 @@ 
 	 * @param bool $apply_html_entities
 	 * @return string
 	 */
-	public function full_name( $apply_html_entities = FALSE ) {
-		$full_name = $this->fname() . ' ' . $this->lname();
-		return $apply_html_entities ? htmlentities( $full_name, ENT_QUOTES, 'UTF-8' ) : $full_name;
+	public function full_name($apply_html_entities = FALSE) {
+		$full_name = $this->fname().' '.$this->lname();
+		return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 * @return string
 	 */
 	public function lname() {
-		return $this->get( 'ATT_lname' );
+		return $this->get('ATT_lname');
 	}
 
 
@@ -277,26 +277,26 @@ 
 	 */
 	public function full_address_as_array() {
 		$full_address_array = array();
-		$initial_address_fields = array( 'ATT_address', 'ATT_address2', 'ATT_city', );
-		foreach ( $initial_address_fields as $address_field_name ) {
-			$address_fields_value = $this->get( $address_field_name );
-			if ( !empty( $address_fields_value ) ) {
-				$full_address_array[ ] = $address_fields_value;
+		$initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
+		foreach ($initial_address_fields as $address_field_name) {
+			$address_fields_value = $this->get($address_field_name);
+			if ( ! empty($address_fields_value)) {
+				$full_address_array[] = $address_fields_value;
 			}
 		}
 		//now handle state and country
 		$state_obj = $this->state_obj();
-		if ( !empty( $state_obj ) ) {
-			$full_address_array[ ] = $state_obj->name();
+		if ( ! empty($state_obj)) {
+			$full_address_array[] = $state_obj->name();
 		}
 		$country_obj = $this->country_obj();
-		if ( !empty( $country_obj ) ) {
-			$full_address_array[ ] = $country_obj->name();
+		if ( ! empty($country_obj)) {
+			$full_address_array[] = $country_obj->name();
 		}
 		//lastly get the xip
 		$zip_value = $this->zip();
-		if ( !empty( $zip_value ) ) {
-			$full_address_array[ ] = $zip_value;
+		if ( ! empty($zip_value)) {
+			$full_address_array[] = $zip_value;
 		}
 		return $full_address_array;
 	}
@@ -308,7 +308,7 @@ 
 	 * @return string
 	 */
 	public function address() {
-		return $this->get( 'ATT_address' );
+		return $this->get('ATT_address');
 	}
 
 
@@ -318,7 +318,7 @@ 
 	 * @return string
 	 */
 	public function address2() {
-		return $this->get( 'ATT_address2' );
+		return $this->get('ATT_address2');
 	}
 
 
@@ -328,7 +328,7 @@ 
 	 * @return string
 	 */
 	public function city() {
-		return $this->get( 'ATT_city' );
+		return $this->get('ATT_city');
 	}
 
 
@@ -338,7 +338,7 @@ 
 	 * @return string
 	 */
 	public function state_ID() {
-		return $this->get( 'STA_ID' );
+		return $this->get('STA_ID');
 	}
 
 
@@ -347,7 +347,7 @@ 
 	 * @return string
 	 */
 	public function state_abbrev() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -357,18 +357,18 @@ 
 	 * @return EE_State
 	 */
 	public function state_obj() {
-		return $this->get_first_related( 'State' );
+		return $this->get_first_related('State');
 	}
 
 	/**
 	 * Returns the state's name, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function state_name(){
-		if( $this->state_obj() ){
+	public function state_name() {
+		if ($this->state_obj()) {
 			return $this->state_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -381,7 +381,7 @@ 
 	 * @return string
 	 */
 	public function state() {
-		if ( apply_filters( 'FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
 			return $this->state_abbrev();
 		} else {
 			return $this->state_name();
@@ -395,7 +395,7 @@ 
 	 * @return string
 	 */
 	public function country_ID() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -405,18 +405,18 @@ 
 	 * @return EE_Country
 	 */
 	public function country_obj() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 	/**
 	 * Returns the country's name if known, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function country_name(){
-		if( $this->country_obj() ){
+	public function country_name() {
+		if ($this->country_obj()) {
 			return $this->country_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -429,7 +429,7 @@ 
 	 * @return string
 	 */
 	public function country() {
-		if ( apply_filters( 'FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
 			return $this->country_ID();
 		} else {
 			return $this->country_name();
@@ -443,7 +443,7 @@ 
 	 * @return string
 	 */
 	public function zip() {
-		return $this->get( 'ATT_zip' );
+		return $this->get('ATT_zip');
 	}
 
 
@@ -453,7 +453,7 @@ 
 	 * @return string
 	 */
 	public function email() {
-		return $this->get( 'ATT_email' );
+		return $this->get('ATT_email');
 	}
 
 
@@ -463,7 +463,7 @@ 
 	 * @return string
 	 */
 	public function phone() {
-		return $this->get( 'ATT_phone' );
+		return $this->get('ATT_phone');
 	}
 
 
@@ -473,7 +473,7 @@ 
 	 * @return        bool
 	 */
 	public function deleted() {
-		return $this->get( 'ATT_deleted' );
+		return $this->get('ATT_deleted');
 	}
 
 
@@ -483,8 +483,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Registration[]
 	 */
-	public function get_registrations( $query_params = array() ) {
-		return $this->get_many_related( 'Registration', $query_params );
+	public function get_registrations($query_params = array()) {
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -494,7 +494,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function get_most_recent_registration() {
-		return $this->get_first_related( 'Registration', array( 'order_by' => array( 'REG_date' => 'DESC' ) ) ); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
+		return $this->get_first_related('Registration', array('order_by' => array('REG_date' => 'DESC'))); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
 	}
 
 
@@ -504,8 +504,8 @@ 
 	 * @param int $event_id
 	 * @return EE_Registration
 	 */
-	public function get_most_recent_registration_for_event( $event_id ) {
-		return $this->get_first_related( 'Registration', array(array( 'EVT_ID' => $event_id ), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
+	public function get_most_recent_registration_for_event($event_id) {
+		return $this->get_first_related('Registration', array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC'))); //, '=', 'OBJECT_K' );
 	}
 
 
@@ -515,7 +515,7 @@ 
 	 * @return array
 	 */
 	public function events() {
-		return $this->get_many_related( 'Event' );
+		return $this->get_many_related('Event');
 	}
 
 	/**
@@ -524,17 +524,17 @@ 
 	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
 	 * @return EE_Form_Section_Proper
 	 */
-	public function billing_info_for_payment_method($payment_method){
+	public function billing_info_for_payment_method($payment_method) {
 		$pm_type = $payment_method->type_obj();
-		if( ! $pm_type instanceof EE_PMT_Base ){
+		if ( ! $pm_type instanceof EE_PMT_Base) {
 			return NULL;
 		}
-		$billing_info =  $this->get_post_meta( $this->get_billing_info_postmeta_name( $payment_method ), true );
-		if ( ! $billing_info){
+		$billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
+		if ( ! $billing_info) {
 			return NULL;
 		}
 		$billing_form = $pm_type->billing_form();
-		$billing_form->receive_form_submission( array( $billing_form->name() => $billing_info ), FALSE );
+		$billing_form->receive_form_submission(array($billing_form->name() => $billing_info), FALSE);
 		return $billing_form;
 	}
 
@@ -544,10 +544,10 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return string
 	 */
-	public function get_billing_info_postmeta_name($payment_method){
-		if( $payment_method->type_obj() instanceof EE_PMT_Base ){
-			return 'billing_info_' . $payment_method->type_obj()->system_name();
-		}else{
+	public function get_billing_info_postmeta_name($payment_method) {
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+			return 'billing_info_'.$payment_method->type_obj()->system_name();
+		} else {
 			return NULL;
 		}
 	}
@@ -558,13 +558,13 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method){
-		if( ! $billing_form instanceof EE_Billing_Attendee_Info_Form ){
-			EE_Error::add_error( __( 'Cannot save billing info because there is none.', 'event_espresso' ) );
+	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method) {
+		if ( ! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
+			EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
 			return false;
 		}
 		$billing_form->clean_sensitive_data();
-		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name( $payment_method ), $billing_form->input_values( true ) );
+		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name($payment_method), $billing_form->input_values(true));
 	}
 
 	/**
@@ -580,14 +580,14 @@ 
 	 * @return string
 	 */
 	public function get_admin_edit_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 		return EEH_URL::add_query_args_and_nonce(
 			array(
 				'page' => 'espresso_registrations',
 				'action' => 'edit_attendee',
 				'post' => $this->ID()
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 
@@ -604,13 +604,13 @@ 
 	 * @return string
 	 */
 	public function get_admin_overview_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 		return EEH_URL::add_query_args_and_nonce(
 			array(
 				'page' => 'espresso_registrations',
 				'action' => 'contact_list'
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 

core/db_classes/EE_Base_Class.class.php

Doc Comments +13 added lines, -13 removed lines

@@ -512,7 +512,7 @@ 
 	 * @access protected
 	 * @param string $fieldname the property item the corresponding value is for.
 	 * @param mixed  $value     The value we are caching.
-	 * @param null   $cache_type
+	 * @param string   $cache_type
 	 * @return void
 	 */
 	protected function _set_cached_property( $fieldname, $value, $cache_type = NULL ) {
@@ -825,7 +825,7 @@ 
 	 *
 	 * @param null $field_to_order_by   What field is being used as the reference point.
 	 * @param array $query_params       Any additional conditions on the query.
-	 * @param null $columns_to_select   If left null, then an array of EE_Base_Class objects is returned, otherwise
+	 * @param string $columns_to_select   If left null, then an array of EE_Base_Class objects is returned, otherwise
 	 *                                  you can indicate just the columns you want returned
 	 *
 	 * @return array|EE_Base_Class
@@ -850,7 +850,7 @@ 
 	 *
 	 * @param null $field_to_order_by   What field is being used as the reference point.
 	 * @param array $query_params       Any additional conditions on the query.
-	 * @param null $columns_to_select   If left null, then an EE_Base_Class object is returned, otherwise
+	 * @param string $columns_to_select   If left null, then an EE_Base_Class object is returned, otherwise
 	 *                                  you can indicate just the column you want returned
 	 *
 	 * @return array|EE_Base_Class
@@ -987,11 +987,11 @@ 
 	 *
 	 * @access   protected
 	 * @param  string  $field_name   Field on the instantiated EE_Base_Class child object
-	 * @param null     $dt_frmt 	valid datetime format used for date (if '' then we just use the default on the field, if NULL we use the last-used format)
-	 * @param null     $tm_frmt 	Same as above except this is for time format
+	 * @param string|null     $dt_frmt 	valid datetime format used for date (if '' then we just use the default on the field, if NULL we use the last-used format)
+	 * @param null|string     $tm_frmt 	Same as above except this is for time format
 	 * @param string   $date_or_time if NULL then both are returned, otherwise "D" = only date and "T" = only time.
 	 * @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
+	 * @return string|boolean | 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 ) {
 
@@ -1164,7 +1164,7 @@ 
 	 * sets the time on a datetime property
 	 *
 	 * @access protected
-	 * @param string|Datetime $time      a valid time string for php datetime functions (or DateTime object)
+	 * @param string $time      a valid time string for php datetime functions (or DateTime object)
 	 * @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 ) {
@@ -1179,7 +1179,7 @@ 
 	 * sets the date on a datetime property
 	 *
 	 * @access protected
-	 * @param string|DateTime $date      a valid date string for php datetime functions ( or DateTime object)
+	 * @param string $date      a valid date string for php datetime functions ( or DateTime object)
 	 * @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 ) {
@@ -1483,7 +1483,7 @@ 
 
 	/**
 	 * for getting a model while instantiated.
-	 * @return \EEM_Base | \EEM_CPT_Base
+	 * @return boolean | \EEM_CPT_Base
 	 */
 	public function get_model() {
 		$modelName = self::_get_model_classname( get_class($this) );
@@ -1514,7 +1514,7 @@ 
 	 * If there is a key in the incoming array that matches the primary key for the model AND it is not null, then we check the db. If there's a an object we return it.  If not we return false.
 	 * @param  array  $props_n_values incoming array of properties and their values
 	 * @param  string $classname      the classname of the child class
-	 * @param null    $timezone
+	 * @param null|string    $timezone
 	 * @return mixed (EE_Base_Class|bool)
 	 */
 	protected static function _check_for_object( $props_n_values, $classname, $timezone = NULL ) {
@@ -1550,7 +1550,7 @@ 
 	 * @param      $classname
 	 * @param null $timezone
 	 * @throws EE_Error
-	 * @return EEM_Base
+	 * @return boolean
 	 */
 	protected static function  _get_model( $classname, $timezone = NULL ){
 		//find model for this class
@@ -1566,8 +1566,8 @@ 
 	/**
 	 * Gets the model instance (eg instance of EEM_Attendee) given its classname (eg EE_Attendee)
 	 * @param string $model_classname
-	 * @param null   $timezone
-	 * @return EEM_Base
+	 * @param string|null   $timezone
+	 * @return boolean
 	 */
 	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){
 		$model_classname = str_replace( 'EEM_', '', $model_classname );

Indentation +21 added lines, -21 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;
 
 
@@ -205,12 +205,12 @@ 
 
 
 		/**
-	 * Gets the field's original value when this object was constructed during this request.
-	 * This can be helpful when determining if a model object has changed or not
-	 *
-	 * @param string $field_name
-	 * @return mixed|null
-	 */
+		 * Gets the field's original value when this object was constructed during this request.
+		 * This can be helpful when determining if a model object has changed or not
+		 *
+		 * @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 )){

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', '' );
 /**
  *
@@ -170,7 +172,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();
 			}
 		}
@@ -215,7 +217,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;
 		}
 	}
@@ -264,7 +266,7 @@ 
 					empty( $this->_fields[$field_name] ) ? $this->set( $field_name, time() ) : $this->set( $field_name, $this->_fields[$field_name] );
 				}
 
-			}else{
+			} else{
 				$this->_fields[$field_name] = $holder_of_value;
 			}
 
@@ -292,7 +294,7 @@ 
 			}
 			//let's unset any cache for this field_name from the $_cached_properties property.
 			$this->_clear_cached_property( $field_name );
-		}else{
+		} else{
 			throw new EE_Error( sprintf( __( "A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso" ), $field_name  ) );
 		}
 
@@ -588,8 +590,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 ] );
+		}
 	}
 
 
@@ -629,10 +632,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])){
@@ -646,20 +649,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
@@ -668,7 +671,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;
 			}
@@ -724,7 +727,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;
 		}
 	}
@@ -743,10 +746,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();
 		}
@@ -761,7 +764,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 )));
 			}
 		}
@@ -886,10 +889,10 @@ 
 				if( $field_obj->is_nullable()){
 					//if the field allows nulls, then let it be null
 					$field_value = NULL;
-				}else{
+				} else{
 					$field_value = $field_obj->get_default_value();
 				}
-			}else{
+			} else{
 				$field_value = $field_obj->prepare_for_set_from_db( $field_value_from_db );
 			}
 			$this->_fields[$field_name] = $field_value;
@@ -1009,15 +1012,17 @@ 
 			$this->_tm_frmt = $in_tm_frmt;
 		}
 
-		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 ( $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 );
@@ -1240,8 +1245,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 );
@@ -1249,8 +1255,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;
 
@@ -1292,7 +1299,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;
@@ -1362,7 +1369,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 ){
@@ -1377,12 +1384,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());
@@ -1393,7 +1400,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 );
 			}
 		}
@@ -1445,7 +1452,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)
@@ -1464,7 +1471,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
@@ -1523,13 +1530,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 ) {
@@ -1587,7 +1594,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;
@@ -1621,7 +1628,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 );
 		}
 	}
@@ -1679,7 +1686,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;
@@ -1695,7 +1702,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;
@@ -1718,7 +1725,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 ){
@@ -1728,11 +1735,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;
@@ -1784,22 +1791,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
@@ -1825,7 +1832,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);
 		}
@@ -1845,7 +1852,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);
@@ -1880,8 +1887,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;
@@ -1961,7 +1969,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 ) );
 			}
@@ -2027,10 +2035,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();
@@ -2040,7 +2048,7 @@ 
 					}
 				}
 				return $values;
-			}else{
+			} else{
 				return $default;
 			}
 		}
@@ -2066,7 +2074,7 @@ 
 					$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 ( $extra_meta_obj instanceof EE_Extra_Meta ) {
@@ -2088,7 +2096,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();
@@ -2108,7 +2116,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;
 		}
 	}
@@ -2122,7 +2130,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 +463 added lines, -463 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
@@ -117,60 +117,60 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Base_Class
 	 */
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array() ){
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array()) {
 
-		$className=get_class($this);
+		$className = get_class($this);
 
-		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' );
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
-		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone );
+		EE_Registry::instance()->load_helper('DTT_Helper');
+		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone);
 
-		if ( ! empty( $date_formats ) && is_array( $date_formats ) ) {
+		if ( ! empty($date_formats) && is_array($date_formats)) {
 			$this->_dt_frmt = $date_formats[0];
 			$this->_tm_frmt = $date_formats[1];
 		} else {
 			//set default formats for date and time
-			$this->_dt_frmt = get_option( 'date_format' );
-			$this->_tm_frmt = get_option( 'time_format' );
+			$this->_dt_frmt = get_option('date_format');
+			$this->_tm_frmt = get_option('time_format');
 		}
 
 		//if db model is instantiating
-		if ( $bydb ){
+		if ($bydb) {
 			//client code has indicated these field values are from the database
-			foreach( $model_fields as $fieldName => $field ){
-				$this->set_from_db( $fieldName, isset( $fieldValues[ $fieldName] ) ? $fieldValues[ $fieldName ] : null );
+			foreach ($model_fields as $fieldName => $field) {
+				$this->set_from_db($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null);
 			}
 		} 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 ){
-				$this->set( $fieldName, isset( $fieldValues[ $fieldName ] ) ? $fieldValues[ $fieldName ] : null, true );
+			foreach ($model_fields as $fieldName => $field) {
+				$this->set($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null, true);
 			}
 		}
 
 		//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();
 			}
 		}
@@ -178,7 +178,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);
 	}
 
 	/**
@@ -198,7 +198,7 @@ 
 	 * @param boolean $allow_persist
 	 * @return boolean
 	 */
-	function set_allow_persist( $allow_persist ) {
+	function set_allow_persist($allow_persist) {
 		return $this->_allow_persist = $allow_persist;
 	}
 
@@ -211,11 +211,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;
 		}
 	}
@@ -225,7 +225,7 @@ 
 	 * @param EE_Base_Class $obj
 	 * @return string
 	 */
-	public function get_class($obj){
+	public function get_class($obj) {
 		return get_class($obj);
 	}
 
@@ -238,19 +238,19 @@ 
 	 * @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 ) {
+	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' )) {
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				$field_obj->set_date_format( $this->_dt_frmt );
-				$field_obj->set_time_format( $this->_tm_frmt );
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				$field_obj->set_date_format($this->_dt_frmt);
+				$field_obj->set_time_format($this->_tm_frmt);
 			}
 
 			$holder_of_value = $field_obj->prepare_for_set($field_value);
 			//should the value be null?
-			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();
 
 				/**
@@ -260,19 +260,19 @@ 
 				 * object.
 				 * @since 4.6.10+
 				 */
-				if ( $field_obj instanceof EE_Datetime_Field && ! is_null( $this->_fields[$field_name] ) && ! $this->_fields[$field_name] instanceof DateTime ) {
-					empty( $this->_fields[$field_name] ) ? $this->set( $field_name, time() ) : $this->set( $field_name, $this->_fields[$field_name] );
+				if ($field_obj instanceof EE_Datetime_Field && ! is_null($this->_fields[$field_name]) && ! $this->_fields[$field_name] instanceof DateTime) {
+					empty($this->_fields[$field_name]) ? $this->set($field_name, time()) : $this->set($field_name, $this->_fields[$field_name]);
 				}
 
-			}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
@@ -280,20 +280,20 @@ 
 				$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{
-			throw new EE_Error( sprintf( __( "A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso" ), $field_name  ) );
+			$this->_clear_cached_property($field_name);
+		} else {
+			throw new EE_Error(sprintf(__("A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso"), $field_name));
 		}
 
 	}
@@ -310,14 +310,14 @@ 
 	 * @param mixed  $field_value  The value to set.
 	 * @return int|bool @see EE_Base_Class::update_extra_meta() for return docs.
 	 */
-	public function set_field_or_extra_meta( $field_name, $field_value ) {
-		if ( $this->get_model()->has_field( $field_name ) ) {
-			$this->set( $field_name, $field_value );
+	public function set_field_or_extra_meta($field_name, $field_value) {
+		if ($this->get_model()->has_field($field_name)) {
+			$this->set($field_name, $field_value);
 			return true;
 		} else {
 			//ensure this object is saved first so that extra meta can be properly related.
 			$this->save();
-			return $this->update_extra_meta( $field_name, $field_value );
+			return $this->update_extra_meta($field_name, $field_value);
 		}
 	}
 
@@ -341,12 +341,12 @@ 
 	 * @param  string $field_name  expecting the fully qualified field name.
 	 * @return mixed|null  value for the field if found.  null if not found.
 	 */
-	public function get_field_or_extra_meta( $field_name ) {
-		if ( $this->get_model()->has_field( $field_name ) ) {
-			$column_value = $this->get( $field_name );
+	public function get_field_or_extra_meta($field_name) {
+		if ($this->get_model()->has_field($field_name)) {
+			$column_value = $this->get($field_name);
 		} else {
 			//This isn't a column in the main table, let's see if it is in the extra meta.
-			$column_value = $this->get_extra_meta( $field_name, true, null );
+			$column_value = $this->get_extra_meta($field_name, true, null);
 		}
 		return $column_value;
 	}
@@ -365,19 +365,19 @@ 
 	 * @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 = '' ) {
+	public function set_timezone($timezone = '') {
 		EE_Registry::instance()->load_helper('DTT_Helper');
-		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone );
+		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone);
 		//make sure we clear all cached properties because they won't be relevant now
 		$this->_clear_cached_properties();
 
 		//make sure we update field settings and the date for all EE_Datetime_Fields
-		$model_fields = $this->get_model()->field_settings( false );
-		foreach ( $model_fields as $field_name => $field_obj ) {
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				if ( isset( $this->_fields[$field_name] ) && $this->_fields[$field_name] instanceof DateTime ) {
-					$this->_fields[$field_name]->setTimezone( new DateTimeZone( $this->_timezone ) );
+		$model_fields = $this->get_model()->field_settings(false);
+		foreach ($model_fields as $field_name => $field_obj) {
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				if (isset($this->_fields[$field_name]) && $this->_fields[$field_name] instanceof DateTime) {
+					$this->_fields[$field_name]->setTimezone(new DateTimeZone($this->_timezone));
 				}
 			}
 		}
@@ -406,7 +406,7 @@ 
 	 *
 	 * @param string $format   should be a format recognizable by PHP date() functions.
 	 */
-	public function set_date_format( $format ) {
+	public function set_date_format($format) {
 		$this->_dt_frmt = $format;
 		//clear cached_properties because they won't be relevant now.
 		$this->_clear_cached_properties();
@@ -422,7 +422,7 @@ 
 	 * @since 4.6
 	 * @param string $format should be a format recognizable by PHP date() functions.
 	 */
-	public function set_time_format( $format ) {
+	public function set_time_format($format) {
 		$this->_tm_frmt = $format;
 		//clear cached_properties because they won't be relevant now.
 		$this->_clear_cached_properties();
@@ -439,8 +439,8 @@ 
 	 *
 	 * @return mixed string|array
 	 */
-	public function get_format( $full = true ) {
-		return $full ? $this->_dt_frmt . ' ' . $this->_tm_frmt : array( $this->_dt_frmt, $this->_tm_frmt );
+	public function get_format($full = true) {
+		return $full ? $this->_dt_frmt.' '.$this->_tm_frmt : array($this->_dt_frmt, $this->_tm_frmt);
 	}
 
 
@@ -458,17 +458,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;
@@ -476,26 +476,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]);
 			}
 
 		}
@@ -513,11 +513,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;
 	}
 
@@ -532,34 +532,34 @@ 
 	 *                                 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 ($field_obj instanceof EE_Model_Field_Base) {
 			/**
 			 * maybe this is EE_Datetime_Field.  If so we need to make sure timezone and
 			 * formats are correct.
 			 */
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				$field_obj->set_date_format( $this->_dt_frmt, $pretty );
-				$field_obj->set_time_format( $this->_tm_frmt, $pretty );
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				$field_obj->set_date_format($this->_dt_frmt, $pretty);
+				$field_obj->set_time_format($this->_tm_frmt, $pretty);
 			}
 
-			if( ! isset($this->_fields[$fieldname])){
+			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;
@@ -585,9 +585,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]);
 	}
 
 
@@ -598,7 +598,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;
@@ -618,55 +618,55 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class | boolean 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;
 			}
@@ -685,24 +685,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;
 			}
 		}
@@ -718,11 +718,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;
 		}
 	}
@@ -737,14 +737,14 @@ 
 	 * @throws \EE_Error
 	 * @return EE_Base_Class[] NOT necessarily indexed by primary keys
 	 */
-	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();
 		}
@@ -752,15 +752,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;
@@ -779,13 +779,13 @@ 
 	 *
 	 * @return array|EE_Base_Class[]
 	 */
-	public function next_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+	public function next_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->next_x( $current_value, $field, $limit, $query_params, $columns_to_select );
+		return $this->get_model()->next_x($current_value, $field, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -804,13 +804,13 @@ 
 	 *
 	 * @return array|EE_Base_Class[]
 	 */
-	public function previous_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+	public function previous_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->previous_x( $current_value, $field, $limit, $query_params, $columns_to_select );
+		return $this->get_model()->previous_x($current_value, $field, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -828,13 +828,13 @@ 
 	 *
 	 * @return array|EE_Base_Class
 	 */
-	public function next( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+	public function next($field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->next( $current_value, $field, $query_params, $columns_to_select );
+		return $this->get_model()->next($current_value, $field, $query_params, $columns_to_select);
 	}
 
 
@@ -853,13 +853,13 @@ 
 	 *
 	 * @return array|EE_Base_Class
 	 */
-	public function previous( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+	public function previous($field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->previous( $current_value, $field, $query_params, $columns_to_select );
+		return $this->get_model()->previous($current_value, $field, $query_params, $columns_to_select);
 	}
 
 
@@ -873,25 +873,25 @@ 
 	 * @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 ){
-				if( $field_obj->is_nullable()){
+			if ($field_value_from_db === NULL) {
+				if ($field_obj->is_nullable()) {
 					//if the field allows nulls, then let it be null
 					$field_value = NULL;
-				}else{
+				} else {
 					$field_value = $field_obj->get_default_value();
 				}
-			}else{
-				$field_value = $field_obj->prepare_for_set_from_db( $field_value_from_db );
+			} else {
+				$field_value = $field_obj->prepare_for_set_from_db($field_value_from_db);
 			}
 			$this->_fields[$field_name] = $field_value;
-			$this->_clear_cached_property( $field_name );
+			$this->_clear_cached_property($field_name);
 		}
 	}
 
@@ -903,8 +903,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);
 	}
 
 
@@ -934,11 +934,11 @@ 
 	 *                    				     just null is returned (because that indicates that likely
 	 *                    				     this field is nullable).
 	 */
-	public function get_DateTime_object( $field_name ) {
-		$field_settings = $this->get_model()->field_settings_for( $field_name );
+	public function get_DateTime_object($field_name) {
+		$field_settings = $this->get_model()->field_settings_for($field_name);
 
-		if ( ! $field_settings instanceof EE_Datetime_Field ) {
-			EE_Error::add_error( sprintf( __('The field %s is not an EE_Datetime_Field field.  There is no DateTime object stored on this field type.', 'event_espresso' ), $field_name ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $field_settings instanceof EE_Datetime_Field) {
+			EE_Error::add_error(sprintf(__('The field %s is not an EE_Datetime_Field field.  There is no DateTime object stored on this field type.', 'event_espresso'), $field_name), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
@@ -954,7 +954,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);
 	}
 	/**
@@ -963,8 +963,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');
 	}
 
 	/**
@@ -973,8 +973,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);
 	}
 
 
@@ -991,37 +991,37 @@ 
 	 * @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 :  $dt_frmt;
+		$in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt : $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);
 
 		//clear cached property if either formats are not null.
-		if( $dt_frmt !== null || $tm_frmt !== null ) {
-			$this->_clear_cached_property( $field_name );
+		if ($dt_frmt !== null || $tm_frmt !== null) {
+			$this->_clear_cached_property($field_name);
 			//reset format properties because they are used in get()
 			$this->_dt_frmt = $in_dt_frmt;
 			$this->_tm_frmt = $in_tm_frmt;
 		}
 
-		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 ( $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');
@@ -1036,11 +1036,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);
 	}
 
 
@@ -1050,8 +1050,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');
 	}
 
 
@@ -1060,8 +1060,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);
 	}
 
 
@@ -1071,8 +1071,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');
 	}
 
 
@@ -1081,8 +1081,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);
 	}
 
 
@@ -1095,8 +1095,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);
 	}
 
 
@@ -1106,8 +1106,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);
 	}
 
 
@@ -1122,10 +1122,10 @@ 
 	 * @return string Date and time string in set locale or false if no field exists for the given
 	 *                         field name.
 	 */
-	public function get_i18n_datetime( $field_name, $format = NULL ) {
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
-		$format = empty( $format ) ? $this->_dt_frmt . ' ' . $this->_tm_frmt : $format;
-		return date_i18n( $format, EEH_DTT_Helper::get_timestamp_with_offset( $this->get_raw( $field_name ), $this->_timezone ) );
+	public function get_i18n_datetime($field_name, $format = NULL) {
+		EE_Registry::instance()->load_helper('DTT_Helper');
+		$format = empty($format) ? $this->_dt_frmt.' '.$this->_tm_frmt : $format;
+		return date_i18n($format, EEH_DTT_Helper::get_timestamp_with_offset($this->get_raw($field_name), $this->_timezone));
 	}
 
 
@@ -1137,14 +1137,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))));
 		}
 	}
 
@@ -1165,8 +1165,8 @@ 
 	 * @param string|Datetime $time      a valid time string for php datetime functions (or DateTime object)
 	 * @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);
 	}
 
 
@@ -1180,8 +1180,8 @@ 
 	 * @param string|DateTime $date      a valid date string for php datetime functions ( or DateTime object)
 	 * @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);
 	}
 
 
@@ -1197,21 +1197,21 @@ 
 	 * @param string|DateTime $datetime_value A valid Date or Time string (or DateTime object)
 	 * @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 );
-		$field->set_date_format( $this->_dt_frmt );
-		$field->set_time_format( $this->_tm_frmt );
+	protected function _set_date_time($what = 'T', $datetime_value, $fieldname) {
+		$field = $this->_get_dtt_field_settings($fieldname);
+		$field->set_timezone($this->_timezone);
+		$field->set_date_format($this->_dt_frmt);
+		$field->set_time_format($this->_tm_frmt);
 
-		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;
 		}
 
@@ -1234,25 +1234,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;
 	}
 
@@ -1263,20 +1263,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;
 	}
 
@@ -1286,11 +1286,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;
@@ -1309,17 +1309,17 @@ 
 	 * @return int , 1 on a successful update, the ID of the new entry on insert; 0 on failure or if the model object
 	 * isn't allowed to persist (as determined by EE_Base_Class::allow_persist())
 	 */
-	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.
@@ -1327,8 +1327,8 @@ 
 		 * 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 );
-		if( ! $this->allow_persist() ) {
+		do_action('AHEE__EE_Base_Class__save__begin', $this);
+		if ( ! $this->allow_persist()) {
 			return 0;
 		}
 		//now get current attribute values
@@ -1338,61 +1338,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
@@ -1405,7 +1405,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;
 	}
 
@@ -1417,13 +1417,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();
 					}
 				}
@@ -1439,21 +1439,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 */
@@ -1462,8 +1462,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()){
@@ -1484,8 +1484,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);
 	}
 
 
@@ -1495,10 +1495,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);
 		}
@@ -1515,24 +1515,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 {
@@ -1550,13 +1550,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);
 	}
 
 
@@ -1567,10 +1567,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;
 	}
 
@@ -1582,10 +1582,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;
@@ -1599,11 +1599,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();
 	}
 
 
@@ -1615,12 +1615,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);
 		}
 	}
 
@@ -1638,24 +1638,24 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class the object the relation was added to
 	 */
-	public function _add_relation_to( $otherObjectModelObjectOrID,$relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL ){
+	public function _add_relation_to($otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values = 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, $extra_join_model_fields_n_values );
+		if ($this->ID()) {
+			$otherObject = $this->get_model()->add_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values);
 			//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);
 		}
 
 
@@ -1673,12 +1673,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;
 	}
@@ -1689,12 +1689,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;
 	}
@@ -1711,26 +1711,26 @@ 
 	 * @return EE_Base_Class[] Results not necessarily indexed by IDs, because some results might not have primary keys
 	 * or might not be saved yet. Consider using EEM_Base::get_IDs() on these results if you want IDs
 	 */
-	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;
@@ -1747,8 +1747,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);
 	}
 
 
@@ -1762,7 +1762,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);
 	}
 
@@ -1774,34 +1774,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);
 			}
 
@@ -1820,12 +1820,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;
 	}
@@ -1840,13 +1840,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;
 	}
 
@@ -1862,7 +1862,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]);
 	}
 
@@ -1874,12 +1874,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;
@@ -1896,7 +1896,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;
@@ -1926,14 +1926,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);
 	}
 
 
@@ -1948,22 +1948,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);
 		}
 	}
 
@@ -1976,10 +1976,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;
 			}
 		}
@@ -1999,12 +1999,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);
@@ -2020,25 +2020,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;
 			}
 		}
@@ -2055,20 +2055,20 @@ 
 	 * @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){
-				if ( $extra_meta_obj instanceof EE_Extra_Meta ) {
+			foreach ($extra_meta_objs as $extra_meta_obj) {
+				if ($extra_meta_obj instanceof EE_Extra_Meta) {
 					$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 ( $extra_meta_obj instanceof EE_Extra_Meta ) {
-					if( ! isset($return_array[$extra_meta_obj->key()])){
+			foreach ($extra_meta_objs as $extra_meta_obj) {
+				if ($extra_meta_obj instanceof EE_Extra_Meta) {
+					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();
@@ -2081,19 +2081,19 @@ 
 	 * Gets a pretty nice displayable nice for this model object. Often overridden
 	 * @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);
 		}
 	}
 
@@ -2102,11 +2102,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;
 		}
 	}
@@ -2117,21 +2117,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()'
 					)
 				);
 			}
@@ -2143,8 +2143,8 @@ 
 	 * (probably a bad assumption they have made, oh well)
 	 * @return string
 	 */
-	public function __toString(){
-		return sprintf( '%s (%s)', $this->name(), $this->ID() );
+	public function __toString() {
+		return sprintf('%s (%s)', $this->name(), $this->ID());
 	}
 
 	/**
@@ -2176,16 +2176,16 @@ 
 	 * @return array
 	 */
 	public function __sleep() {
-		foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
-			if( $relation_obj instanceof EE_Belongs_To_Relation ) {
-				$classname = 'EE_' . $this->get_model()->get_this_model_name();
-				if( $this->get_one_from_cache( $relation_name ) instanceof $classname &&
-						$this->get_one_from_cache( $relation_name )->ID() ) {
-					$this->clear_cache( $relation_name, $this->get_one_from_cache( $relation_name )->ID() );
+		foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
+				$classname = 'EE_'.$this->get_model()->get_this_model_name();
+				if ($this->get_one_from_cache($relation_name) instanceof $classname &&
+						$this->get_one_from_cache($relation_name)->ID()) {
+					$this->clear_cache($relation_name, $this->get_one_from_cache($relation_name)->ID());
 				}
 			}
 		}
-		return array_keys( get_object_vars( $this ) );
+		return array_keys(get_object_vars($this));
 	}
 
 

core/db_classes/EE_Change_Log.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -47,14 +47,14 @@ 
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Change_Log
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
 	}
 	/**
 	 * Gets message
-	 * @return mixed
+	 * @return boolean
 	 */
 	function message() {
 		return $this->get('LOG_message');
@@ -69,7 +69,7 @@ 
 	}
 	/**
 	 * Gets time
-	 * @return string
+	 * @return boolean
 	 */
 	function time() {
 		return $this->get('LOG_time');
@@ -84,7 +84,7 @@ 
 	}
 	/**
 	 * Gets log_type
-	 * @return string
+	 * @return boolean
 	 */
 	function log_type() {
 		return $this->get('LOG_log_type');
@@ -99,7 +99,7 @@ 
 	}
 	/**
 	 * Gets type of the model object related to this log
-	 * @return string
+	 * @return boolean
 	 */
 	function OBJ_type() {
 		return $this->get('OBJ_type');
@@ -114,7 +114,7 @@ 
 	}
 	/**
 	 * Gets OBJ_ID (the ID of the item related to this log)
-	 * @return mixed
+	 * @return boolean
 	 */
 	function OBJ_ID() {
 		return $this->get('OBJ_ID');
@@ -129,7 +129,7 @@ 
 	}
 	/**
 	 * Gets wp_user
-	 * @return int
+	 * @return boolean
 	 */
 	function wp_user() {
 		return $this->get('LOG_wp_user');

Spacing +15 added lines, -15 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_Change_Log extends EE_Base_Class{
+class EE_Change_Log extends EE_Base_Class {
 
 	/**
 	 *
@@ -36,9 +36,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -49,8 +49,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 	/**
 	 * Gets message
@@ -147,12 +147,12 @@ 
 	 * Gets the model object attached to this log
 	 * @return EE_Base_Class
 	 */
-	function object(){
+	function object() {
 		$model_name_of_related_obj = $this->OBJ_type();
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
-		if( ! $is_model_name ){
+		if ( ! $is_model_name) {
 			return null;
-		}else{
+		} else {
 			return $this->get_first_related($model_name_of_related_obj);
 		}
 	}
@@ -165,17 +165,17 @@ 
 	 * @param boolean $save
 	 * @return boolean if $save=true, NULL is $save=false
 	 */
-	function set_object($object, $save = TRUE ) {
-		if($object instanceof EE_Base_Class){
+	function set_object($object, $save = TRUE) {
+		if ($object instanceof EE_Base_Class) {
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
 			$this->set_OBJ_ID($object->ID());
-		}else{
+		} else {
 			$this->set_OBJ_type(NULL);
 			$this->set_OBJ_ID(NULL);
 		}
-		if($save){
+		if ($save) {
 			return $this->save();
-		}else{
+		} else {
 			return NULL;
 		}
 	}

Braces +5 added lines, -4 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
@@ -152,7 +153,7 @@ 
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
 		if( ! $is_model_name ){
 			return null;
-		}else{
+		} else{
 			return $this->get_first_related($model_name_of_related_obj);
 		}
 	}
@@ -169,13 +170,13 @@ 
 		if($object instanceof EE_Base_Class){
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
 			$this->set_OBJ_ID($object->ID());
-		}else{
+		} else{
 			$this->set_OBJ_type(NULL);
 			$this->set_OBJ_ID(NULL);
 		}
 		if($save){
 			return $this->save();
-		}else{
+		} else{
 			return NULL;
 		}
 	}

core/db_classes/EE_Checkin.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Checkin
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );

Spacing +8 added lines, -8 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
  *
@@ -23,7 +23,7 @@ 
  * @subpackage		includes/classes/EE_Checkin.class.php
  * @author				Darren Ethier
  */
-class EE_Checkin extends EE_Base_Class{
+class EE_Checkin extends EE_Base_Class {
 
 	/**
 	 *
@@ -34,9 +34,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 

Braces +3 added lines, -1 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

core/db_classes/EE_Country.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -51,7 +51,7 @@ 
 
 	/**
 	 * Gets the country name
-	 * @return string
+	 * @return boolean
 	 */
 	public function name() {
 		return $this->get( 'CNT_name' );
@@ -61,7 +61,7 @@ 
 
 	/**
 	 * gets the country's currency code
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_code() {
 		return $this->get( 'CNT_cur_code' );
@@ -82,7 +82,7 @@ 
 
 	/**
 	 * Currency name singular
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_name_single() {
 		return $this->get( 'CNT_cur_single' );
@@ -92,7 +92,7 @@ 
 
 	/**
 	 * Currency name plural
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_name_plural() {
 		return $this->get( 'CNT_cur_plural' );
@@ -112,7 +112,7 @@ 
 
 	/**
 	 * currency_decimal_places : 2 = 0.00   3 = 0.000
-	 * @return integer
+	 * @return boolean
 	 */
 	public function currency_decimal_places() {
 		return $this->get( 'CNT_cur_dec_plc' );
@@ -122,7 +122,7 @@ 
 
 	/**
 	 * currency_decimal_mark :   (comma) ',' = 0,01   or   (decimal) '.' = 0.01
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_decimal_mark() {
 		return $this->get( 'CNT_cur_dec_mrk' );
@@ -132,7 +132,7 @@ 
 
 	/**
 	 * currency thousands separator:   (comma) ',' = 1,000   or   (decimal) '.' = 1.000
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_thousands_separator() {
 		return $this->get( 'CNT_cur_thsnds' );

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package            Event Espresso
- * @ author            Seth Shoultes
- * @ copyright        (c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license            {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link                    {@link http://www.eventespresso.com}
- * @ since                3.2.P
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package            Event Espresso
+	 * @ author            Seth Shoultes
+	 * @ copyright        (c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license            {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link                    {@link http://www.eventespresso.com}
+	 * @ since                3.2.P
+	 *
+	 */
 
 
 

Spacing +16 added lines, -16 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -30,9 +30,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Country|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -41,8 +41,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Country
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'CNT_name' );
+		return $this->get('CNT_name');
 	}
 
 
@@ -64,7 +64,7 @@ 
 	 * @return string
 	 */
 	public function currency_code() {
-		return $this->get( 'CNT_cur_code' );
+		return $this->get('CNT_cur_code');
 	}
 
 
@@ -74,7 +74,7 @@ 
 	 * @return string
 	 */
 	public function currency_sign() {
-		$CNT_cur_sign = $this->get( 'CNT_cur_sign' );
+		$CNT_cur_sign = $this->get('CNT_cur_sign');
 		return $CNT_cur_sign ? $CNT_cur_sign : '&#164;';
 	}
 
@@ -85,7 +85,7 @@ 
 	 * @return string
 	 */
 	public function currency_name_single() {
-		return $this->get( 'CNT_cur_single' );
+		return $this->get('CNT_cur_single');
 	}
 
 
@@ -95,7 +95,7 @@ 
 	 * @return string
 	 */
 	public function currency_name_plural() {
-		return $this->get( 'CNT_cur_plural' );
+		return $this->get('CNT_cur_plural');
 	}
 
 
@@ -105,7 +105,7 @@ 
 	 * @return boolean
 	 */
 	public function currency_sign_before() {
-		return $this->get( 'CNT_cur_sign_b4' );
+		return $this->get('CNT_cur_sign_b4');
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @return integer
 	 */
 	public function currency_decimal_places() {
-		return $this->get( 'CNT_cur_dec_plc' );
+		return $this->get('CNT_cur_dec_plc');
 	}
 
 
@@ -125,7 +125,7 @@ 
 	 * @return string
 	 */
 	public function currency_decimal_mark() {
-		return $this->get( 'CNT_cur_dec_mrk' );
+		return $this->get('CNT_cur_dec_mrk');
 	}
 
 
@@ -135,7 +135,7 @@ 
 	 * @return string
 	 */
 	public function currency_thousands_separator() {
-		return $this->get( 'CNT_cur_thsnds' );
+		return $this->get('CNT_cur_thsnds');
 	}
 }
 /* End of file EE_Country.class.php */

core/db_classes/EE_CPT_Base.class.php

Doc Comments +6 added lines, -6 removed lines

@@ -98,7 +98,7 @@ 
 	 * The main purpose of this method is to return the parent for the model object
 	 *
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function parent() {
 		return $this->get( 'parent' );
@@ -108,7 +108,7 @@ 
 
 	/**
 	 * return the _status property
-	 * @return string
+	 * @return boolean
 	 */
 	public function status() {
 		return $this->get( 'status' );
@@ -130,7 +130,7 @@ 
 	 *
 	 * @link   http://codex.wordpress.org/Function_Reference/get_the_post_thumbnail
 	 * @access protected
-	 * @param string|array $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
+	 * @param string $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
@@ -158,7 +158,7 @@ 
 
 	/**
 	 * This uses the wp "wp_get_attachment_image_src()" function to return the feature image for the current class using the given size params.
-	 * @param  string|array $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
+	 * @param  integer[] $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
 	 * @return string|boolean          the url of the image or false if not found
 	 */
 	public function feature_image_url( $size = 'thumbnail' ) {
@@ -218,7 +218,7 @@ 
 	 * Wrapper for get_post_meta, http://codex.wordpress.org/Function_Reference/get_post_meta
 	 * @param string  $meta_key
 	 * @param boolean $single
-	 * @return mixed <ul><li>If only $id is set it will return all meta values in an associative array.</li>
+	 * @return string|null <ul><li>If only $id is set it will return all meta values in an associative array.</li>
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
 	 */
@@ -275,7 +275,7 @@ 
 	/**
 	 * Gets all the term-taxonomies for this CPT
 	 * @param array $query_params
-	 * @return EE_Term_Taxonomy
+	 * @return EE_Base_Class[]
 	 */
 	public function term_taxonomies( $query_params = array() ) {
 		return $this->get_many_related( 'Term_Taxonomy', $query_params );

Spacing +56 added lines, -56 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -47,8 +47,8 @@ 
 	 * @param int    $parent_term_taxonomy_id optional
 	 * @return EE_Term_Taxonomy
 	 */
-	function add_event_category( $category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL ) {
-		return $this->get_model()->add_event_category( $this, $category_name, $category_description, $parent_term_taxonomy_id );
+	function add_event_category($category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL) {
+		return $this->get_model()->add_event_category($this, $category_name, $category_description, $parent_term_taxonomy_id);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 * @param string $category_name
 	 * @return bool
 	 */
-	function remove_event_category( $category_name ) {
-		return $this->get_model()->remove_event_category( $this, $category_name );
+	function remove_event_category($category_name) {
+		return $this->get_model()->remove_event_category($this, $category_name);
 	}
 
 
@@ -70,14 +70,14 @@ 
 	 * @param EE_Term_Taxonomy $term_taxonomy
 	 * @return EE_Base_Class the relation was removed from
 	 */
-	function remove_relation_to_term_taxonomy( $term_taxonomy ) {
-		if ( !$term_taxonomy ) {
-			EE_Error::add_error( sprintf( __( "No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso" ), get_class( $this ), $this->ID() ), __FILE__, __FUNCTION__, __LINE__ );
+	function remove_relation_to_term_taxonomy($term_taxonomy) {
+		if ( ! $term_taxonomy) {
+			EE_Error::add_error(sprintf(__("No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso"), get_class($this), $this->ID()), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
-		$term_taxonomy->set_count( $term_taxonomy->count() - 1 );
+		$term_taxonomy->set_count($term_taxonomy->count() - 1);
 		$term_taxonomy->save();
-		return $this->_remove_relation_to( $term_taxonomy, 'Term_Taxonomy' );
+		return $this->_remove_relation_to($term_taxonomy, 'Term_Taxonomy');
 	}
 
 
@@ -101,7 +101,7 @@ 
 	 * @return int
 	 */
 	public function parent() {
-		return $this->get( 'parent' );
+		return $this->get('parent');
 	}
 
 
@@ -111,7 +111,7 @@ 
 	 * @return string
 	 */
 	public function status() {
-		return $this->get( 'status' );
+		return $this->get('status');
 	}
 
 
@@ -119,8 +119,8 @@ 
 	/**
 	 * @param string $status
 	 */
-	public function set_status( $status ) {
-		$this->set( 'status', $status );
+	public function set_status($status) {
+		$this->set('status', $status);
 	}
 
 
@@ -134,12 +134,12 @@ 
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
-	protected function _get_feature_image( $size, $attr ) {
+	protected function _get_feature_image($size, $attr) {
 		//first let's see if we already have the _feature_image property set AND if it has a cached element on it FOR the given size
-		$attr_key = is_array( $attr ) ? implode( '_', $attr ) : $attr;
-		$cache_key = is_array( $size ) ? implode( '_', $size ) . $attr_key : $size . $attr_key;
-		$this->_feature_image[ $cache_key ] = isset( $this->_feature_image[ $cache_key ] ) ? $this->_feature_image[ $cache_key ] : $this->get_model()->get_feature_image( $this->ID(), $size, $attr );
-		return $this->_feature_image[ $cache_key ];
+		$attr_key = is_array($attr) ? implode('_', $attr) : $attr;
+		$cache_key = is_array($size) ? implode('_', $size).$attr_key : $size.$attr_key;
+		$this->_feature_image[$cache_key] = isset($this->_feature_image[$cache_key]) ? $this->_feature_image[$cache_key] : $this->get_model()->get_feature_image($this->ID(), $size, $attr);
+		return $this->_feature_image[$cache_key];
 	}
 
 
@@ -150,8 +150,8 @@ 
 	 * @param string|array $attr
 	 * @return string of html
 	 */
-	public function feature_image( $size = 'thumbnail', $attr = '' ) {
-		return $this->_get_feature_image( $size, $attr );
+	public function feature_image($size = 'thumbnail', $attr = '') {
+		return $this->_get_feature_image($size, $attr);
 	}
 
 
@@ -161,9 +161,9 @@ 
 	 * @param  string|array $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
 	 * @return string|boolean          the url of the image or false if not found
 	 */
-	public function feature_image_url( $size = 'thumbnail' ) {
-		$attachment = wp_get_attachment_image_src( get_post_thumbnail_id( $this->ID() ), $size );
-		return !empty( $attachment ) ? $attachment[ 0 ] : FALSE;
+	public function feature_image_url($size = 'thumbnail') {
+		$attachment = wp_get_attachment_image_src(get_post_thumbnail_id($this->ID()), $size);
+		return ! empty($attachment) ? $attachment[0] : FALSE;
 	}
 
 
@@ -176,37 +176,37 @@ 
 	 * @internal param array|string $related_obj_names if included this will be used to restore for related obj if not included then we just do restore on the meta.  We will accept an array of related_obj_names for restoration here.
 	 * @return void
 	 */
-	public function restore_revision( $revision_id, $related_obj_names = array(), $where_query = array() ) {
+	public function restore_revision($revision_id, $related_obj_names = array(), $where_query = array()) {
 		//get revision object
-		$revision_obj = $this->get_model()->get_one_by_ID( $revision_id );
-		if ( $revision_obj instanceof EE_CPT_Base ) {
+		$revision_obj = $this->get_model()->get_one_by_ID($revision_id);
+		if ($revision_obj instanceof EE_CPT_Base) {
 			//no related_obj_name so we assume we're saving a revision on this object.
-			if ( empty( $related_obj_names ) ) {
+			if (empty($related_obj_names)) {
 				$fields = $this->get_model()->get_meta_table_fields();
-				foreach ( $fields as $field ) {
-					$this->set( $field, $revision_obj->get( $field ) );
+				foreach ($fields as $field) {
+					$this->set($field, $revision_obj->get($field));
 				}
 				$this->save();
 			}
-			$related_obj_names = (array)$related_obj_names;
-			foreach ( $related_obj_names as $related_name ) {
+			$related_obj_names = (array) $related_obj_names;
+			foreach ($related_obj_names as $related_name) {
 				//related_obj_name so we're saving a revision on an object related to this object
 				//do we have $where_query params for this related object?  If we do then we include that.
-				$cols_n_values = isset( $where_query[ $related_name ] ) ? $where_query[ $related_name ] : array();
-				$where_params = !empty( $cols_n_values ) ? array( $cols_n_values ) : array();
-				$related_objs = $this->get_many_related( $related_name, $where_params );
-				$revision_related_objs = $revision_obj->get_many_related( $related_name, $where_params );
+				$cols_n_values = isset($where_query[$related_name]) ? $where_query[$related_name] : array();
+				$where_params = ! empty($cols_n_values) ? array($cols_n_values) : array();
+				$related_objs = $this->get_many_related($related_name, $where_params);
+				$revision_related_objs = $revision_obj->get_many_related($related_name, $where_params);
 				//load helper
-				EE_Registry::instance()->load_helper( 'Array' );
+				EE_Registry::instance()->load_helper('Array');
 				//remove related objs from this object that are not in revision
 				//array_diff *should* work cause I think objects are indexed by ID?
-				$related_to_remove = EEH_Array::object_array_diff( $related_objs, $revision_related_objs );
-				foreach ( $related_to_remove as $rr ) {
-					$this->_remove_relation_to( $rr, $related_name, $cols_n_values );
+				$related_to_remove = EEH_Array::object_array_diff($related_objs, $revision_related_objs);
+				foreach ($related_to_remove as $rr) {
+					$this->_remove_relation_to($rr, $related_name, $cols_n_values);
 				}
 				//add all related objs attached to revision to this object
-				foreach ( $revision_related_objs as $r_obj ) {
-					$this->_add_relation_to( $r_obj, $related_name, $cols_n_values );
+				foreach ($revision_related_objs as $r_obj) {
+					$this->_add_relation_to($r_obj, $related_name, $cols_n_values);
 				}
 			}
 		}
@@ -222,8 +222,8 @@ 
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
 	 */
-	public function get_post_meta( $meta_key = NULL, $single = FALSE ) {
-		return get_post_meta( $this->ID(), $meta_key, $single );
+	public function get_post_meta($meta_key = NULL, $single = FALSE) {
+		return get_post_meta($this->ID(), $meta_key, $single);
 	}
 
 
@@ -236,11 +236,11 @@ 
 	 * @throws EE_Error
 	 * @return mixed Returns meta_id if the meta doesn't exist, otherwise returns true on success and false on failure. NOTE: If the meta_value passed to this function is the same as the value that is already in the database, this function returns false.
 	 */
-	public function update_post_meta( $meta_key, $meta_value, $prev_value = NULL ) {
-		if ( !$this->ID() ) {
-			throw new EE_Error( sprintf( __( "You must save this custom post type before adding or updating a post meta field", "event_espresso" ) ) );
+	public function update_post_meta($meta_key, $meta_value, $prev_value = NULL) {
+		if ( ! $this->ID()) {
+			throw new EE_Error(sprintf(__("You must save this custom post type before adding or updating a post meta field", "event_espresso")));
 		}
-		return update_post_meta( $this->ID(), $meta_key, $meta_value, $prev_value );
+		return update_post_meta($this->ID(), $meta_key, $meta_value, $prev_value);
 	}
 
 
@@ -253,11 +253,11 @@ 
 	 * @throws EE_Error
 	 * @return boolean Boolean true, except if the $unique argument was set to true and a custom field with the given key already exists, in which case false is returned.
 	 */
-	public function add_post_meta( $meta_key, $meta_value, $unique = FALSE ) {
-		if ( !$this->ID() ) {
-			throw new EE_Error( sprintf( __( "You must save this custom post type before adding or updating a post meta field", "event_espresso" ) ) );
+	public function add_post_meta($meta_key, $meta_value, $unique = FALSE) {
+		if ( ! $this->ID()) {
+			throw new EE_Error(sprintf(__("You must save this custom post type before adding or updating a post meta field", "event_espresso")));
 		}
-		return add_post_meta( $this->ID(), $meta_key, $meta_value, $unique );
+		return add_post_meta($this->ID(), $meta_key, $meta_value, $unique);
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		return get_permalink( $this->ID() );
+		return get_permalink($this->ID());
 	}
 
 
@@ -277,8 +277,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Term_Taxonomy
 	 */
-	public function term_taxonomies( $query_params = array() ) {
-		return $this->get_many_related( 'Term_Taxonomy', $query_params );
+	public function term_taxonomies($query_params = array()) {
+		return $this->get_many_related('Term_Taxonomy', $query_params);
 	}
 
 

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package        Event Espresso
- * @ author        Event Espresso
- * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link                {@link http://www.eventespresso.com}
- * @ since            4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package        Event Espresso
+	 * @ author        Event Espresso
+	 * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link                {@link http://www.eventespresso.com}
+	 * @ since            4.0
+	 *
+	 */
 
 
 

core/db_classes/EE_CSV.class.php

Doc Comments +6 added lines, -8 removed lines

@@ -287,7 +287,7 @@ 
 	 * Sends HTTP headers to indicate that the browser should download a file,
 	 * and starts writing the file to PHP's output. Returns the file handle so other functions can
 	 * also write to it
-	 * @param string $new_filename the name of the file that the user will download
+	 * @param string|false $filename the name of the file that the user will download
 	 * @return resource, like the results of fopen(), which can be used for fwrite, fputcsv2, etc.
 	 */
 	public function begin_sending_csv($filename){
@@ -343,9 +343,7 @@ 
 	/**
 	 * Writes $data to the csv file open in $filehandle. uses the array indices of $data for column headers
 	 * @param array $data 2D array, first numerically-indexed, and next-level-down preferably indexed by string
-	 * @param boolean $add_csv_column_names whether or not we should add the keys in the bottom-most array as a row for headers in the CSV.
-	 * Eg, if $data looked like array(0=>array('EVT_ID'=>1,'EVT_name'=>'monkey'...), 1=>array(...),...))
-	 * then the first row we'd write to the CSV would be "EVT_ID,EVT_name,..."
+	 * @param resource $filehandle
 	 * @return boolean if we successfully wrote to the CSV or not. If there's no $data, we consider that a success (because we wrote everything there was...nothing)
 	 */
 	public function write_data_array_to_csv($filehandle, $data){
@@ -427,7 +425,7 @@ 
 	 * @param array $model_data_array is assumed to be a 3d array: 1st layer has keys of model names (eg 'Event'),
 	 * next layer is numerically indexed to represent each model object (eg, each individual event), and the last layer
 	 * has all the attributes o fthat model object (eg, the event's id, name, etc)
-	 * @return boolean success
+	 * @return boolean|null success
 	 */
 	public function write_model_data_to_csv($filehandle,$model_data_array){
 		$this->write_metadata_to_csv($filehandle);
@@ -456,8 +454,8 @@ 
 	 * Writes the CSV file to the output buffer, with rows corresponding to $model_data_array,
 	 * and dies (in order to avoid other plugins from messing up the csv output)
 	 * @param string $filename the filename you want to give the file
-	 * @param array $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
-	 * @return bool | void writes CSV file to output and dies
+	 * @param boolean $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
+	 * @return boolean|null | void writes CSV file to output and dies
 	 */
 	public function export_multiple_model_data_to_csv($filename,$model_data_array){
 		$filehandle = $this->begin_sending_csv($filename);
@@ -469,7 +467,7 @@ 
 	 *		  @access public
 	 *			@param array $data - the array of data to be converted to csv and exported
 	 *			@param string $filename - name for newly created csv file
-	 *			@return TRUE on success, FALSE on fail
+	 *			@return false|null on success, FALSE on fail
 	 */
 	public function export_array_to_csv( $data = FALSE, $filename = FALSE  ) {
 

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * CSV Import Export class
- *
- * @package				Event Espresso
- * @subpackage		includes/functions
- * @author					Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 * CSV Import Export class
+	 *
+	 * @package				Event Espresso
+	 * @subpackage		includes/functions
+	 * @author					Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
  class EE_CSV {
 
   // instance of the EE_CSV object

Spacing +108 added lines, -108 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
  * CSV Import Export class
  *
@@ -41,31 +41,31 @@ 
 		global $wpdb;
 
 		$this->_primary_keys = array(
-				$wpdb->prefix . 'esp_answer' => array( 'ANS_ID' ),
-				$wpdb->prefix . 'esp_attendee' => array( 'ATT_ID' ),
-				$wpdb->prefix . 'esp_datetime'	=> array( 'DTT_ID' ),
-				$wpdb->prefix . 'esp_event_question_group'	=> array( 'EQG_ID' ),
-				$wpdb->prefix . 'esp_message_template'	=> array( 'MTP_ID' ),
-				$wpdb->prefix . 'esp_payment'	=> array( 'PAY_ID' ),
-				$wpdb->prefix . 'esp_price'	=> array( 'PRC_ID' ),
-				$wpdb->prefix . 'esp_price_type'	=> array( 'PRT_ID' ),
-				$wpdb->prefix . 'esp_question'	=> array( 'QST_ID' ),
-				$wpdb->prefix . 'esp_question_group'	=> array( 'QSG_ID' ),
-				$wpdb->prefix . 'esp_question_group_question'	=> array( 'QGQ_ID' ),
-				$wpdb->prefix . 'esp_question_option'	=> array( 'QSO_ID' ),
-				$wpdb->prefix . 'esp_registration'	=> array( 'REG_ID' ),
-				$wpdb->prefix . 'esp_status'	=> array( 'STS_ID' ),
-				$wpdb->prefix . 'esp_transaction'	=> array( 'TXN_ID' ),
-				$wpdb->prefix . 'esp_transaction'	=> array( 'TXN_ID' ),
-				$wpdb->prefix . 'events_detail'	=> array( 'id' ),
-				$wpdb->prefix . 'events_category_detail'	=> array( 'id' ),
-				$wpdb->prefix . 'events_category_rel'	=> array( 'id' ),
-				$wpdb->prefix . 'events_venue'	=> array( 'id' ),
-				$wpdb->prefix . 'events_venue_rel' =>  array( 'emeta_id' ),
-				$wpdb->prefix . 'events_locale'	=> array( 'id' ),
-				$wpdb->prefix . 'events_locale_rel'	=> array( 'id' ),
-				$wpdb->prefix . 'events_personnel' =>  array( 'id' ),
-				$wpdb->prefix . 'events_personnel_rel' =>  array( 'id' ),
+				$wpdb->prefix.'esp_answer' => array('ANS_ID'),
+				$wpdb->prefix.'esp_attendee' => array('ATT_ID'),
+				$wpdb->prefix.'esp_datetime'	=> array('DTT_ID'),
+				$wpdb->prefix.'esp_event_question_group'	=> array('EQG_ID'),
+				$wpdb->prefix.'esp_message_template'	=> array('MTP_ID'),
+				$wpdb->prefix.'esp_payment'	=> array('PAY_ID'),
+				$wpdb->prefix.'esp_price'	=> array('PRC_ID'),
+				$wpdb->prefix.'esp_price_type'	=> array('PRT_ID'),
+				$wpdb->prefix.'esp_question'	=> array('QST_ID'),
+				$wpdb->prefix.'esp_question_group'	=> array('QSG_ID'),
+				$wpdb->prefix.'esp_question_group_question'	=> array('QGQ_ID'),
+				$wpdb->prefix.'esp_question_option'	=> array('QSO_ID'),
+				$wpdb->prefix.'esp_registration'	=> array('REG_ID'),
+				$wpdb->prefix.'esp_status'	=> array('STS_ID'),
+				$wpdb->prefix.'esp_transaction'	=> array('TXN_ID'),
+				$wpdb->prefix.'esp_transaction'	=> array('TXN_ID'),
+				$wpdb->prefix.'events_detail'	=> array('id'),
+				$wpdb->prefix.'events_category_detail'	=> array('id'),
+				$wpdb->prefix.'events_category_rel'	=> array('id'),
+				$wpdb->prefix.'events_venue'	=> array('id'),
+				$wpdb->prefix.'events_venue_rel' =>  array('emeta_id'),
+				$wpdb->prefix.'events_locale'	=> array('id'),
+				$wpdb->prefix.'events_locale_rel'	=> array('id'),
+				$wpdb->prefix.'events_personnel' =>  array('id'),
+				$wpdb->prefix.'events_personnel_rel' =>  array('id'),
 			);
 
 	}
@@ -77,9 +77,9 @@ 
 	 *		@ access public
 	 *		@ return class instance
 	 */
-	public static function instance ( ) {
+	public static function instance( ) {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_CSV )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_CSV)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -91,22 +91,22 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	private function read_unicode_file($file_path){
+	private function read_unicode_file($file_path) {
 		$fc = "";
-		$fh = fopen($file_path,"rb");
-		if( ! $fh ){
-			throw new EE_Error( sprintf( __("Cannot open file for read: %s<br>\n", 'event_espresso'), $file_path ) );
+		$fh = fopen($file_path, "rb");
+		if ( ! $fh) {
+			throw new EE_Error(sprintf(__("Cannot open file for read: %s<br>\n", 'event_espresso'), $file_path));
 		}
 		$flen = filesize($file_path);
 		$bc = fread($fh, $flen);
-		for ($i=0; $i<$flen; $i++){
-			$c = substr($bc,$i,1);
-			if ((ord($c) != 0) && (ord($c) != 13)){
-			  $fc = $fc . $c;
+		for ($i = 0; $i < $flen; $i++) {
+			$c = substr($bc, $i, 1);
+			if ((ord($c) != 0) && (ord($c) != 13)) {
+			  $fc = $fc.$c;
 			}
 		}
-		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254))
-		$fc = substr($fc,2);
+		if ((ord(substr($fc, 0, 1)) == 255) && (ord(substr($fc, 1, 1)) == 254))
+		$fc = substr($fc, 2);
 		return ($fc);
 }
 
@@ -118,15 +118,15 @@ 
 	 * @param string $path_to_file
 	 * @return array of arrays. Top-level array has rows, second-level array has each item
 	 */
-	public function import_csv_to_multi_dimensional_array($path_to_file){
+	public function import_csv_to_multi_dimensional_array($path_to_file) {
 		// needed to deal with Mac line endings
-		ini_set('auto_detect_line_endings',TRUE);
+		ini_set('auto_detect_line_endings', TRUE);
 
 		// because fgetcsv does not correctly deal with backslashed quotes such as \"
 		// we'll read the file into a string
-		$file_contents = $this->read_unicode_file( $path_to_file );
+		$file_contents = $this->read_unicode_file($path_to_file);
 		// replace backslashed quotes with CSV enclosures
-		$file_contents = str_replace ( '\\"', '"""', $file_contents );
+		$file_contents = str_replace('\\"', '"""', $file_contents);
 		// HEY YOU! PUT THAT FILE BACK!!!
 		file_put_contents($path_to_file, $file_contents);
 
@@ -136,25 +136,25 @@ 
 			$csvarray = array();
 
 			// in PHP 5.3 fgetcsv accepts a 5th parameter, but the pre 5.3 versions of fgetcsv choke if passed more than 4 - is that crazy or what?
-			if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) {
+			if (version_compare(PHP_VERSION, '5.3.0') < 0) {
 
 				//  PHP 5.2- version
 
 				// loop through each row of the file
-				while(($data = fgetcsv($file_handle, 0, ',', '"' )) !== FALSE){
-					$csvarray[]= $data;
+				while (($data = fgetcsv($file_handle, 0, ',', '"')) !== FALSE) {
+					$csvarray[] = $data;
 				}
-			}else{
+			} else {
 				// loop through each row of the file
-				while (( $data = fgetcsv( $file_handle, 0, ',', '"', '\\' )) !== FALSE ) {
-					$csvarray[]=$data;
+				while (($data = fgetcsv($file_handle, 0, ',', '"', '\\')) !== FALSE) {
+					$csvarray[] = $data;
 				}
 			}
 			# Close the File.
 			fclose($file_handle);
 			return $csvarray;
-		}else{
-			EE_Error::add_error( sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"),$path_to_file), __FILE__, __FUNCTION__, __LINE__ );
+		} else {
+			EE_Error::add_error(sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"), $path_to_file), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 	}
@@ -184,9 +184,9 @@ 
 	 *						...
 	 *						)
 	 */
-	public function import_csv_to_model_data_array( $path_to_file, $model_name = FALSE, $first_row_is_headers = TRUE ) {
+	public function import_csv_to_model_data_array($path_to_file, $model_name = FALSE, $first_row_is_headers = TRUE) {
 		$multi_dimensional_array = $this->import_csv_to_multi_dimensional_array($path_to_file);
-		if( ! $multi_dimensional_array ){
+		if ( ! $multi_dimensional_array) {
 			return false;
 		}
 		// gotta start somewhere
@@ -195,9 +195,9 @@ 
 		$ee_formatted_data = array();
 		// array to store headers (column names)
 		$headers = array();
-		foreach($multi_dimensional_array as $data){
+		foreach ($multi_dimensional_array as $data) {
 			// if first cell is MODEL, then second cell is the MODEL name
-			if ( $data[0]	== 'MODEL' ) {
+			if ($data[0] == 'MODEL') {
 				$model_name = $data[1];
 				//don't bother looking for model data in this row. The rest of this
 				//row should be blank
@@ -207,7 +207,7 @@ 
 				$headers = array();
 				continue;
 			}
-			if( strpos( $data[0], EE_CSV::metadata_header ) !==FALSE ){
+			if (strpos($data[0], EE_CSV::metadata_header) !== FALSE) {
 				$model_name = EE_CSV::metadata_header;
 				//store like model data, we just won't try importing it etc.
 				$row = 1;
@@ -220,31 +220,31 @@ 
 
 			$model_entry = array();
 			// loop through each column
-			for ( $i=0; $i < $columns; $i++ ) {
+			for ($i = 0; $i < $columns; $i++) {
 
 				//replace csv_enclosures with backslashed quotes
-				$data[$i] = str_replace ( '"""', '\\"', $data[$i] );
+				$data[$i] = str_replace('"""', '\\"', $data[$i]);
 				// do we need to grab the column names?
-				if ( $row === 1){
-					if( $first_row_is_headers ) {
+				if ($row === 1) {
+					if ($first_row_is_headers) {
 						// store the column names to use for keys
 						$column_name = $data[$i];
 						//check it's not blank... sometimes CSV editign programs adda bunch of empty columns onto the end...
-						if(!$column_name){continue;}
+						if ( ! $column_name) {continue; }
 						$matches = array();
-						if($model_name == EE_CSV::metadata_header){
+						if ($model_name == EE_CSV::metadata_header) {
 							$headers[$i] = $column_name;
-						}else{
+						} else {
 							//now get the db table name from it (the part between square brackets)
-							$success = preg_match('~(.*)\[(.*)\]~', $column_name,$matches);
-							if (!$success){
-								EE_Error::add_error( sprintf(__("The column titled %s is invalid for importing. It must be be in the format of 'Nice Name[model_field_name]' in row %s", "event_espresso"),$column_name,implode(",",$data)), __FILE__, __FUNCTION__, __LINE__ );
+							$success = preg_match('~(.*)\[(.*)\]~', $column_name, $matches);
+							if ( ! $success) {
+								EE_Error::add_error(sprintf(__("The column titled %s is invalid for importing. It must be be in the format of 'Nice Name[model_field_name]' in row %s", "event_espresso"), $column_name, implode(",", $data)), __FILE__, __FUNCTION__, __LINE__);
 								return false;
 							}
 							$headers[$i] = $matches[2];
 						}
 
-					}else{
+					} else {
 						// no column names means our final array will just use counters for keys
 						$model_entry[$headers[$i]] = $data[$i];
 						$headers[$i] = $i;
@@ -252,14 +252,14 @@ 
 					// and we need to store csv data
 				} else {
 					// this column isn' ta header, store it if there is a header for it
-					if(isset($headers[$i])){
+					if (isset($headers[$i])) {
 						$model_entry[$headers[$i]] = $data[$i];
 					}
 				}
 
 			}
 			//save the row's data IF it's a non-header-row
-			if( ! $first_row_is_headers || ($first_row_is_headers && $row > 1)){
+			if ( ! $first_row_is_headers || ($first_row_is_headers && $row > 1)) {
 				$ee_formatted_data[$model_name][] = $model_entry;
 			}
 			// advance to next row
@@ -278,9 +278,9 @@ 
 	}
 
 
-	public function save_csv_to_db( $csv_data_array, $model_name = FALSE ) {
-		EE_Error::doing_it_wrong('save_csv_to_db', __( 'Function moved to EE_Import and renamed to save_csv_data_array_to_db', 'event_espresso' ), '4.6.7' );
-		return EE_Import::instance()->save_csv_data_array_to_db( $csv_data_array, $model_name );
+	public function save_csv_to_db($csv_data_array, $model_name = FALSE) {
+		EE_Error::doing_it_wrong('save_csv_to_db', __('Function moved to EE_Import and renamed to save_csv_data_array_to_db', 'event_espresso'), '4.6.7');
+		return EE_Import::instance()->save_csv_data_array_to_db($csv_data_array, $model_name);
 	}
 
 	/**
@@ -290,11 +290,11 @@ 
 	 * @param string $new_filename the name of the file that the user will download
 	 * @return resource, like the results of fopen(), which can be used for fwrite, fputcsv2, etc.
 	 */
-	public function begin_sending_csv($filename){
+	public function begin_sending_csv($filename) {
 		// grab file extension
 		$ext = substr(strrchr($filename, '.'), 1);
-		if ( $ext == '.csv' or  $ext == '.xls' ) {
-			str_replace( $ext, '', $filename );
+		if ($ext == '.csv' or $ext == '.xls') {
+			str_replace($ext, '', $filename);
 		}
 		$filename .= '.csv';
 
@@ -325,12 +325,12 @@ 
 	 * mentioning the version and timezone
 	 * @param resource $filehandle
 	 */
-	public function write_metadata_to_csv($filehandle){
+	public function write_metadata_to_csv($filehandle) {
 		EE_Registry::instance()->load_helper('DTT_Helper');
-		$data_row = array(EE_CSV::metadata_header);//do NOT translate because this exact string is used when importing
+		$data_row = array(EE_CSV::metadata_header); //do NOT translate because this exact string is used when importing
 		$this->fputcsv2($filehandle, $data_row);
 		EE_Registry::instance()->load_helper('DTT_Helper');
-		$meta_data = array( 0=> array(
+		$meta_data = array(0=> array(
 			'version'=>espresso_version(),
 			'timezone'=>  EEH_DTT_Helper::get_timezone(),
 			'time_of_export'=>current_time('mysql'),
@@ -348,30 +348,30 @@ 
 	 * then the first row we'd write to the CSV would be "EVT_ID,EVT_name,..."
 	 * @return boolean if we successfully wrote to the CSV or not. If there's no $data, we consider that a success (because we wrote everything there was...nothing)
 	 */
-	public function write_data_array_to_csv($filehandle, $data){
+	public function write_data_array_to_csv($filehandle, $data) {
 		EE_Registry::instance()->load_helper('Array');
 
 
 		//determine if $data is actually a 2d array
-		if ( $data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))){
+		if ($data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))) {
 			//make sure top level is numerically indexed,
 
-			if( EEH_Array::is_associative_array($data)){
-				throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s","event_espresso"),implode(",",array_keys($data))));
+			if (EEH_Array::is_associative_array($data)) {
+				throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s", "event_espresso"), implode(",", array_keys($data))));
 			}
 			$item_in_top_level_array = EEH_Array::get_one_item_from_array($data);
 			//now, is the last item in the top-level array of $data an associative or numeric array?
-			if(EEH_Array::is_associative_array($item_in_top_level_array)){
+			if (EEH_Array::is_associative_array($item_in_top_level_array)) {
 				//its associative, so we want to output its keys as column headers
 				$keys = array_keys($item_in_top_level_array);
 				echo $this->fputcsv2($filehandle, $keys);
 			}
 			//start writing data
-			foreach($data as $data_row){
+			foreach ($data as $data_row) {
 				echo $this->fputcsv2($filehandle, $data_row);
 			}
 			return true;
-		}else{
+		} else {
 			//no data TO write... so we can assume that's a success
 			return true;
 		}
@@ -416,7 +416,7 @@ 
 	 * Calls exit to prevent polluting the CSV file with other junk
 	 * @param resource $fh filehandle where we're writing the CSV to
 	 */
-	public function end_sending_csv($fh){
+	public function end_sending_csv($fh) {
 		fclose($fh);
 		exit(0);
 	}
@@ -429,23 +429,23 @@ 
 	 * has all the attributes o fthat model object (eg, the event's id, name, etc)
 	 * @return boolean success
 	 */
-	public function write_model_data_to_csv($filehandle,$model_data_array){
+	public function write_model_data_to_csv($filehandle, $model_data_array) {
 		$this->write_metadata_to_csv($filehandle);
-		foreach($model_data_array as $model_name => $model_instance_arrays){
+		foreach ($model_data_array as $model_name => $model_instance_arrays) {
 			//first: output a special row stating the model
-			echo $this->fputcsv2($filehandle,array('MODEL',$model_name));
+			echo $this->fputcsv2($filehandle, array('MODEL', $model_name));
 			//if we have items to put in the CSV, do it normally
 
-			if( ! empty($model_instance_arrays) ){
+			if ( ! empty($model_instance_arrays)) {
 				$this->write_data_array_to_csv($filehandle, $model_instance_arrays);
-			}else{
+			} else {
 //				echo "no data to write... so just write the headers";
 				//so there's actually NO model objects for that model.
 				//probably still want to show the columns
 				$model = EE_Registry::instance()->load_model($model_name);
 				$column_names = array();
-				foreach($model->field_settings() as $field){
-					$column_names[$field->get_nicename()."[".$field->get_name()."]"] = null ;
+				foreach ($model->field_settings() as $field) {
+					$column_names[$field->get_nicename()."[".$field->get_name()."]"] = null;
 				}
 				$this->write_data_array_to_csv($filehandle, array($column_names));
 			}
@@ -459,7 +459,7 @@ 
 	 * @param array $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
 	 * @return bool | void writes CSV file to output and dies
 	 */
-	public function export_multiple_model_data_to_csv($filename,$model_data_array){
+	public function export_multiple_model_data_to_csv($filename, $model_data_array) {
 		$filehandle = $this->begin_sending_csv($filename);
 		$this->write_model_data_to_csv($filehandle, $model_data_array);
 		$this->end_sending_csv($filehandle);
@@ -471,15 +471,15 @@ 
 	 *			@param string $filename - name for newly created csv file
 	 *			@return TRUE on success, FALSE on fail
 	 */
-	public function export_array_to_csv( $data = FALSE, $filename = FALSE  ) {
+	public function export_array_to_csv($data = FALSE, $filename = FALSE) {
 
 		// no data file?? get outta here
-		if ( ! $data or ! is_array( $data ) or empty( $data ) ) {
+		if ( ! $data or ! is_array($data) or empty($data)) {
 			return FALSE;
 		}
 
 		// no filename?? get outta here
-		if ( ! $filename ) {
+		if ( ! $filename) {
 			return FALSE;
 		}
 
@@ -505,11 +505,11 @@ 
 	 *			@param int $percent_of_max - desired percentage of the max upload_mb
 	 *			@return int KB
 	 */
-	public function get_max_upload_size ( $percent_of_max = FALSE ) {
+	public function get_max_upload_size($percent_of_max = FALSE) {
 
-		$max_upload = (int)(ini_get('upload_max_filesize'));
-		$max_post = (int)(ini_get('post_max_size'));
-		$memory_limit = (int)(ini_get('memory_limit'));
+		$max_upload = (int) (ini_get('upload_max_filesize'));
+		$max_post = (int) (ini_get('post_max_size'));
+		$memory_limit = (int) (ini_get('memory_limit'));
 
 		// determine the smallest of the three values from above
 		$upload_mb = min($max_upload, $max_post, $memory_limit);
@@ -518,9 +518,9 @@ 
 		$upload_mb = $upload_mb * 1024;
 
 		// don't want the full monty? then reduce the max uplaod size
-		if ( $percent_of_max ) {
+		if ($percent_of_max) {
 			// is percent_of_max like this -> 50 or like this -> 0.50 ?
-			if ( $percent_of_max > 1 ) {
+			if ($percent_of_max > 1) {
 				// chnages 50 to 0.50
 				$percent_of_max = $percent_of_max / 100;
 			}
@@ -542,17 +542,17 @@ 
 	 *			@param string $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
 	 *			@return void
 	 */
-	private function fputcsv2 ($fh, array $row, $delimiter = ',', $enclosure = '"', $mysql_null = FALSE) {
+	private function fputcsv2($fh, array $row, $delimiter = ',', $enclosure = '"', $mysql_null = FALSE) {
 		//Allow user to filter the csv delimiter and enclosure for other countries csv standards
-		$delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter );
-		$enclosure = apply_filters( 'FHEE__EE_CSV__fputcsv2__enclosure', $enclosure );
+		$delimiter = apply_filters('FHEE__EE_CSV__fputcsv2__delimiter', $delimiter);
+		$enclosure = apply_filters('FHEE__EE_CSV__fputcsv2__enclosure', $enclosure);
 
 		$delimiter_esc = preg_quote($delimiter, '/');
 		$enclosure_esc = preg_quote($enclosure, '/');
 
 		$output = array();
 		foreach ($row as $field_value) {
-			if(is_object($field_value) || is_array($field_value)){
+			if (is_object($field_value) || is_array($field_value)) {
 				$field_value = serialize($field_value);
 			}
 			if ($field_value === null && $mysql_null) {
@@ -561,10 +561,10 @@ 
 			}
 
 			$output[] = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value) ?
-				( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure ) : $field_value;
+				($enclosure.str_replace($enclosure, $enclosure.$enclosure, $field_value).$enclosure) : $field_value;
 		}
 
-		fwrite($fh, join($delimiter, $output) . PHP_EOL);
+		fwrite($fh, join($delimiter, $output).PHP_EOL);
 	}
 
 

Braces +12 added lines, -9 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');
+}
 /**
  * CSV Import Export class
  *
@@ -105,8 +107,9 @@ 
 			  $fc = $fc . $c;
 			}
 		}
-		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254))
-		$fc = substr($fc,2);
+		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254)) {
+				$fc = substr($fc,2);
+		}
 		return ($fc);
 }
 
@@ -144,7 +147,7 @@ 
 				while(($data = fgetcsv($file_handle, 0, ',', '"' )) !== FALSE){
 					$csvarray[]= $data;
 				}
-			}else{
+			} else{
 				// loop through each row of the file
 				while (( $data = fgetcsv( $file_handle, 0, ',', '"', '\\' )) !== FALSE ) {
 					$csvarray[]=$data;
@@ -153,7 +156,7 @@ 
 			# Close the File.
 			fclose($file_handle);
 			return $csvarray;
-		}else{
+		} else{
 			EE_Error::add_error( sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"),$path_to_file), __FILE__, __FUNCTION__, __LINE__ );
 			return false;
 		}
@@ -234,7 +237,7 @@ 
 						$matches = array();
 						if($model_name == EE_CSV::metadata_header){
 							$headers[$i] = $column_name;
-						}else{
+						} else{
 							//now get the db table name from it (the part between square brackets)
 							$success = preg_match('~(.*)\[(.*)\]~', $column_name,$matches);
 							if (!$success){
@@ -244,7 +247,7 @@ 
 							$headers[$i] = $matches[2];
 						}
 
-					}else{
+					} else{
 						// no column names means our final array will just use counters for keys
 						$model_entry[$headers[$i]] = $data[$i];
 						$headers[$i] = $i;
@@ -371,7 +374,7 @@ 
 				echo $this->fputcsv2($filehandle, $data_row);
 			}
 			return true;
-		}else{
+		} else{
 			//no data TO write... so we can assume that's a success
 			return true;
 		}
@@ -438,7 +441,7 @@ 
 
 			if( ! empty($model_instance_arrays) ){
 				$this->write_data_array_to_csv($filehandle, $model_instance_arrays);
-			}else{
+			} else{
 //				echo "no data to write... so just write the headers";
 				//so there's actually NO model objects for that model.
 				//probably still want to show the columns

core/db_classes/EE_Currency.class.php

Doc Comments +12 added lines, -12 removed lines

@@ -54,14 +54,14 @@ 
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Currency
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
 	}
 	/**
 	 * Gets code
-	 * @return string
+	 * @return boolean
 	 */
 	function code() {
 		return $this->get('CUR_code');
@@ -70,7 +70,7 @@ 
 	/**
 	 * Sets code
 	 * @param string $code
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_code($code) {
 		return $this->set('CUR_code', $code);
@@ -86,14 +86,14 @@ 
 	/**
 	 * Sets active
 	 * @param boolean $active
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_active($active) {
 		return $this->set('CUR_active', $active);
 	}
 	/**
 	 * Gets dec_plc
-	 * @return int
+	 * @return boolean
 	 */
 	function dec_plc() {
 		return $this->get('CUR_dec_plc');
@@ -102,14 +102,14 @@ 
 	/**
 	 * Sets dec_plc
 	 * @param int $dec_plc
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_dec_plc($dec_plc) {
 		return $this->set('CUR_dec_plc', $dec_plc);
 	}
 	/**
 	 * Gets plural
-	 * @return string
+	 * @return boolean
 	 */
 	function plural_name() {
 		return $this->get('CUR_plural');
@@ -118,14 +118,14 @@ 
 	/**
 	 * Sets plural
 	 * @param string $plural
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_plural_name($plural) {
 		return $this->set('CUR_plural', $plural);
 	}
 	/**
 	 * Gets sign
-	 * @return string
+	 * @return boolean
 	 */
 	function sign() {
 		return $this->get('CUR_sign');
@@ -134,14 +134,14 @@ 
 	/**
 	 * Sets sign
 	 * @param string $sign
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_sign($sign) {
 		return $this->set('CUR_sign', $sign);
 	}
 	/**
 	 * Gets single
-	 * @return string
+	 * @return boolean
 	 */
 	function singular_name() {
 		return $this->get('CUR_single');
@@ -150,7 +150,7 @@ 
 	/**
 	 * Sets single
 	 * @param string $single
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_singular_name($single) {
 		return $this->set('CUR_single', $single);

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_Currency extends EE_Base_Class{
+class EE_Currency extends EE_Base_Class {
 
 		/** Currency COde @var CUR_code*/ protected $_CUR_code = NULL;
 		/** Currency Name Singular @var CUR_single*/ protected $_CUR_single = NULL;
@@ -43,9 +43,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -56,8 +56,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 	/**
 	 * Gets code
@@ -159,8 +159,8 @@ 
 	 * Gets a prettier name
 	 * @return string
 	 */
-	function name(){
-		return sprintf(__("%s (%s)", "event_espresso"),$this->code(),$this->plural_name());
+	function name() {
+		return sprintf(__("%s (%s)", "event_espresso"), $this->code(), $this->plural_name());
 	}
 
 }

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
  *