eventespresso / event-espresso-core

core/data_migration_scripts/4_8_0_stages/EE_DMS_4_8_0_event_subtotals.dmsstage.php

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,68 +12,68 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_DMS_4_8_0_event_subtotals extends EE_Data_Migration_Script_Stage_Table{
-	function __construct(){
+class EE_DMS_4_8_0_event_subtotals extends EE_Data_Migration_Script_Stage_Table {
+	function __construct() {
 		global $wpdb;
-		$this->_old_table = $wpdb->prefix . 'esp_line_item';
+		$this->_old_table = $wpdb->prefix.'esp_line_item';
 		$this->_extra_where_sql = ' WHERE LIN_type="sub-total" AND LIN_code="pre-tax-subtotal"';
 		$this->_pretty_name = __('Event Sub-total line items', 'event_espresso');
 		parent::__construct();
 	}
-	protected function _migrate_old_row( $line_item_row ) {
+	protected function _migrate_old_row($line_item_row) {
 		global $wpdb;
 		//what event is this line item for? this can be found by looking at its transaction's registration's EVT_ID
-		$event_id = $wpdb->get_var( $wpdb->prepare( 'SELECT EVT_ID FROM ' . $wpdb->prefix . 'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row[ 'TXN_ID' ] ) );
+		$event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM '.$wpdb->prefix.'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
 		$new_line_item_data = array(
-					'LIN_code' => 'event-' . $event_id,
-					'TXN_ID' => $line_item_row[ 'TXN_ID' ],
-					'LIN_name' => __( 'Event', 'event_espresso' ),
-					'LIN_desc' => $line_item_row[ 'LIN_desc' ],
-					'LIN_unit_price' => $line_item_row[ 'LIN_unit_price' ],
-					'LIN_percent' => $line_item_row[ 'LIN_percent' ],
-					'LIN_is_taxable' => $line_item_row[ 'LIN_is_taxable' ],
-					'LIN_order' => $line_item_row[ 'LIN_order' ],
-					'LIN_total' => $line_item_row[ 'LIN_total' ],
-					'LIN_quantity' => $line_item_row[ 'LIN_quantity' ],
-					'LIN_parent' => $line_item_row[ 'LIN_ID'],
+					'LIN_code' => 'event-'.$event_id,
+					'TXN_ID' => $line_item_row['TXN_ID'],
+					'LIN_name' => __('Event', 'event_espresso'),
+					'LIN_desc' => $line_item_row['LIN_desc'],
+					'LIN_unit_price' => $line_item_row['LIN_unit_price'],
+					'LIN_percent' => $line_item_row['LIN_percent'],
+					'LIN_is_taxable' => $line_item_row['LIN_is_taxable'],
+					'LIN_order' => $line_item_row['LIN_order'],
+					'LIN_total' => $line_item_row['LIN_total'],
+					'LIN_quantity' => $line_item_row['LIN_quantity'],
+					'LIN_parent' => $line_item_row['LIN_ID'],
 					'LIN_type' => 'sub-total',
 					'OBJ_type' => 'Event',
 					'OBJ_ID' => $event_id,
 				);
 		$new_line_item_datatypes = array(
-					'%s',//LIN_code
-					'%d',//TXN_ID
-					'%s',//LIN_name
-					'%s',//LIN_desc
-					'%f',//LIN_unit_price
-					'%f',//LIN_percent
-					'%d',//LIN_is_taxable
-					'%d',//LIN_order
-					'%f',//LIN_total
-					'%d',//LIN_quantity
-					'%d',//LIN_parent
-					'%s',//LIN_type
-					'%s',//OBJ_type
-					'%d',//OBJ_ID
+					'%s', //LIN_code
+					'%d', //TXN_ID
+					'%s', //LIN_name
+					'%s', //LIN_desc
+					'%f', //LIN_unit_price
+					'%f', //LIN_percent
+					'%d', //LIN_is_taxable
+					'%d', //LIN_order
+					'%f', //LIN_total
+					'%d', //LIN_quantity
+					'%d', //LIN_parent
+					'%s', //LIN_type
+					'%s', //OBJ_type
+					'%d', //OBJ_ID
 				);
 		//insert the new event subtotal line item, pointing to this line item
-		$success = $wpdb->insert( $this->_old_table, $new_line_item_data, $new_line_item_datatypes );
-		if( ! $success ) {
-			$this->add_error( $this->_create_error_message_for_db_insertion( $this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes ) );
+		$success = $wpdb->insert($this->_old_table, $new_line_item_data, $new_line_item_datatypes);
+		if ( ! $success) {
+			$this->add_error($this->_create_error_message_for_db_insertion($this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes));
 		}
 		$new_line_item_id = $wpdb->insert_id;
-		$this->get_migration_script()->set_mapping($this->_old_table, $line_item_row[ 'LIN_ID' ], $this->_old_table, $new_line_item_id );
+		$this->get_migration_script()->set_mapping($this->_old_table, $line_item_row['LIN_ID'], $this->_old_table, $new_line_item_id);
 		$query = $wpdb->prepare(
 					"UPDATE {$this->_old_table} SET LIN_parent=%d WHERE LIN_parent = %d AND LIN_ID != %d LIMIT 100",
 					$new_line_item_id,
-					$line_item_row[ 'LIN_ID' ],
+					$line_item_row['LIN_ID'],
 					$new_line_item_id );
-		$success = $wpdb->query( $query );
-		if( $success === false ) {
+		$success = $wpdb->query($query);
+		if ($success === false) {
 			$this->add_error(
-					sprintf( __( 'Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso' ),
+					sprintf(__('Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso'),
 					$new_line_item_id,
-					$line_item_row[ 'LIN_ID' ],
+					$line_item_row['LIN_ID'],
 					$wpdb->last_error,
 					$query,
 					$success) );

core/db_classes/EE_WP_User.class.php

Spacing +11 added lines, -11 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');
 }
 /**
  * EE_WP_User class
@@ -22,9 +22,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_WP_User|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);
 	}
 
 
@@ -33,8 +33,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_WP_User
 	 */
-	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);
 	}
 
 	/**
@@ -42,8 +42,8 @@ 
 	 * @return WP_User
 	 */
 	public function wp_user_obj() {
-		if( ! $this->_wp_user_obj ) {
-			$this->_wp_user_obj = get_user_by('ID', $this->ID() );
+		if ( ! $this->_wp_user_obj) {
+			$this->_wp_user_obj = get_user_by('ID', $this->ID());
 		}
 		return $this->_wp_user_obj;
 	}
@@ -69,7 +69,7 @@ 
 						$_SERVER['REQUEST_URI']
 					)
 				),
-				get_edit_user_link( $this->ID() )
+				get_edit_user_link($this->ID())
 			)
 		);
 	}
@@ -87,7 +87,7 @@ 
 	 * @return string
 	 */
 	public function get_admin_overview_link() {
-		return admin_url( 'users.php' );
+		return admin_url('users.php');
 	}
 
 

core/interfaces/EEI_Query_Filter.interface.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,7 +12,7 @@ 
  * @since      4.9.0
  * @author     Darren Ethier
  */
-interface EEI_Query_Filter  {
+interface EEI_Query_Filter {
 
 
 	/**

core/libraries/line_item_filters/EE_Line_Item_Filter_Base.class.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Line_Item_Filter_Base
@@ -24,7 +24,7 @@ 
 	 * @param \EEI_Line_Item $line_item
 	 * @return \EEI_Line_Item
 	 */
-	public function process( EEI_Line_Item $line_item ) {
+	public function process(EEI_Line_Item $line_item) {
 		return $line_item;
 	}
 

modules/single_page_checkout/reg_steps/payment_options/payment_options_main.template.php

Spacing +13 added lines, -13 removed lines

@@ -1,37 +1,37 @@
 
 	<h4 id="reg-page-totals-hdr" class="">
-		<span class="drk-grey-text"><?php _e('Registrations:', 'event_espresso'); ?></span> <?php echo $reg_count;?>
+		<span class="drk-grey-text"><?php _e('Registrations:', 'event_espresso'); ?></span> <?php echo $reg_count; ?>
 	</h4>
 
 	<div class="spco-payment-info-dv">
 		<table id="spco-payment-info-table">
 			<thead>
 				<tr>
-					<th scope="col" width=""><?php _e('Name and Description', 'event_espresso');?></th>
-					<th scope="col" width="15%" class="jst-cntr"><?php _e('Price', 'event_espresso');?></th>
-					<th scope="col" width="5%" class="jst-cntr"><?php _e( 'Qty', 'event_espresso' ); ?></th>
-					<th scope="col" width="15%" class="jst-cntr"><?php _e('Total', 'event_espresso');?></th>
-					<?php	do_action( 'AHEE__registration_page_payment_options__payment_info_table_thead_row_end' ); ?>
+					<th scope="col" width=""><?php _e('Name and Description', 'event_espresso'); ?></th>
+					<th scope="col" width="15%" class="jst-cntr"><?php _e('Price', 'event_espresso'); ?></th>
+					<th scope="col" width="5%" class="jst-cntr"><?php _e('Qty', 'event_espresso'); ?></th>
+					<th scope="col" width="15%" class="jst-cntr"><?php _e('Total', 'event_espresso'); ?></th>
+					<?php	do_action('AHEE__registration_page_payment_options__payment_info_table_thead_row_end'); ?>
 				</tr>
 			</thead>
 			<tbody>
-			<?php echo $transaction_details;?>
-			<?php	do_action( 'AHEE__registration_page_payment_options__payment_info_table_tbody_end' ); ?>
+			<?php echo $transaction_details; ?>
+			<?php	do_action('AHEE__registration_page_payment_options__payment_info_table_tbody_end'); ?>
 			</tbody>
 		</table>
 	</div>
 	<div class="clear-float"> </div>
 
-	<?php  echo $before_payment_options;  ?>
+	<?php  echo $before_payment_options; ?>
 
 	<div id="methods-of-payment">
 		<?php echo $payment_options; ?>
-		<a id="reg-page-select-other-method-of-payment-lnk" class="hidden smaller-text right" rel=""><?php echo apply_filters( 'FHEE__registration_page_payment_options__select_other_method_of_payment_lnk', __( 'select a different method of payment:', 'event_espresso' )); ?></a>
+		<a id="reg-page-select-other-method-of-payment-lnk" class="hidden smaller-text right" rel=""><?php echo apply_filters('FHEE__registration_page_payment_options__select_other_method_of_payment_lnk', __('select a different method of payment:', 'event_espresso')); ?></a>
 	</div>
 	<!-- end #methods-of-payment -->
 
-	<?php  echo $after_payment_options;  ?>
+	<?php  echo $after_payment_options; ?>
 
-	<?php  echo $default_hidden_inputs;  ?>
-	<?php  echo $extra_hidden_inputs;  ?>
+	<?php  echo $default_hidden_inputs; ?>
+	<?php  echo $extra_hidden_inputs; ?>
 

public/Espresso_Arabica_2014/content-espresso_venues-details.php

Spacing +13 added lines, -13 removed lines

@@ -1,43 +1,43 @@
 <?php //echo '<h1>' . __FILE__ . '</h1>'; ?>
 <?php global $post; ?>
 <div class="venue-content">
-<?php if ( apply_filters( 'FHEE__content_espresso_venues_details_template__display_entry_meta', TRUE )): ?>
+<?php if (apply_filters('FHEE__content_espresso_venues_details_template__display_entry_meta', TRUE)): ?>
 	<div class="entry-meta">
-		<span class="tags-links"><?php espresso_venue_categories( $post->ID, TRUE, TRUE ); ?></span>
+		<span class="tags-links"><?php espresso_venue_categories($post->ID, TRUE, TRUE); ?></span>
 		<?php
-			if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+			if ( ! post_password_required() && (comments_open() || get_comments_number())) :
 		?>
-		<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'event_espresso' ), __( '1 Comment', 'event_espresso' ), __( '% Comments', 'event_espresso' ) ); ?></span>
+		<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'event_espresso'), __('1 Comment', 'event_espresso'), __('% Comments', 'event_espresso')); ?></span>
 		<?php
 			endif;
 
-			edit_post_link( __( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' );
+			edit_post_link(__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>');
 		?>
 	</div>
 <?php  endif; ?>
 	
 	<h3 class="event-venues-h3 ee-event-h3">
-		<?php _e( 'Details', 'event_espresso' ); ?>
+		<?php _e('Details', 'event_espresso'); ?>
 	</h3>
 
-	<?php if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
+	<?php if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Venue Phone:', 'event_espresso' ); ?> </strong></span><?php echo $venue_phone; ?>
+		<span class="small-text"><strong><?php _e('Venue Phone:', 'event_espresso'); ?> </strong></span><?php echo $venue_phone; ?>
 	</p>
 	<?php endif; ?>
-	<?php if ( $venue_website = espresso_venue_website( $post->ID, FALSE )) : ?>
+	<?php if ($venue_website = espresso_venue_website($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Venue Website:', 'event_espresso' ); ?> </strong></span><?php echo $venue_website; ?>
+		<span class="small-text"><strong><?php _e('Venue Website:', 'event_espresso'); ?> </strong></span><?php echo $venue_website; ?>
 	</p>
 	<?php endif; ?>
 	<?php 
-	do_action( 'AHEE__content_espresso_venues_details_template__before_the_content', $post ); 
-	if ( is_archive() && has_excerpt( $post->ID )) {
+	do_action('AHEE__content_espresso_venues_details_template__before_the_content', $post); 
+	if (is_archive() && has_excerpt($post->ID)) {
 		the_excerpt();
 	} else {
 		the_content();
 	}
-	do_action( 'AHEE__content_espresso_venues_details_template__after_the_content', $post ); 
+	do_action('AHEE__content_espresso_venues_details_template__after_the_content', $post); 
 	?>
 </div>
 <!-- .venue-content -->

core/db_classes/EE_Import.class.php

Doc Comments +29 added lines, -1 removed lines

@@ -286,7 +286,7 @@ 
 	 *
 	 * @param array         $csv_data_array - the array containing the csv data produced from EE_CSV::import_csv_to_model_data_array()
 	 * @param bool | string $model_name - an array containing the csv column names as keys with the corresponding db table fields they will be saved to
-	 * @return TRUE on success, FALSE on fail
+	 * @return boolean on success, FALSE on fail
 	 */
 	public function save_csv_data_array_to_db( $csv_data_array, $model_name = FALSE ) {
 
@@ -883,18 +883,46 @@ 
 	public function get_total_general_errors(){
 		return count( $this->_general_errors );
 	}
+
+	/**
+	 * @param string $message
+	 */
 	protected function _add_update_success( $message ){
 		$this->_updates[] = $message;
 	}
+
+	/**
+	 * @param string $message
+	 */
 	protected function _add_insert_success( $message ){
 		$this->_inserts[] = $message;
 	}
+
+	/**
+	 * @param string $message
+	 * @param string $file
+	 * @param string $function
+	 * @param integer $line
+	 */
 	protected function _add_update_error( $message, $file, $function, $line ){
 		$this->_update_errors[] = array( $message, $file, $function, $line );
 	}
+
+	/**
+	 * @param string $message
+	 * @param string $file
+	 * @param string $function
+	 * @param integer $line
+	 */
 	protected function _add_insert_error( $message, $file, $function, $line ){
 		$this->_insert_errors[] = array( $message, $file, $function, $line );
 	}
+
+	/**
+	 * @param string $file
+	 * @param string $function
+	 * @param integer $line
+	 */
 	protected function _add_general_error( $message, $file, $function, $line ){
 		$this->_general_errors[] = array( $message, $file, $function, $line );
 	}

Indentation +39 added lines, -39 removed lines

@@ -146,43 +146,43 @@ 
 		if ( isset( $_REQUEST['import'] )) {
 			if( isset( $_POST['csv_submitted'] )) {
 
-			    switch ( $_FILES['file']['error'][0] ) {
-			        case UPLOAD_ERR_OK:
-			            $error_msg = FALSE;
-			            break;
-			        case UPLOAD_ERR_INI_SIZE:
-			            $error_msg = __("'The uploaded file exceeds the upload_max_filesize directive in php.ini.'", "event_espresso");
-			            break;
-			        case UPLOAD_ERR_FORM_SIZE:
-			            $error_msg = __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_PARTIAL:
-			            $error_msg = __('The uploaded file was only partially uploaded.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_NO_FILE:
-			            $error_msg = __('No file was uploaded.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_NO_TMP_DIR:
-			            $error_msg = __('Missing a temporary folder.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_CANT_WRITE:
-			            $error_msg = __('Failed to write file to disk.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_EXTENSION:
-			            $error_msg = __('File upload stopped by extension.', "event_espresso");
-			            break;
-			        default:
-			            $error_msg = __('An unknown error occurred and the file could not be uploaded', "event_espresso");
-			            break;
-			    }
+				switch ( $_FILES['file']['error'][0] ) {
+					case UPLOAD_ERR_OK:
+						$error_msg = FALSE;
+						break;
+					case UPLOAD_ERR_INI_SIZE:
+						$error_msg = __("'The uploaded file exceeds the upload_max_filesize directive in php.ini.'", "event_espresso");
+						break;
+					case UPLOAD_ERR_FORM_SIZE:
+						$error_msg = __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.', "event_espresso");
+						break;
+					case UPLOAD_ERR_PARTIAL:
+						$error_msg = __('The uploaded file was only partially uploaded.', "event_espresso");
+						break;
+					case UPLOAD_ERR_NO_FILE:
+						$error_msg = __('No file was uploaded.', "event_espresso");
+						break;
+					case UPLOAD_ERR_NO_TMP_DIR:
+						$error_msg = __('Missing a temporary folder.', "event_espresso");
+						break;
+					case UPLOAD_ERR_CANT_WRITE:
+						$error_msg = __('Failed to write file to disk.', "event_espresso");
+						break;
+					case UPLOAD_ERR_EXTENSION:
+						$error_msg = __('File upload stopped by extension.', "event_espresso");
+						break;
+					default:
+						$error_msg = __('An unknown error occurred and the file could not be uploaded', "event_espresso");
+						break;
+				}
 
 				if ( ! $error_msg ) {
 
-				    $filename	= $_FILES['file']['name'][0];
+					$filename	= $_FILES['file']['name'][0];
 					$file_ext 		= substr( strrchr( $filename, '.' ), 1 );
-				    //$file_type 	= $_FILES['file']['type'][0];
-				    $temp_file	= $_FILES['file']['tmp_name'][0];
-				    $filesize    	= $_FILES['file']['size'][0] / 1024;//convert from bytes to KB
+					//$file_type 	= $_FILES['file']['type'][0];
+					$temp_file	= $_FILES['file']['tmp_name'][0];
+					$filesize    	= $_FILES['file']['size'][0] / 1024;//convert from bytes to KB
 
 					if ( $file_ext=='csv' ) {
 
@@ -331,10 +331,10 @@ 
 			unset($csv_data_array[EE_CSV::metadata_header]);
 		}
 		/**
-		* @var $old_db_to_new_db_mapping 2d array: top level keys being model names, bottom-level keys being the original key, and
-		* the value will be the newly-inserted ID.
-		* If we have already imported data from the same website via CSV, it should be kept in this wp option
-		*/
+		 * @var $old_db_to_new_db_mapping 2d array: top level keys being model names, bottom-level keys being the original key, and
+		 * the value will be the newly-inserted ID.
+		 * If we have already imported data from the same website via CSV, it should be kept in this wp option
+		 */
 	   $old_db_to_new_db_mapping = get_option('ee_id_mapping_from'.sanitize_title($old_site_url),array());
 	   if( $old_db_to_new_db_mapping){
 		   EE_Error::add_attention(
@@ -435,7 +435,7 @@ 
 				foreach($model_object_data as $field){
 					if($field){
 						$row_is_completely_empty = false;
-                                                break;
+												break;
 					}
 				}
 				if($row_is_completely_empty){
@@ -453,7 +453,7 @@ 
 
 
 				$model_object_data = $this->_replace_temp_ids_with_mappings( $model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b );
-                $model_object_data = $this->_prepare_data_for_use_in_db( $model_object_data, $model, $export_from_site_a_to_b );
+				$model_object_data = $this->_prepare_data_for_use_in_db( $model_object_data, $model, $export_from_site_a_to_b );
 //now we need to decide if we're going to add a new model object given the $model_object_data,
 				//or just update.
 				if($export_from_site_a_to_b){

Spacing +225 added lines, -225 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__, '');
 /**
  * EE_Import class
  *
@@ -69,10 +69,10 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Import )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Import)) {
 			self::$_instance = new self();
 		}
-		add_filter( 'FHEE__EE_Import___replace_temp_ids_with_mappings__model_object_data__end', array( self::$_instance, 'handle_split_term_ids' ), 10, 2 );
+		add_filter('FHEE__EE_Import___replace_temp_ids_with_mappings__model_object_data__end', array(self::$_instance, 'handle_split_term_ids'), 10, 2);
 		return self::$_instance;
 	}
 
@@ -80,7 +80,7 @@ 
 	 * Resets the importer
 	 * @return EE_Import
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance = null;
 		return self::instance();
 	}
@@ -99,27 +99,27 @@ 
 	  *
 *@return string
 	  */
-	public function upload_form ( $title, $intro, $form_url, $action, $type  ) {
+	public function upload_form($title, $intro, $form_url, $action, $type) {
 
-		$form_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => $action ), $form_url );
+		$form_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => $action), $form_url);
 
 		ob_start();
 ?>
 	<div class="ee-upload-form-dv">
-		<h3><?php echo $title;?></h3>
-		<p><?php echo $intro;?></p>
+		<h3><?php echo $title; ?></h3>
+		<p><?php echo $intro; ?></p>
 
 		<form action="<?php echo $form_url?>" method="post" enctype="multipart/form-data">
-			<input type="hidden" name="csv_submitted" value="TRUE" id="<?php echo time();?>">
-			<input name="import" type="hidden" value="<?php echo $type;?>" />
+			<input type="hidden" name="csv_submitted" value="TRUE" id="<?php echo time(); ?>">
+			<input name="import" type="hidden" value="<?php echo $type; ?>" />
 			<input type="file" name="file[]" size="90" >
-			<input class="button-primary" type="submit" value="<?php _e( 'Upload File', 'event_espresso' );?>">
+			<input class="button-primary" type="submit" value="<?php _e('Upload File', 'event_espresso'); ?>">
 		</form>
 
 		<p class="ee-attention">
-			<b><?php _e( 'Attention', 'event_espresso' );?></b><br/>
-			<?php echo sprintf( __( 'Accepts .%s file types only.', 'event_espresso' ), $type ) ;?>
-			<?php echo __( 'Please only import CSV files exported from Event Espresso, or compatible 3rd-party software.', 'event_espresso' );?>
+			<b><?php _e('Attention', 'event_espresso'); ?></b><br/>
+			<?php echo sprintf(__('Accepts .%s file types only.', 'event_espresso'), $type); ?>
+			<?php echo __('Please only import CSV files exported from Event Espresso, or compatible 3rd-party software.', 'event_espresso'); ?>
 		</p>
 
 	</div>
@@ -140,13 +140,13 @@ 
 	 */
 	public function import() {
 
-		require_once( EE_CLASSES . 'EE_CSV.class.php' );
+		require_once(EE_CLASSES.'EE_CSV.class.php');
 		$this->EE_CSV = EE_CSV::instance();
 		$success = true;
-		if ( isset( $_REQUEST['import'] )) {
-			if( isset( $_POST['csv_submitted'] )) {
+		if (isset($_REQUEST['import'])) {
+			if (isset($_POST['csv_submitted'])) {
 
-			    switch ( $_FILES['file']['error'][0] ) {
+			    switch ($_FILES['file']['error'][0]) {
 			        case UPLOAD_ERR_OK:
 			            $error_msg = FALSE;
 			            break;
@@ -176,29 +176,29 @@ 
 			            break;
 			    }
 
-				if ( ! $error_msg ) {
+				if ( ! $error_msg) {
 
-				    $filename	= $_FILES['file']['name'][0];
-					$file_ext 		= substr( strrchr( $filename, '.' ), 1 );
+				    $filename = $_FILES['file']['name'][0];
+					$file_ext = substr(strrchr($filename, '.'), 1);
 				    //$file_type 	= $_FILES['file']['type'][0];
-				    $temp_file	= $_FILES['file']['tmp_name'][0];
-				    $filesize    	= $_FILES['file']['size'][0] / 1024;//convert from bytes to KB
+				    $temp_file = $_FILES['file']['tmp_name'][0];
+				    $filesize = $_FILES['file']['size'][0] / 1024; //convert from bytes to KB
 
-					if ( $file_ext=='csv' ) {
+					if ($file_ext == 'csv') {
 
-						$max_upload = $this->EE_CSV->get_max_upload_size();//max upload size in KB
-						if ( $filesize < $max_upload || true) {
+						$max_upload = $this->EE_CSV->get_max_upload_size(); //max upload size in KB
+						if ($filesize < $max_upload || true) {
 
-							$wp_upload_dir = str_replace( array( '\\', '/' ), DS, wp_upload_dir());
-							$path_to_file = $wp_upload_dir['basedir'] . DS . 'espresso' . DS . $filename;
+							$wp_upload_dir = str_replace(array('\\', '/'), DS, wp_upload_dir());
+							$path_to_file = $wp_upload_dir['basedir'].DS.'espresso'.DS.$filename;
 
-							if( move_uploaded_file( $temp_file, $path_to_file )) {
+							if (move_uploaded_file($temp_file, $path_to_file)) {
 								// convert csv to array
-								$this->csv_array = $this->EE_CSV->import_csv_to_model_data_array( $path_to_file );
+								$this->csv_array = $this->EE_CSV->import_csv_to_model_data_array($path_to_file);
 								// was data successfully stored in an array?
-								if ( is_array( $this->csv_array ) ) {
+								if (is_array($this->csv_array)) {
 									// save processed codes to db
-									if ( $this->save_csv_data_array_to_db( $this->csv_array, false ) ) {
+									if ($this->save_csv_data_array_to_db($this->csv_array, false)) {
 										$success = TRUE;
 									}
 								} else {
@@ -245,7 +245,7 @@ 
 					}
 
 				} else {
-					$this->_add_general_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+					$this->_add_general_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 					$success = FALSE;
 				}
 
@@ -288,14 +288,14 @@ 
 	 * @param bool | string $model_name - an array containing the csv column names as keys with the corresponding db table fields they will be saved to
 	 * @return TRUE on success, FALSE on fail
 	 */
-	public function save_csv_data_array_to_db( $csv_data_array, $model_name = FALSE ) {
+	public function save_csv_data_array_to_db($csv_data_array, $model_name = FALSE) {
 
 		//whether to treat this import as if it's data from a different database or not
 		//ie, if it IS from a different database, ignore foreign keys
 		$export_from_site_a_to_b = true;
 		// first level of array is not table information but a table name was passed to the function
 		// array is only two levels deep, so let's fix that by adding a level, else the next steps will fail
-		if($model_name){
+		if ($model_name) {
 			$csv_data_array = array($csv_data_array);
 		}
 		//what models we want to update
@@ -309,14 +309,14 @@ 
 		$old_site_url = site_url();
 
 		//handle metadata
-		if(isset($csv_data_array[EE_CSV::metadata_header]) ){
+		if (isset($csv_data_array[EE_CSV::metadata_header])) {
 			$this->_csv_import_metadata_row = array_shift($csv_data_array[EE_CSV::metadata_header]);
 			//ok so its metadata, dont try to save it to the db obviously...
-			if(isset($this->_csv_import_metadata_row['site_url']) && $this->_csv_import_metadata_row['site_url'] == site_url()){
-				EE_Error::add_attention( __("CSV Data appears to be from the same database, so attempting to update data", "event_espresso") );
+			if (isset($this->_csv_import_metadata_row['site_url']) && $this->_csv_import_metadata_row['site_url'] == site_url()) {
+				EE_Error::add_attention(__("CSV Data appears to be from the same database, so attempting to update data", "event_espresso"));
 				$export_from_site_a_to_b = false;
-			}else{
-				$old_site_url = isset( $this->_csv_import_metadata_row['site_url']) ? $this->_csv_import_metadata_row['site_url'] : $old_site_url;
+			} else {
+				$old_site_url = isset($this->_csv_import_metadata_row['site_url']) ? $this->_csv_import_metadata_row['site_url'] : $old_site_url;
 				EE_Error::add_attention(
 					sprintf(
 						__('CSV Data appears to be from a different database (%1$s instead of %2$s), so we assume IDs in the CSV data DO NOT correspond to IDs in this database', "event_espresso"),
@@ -325,8 +325,8 @@ 
 					)
 				);
 			};
-			if( ! empty( $this->_csv_import_metadata_row['models_to_update'] )){
-				$models_to_update = explode(",", $this->_csv_import_metadata_row['models_to_update' ] );
+			if ( ! empty($this->_csv_import_metadata_row['models_to_update'])) {
+				$models_to_update = explode(",", $this->_csv_import_metadata_row['models_to_update']);
 			}
 			unset($csv_data_array[EE_CSV::metadata_header]);
 		}
@@ -335,8 +335,8 @@ 
 		* the value will be the newly-inserted ID.
 		* If we have already imported data from the same website via CSV, it should be kept in this wp option
 		*/
-	   $old_db_to_new_db_mapping = get_option('ee_id_mapping_from'.sanitize_title($old_site_url),array());
-	   if( $old_db_to_new_db_mapping){
+	   $old_db_to_new_db_mapping = get_option('ee_id_mapping_from'.sanitize_title($old_site_url), array());
+	   if ($old_db_to_new_db_mapping) {
 		   EE_Error::add_attention(
 			   sprintf(
 				   __('We noticed you have imported data via CSV from %1$s before. Because of this, IDs in your CSV have been mapped to their new IDs in %2$s', "event_espresso"),
@@ -345,23 +345,23 @@ 
 			   )
 		   );
 	   }
-	   $old_db_to_new_db_mapping = $this->save_data_rows_to_db($csv_data_array, $export_from_site_a_to_b, $old_db_to_new_db_mapping, $models_to_update );
+	   $old_db_to_new_db_mapping = $this->save_data_rows_to_db($csv_data_array, $export_from_site_a_to_b, $old_db_to_new_db_mapping, $models_to_update);
 
 		//save the mapping from old db to new db in case they try re-importing the same data from the same website again
-		update_option('ee_id_mapping_from'.sanitize_title($old_site_url),$old_db_to_new_db_mapping);
+		update_option('ee_id_mapping_from'.sanitize_title($old_site_url), $old_db_to_new_db_mapping);
 
 
 		//lastly, we need to update the datetime and ticket sold amounts
 		//as those may have been affected by this
-		EEM_Datetime::instance()->update_sold( EEM_Datetime::instance()->get_all() );
+		EEM_Datetime::instance()->update_sold(EEM_Datetime::instance()->get_all());
 		EEM_Ticket::instance()->update_tickets_sold(EEM_Ticket::instance()->get_all());
 
 		// if there was at least one success and absolutely no errors
-		if (	! $this->get_total_general_errors() &&
-				! $this->get_total_insert_errors()  &&
+		if ( ! $this->get_total_general_errors() &&
+				! $this->get_total_insert_errors() &&
 				! $this->get_total_update_errors() &&
 				$this->get_total_inserts() &&
-				$this->get_total_updates() ) {
+				$this->get_total_updates()) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -401,23 +401,23 @@ 
 	  * @return array updated $old_db_to_new_db_mapping
 	  * @throws \EE_Error
 	  */
-	public function save_data_rows_to_db( $csv_data_array, $export_from_site_a_to_b, $old_db_to_new_db_mapping, $models_to_update = NULL ) {
-		foreach ( $csv_data_array as $model_name_in_csv_data => $model_data_from_import ) {
+	public function save_data_rows_to_db($csv_data_array, $export_from_site_a_to_b, $old_db_to_new_db_mapping, $models_to_update = NULL) {
+		foreach ($csv_data_array as $model_name_in_csv_data => $model_data_from_import) {
 			//now check that assumption was correct. If
-			if ( EE_Registry::instance()->is_model_name($model_name_in_csv_data)) {
+			if (EE_Registry::instance()->is_model_name($model_name_in_csv_data)) {
 				$model_name = $model_name_in_csv_data;
-			}elseif( empty( $model_name_in_csv_data ) ) {
+			}elseif (empty($model_name_in_csv_data)) {
 				// no table info in the array and no table name passed to the function?? FAIL
 				$this->_add_general_error(
-					__('No table information was specified and/or found, therefore the import could not be completed','event_espresso'),
+					__('No table information was specified and/or found, therefore the import could not be completed', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				return FALSE;
-			}else{
+			} else {
 				//what is this model name??
 				$this->_add_general_error(
 					sprintf(
-						__( 'The model "%1$s" is not recognized so its data cannot be imported', 'event_espresso' ),
+						__('The model "%1$s" is not recognized so its data cannot be imported', 'event_espresso'),
 						$model_name_in_csv_data
 					),
 					__FILE__, __FUNCTION__, __LINE__
@@ -429,77 +429,77 @@ 
 			$model = EE_Registry::instance()->load_model($model_name);
 
 			//so without further ado, scanning all the data provided for primary keys and their inital values
-			foreach ( $model_data_from_import as $model_object_data ) {
+			foreach ($model_data_from_import as $model_object_data) {
 				//before we do ANYTHING, make sure the csv row wasn't just completely blank
 				$row_is_completely_empty = true;
-				foreach($model_object_data as $field){
-					if($field){
+				foreach ($model_object_data as $field) {
+					if ($field) {
 						$row_is_completely_empty = false;
                                                 break;
 					}
 				}
-				if($row_is_completely_empty){
+				if ($row_is_completely_empty) {
 					continue;
 				}
 				//make sure there is no data for fields we don't recognize
-				$model_object_data = array_intersect_key( $model_object_data, $model->field_settings() );
+				$model_object_data = array_intersect_key($model_object_data, $model->field_settings());
 				//find the PK in the row of data (or a combined key if
 				//there is no primary key)
-				if($model->has_primary_key_field()){
-					$id_in_csv =  $model_object_data[$model->primary_key_name()];
-				}else{
+				if ($model->has_primary_key_field()) {
+					$id_in_csv = $model_object_data[$model->primary_key_name()];
+				} else {
 					$id_in_csv = $model->get_index_primary_key_string($model_object_data);
 				}
 
 
-				$model_object_data = $this->_replace_temp_ids_with_mappings( $model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b );
-                $model_object_data = $this->_prepare_data_for_use_in_db( $model_object_data, $model, $export_from_site_a_to_b );
+				$model_object_data = $this->_replace_temp_ids_with_mappings($model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b);
+                $model_object_data = $this->_prepare_data_for_use_in_db($model_object_data, $model, $export_from_site_a_to_b);
 //now we need to decide if we're going to add a new model object given the $model_object_data,
 				//or just update.
-				if($export_from_site_a_to_b){
-					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_other_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}else{//this is just a re-import
-					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_same_db( $id_in_csv, $model_object_data, $model );
+				if ($export_from_site_a_to_b) {
+					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_other_db($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping);
+				} else {//this is just a re-import
+					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_same_db($id_in_csv, $model_object_data, $model);
 				}
-				if( $what_to_do == self::do_nothing ) {
+				if ($what_to_do == self::do_nothing) {
 					continue;
 				}
 
 				//double-check we actually want to insert, if that's what we're planning
 				//based on whether this item would be unique in the DB or not
-				if( $what_to_do == self::do_insert ) {
+				if ($what_to_do == self::do_insert) {
 					//we're supposed to be inserting. But wait, will this thing
 					//be acceptable if inserted?
-					$conflicting = $model->get_one_conflicting( $model_object_data, false );
-					if($conflicting){
+					$conflicting = $model->get_one_conflicting($model_object_data, false);
+					if ($conflicting) {
 						//ok, this item would conflict if inserted. Just update the item that it conflicts with.
 						$what_to_do = self::do_update;
 						//and if this model has a primary key, remember its mapping
-						if($model->has_primary_key_field()){
+						if ($model->has_primary_key_field()) {
 							$old_db_to_new_db_mapping[$model_name][$id_in_csv] = $conflicting->ID();
 							$model_object_data[$model->primary_key_name()] = $conflicting->ID();
-						}else{
+						} else {
 							//we want to update this conflicting item, instead of inserting a conflicting item
 							//so we need to make sure they match entirely (its possible that they only conflicted on one field, but we need them to match on other fields
 							//for the WHERE conditions in the update). At the time of this comment, there were no models like this
-							foreach($model->get_combined_primary_key_fields() as $key_field){
+							foreach ($model->get_combined_primary_key_fields() as $key_field) {
 								$model_object_data[$key_field->get_name()] = $conflicting->get($key_field->get_name());
 							}
 						}
 					}
 				}
-				if( $what_to_do == self::do_insert ) {
-					$old_db_to_new_db_mapping = $this->_insert_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}elseif( $what_to_do == self::do_update ) {
-					if( $models_to_update === null || in_array( $model_name_in_csv_data, $models_to_update ) ){
-						$old_db_to_new_db_mapping = $this->_update_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-					}else{
+				if ($what_to_do == self::do_insert) {
+					$old_db_to_new_db_mapping = $this->_insert_from_data_array($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping);
+				}elseif ($what_to_do == self::do_update) {
+					if ($models_to_update === null || in_array($model_name_in_csv_data, $models_to_update)) {
+						$old_db_to_new_db_mapping = $this->_update_from_data_array($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping);
+					} else {
 						//we would have updated this, but the export data indicated we ought not
 					}
-				}else{
+				} else {
 					throw new EE_Error(
 						sprintf(
-							__( 'Programming error. We should be inserting or updating, but instead we are being told to "%1$s", which is invalid', 'event_espresso' ),
+							__('Programming error. We should be inserting or updating, but instead we are being told to "%1$s", which is invalid', 'event_espresso'),
 							$what_to_do
 						)
 					);
@@ -523,20 +523,20 @@ 
 	 * @param array $old_db_to_new_db_mapping by reference so it can be modified
 	 * @return string one of the constants on this class that starts with do_*
 	 */
-	protected function _decide_whether_to_insert_or_update_given_data_from_other_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping ) {
+	protected function _decide_whether_to_insert_or_update_given_data_from_other_db($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping) {
 		$model_name = $model->get_this_model_name();
 		//if it's a site-to-site export-and-import, see if this model object's id
 		//in the old data that we know of
 
-		if( isset($old_db_to_new_db_mapping[$model_name][$id_in_csv]) ){
-			$what_to_do =  self::do_update;
-		}else{
-			$what_to_do =  self::do_insert;
+		if (isset($old_db_to_new_db_mapping[$model_name][$id_in_csv])) {
+			$what_to_do = self::do_update;
+		} else {
+			$what_to_do = self::do_insert;
 		}
 		//consider any exceptions, usually where there are other uniqueness constraints
-		if( $model instanceof EEM_Question_Group ) {
-			if( isset( $model_object_data[ 'QSG_system' ] ) &&
-					$model_object_data[ 'QSG_system' ] ) {
+		if ($model instanceof EEM_Question_Group) {
+			if (isset($model_object_data['QSG_system']) &&
+					$model_object_data['QSG_system']) {
 				$what_to_do = self::do_update;
 			}
 		}
@@ -558,11 +558,11 @@ 
 	  * @throws \EE_Error
 	  * @internal param \type $old_db_to_new_db_mapping
 	  */
-	protected function _decide_whether_to_insert_or_update_given_data_from_same_db( $id_in_csv, $model_object_data, $model ) {
+	protected function _decide_whether_to_insert_or_update_given_data_from_same_db($id_in_csv, $model_object_data, $model) {
 		//in this case, check if this thing ACTUALLY exists in the database
-		if( $model->get_one_conflicting( $model_object_data ) ){
+		if ($model->get_one_conflicting($model_object_data)) {
 			return self::do_update;
-		}else{
+		} else {
 			return self::do_insert;
 		}
 	}
@@ -583,32 +583,32 @@ 
 	 *
 *@return array updated model object data with temp IDs removed
 	 */
-	protected function _replace_temp_ids_with_mappings( $model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b ) {
+	protected function _replace_temp_ids_with_mappings($model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {
 		//if this model object's primary key is in the mapping, replace it
-		if( $model->has_primary_key_field() &&
+		if ($model->has_primary_key_field() &&
 				$model->get_primary_key_field()->is_auto_increment() &&
-				isset( $old_db_to_new_db_mapping[ $model->get_this_model_name() ] ) &&
-				isset( $old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $model_object_data[ $model->primary_key_name() ] ] ) ) {
-			$model_object_data[ $model->primary_key_name() ] = $old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $model_object_data[ $model->primary_key_name() ] ];
+				isset($old_db_to_new_db_mapping[$model->get_this_model_name()]) &&
+				isset($old_db_to_new_db_mapping[$model->get_this_model_name()][$model_object_data[$model->primary_key_name()]])) {
+			$model_object_data[$model->primary_key_name()] = $old_db_to_new_db_mapping[$model->get_this_model_name()][$model_object_data[$model->primary_key_name()]];
 		}
 
-		try{
+		try {
 			$model_name_field = $model->get_field_containing_related_model_name();
 			//$models_pointed_to_by_model_name_field = $model_name_field->get_model_names_pointed_to();
-		}catch( EE_Error $e ){
+		} catch (EE_Error $e) {
 			$model_name_field = NULL;
 			//$models_pointed_to_by_model_name_field = array();
 		}
-		foreach( $model->field_settings( true )  as $field_obj ){
-			if( $field_obj instanceof EE_Foreign_Key_Int_Field ) {
+		foreach ($model->field_settings(true)  as $field_obj) {
+			if ($field_obj instanceof EE_Foreign_Key_Int_Field) {
 				$models_pointed_to = $field_obj->get_model_names_pointed_to();
-				foreach( $models_pointed_to as $model_pointed_to_by_fk ) {
+				foreach ($models_pointed_to as $model_pointed_to_by_fk) {
 
-					if( $model_name_field ){
-						$value_of_model_name_field = $model_object_data[ $model_name_field->get_name() ];
-						if( $value_of_model_name_field == $model_pointed_to_by_fk ) {
-							$model_object_data[ $field_obj->get_name() ] = $this->_find_mapping_in(
-								$model_object_data[ $field_obj->get_name() ],
+					if ($model_name_field) {
+						$value_of_model_name_field = $model_object_data[$model_name_field->get_name()];
+						if ($value_of_model_name_field == $model_pointed_to_by_fk) {
+							$model_object_data[$field_obj->get_name()] = $this->_find_mapping_in(
+								$model_object_data[$field_obj->get_name()],
 								$model_pointed_to_by_fk,
 								$old_db_to_new_db_mapping,
 								$export_from_site_a_to_b
@@ -616,9 +616,9 @@ 
 							//once we've found a mapping for this field no need to continue
 							break;
 						}
-					}else{
-						$model_object_data[ $field_obj->get_name() ] = $this->_find_mapping_in(
-							$model_object_data[ $field_obj->get_name() ],
+					} else {
+						$model_object_data[$field_obj->get_name()] = $this->_find_mapping_in(
+							$model_object_data[$field_obj->get_name()],
 							$model_pointed_to_by_fk,
 							$old_db_to_new_db_mapping,
 							$export_from_site_a_to_b
@@ -627,7 +627,7 @@ 
 						break;
 					}
 				}
-			}else{
+			} else {
 				//it's a string foreign key (which we leave alone, because those are things
 				//like country names, which we'd really rather not make 2 USAs etc (we'd actually
 				//prefer to just update one)
@@ -635,7 +635,7 @@ 
 			}
 		}
 		//allow for any other value replacement
-		return apply_filters( 'FHEE__EE_Import___replace_temp_ids_with_mappings__model_object_data__end', $model_object_data, $model );
+		return apply_filters('FHEE__EE_Import___replace_temp_ids_with_mappings__model_object_data__end', $model_object_data, $model);
 	}
 
 
@@ -648,13 +648,13 @@ 
 	  * @param boolean  $export_from_site_a_to_b
 	  * @return mixed|null|void
 	  */
-	 protected function _prepare_data_for_use_in_db( $original_data_row, $model, $export_from_site_a_to_b ) {
+	 protected function _prepare_data_for_use_in_db($original_data_row, $model, $export_from_site_a_to_b) {
 		 $altered_data_row = $original_data_row;
-		 switch ( $model->get_this_model_name() ) {
+		 switch ($model->get_this_model_name()) {
 			 case 'Message_Template_Group':
 				 if (
-					 isset( $original_data_row[ 'MTP_is_global' ] )
-					 && intval( $original_data_row[ 'MTP_is_global' ] ) == 1
+					 isset($original_data_row['MTP_is_global'])
+					 && intval($original_data_row['MTP_is_global']) == 1
 					 && apply_filters(
 						  'FHEE__EE_Import___prepare_data_for_use_in_db__tweak_global_message_template_groups',
 						  true,
@@ -664,34 +664,34 @@ 
 					  )
 					  && ! $export_from_site_a_to_b
 				 ) {
-					 $altered_data_row[ 'MTP_is_global' ] = 0;
-					 $message_type = isset( $altered_data_row[ 'MTP_message_type' ] )
-						 ? $altered_data_row[ 'MTP_message_type' ]
-						 : __( 'Unknown', 'event_espresso' );
-					 $altered_data_row[ 'MTP_name' ] = sprintf(
-						 __( 'Global %1$s message template from %2$s', 'event_espresso' ),
+					 $altered_data_row['MTP_is_global'] = 0;
+					 $message_type = isset($altered_data_row['MTP_message_type'])
+						 ? $altered_data_row['MTP_message_type']
+						 : __('Unknown', 'event_espresso');
+					 $altered_data_row['MTP_name'] = sprintf(
+						 __('Global %1$s message template from %2$s', 'event_espresso'),
 						 $message_type,
-						 $this->_csv_import_metadata_row[ 'site_url' ]
+						 $this->_csv_import_metadata_row['site_url']
 					 );
 					 global $current_user;
-					 $altered_data_row[ 'MTP_description' ] = sprintf(
-						 __( 'Imported at %1$s by user %2$s', 'event_espresso' ),
-						 current_time( 'mysql' ),
+					 $altered_data_row['MTP_description'] = sprintf(
+						 __('Imported at %1$s by user %2$s', 'event_espresso'),
+						 current_time('mysql'),
 						 $current_user->user_nicename
 					 );
 				 }
 		 }
-		 foreach ( $model->field_settings() as $field_name => $field_obj ) {
-			 if ( $field_obj instanceof EE_Datetime_Field ) {
-				 $altered_data_row[ $field_name ] = $model->convert_datetime_for_query(
+		 foreach ($model->field_settings() as $field_name => $field_obj) {
+			 if ($field_obj instanceof EE_Datetime_Field) {
+				 $altered_data_row[$field_name] = $model->convert_datetime_for_query(
 					 $field_name,
-					 $original_data_row[ $field_name ],
+					 $original_data_row[$field_name],
 					 apply_filters(
 						 'FHEE__EE_Import___prepare_data_for_use_in_db__datetime_format_in_csv',
 						 'Y-m-d H:i:s'
 					 ),
-					 isset( $this->_csv_import_metadata_row[ 'timezone' ] )
-						 ? $this->_csv_import_metadata_row[ 'timezone' ]
+					 isset($this->_csv_import_metadata_row['timezone'])
+						 ? $this->_csv_import_metadata_row['timezone']
 						 : ''
 				 );
 			 }
@@ -713,14 +713,14 @@ 
 	 * @param EEM_Base $model
 	 * @return array new model object data
 	 */
-	public function handle_split_term_ids( $model_object_data, $model ){
-		if( $model instanceof EEM_Term_Taxonomy &&
-				isset( $model_object_data['term_id'] ) &&
-				isset( $model_object_data[ 'taxonomy' ]) &&
-				apply_filters( 'FHEE__EE_Import__handle_split_term_ids__function_exists', function_exists( 'wp_get_split_term' ), $model_object_data ) ) {
-			$new_term_id = wp_get_split_term( $model_object_data[ 'term_id' ], $model_object_data[ 'taxonomy' ] );
-			if( $new_term_id ){
-				$model_object_data[ 'term_id' ] = $new_term_id;
+	public function handle_split_term_ids($model_object_data, $model) {
+		if ($model instanceof EEM_Term_Taxonomy &&
+				isset($model_object_data['term_id']) &&
+				isset($model_object_data['taxonomy']) &&
+				apply_filters('FHEE__EE_Import__handle_split_term_ids__function_exists', function_exists('wp_get_split_term'), $model_object_data)) {
+			$new_term_id = wp_get_split_term($model_object_data['term_id'], $model_object_data['taxonomy']);
+			if ($new_term_id) {
+				$model_object_data['term_id'] = $new_term_id;
 			}
 		}
 		return $model_object_data;
@@ -734,17 +734,17 @@ 
 	 * @param bool $export_from_site_a_to_b
 	 * @return int
 	 */
-	protected function _find_mapping_in( $object_id, $model_name, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {
-		if(	isset( $old_db_to_new_db_mapping[ $model_name ][ $object_id ] ) ){
-			return $old_db_to_new_db_mapping[ $model_name ][ $object_id ];
-		}elseif( $object_id == '0' || $object_id == '' ) {
+	protected function _find_mapping_in($object_id, $model_name, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {
+		if (isset($old_db_to_new_db_mapping[$model_name][$object_id])) {
+			return $old_db_to_new_db_mapping[$model_name][$object_id];
+		}elseif ($object_id == '0' || $object_id == '') {
 			//leave as-is
 			return $object_id;
-		}elseif( $export_from_site_a_to_b ){
+		}elseif ($export_from_site_a_to_b) {
 			//we couldn't find a mapping for this, and it's from a different site,
 			//so blank it out
 			return null;
-		}elseif( ! $export_from_site_a_to_b ) {
+		}elseif ( ! $export_from_site_a_to_b) {
 			//we couldn't find a mapping for this, but it's from this DB anyway
 			//so let's just leave it as-is
 			return $object_id;
@@ -760,19 +760,19 @@ 
 	 * @param array $old_db_to_new_db_mapping
 	 * @return array updated $old_db_to_new_db_mapping
 	 */
-	protected function _insert_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping ) {
+	protected function _insert_from_data_array($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping) {
 		//remove the primary key, if there is one (we don't want it for inserts OR updates)
 		//we'll put it back in if we need it
-		if($model->has_primary_key_field() && $model->get_primary_key_field()->is_auto_increment()){
+		if ($model->has_primary_key_field() && $model->get_primary_key_field()->is_auto_increment()) {
 			$effective_id = $model_object_data[$model->primary_key_name()];
 			unset($model_object_data[$model->primary_key_name()]);
-		}else{
-			$effective_id = $model->get_index_primary_key_string( $model_object_data );
+		} else {
+			$effective_id = $model->get_index_primary_key_string($model_object_data);
 		}
 		//the model takes care of validating the CSV's input
-		try{
+		try {
 			$new_id = $model->insert($model_object_data);
-			if( $new_id ){
+			if ($new_id) {
 				$old_db_to_new_db_mapping[$model->get_this_model_name()][$id_in_csv] = $new_id;
 				$this->_add_insert_success(
 					sprintf(
@@ -781,15 +781,15 @@ 
 						$new_id
 					)
 				);
-			}else{
+			} else {
 				//put the ID used back in there for the error message
-				if($model->has_primary_key_field()){
+				if ($model->has_primary_key_field()) {
 					$model_object_data[$model->primary_key_name()] = $effective_id;
 				}
 				global $wpdb;
 				$this->_add_insert_error(
 					sprintf(
-						__('Could not insert new %1$s with ID in file %2$s because %3$s', "event_espresso" ),
+						__('Could not insert new %1$s with ID in file %2$s because %3$s', "event_espresso"),
 						$model->get_this_model_name(),
 						$id_in_csv,
 						$wpdb->last_error
@@ -797,8 +797,8 @@ 
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
-		}catch(EE_Error $e){
-			if($model->has_primary_key_field()){
+		} catch (EE_Error $e) {
+			if ($model->has_primary_key_field()) {
 				$model_object_data[$model->primary_key_name()] = $effective_id;
 			}
 			$this->_add_insert_error(
@@ -822,29 +822,29 @@ 
 	 * @param array $old_db_to_new_db_mapping
 	 * @return array updated $old_db_to_new_db_mapping
 	 */
-	protected function _update_from_data_array( $id_in_csv,  $original_model_object_data, $model, $old_db_to_new_db_mapping ) {
-		try{
+	protected function _update_from_data_array($id_in_csv, $original_model_object_data, $model, $old_db_to_new_db_mapping) {
+		try {
 			//let's keep two copies of the model object data:
 			//one for performing an update, one for everything else
 			$model_object_data_for_update = $original_model_object_data;
-			if ( $model->has_primary_key_field() ) {
+			if ($model->has_primary_key_field()) {
 				//wait- will this update cause a conflict with other data?
-				$conflicting = $model->get_one_conflicting( $original_model_object_data, false );
-				if ( $conflicting ) {
+				$conflicting = $model->get_one_conflicting($original_model_object_data, false);
+				if ($conflicting) {
 					//if so, just update the thing it would conflict with, dont cause a conflict
 					$pk_value = $conflicting->ID();
 				} else {
-					$pk_value = $model_object_data_for_update[ $model->primary_key_name() ];
+					$pk_value = $model_object_data_for_update[$model->primary_key_name()];
 				}
-				$conditions = array( $model->primary_key_name() => $pk_value );
+				$conditions = array($model->primary_key_name() => $pk_value);
 				//remove the primary key because we shouldn't use it for updating
-				unset( $model_object_data_for_update[ $model->primary_key_name() ] );
-			} elseif ( $model->get_combined_primary_key_fields() > 1 ) {
+				unset($model_object_data_for_update[$model->primary_key_name()]);
+			} elseif ($model->get_combined_primary_key_fields() > 1) {
 				$conditions = array();
-				foreach ( $model->get_combined_primary_key_fields() as $key_field ) {
-					$conditions[ $key_field->get_name() ] = $model_object_data_for_update[ $key_field->get_name() ];
+				foreach ($model->get_combined_primary_key_fields() as $key_field) {
+					$conditions[$key_field->get_name()] = $model_object_data_for_update[$key_field->get_name()];
 				}
-				$pk_value = $model->get_index_primary_key_string( $original_model_object_data );
+				$pk_value = $model->get_index_primary_key_string($original_model_object_data);
 			} else {
 				//this should just throw an exception, explaining that we dont have a primary key (or a combined key)
 				$model->primary_key_name();
@@ -855,8 +855,8 @@ 
 				$conditions,
 				'default_where_conditions' => 'minimum'
 			);
-			$success = $model->update($model_object_data_for_update,$query_params);
-			if($success){
+			$success = $model->update($model_object_data_for_update, $query_params);
+			if ($success) {
 				$this->_add_update_success(
 					sprintf(
 						__('Successfully updated %1$s (with ID %2$s).', "event_espresso"),
@@ -868,10 +868,10 @@ 
 				//because if we were going to insert something but it was going to conflict
 				//we would have last-minute decided to update. So we'd like to know what we updated
 				//and so we record what record ended up being updated using the mapping
-				$old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $id_in_csv ] = $pk_value;
-			}else{
+				$old_db_to_new_db_mapping[$model->get_this_model_name()][$id_in_csv] = $pk_value;
+			} else {
 				$matched_items = $model->get_all($query_params);
-				if( ! $matched_items){
+				if ( ! $matched_items) {
 					//no items were matched (so we shouldn't have updated)... but then we should have inserted? what the heck?
 					$this->_add_update_error(
 						sprintf(
@@ -886,15 +886,15 @@ 
 					//wasn't an error, just didn't need updating
 				}
 			}
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$basic_message = sprintf(
 				__('Could not update %1$s with ID %2$s because %3$s', "event_espresso"),
 				$model->get_this_model_name(),
 				$pk_value,
 				$e->getMessage()
 			);
-			$debug_message = $basic_message . ' Stack trace: ' . $e->getTraceAsString();
-			$this->_add_general_error( "$basic_message | $debug_message", __FILE__, __FUNCTION__, __LINE__ );
+			$debug_message = $basic_message.' Stack trace: '.$e->getTraceAsString();
+			$this->_add_general_error("$basic_message | $debug_message", __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $old_db_to_new_db_mapping;
 	}
@@ -903,52 +903,52 @@ 
 	 * Gets the number of inserts performed since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_inserts(){
-		return count( $this->_inserts );
+	public function get_total_inserts() {
+		return count($this->_inserts);
 	}
 	/**
 	 *  Gets the number of insert errors since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_insert_errors(){
-		return count( $this->_insert_errors );
+	public function get_total_insert_errors() {
+		return count($this->_insert_errors);
 	}
 	/**
 	 *  Gets the number of updates performed since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_updates(){
-		return count( $this->_updates );
+	public function get_total_updates() {
+		return count($this->_updates);
 	}
 	/**
 	 *  Gets the number of update errors since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_update_errors(){
-		return count( $this->_update_errors );
+	public function get_total_update_errors() {
+		return count($this->_update_errors);
 	}
 
 	/**
 	 * Gets count of general errors during import
 	 * @return int
 	 */
-	public function get_total_general_errors(){
-		return count( $this->_general_errors );
+	public function get_total_general_errors() {
+		return count($this->_general_errors);
 	}
-	protected function _add_update_success( $message ){
+	protected function _add_update_success($message) {
 		$this->_updates[] = $message;
 	}
-	protected function _add_insert_success( $message ){
+	protected function _add_insert_success($message) {
 		$this->_inserts[] = $message;
 	}
-	protected function _add_update_error( $message, $file, $function, $line ){
-		$this->_update_errors[] = array( $message, $file, $function, $line );
+	protected function _add_update_error($message, $file, $function, $line) {
+		$this->_update_errors[] = array($message, $file, $function, $line);
 	}
-	protected function _add_insert_error( $message, $file, $function, $line ){
-		$this->_insert_errors[] = array( $message, $file, $function, $line );
+	protected function _add_insert_error($message, $file, $function, $line) {
+		$this->_insert_errors[] = array($message, $file, $function, $line);
 	}
-	protected function _add_general_error( $message, $file, $function, $line ){
-		$this->_general_errors[] = array( $message, $file, $function, $line );
+	protected function _add_general_error($message, $file, $function, $line) {
+		$this->_general_errors[] = array($message, $file, $function, $line);
 	}
 
 	/**
@@ -958,7 +958,7 @@ 
 	 * happened.
 	 * @return array
 	 */
-	public function get_update_errors(){
+	public function get_update_errors() {
 		return $this->_update_errors;
 	}
 	/**
@@ -968,7 +968,7 @@ 
 	 * happened.
 	 * @return array
 	 */
-	public function get_insert_errors(){
+	public function get_insert_errors() {
 		return $this->_insert_errors;
 	}
 	/**
@@ -978,21 +978,21 @@ 
 	 * happened.
 	 * @return array
 	 */
-	public function get_general_errors(){
+	public function get_general_errors() {
 		return $this->_general_errors;
 	}
 	/**
 	 * Gets a simple array where each item in the array is a string describing what was inserted
 	 * @return array
 	 */
-	public function get_inserts(){
+	public function get_inserts() {
 		return $this->_inserts;
 	}
 	/**
 	 * Gets a simple array where each item in the array is a string describing what was updated
 	 * @return array
 	 */
-	public function get_updates(){
+	public function get_updates() {
 		return $this->_updates;
 	}
 	/**
@@ -1000,40 +1000,40 @@ 
 	 * normal EE_Error success and error messages.
 	 * @return boolean there were no errors and we successfully did something
 	 */
-	public function report_successes_and_errors(){
+	public function report_successes_and_errors() {
 		$success = false;
 		$error = false;
-		if ( $this->get_total_updates() ) {
-			EE_Error::add_success( sprintf(__("%s existing records in the database were updated.", "event_espresso"),$this->get_total_updates()));
+		if ($this->get_total_updates()) {
+			EE_Error::add_success(sprintf(__("%s existing records in the database were updated.", "event_espresso"), $this->get_total_updates()));
 			$success = true;
 		}
-		if ( $this->get_total_inserts() ) {
-			EE_Error::add_success(sprintf(__("%s new records were added to the database.", "event_espresso"),$this->get_total_inserts()));
+		if ($this->get_total_inserts()) {
+			EE_Error::add_success(sprintf(__("%s new records were added to the database.", "event_espresso"), $this->get_total_inserts()));
 			$success = true;
 		}
 
-		if ( $this->get_total_update_errors()) {
-			EE_Error::add_error(sprintf(__("'One or more errors occurred, and a total of %s existing records in the database were <strong>not</strong> updated.'", "event_espresso"),$this->get_total_update_errors() ), __FILE__, __FUNCTION__, __LINE__ );
+		if ($this->get_total_update_errors()) {
+			EE_Error::add_error(sprintf(__("'One or more errors occurred, and a total of %s existing records in the database were <strong>not</strong> updated.'", "event_espresso"), $this->get_total_update_errors()), __FILE__, __FUNCTION__, __LINE__);
 			$error = true;
 		}
-		if ( $this->get_total_insert_errors() ) {
-			EE_Error::add_error(sprintf(__("One or more errors occurred, and a total of %s new records were <strong>not</strong> added to the database.'", "event_espresso"),$this->get_total_insert_errors() ), __FILE__, __FUNCTION__, __LINE__ );
+		if ($this->get_total_insert_errors()) {
+			EE_Error::add_error(sprintf(__("One or more errors occurred, and a total of %s new records were <strong>not</strong> added to the database.'", "event_espresso"), $this->get_total_insert_errors()), __FILE__, __FUNCTION__, __LINE__);
 			$error = true;
 		}
-		foreach( $this->_general_errors as $message_data ){
-			EE_Error::add_error( $message_data[0], $message_data[1], $message_data[2], $message_data[3]);
+		foreach ($this->_general_errors as $message_data) {
+			EE_Error::add_error($message_data[0], $message_data[1], $message_data[2], $message_data[3]);
 		}
-		foreach( $this->_inserts as $insert ){
-			EE_Error::add_success( $insert );
+		foreach ($this->_inserts as $insert) {
+			EE_Error::add_success($insert);
 		}
-		foreach( $this->_updates as $update ){
-			EE_Error::add_success( $update );
+		foreach ($this->_updates as $update) {
+			EE_Error::add_success($update);
 		}
-		foreach( $this->_insert_errors as $message_data ){
-			EE_Error::add_error( $message_data[0], $message_data[1], $message_data[2], $message_data[3]);
+		foreach ($this->_insert_errors as $message_data) {
+			EE_Error::add_error($message_data[0], $message_data[1], $message_data[2], $message_data[3]);
 		}
-		foreach( $this->_update_errors as $message_data ){
-			EE_Error::add_error( $message_data[0], $message_data[1], $message_data[2], $message_data[3]);
+		foreach ($this->_update_errors as $message_data) {
+			EE_Error::add_error($message_data[0], $message_data[1], $message_data[2], $message_data[3]);
 		}
 		return $success && ! $error;
 	}

Braces +25 added lines, -23 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__, '' );
 /**
  * EE_Import class
@@ -315,7 +317,7 @@ 
 			if(isset($this->_csv_import_metadata_row['site_url']) && $this->_csv_import_metadata_row['site_url'] == site_url()){
 				EE_Error::add_attention( __("CSV Data appears to be from the same database, so attempting to update data", "event_espresso") );
 				$export_from_site_a_to_b = false;
-			}else{
+			} else{
 				$old_site_url = isset( $this->_csv_import_metadata_row['site_url']) ? $this->_csv_import_metadata_row['site_url'] : $old_site_url;
 				EE_Error::add_attention(
 					sprintf(
@@ -406,14 +408,14 @@ 
 			//now check that assumption was correct. If
 			if ( EE_Registry::instance()->is_model_name($model_name_in_csv_data)) {
 				$model_name = $model_name_in_csv_data;
-			}elseif( empty( $model_name_in_csv_data ) ) {
+			} elseif( empty( $model_name_in_csv_data ) ) {
 				// no table info in the array and no table name passed to the function?? FAIL
 				$this->_add_general_error(
 					__('No table information was specified and/or found, therefore the import could not be completed','event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				return FALSE;
-			}else{
+			} else{
 				//what is this model name??
 				$this->_add_general_error(
 					sprintf(
@@ -447,7 +449,7 @@ 
 				//there is no primary key)
 				if($model->has_primary_key_field()){
 					$id_in_csv =  $model_object_data[$model->primary_key_name()];
-				}else{
+				} else{
 					$id_in_csv = $model->get_index_primary_key_string($model_object_data);
 				}
 
@@ -458,7 +460,7 @@ 
 				//or just update.
 				if($export_from_site_a_to_b){
 					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_other_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}else{//this is just a re-import
+				} else{//this is just a re-import
 					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_same_db( $id_in_csv, $model_object_data, $model );
 				}
 				if( $what_to_do == self::do_nothing ) {
@@ -478,7 +480,7 @@ 
 						if($model->has_primary_key_field()){
 							$old_db_to_new_db_mapping[$model_name][$id_in_csv] = $conflicting->ID();
 							$model_object_data[$model->primary_key_name()] = $conflicting->ID();
-						}else{
+						} else{
 							//we want to update this conflicting item, instead of inserting a conflicting item
 							//so we need to make sure they match entirely (its possible that they only conflicted on one field, but we need them to match on other fields
 							//for the WHERE conditions in the update). At the time of this comment, there were no models like this
@@ -490,13 +492,13 @@ 
 				}
 				if( $what_to_do == self::do_insert ) {
 					$old_db_to_new_db_mapping = $this->_insert_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}elseif( $what_to_do == self::do_update ) {
+				} elseif( $what_to_do == self::do_update ) {
 					if( $models_to_update === null || in_array( $model_name_in_csv_data, $models_to_update ) ){
 						$old_db_to_new_db_mapping = $this->_update_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-					}else{
+					} else{
 						//we would have updated this, but the export data indicated we ought not
 					}
-				}else{
+				} else{
 					throw new EE_Error(
 						sprintf(
 							__( 'Programming error. We should be inserting or updating, but instead we are being told to "%1$s", which is invalid', 'event_espresso' ),
@@ -530,7 +532,7 @@ 
 
 		if( isset($old_db_to_new_db_mapping[$model_name][$id_in_csv]) ){
 			$what_to_do =  self::do_update;
-		}else{
+		} else{
 			$what_to_do =  self::do_insert;
 		}
 		//consider any exceptions, usually where there are other uniqueness constraints
@@ -562,7 +564,7 @@ 
 		//in this case, check if this thing ACTUALLY exists in the database
 		if( $model->get_one_conflicting( $model_object_data ) ){
 			return self::do_update;
-		}else{
+		} else{
 			return self::do_insert;
 		}
 	}
@@ -595,7 +597,7 @@ 
 		try{
 			$model_name_field = $model->get_field_containing_related_model_name();
 			//$models_pointed_to_by_model_name_field = $model_name_field->get_model_names_pointed_to();
-		}catch( EE_Error $e ){
+		} catch( EE_Error $e ){
 			$model_name_field = NULL;
 			//$models_pointed_to_by_model_name_field = array();
 		}
@@ -616,7 +618,7 @@ 
 							//once we've found a mapping for this field no need to continue
 							break;
 						}
-					}else{
+					} else{
 						$model_object_data[ $field_obj->get_name() ] = $this->_find_mapping_in(
 							$model_object_data[ $field_obj->get_name() ],
 							$model_pointed_to_by_fk,
@@ -627,7 +629,7 @@ 
 						break;
 					}
 				}
-			}else{
+			} else{
 				//it's a string foreign key (which we leave alone, because those are things
 				//like country names, which we'd really rather not make 2 USAs etc (we'd actually
 				//prefer to just update one)
@@ -737,14 +739,14 @@ 
 	protected function _find_mapping_in( $object_id, $model_name, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {
 		if(	isset( $old_db_to_new_db_mapping[ $model_name ][ $object_id ] ) ){
 			return $old_db_to_new_db_mapping[ $model_name ][ $object_id ];
-		}elseif( $object_id == '0' || $object_id == '' ) {
+		} elseif( $object_id == '0' || $object_id == '' ) {
 			//leave as-is
 			return $object_id;
-		}elseif( $export_from_site_a_to_b ){
+		} elseif( $export_from_site_a_to_b ){
 			//we couldn't find a mapping for this, and it's from a different site,
 			//so blank it out
 			return null;
-		}elseif( ! $export_from_site_a_to_b ) {
+		} elseif( ! $export_from_site_a_to_b ) {
 			//we couldn't find a mapping for this, but it's from this DB anyway
 			//so let's just leave it as-is
 			return $object_id;
@@ -766,7 +768,7 @@ 
 		if($model->has_primary_key_field() && $model->get_primary_key_field()->is_auto_increment()){
 			$effective_id = $model_object_data[$model->primary_key_name()];
 			unset($model_object_data[$model->primary_key_name()]);
-		}else{
+		} else{
 			$effective_id = $model->get_index_primary_key_string( $model_object_data );
 		}
 		//the model takes care of validating the CSV's input
@@ -781,7 +783,7 @@ 
 						$new_id
 					)
 				);
-			}else{
+			} else{
 				//put the ID used back in there for the error message
 				if($model->has_primary_key_field()){
 					$model_object_data[$model->primary_key_name()] = $effective_id;
@@ -797,7 +799,7 @@ 
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			if($model->has_primary_key_field()){
 				$model_object_data[$model->primary_key_name()] = $effective_id;
 			}
@@ -869,7 +871,7 @@ 
 				//we would have last-minute decided to update. So we'd like to know what we updated
 				//and so we record what record ended up being updated using the mapping
 				$old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $id_in_csv ] = $pk_value;
-			}else{
+			} else{
 				$matched_items = $model->get_all($query_params);
 				if( ! $matched_items){
 					//no items were matched (so we shouldn't have updated)... but then we should have inserted? what the heck?
@@ -886,7 +888,7 @@ 
 					//wasn't an error, just didn't need updating
 				}
 			}
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			$basic_message = sprintf(
 				__('Could not update %1$s with ID %2$s because %3$s', "event_espresso"),
 				$model->get_this_model_name(),

core/db_models/EEM_Price_Type.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 	 * 		instantiate a new price type object with blank/empty properties
 	 *
 	 * 		@access		public
-	 * 		@return		mixed		array on success, FALSE on fail
+	 * 		@return		EE_Price_Type		array on success, FALSE on fail
 	 */
 	public function get_new_price_type() {
 		return EE_Price_Type::new_instance();

Indentation +7 added lines, -7 removed lines

@@ -33,11 +33,11 @@ 
 	public $type = NULL;
 
 	/**
-	*	Price Base types
-	*
-	*	@access	private
-	*	@var array
-	*/
+	 *	Price Base types
+	 *
+	 *	@access	private
+	 *	@var array
+	 */
 	public $base_types = null;
 
 	/**
@@ -152,8 +152,8 @@ 
  *
  * @param array $query_params
  * @param boolean $allow_blocking if TRUE, matched objects will only be deleted if there is no related model info
-	 * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects
-	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
+ * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects
+ * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
  * @return boolean
  */
 	public function delete_permanently($query_params = array(), $allow_blocking = true) {

Spacing +27 added lines, -27 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Price_Type.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Price_Type.class.php');
 
 
 class EEM_Price_Type extends EEM_Soft_Delete_Base {
@@ -45,7 +45,7 @@ 
 	 * values are text-representations of the base type.
 	 * @return array
 	 */
-	public function get_base_types(){
+	public function get_base_types() {
 		return $this->base_types;
 	}
 
@@ -54,7 +54,7 @@ 
 	 * @param int $base_type_int
 	 * @return string
 	 */
-	public function get_base_type_name($base_type_int){
+	public function get_base_type_name($base_type_int) {
 		return $this->base_types[$base_type_int];
 	}
 
@@ -83,27 +83,27 @@ 
 	 * @access protected
 	 * @param null $timezone
 	 */
-	protected function __construct( $timezone = NULL ) {
+	protected function __construct($timezone = NULL) {
 		$this->base_types = array(
-			EEM_Price_Type::base_type_base_price => __('Price','event_espresso'),
-			EEM_Price_Type::base_type_discount => __('Discount','event_espresso'),
-			EEM_Price_Type::base_type_surcharge => __('Surcharge','event_espresso'),
-			EEM_Price_Type::base_type_tax => __('Tax','event_espresso') );
-		$this->singular_item = __('Price Type','event_espresso');
-		$this->plural_item = __('Price Types','event_espresso');
+			EEM_Price_Type::base_type_base_price => __('Price', 'event_espresso'),
+			EEM_Price_Type::base_type_discount => __('Discount', 'event_espresso'),
+			EEM_Price_Type::base_type_surcharge => __('Surcharge', 'event_espresso'),
+			EEM_Price_Type::base_type_tax => __('Tax', 'event_espresso') );
+		$this->singular_item = __('Price Type', 'event_espresso');
+		$this->plural_item = __('Price Types', 'event_espresso');
 
 		$this->_tables = array(
-			'Price_Type'=>new EE_Primary_Table('esp_price_type','PRT_ID')
+			'Price_Type'=>new EE_Primary_Table('esp_price_type', 'PRT_ID')
 		);
 		$this->_fields = array(
 			'Price_Type'=>array(
-				'PRT_ID'=>new EE_Primary_Key_Int_Field('PRT_ID', __('Price Type ID','event_espresso')),
-				'PRT_name'=>new EE_Plain_Text_Field('PRT_name', __('Price Type Name','event_espresso'), false, ''),
-				'PBT_ID'=>new EE_Enum_Integer_Field('PBT_ID', __('Price Base type ID, 1 = Price , 2 = Discount , 3 = Surcharge , 4 = Tax','event_espresso'), false, EEM_Price_Type::base_type_base_price, $this->base_types),
-				'PRT_is_percent'=>new EE_Boolean_Field('PRT_is_percent', __('Flag indicating price is a percentage','event_espresso'), false, false),
-				'PRT_order'=>new EE_Integer_Field('PRT_order', __('Order in which price should be applied. ','event_espresso'), false, 0),
-				'PRT_deleted'=>new EE_Trashed_Flag_Field('PRT_deleted', __('Flag indicating price type has been trashed','event_espresso'), false, false),
-				'PRT_wp_user' => new EE_WP_User_Field('PRT_wp_user', __('Price Type Creator ID', 'event_espresso'), FALSE ),
+				'PRT_ID'=>new EE_Primary_Key_Int_Field('PRT_ID', __('Price Type ID', 'event_espresso')),
+				'PRT_name'=>new EE_Plain_Text_Field('PRT_name', __('Price Type Name', 'event_espresso'), false, ''),
+				'PBT_ID'=>new EE_Enum_Integer_Field('PBT_ID', __('Price Base type ID, 1 = Price , 2 = Discount , 3 = Surcharge , 4 = Tax', 'event_espresso'), false, EEM_Price_Type::base_type_base_price, $this->base_types),
+				'PRT_is_percent'=>new EE_Boolean_Field('PRT_is_percent', __('Flag indicating price is a percentage', 'event_espresso'), false, false),
+				'PRT_order'=>new EE_Integer_Field('PRT_order', __('Order in which price should be applied. ', 'event_espresso'), false, 0),
+				'PRT_deleted'=>new EE_Trashed_Flag_Field('PRT_deleted', __('Flag indicating price type has been trashed', 'event_espresso'), false, false),
+				'PRT_wp_user' => new EE_WP_User_Field('PRT_wp_user', __('Price Type Creator ID', 'event_espresso'), FALSE),
 			)
 		);
 		$this->_model_relations = array(
@@ -111,14 +111,14 @@ 
 			'WP_User' => new EE_Belongs_To_Relation(),
 		);
 		$this->_indexes = array(
-			'name' => new EE_Unique_Index( array( 'PRT_name' ) )
+			'name' => new EE_Unique_Index(array('PRT_name'))
 		);
 
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 		//all price types are "default" in terms of capability names
 		$this->_caps_slug = 'default_price_types';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 
@@ -164,15 +164,15 @@ 
 		$ID = $query_params[0][$this->get_primary_key_field()->get_name()];
 
 		//check if any prices use this price type
-		$prc_query_params = array(array('PRT_ID'=>array('IN',$would_be_deleted_price_type_ids)));
-		if ( $prices = $this->get_all_related($ID,'Price',$prc_query_params)) {
+		$prc_query_params = array(array('PRT_ID'=>array('IN', $would_be_deleted_price_type_ids)));
+		if ($prices = $this->get_all_related($ID, 'Price', $prc_query_params)) {
 			$prices_names_and_ids = array();
-			foreach($prices as $price){
+			foreach ($prices as $price) {
 				/* @var $price EE_Price */
 				$prices_names_and_ids[] = $price->name()."(".$price->ID().")";
 			}
-			$msg = sprintf(__('The Price Type(s) could not be deleted because there are existing Prices that currently use this Price Type.  If you still wish to delete this Price Type, then either delete those Prices or change them to use other Price Types.The prices are: %s', 'event_espresso'),implode(",",$prices_names_and_ids));
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg = sprintf(__('The Price Type(s) could not be deleted because there are existing Prices that currently use this Price Type.  If you still wish to delete this Price Type, then either delete those Prices or change them to use other Price Types.The prices are: %s', 'event_espresso'), implode(",", $prices_names_and_ids));
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 

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');
+}
 /**
  * Event Espresso
  *

admin_pages/venues/Venues_Admin_Page.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -944,7 +944,7 @@
 	 * @access  private
 	 * @param  int $VNU_ID
 	 * @param  string $venue_status
-	 * @return void
+	 * @return boolean
 	 */
 	private function _change_venue_status( $VNU_ID = 0, $venue_status = '' ) {
 		// grab venue id

Braces +12 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -893,8 +894,9 @@ 
 		}
 		$action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
 
-		if ( $redirect_after )
-			$this->_redirect_after_action($success, 'Venue', $action, array('action' => 'default'));
+		if ( $redirect_after ) {
+					$this->_redirect_after_action($success, 'Venue', $action, array('action' => 'default'));
+		}
 
 	}
 
@@ -1013,8 +1015,9 @@ 
 			$msg = __('An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( $redirect_after )
-			$this->_redirect_after_action($success, 'Venue', 'deleted', array('action' => 'default'));
+		if ( $redirect_after ) {
+					$this->_redirect_after_action($success, 'Venue', 'deleted', array('action' => 'default'));
+		}
 	}
 
 
@@ -1185,8 +1188,10 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
-			return; //already have the category object so get out.
+		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) ) {
+					return;
+		}
+		//already have the category object so get out.
 
 		//set default category object
 		$this->_set_empty_category_object();

Spacing +238 added lines, -238 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -62,10 +62,10 @@ 
 
 
 	protected function _init_page_props() {
-		require_once( EE_MODELS . 'EEM_Venue.model.php' );
+		require_once(EE_MODELS.'EEM_Venue.model.php');
 		$this->page_slug = EE_VENUES_PG_SLUG;
 		$this->_admin_base_url = EE_VENUES_ADMIN_URL;
-		$this->_admin_base_path = EE_ADMIN_PAGES . 'venues';
+		$this->_admin_base_path = EE_ADMIN_PAGES.'venues';
 		$this->page_label = __('Event Venues', 'event_espresso');
 		$this->_cpt_model_names = array(
 			'create_new' => 'EEM_Venue',
@@ -108,7 +108,7 @@ 
 				'edit' => __('Update Venue', 'event_espresso'),
 				'add_category' => __('Save New Category', 'event_espresso'),
 				'edit_category' => __('Update Category', 'event_espresso'),
-				'google_map_settings' => __( 'Update Settings', 'event_espresso' )
+				'google_map_settings' => __('Update Settings', 'event_espresso')
 				)
 		);
 	}
@@ -123,8 +123,8 @@ 
 		//load field generator helper
 
 		//is there a vnu_id in the request?
-		$vnu_id = ! empty( $this->_req_data['VNU_ID'] ) && ! is_array( $this->_req_data['VNU_ID'] ) ? $this->_req_data['VNU_ID'] : 0;
-		$vnu_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $vnu_id;
+		$vnu_id = ! empty($this->_req_data['VNU_ID']) && ! is_array($this->_req_data['VNU_ID']) ? $this->_req_data['VNU_ID'] : 0;
+		$vnu_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $vnu_id;
 
 		$this->_page_routes = array(
 			'default' => array(
@@ -142,27 +142,27 @@ 
 				),
 			'trash_venue' => array(
 				'func' => '_trash_or_restore_venue',
-				'args' => array( 'venue_status' => 'trash' ),
+				'args' => array('venue_status' => 'trash'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venue',
 				'obj_id' => $vnu_id
 				),
 			'trash_venues' => array(
 				'func' => '_trash_or_restore_venues',
-				'args' => array( 'venue_status' => 'trash' ),
+				'args' => array('venue_status' => 'trash'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venues'
 				),
 			'restore_venue' => array(
 				'func' => '_trash_or_restore_venue',
-				'args' => array( 'venue_status' => 'draft' ),
+				'args' => array('venue_status' => 'draft'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venue',
 				'obj_id' => $vnu_id
 				),
 			'restore_venues' => array(
 				'func' => '_trash_or_restore_venues',
-				'args' => array( 'venue_status' => 'draft' ),
+				'args' => array('venue_status' => 'draft'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venues'
 				),
@@ -264,7 +264,7 @@ 
 						'filename' => 'venues_overview_views_bulk_actions_search'
 					)
 				),
-				'help_tour' => array( 'Venues_Overview_Help_Tour' ),
+				'help_tour' => array('Venues_Overview_Help_Tour'),
 				'metaboxes' => array('_espresso_news_post_box', '_espresso_links_post_box'),
 				'require_nonce' => FALSE
 			),
@@ -300,7 +300,7 @@ 
 						'filename' => 'venues_editor_other'
 					)
 				),
-				'help_tour' => array( 'Venues_Add_Venue_Help_Tour' ),
+				'help_tour' => array('Venues_Add_Venue_Help_Tour'),
 				'metaboxes' => array('_venue_editor_metaboxes'),
 				'require_nonce' => FALSE
 				),
@@ -309,7 +309,7 @@ 
 					'label' => __('Edit Venue', 'event_espresso'),
 					'order' => 5,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['post']) ? add_query_arg(array('post' => $this->_req_data['post'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['post']) ? add_query_arg(array('post' => $this->_req_data['post']), $this->_current_page_view_url) : $this->_admin_base_url
 				),
 				'help_tabs' => array(
 					'venues_editor_help_tab' => array(
@@ -346,14 +346,14 @@ 
 					'label' => __('Google Maps'),
 					'order' => 40
 				),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'general_settings_google_maps_help_tab' => array(
 						'title' => __('Google Maps', 'event_espresso'),
 						'filename' => 'general_settings_google_maps'
 					)
 				),
-				'help_tour' => array( 'Google_Maps_Help_Tour' ),
+				'help_tour' => array('Google_Maps_Help_Tour'),
 				'require_nonce' => FALSE
 			),
 			//venue category stuff
@@ -369,7 +369,7 @@ 
 						'filename' => 'venues_add_category'
 					)
 				),
-				'help_tour' => array( 'Venues_Add_Category_Help_Tour' ),
+				'help_tour' => array('Venues_Add_Category_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			'edit_category' => array(
@@ -377,7 +377,7 @@ 
 					'label' => __('Edit Category', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
 				'metaboxes' => array('_publish_post_box'),
 				'help_tabs' => array(
@@ -413,7 +413,7 @@ 
 						'filename' => 'venues_categories_other'
 					)
 				),
-				'help_tour' => array( 'Venues_Categories_Help_Tour' ),
+				'help_tour' => array('Venues_Categories_Help_Tour'),
 				'metaboxes' => $this->_default_espresso_metaboxes,
 				'require_nonce' => FALSE
 				)
@@ -470,7 +470,7 @@ 
 
 
 	public function load_scripts_styles() {
-		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL.'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('ee-cat-admin');
 	}
 
@@ -493,7 +493,7 @@ 
 	public function load_scripts_styles_edit() {
 		//styles
 		wp_enqueue_style('espresso-ui-theme');
-		wp_register_style( 'espresso_venues', EE_VENUES_ASSETS_URL . 'ee-venues-admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_venues', EE_VENUES_ASSETS_URL.'ee-venues-admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_venues');
 	}
 
@@ -512,13 +512,13 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_venues', 'espresso_venues_trash_venues' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venues', 'espresso_venues_trash_venues')) {
 			$this->_views['all']['bulk_action'] = array(
 				'trash_venues' => __('Move to Trash', 'event_espresso')
 			);
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
-				'label' => __( 'Trash', 'event_espresso' ),
+				'label' => __('Trash', 'event_espresso'),
 				'count' => 0,
 				'bulk_action' => array(
 					'restore_venues' => __('Restore from Trash', 'event_espresso'),
@@ -551,8 +551,8 @@ 
 
 
 	protected function _overview_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link( get_post_type_archive_link('espresso_venues'), __("View Venue Archive Page", "event_espresso"), 'button' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(get_post_type_archive_link('espresso_venues'), __("View Venue Archive Page", "event_espresso"), 'button');
 		$this->_admin_page_title .= $this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2');
 		$this->_search_btn_label = __('Venues', 'event_espresso');
 		$this->display_admin_list_table_page_with_sidebar();
@@ -566,8 +566,8 @@ 
 			'vnu_url' => $this->_cpt_model_obj->venue_url(),
 			'vnu_phone' => $this->_cpt_model_obj->phone()
 			);
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_publish_box_extras.template.php';
-		EEH_Template::display_template( $template, $extra_rows );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_publish_box_extras.template.php';
+		EEH_Template::display_template($template, $extra_rows);
 	}
 
 
@@ -583,31 +583,31 @@ 
 		$default_map_settings->use_google_maps = TRUE;
 		$default_map_settings->google_map_api_key = '';
 		// for event details pages (reg page)
-		$default_map_settings->event_details_map_width = 585; 			// ee_map_width_single
-		$default_map_settings->event_details_map_height = 362; 			// ee_map_height_single
-		$default_map_settings->event_details_map_zoom = 14; 			// ee_map_zoom_single
-		$default_map_settings->event_details_display_nav = TRUE; 			// ee_map_nav_display_single
-		$default_map_settings->event_details_nav_size = FALSE; 			// ee_map_nav_size_single
-		$default_map_settings->event_details_control_type = 'default'; 		// ee_map_type_control_single
-		$default_map_settings->event_details_map_align = 'center'; 			// ee_map_align_single
+		$default_map_settings->event_details_map_width = 585; // ee_map_width_single
+		$default_map_settings->event_details_map_height = 362; // ee_map_height_single
+		$default_map_settings->event_details_map_zoom = 14; // ee_map_zoom_single
+		$default_map_settings->event_details_display_nav = TRUE; // ee_map_nav_display_single
+		$default_map_settings->event_details_nav_size = FALSE; // ee_map_nav_size_single
+		$default_map_settings->event_details_control_type = 'default'; // ee_map_type_control_single
+		$default_map_settings->event_details_map_align = 'center'; // ee_map_align_single
 		// for event list pages
-		$default_map_settings->event_list_map_width = 300; 			// ee_map_width
-		$default_map_settings->event_list_map_height = 185; 		// ee_map_height
-		$default_map_settings->event_list_map_zoom = 12; 			// ee_map_zoom
-		$default_map_settings->event_list_display_nav = FALSE; 		// ee_map_nav_display
-		$default_map_settings->event_list_nav_size = TRUE; 			// ee_map_nav_size
-		$default_map_settings->event_list_control_type = 'dropdown'; 		// ee_map_type_control
-		$default_map_settings->event_list_map_align = 'center'; 			// ee_map_align
+		$default_map_settings->event_list_map_width = 300; // ee_map_width
+		$default_map_settings->event_list_map_height = 185; // ee_map_height
+		$default_map_settings->event_list_map_zoom = 12; // ee_map_zoom
+		$default_map_settings->event_list_display_nav = FALSE; // ee_map_nav_display
+		$default_map_settings->event_list_nav_size = TRUE; // ee_map_nav_size
+		$default_map_settings->event_list_control_type = 'dropdown'; // ee_map_type_control
+		$default_map_settings->event_list_map_align = 'center'; // ee_map_align
 
 		$this->_template_args['map_settings'] =
-			isset( EE_Registry::instance()->CFG->map_settings ) && ! empty( EE_Registry::instance()->CFG->map_settings )
-				? (object)array_merge( (array)$default_map_settings, (array)EE_Registry::instance()->CFG->map_settings )
+			isset(EE_Registry::instance()->CFG->map_settings) && ! empty(EE_Registry::instance()->CFG->map_settings)
+				? (object) array_merge((array) $default_map_settings, (array) EE_Registry::instance()->CFG->map_settings)
 				: $default_map_settings;
 
-		$this->_set_add_edit_form_tags( 'update_google_map_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
+		$this->_set_add_edit_form_tags('update_google_map_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EE_VENUES_TEMPLATE_PATH . 'google_map.template.php',
+			EE_VENUES_TEMPLATE_PATH.'google_map.template.php',
 			$this->_template_args,
 			true
 		);
@@ -617,83 +617,83 @@ 
 	protected function _update_google_map_settings() {
 
 		EE_Registry::instance()->CFG->map_settings->use_google_maps =
-			isset( $this->_req_data['use_google_maps'] )
-				? absint( $this->_req_data['use_google_maps'] )
+			isset($this->_req_data['use_google_maps'])
+				? absint($this->_req_data['use_google_maps'])
 				: EE_Registry::instance()->CFG->map_settings->use_google_maps;
 
 		EE_Registry::instance()->CFG->map_settings->google_map_api_key =
-			isset( $this->_req_data['google_map_api_key'] )
-				? sanitize_text_field( $this->_req_data['google_map_api_key'] )
+			isset($this->_req_data['google_map_api_key'])
+				? sanitize_text_field($this->_req_data['google_map_api_key'])
 				: EE_Registry::instance()->CFG->map_settings->google_map_api_key;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_map_width =
-			isset( $this->_req_data['event_details_map_width'] )
-				? absint( $this->_req_data['event_details_map_width'] )
+			isset($this->_req_data['event_details_map_width'])
+				? absint($this->_req_data['event_details_map_width'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_map_width;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_map_height =
-			isset( $this->_req_data['event_details_map_height'] )
-				? absint( $this->_req_data['event_details_map_height'] )
+			isset($this->_req_data['event_details_map_height'])
+				? absint($this->_req_data['event_details_map_height'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_map_height;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_map_zoom =
-			isset( $this->_req_data['event_details_map_zoom'] )
-				? absint( $this->_req_data['event_details_map_zoom'] )
+			isset($this->_req_data['event_details_map_zoom'])
+				? absint($this->_req_data['event_details_map_zoom'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_map_zoom;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_display_nav =
-			isset( $this->_req_data['event_details_display_nav'] )
-				? absint( $this->_req_data['event_details_display_nav'] )
+			isset($this->_req_data['event_details_display_nav'])
+				? absint($this->_req_data['event_details_display_nav'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_display_nav;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_nav_size =
-			isset( $this->_req_data['event_details_nav_size'] )
-				? absint( $this->_req_data['event_details_nav_size'] )
+			isset($this->_req_data['event_details_nav_size'])
+				? absint($this->_req_data['event_details_nav_size'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_nav_size;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_control_type =
-			isset( $this->_req_data['event_details_control_type'] )
-				? sanitize_text_field( $this->_req_data['event_details_control_type'] )
+			isset($this->_req_data['event_details_control_type'])
+				? sanitize_text_field($this->_req_data['event_details_control_type'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_control_type;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_map_align =
-			isset( $this->_req_data['event_details_map_align'] )
-				? sanitize_text_field( $this->_req_data['event_details_map_align'] )
+			isset($this->_req_data['event_details_map_align'])
+				? sanitize_text_field($this->_req_data['event_details_map_align'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_map_align;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_map_width =
-			isset( $this->_req_data['event_list_map_width'] )
-				? absint( $this->_req_data['event_list_map_width'] )
+			isset($this->_req_data['event_list_map_width'])
+				? absint($this->_req_data['event_list_map_width'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_map_width;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_map_height =
-			isset( $this->_req_data['event_list_map_height'] )
-				? absint( $this->_req_data['event_list_map_height'] )
+			isset($this->_req_data['event_list_map_height'])
+				? absint($this->_req_data['event_list_map_height'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_map_height;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_map_zoom =
-			isset( $this->_req_data['event_list_map_zoom'] )
-				? absint( $this->_req_data['event_list_map_zoom'] )
+			isset($this->_req_data['event_list_map_zoom'])
+				? absint($this->_req_data['event_list_map_zoom'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_map_zoom;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_display_nav =
-			isset( $this->_req_data['event_list_display_nav'] )
-				? absint( $this->_req_data['event_list_display_nav'] )
+			isset($this->_req_data['event_list_display_nav'])
+				? absint($this->_req_data['event_list_display_nav'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_display_nav;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_nav_size =
-			isset( $this->_req_data['event_list_nav_size'] )
-				? absint( $this->_req_data['event_list_nav_size'] )
+			isset($this->_req_data['event_list_nav_size'])
+				? absint($this->_req_data['event_list_nav_size'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_nav_size;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_control_type =
-			isset( $this->_req_data['event_list_control_type'] )
-				? sanitize_text_field( $this->_req_data['event_list_control_type'] )
+			isset($this->_req_data['event_list_control_type'])
+				? sanitize_text_field($this->_req_data['event_list_control_type'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_control_type;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_map_align =
-			isset( $this->_req_data['event_list_map_align'] )
-				? sanitize_text_field( $this->_req_data['event_list_map_align'] )
+			isset($this->_req_data['event_list_map_align'])
+				? sanitize_text_field($this->_req_data['event_list_map_align'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_map_align;
 
 		EE_Registry::instance()->CFG->map_settings = apply_filters(
@@ -707,7 +707,7 @@ 
 			EE_Registry::instance()->CFG->map_settings,
 			__FILE__, __FUNCTION__, __LINE__
 		);
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'google_map_settings' ) );
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'google_map_settings'));
 
 	}
 
@@ -716,9 +716,9 @@ 
 	protected function _venue_editor_metaboxes() {
 		$this->verify_cpt_object();
 
-		add_meta_box( 'espresso_venue_address_options', __('Physical Location', 'event_espresso'), array( $this, 'venue_address_metabox'), $this->page_slug, 'side', 'default' );
-		add_meta_box( 'espresso_venue_gmap_options', __('Google Map', 'event_espresso'), array( $this, 'venue_gmap_metabox'), $this->page_slug, 'side', 'default' );
-		add_meta_box( 'espresso_venue_virtual_loc_options', __('Virtual Location', 'event_espresso'), array( $this, 'venue_virtual_loc_metabox'), $this->page_slug, 'side', 'default' );
+		add_meta_box('espresso_venue_address_options', __('Physical Location', 'event_espresso'), array($this, 'venue_address_metabox'), $this->page_slug, 'side', 'default');
+		add_meta_box('espresso_venue_gmap_options', __('Google Map', 'event_espresso'), array($this, 'venue_gmap_metabox'), $this->page_slug, 'side', 'default');
+		add_meta_box('espresso_venue_virtual_loc_options', __('Virtual Location', 'event_espresso'), array($this, 'venue_virtual_loc_metabox'), $this->page_slug, 'side', 'default');
 
 	}
 
@@ -726,23 +726,23 @@ 
 
 	public function venue_gmap_metabox() {
 		$template_args = array(
-			'vnu_enable_for_gmap' => EEH_Form_Fields::select_input('vnu_enable_for_gmap', $this->get_yes_no_values(), $this->_cpt_model_obj->enable_for_gmap() ),
+			'vnu_enable_for_gmap' => EEH_Form_Fields::select_input('vnu_enable_for_gmap', $this->get_yes_no_values(), $this->_cpt_model_obj->enable_for_gmap()),
 			'vnu_google_map_link' => $this->_cpt_model_obj->google_map_link(),
 			);
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_gmap_metabox_content.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_gmap_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
 
 	public function venue_address_metabox() {
 
-		$template_args['_venue'] =$this->_cpt_model_obj;
+		$template_args['_venue'] = $this->_cpt_model_obj;
 
 		$template_args['states_dropdown'] = EEH_Form_Fields::generate_form_input(
 			$QFI = new EE_Question_Form_Input(
-				EE_Question::new_instance( array( 'QST_display_text' => 'State', 'QST_system' => 'state' )),
-				EE_Answer::new_instance( array(  'ANS_value'=> $this->_cpt_model_obj->state_ID() )),
+				EE_Question::new_instance(array('QST_display_text' => 'State', 'QST_system' => 'state')),
+				EE_Answer::new_instance(array('ANS_value'=> $this->_cpt_model_obj->state_ID())),
 				array(
 					'input_name' =>  'sta_id',
 					'input_id' => 'sta_id',
@@ -754,8 +754,8 @@ 
 		);
 		$template_args['countries_dropdown'] = EEH_Form_Fields::generate_form_input(
 			$QFI = new EE_Question_Form_Input(
-				EE_Question::new_instance( array( 'QST_display_text' => 'Country', 'QST_system' => 'country' )),
-				EE_Answer::new_instance( array(  'ANS_value'=> $this->_cpt_model_obj->country_ID() )),
+				EE_Question::new_instance(array('QST_display_text' => 'Country', 'QST_system' => 'country')),
+				EE_Answer::new_instance(array('ANS_value'=> $this->_cpt_model_obj->country_ID())),
 				array(
 					'input_name' =>  'cnt_iso',
 					'input_id' => 'cnt_iso',
@@ -766,8 +766,8 @@ 
 			)
 		);
 
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_address_metabox_content.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_address_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -779,8 +779,8 @@ 
 		$template_args = array(
 			'_venue' => $this->_cpt_model_obj
 			);
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_virtual_location_metabox_content.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_virtual_location_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -803,52 +803,52 @@ 
 	 * @param  object $post    Post object (with "blessed" WP properties)
 	 * @return void
 	 */
-	protected function _insert_update_cpt_item( $post_id, $post ) {
+	protected function _insert_update_cpt_item($post_id, $post) {
 
-		if ( $post instanceof WP_Post && $post->post_type !== 'espresso_venues' ) {
-			return;// get out we're not processing the saving of venues.
+		if ($post instanceof WP_Post && $post->post_type !== 'espresso_venues') {
+			return; // get out we're not processing the saving of venues.
 		}
 
-		$wheres = array( $this->_venue_model->primary_key_name() => $post_id );
+		$wheres = array($this->_venue_model->primary_key_name() => $post_id);
 
 		$venue_values = array(
-			'VNU_address' => !empty( $this->_req_data['vnu_address'] ) ? $this->_req_data['vnu_address'] : NULL,
-			'VNU_address2' => !empty( $this->_req_data['vnu_address2'] ) ? $this->_req_data['vnu_address2'] : NULL,
-			'VNU_city' => !empty( $this->_req_data['vnu_city'] ) ? $this->_req_data['vnu_city'] : NULL,
-			'STA_ID' => !empty( $this->_req_data['sta_id'] ) ? $this->_req_data['sta_id'] : NULL,
-			'CNT_ISO' => !empty( $this->_req_data['cnt_iso'] ) ? $this->_req_data['cnt_iso'] : NULL,
-			'VNU_zip' => !empty( $this->_req_data['vnu_zip'] ) ? $this->_req_data['vnu_zip'] : NULL,
-			'VNU_phone' => !empty( $this->_req_data['vnu_phone'] ) ? $this->_req_data['vnu_phone'] : NULL,
-			'VNU_capacity' => !empty( $this->_req_data['vnu_capacity'] ) ? str_replace( ',', '', $this->_req_data['vnu_capacity'] ) : EE_INF,
-			'VNU_url' => !empty( $this->_req_data['vnu_url'] ) ? $this->_req_data['vnu_url'] : NULL,
-			'VNU_virtual_phone' => !empty( $this->_req_data['vnu_virtual_phone'] ) ? $this->_req_data['vnu_virtual_phone'] : NULL,
-			'VNU_virtual_url' => !empty( $this->_req_data['vnu_virtual_url'] ) ? $this->_req_data['vnu_virtual_url'] : NULL,
-			'VNU_enable_for_gmap' => !empty( $this->_req_data['vnu_enable_for_gmap'] ) ? TRUE : FALSE,
-			'VNU_google_map_link' => !empty( $this->_req_data['vnu_google_map_link'] ) ? $this->_req_data['vnu_google_map_link'] : NULL
+			'VNU_address' => ! empty($this->_req_data['vnu_address']) ? $this->_req_data['vnu_address'] : NULL,
+			'VNU_address2' => ! empty($this->_req_data['vnu_address2']) ? $this->_req_data['vnu_address2'] : NULL,
+			'VNU_city' => ! empty($this->_req_data['vnu_city']) ? $this->_req_data['vnu_city'] : NULL,
+			'STA_ID' => ! empty($this->_req_data['sta_id']) ? $this->_req_data['sta_id'] : NULL,
+			'CNT_ISO' => ! empty($this->_req_data['cnt_iso']) ? $this->_req_data['cnt_iso'] : NULL,
+			'VNU_zip' => ! empty($this->_req_data['vnu_zip']) ? $this->_req_data['vnu_zip'] : NULL,
+			'VNU_phone' => ! empty($this->_req_data['vnu_phone']) ? $this->_req_data['vnu_phone'] : NULL,
+			'VNU_capacity' => ! empty($this->_req_data['vnu_capacity']) ? str_replace(',', '', $this->_req_data['vnu_capacity']) : EE_INF,
+			'VNU_url' => ! empty($this->_req_data['vnu_url']) ? $this->_req_data['vnu_url'] : NULL,
+			'VNU_virtual_phone' => ! empty($this->_req_data['vnu_virtual_phone']) ? $this->_req_data['vnu_virtual_phone'] : NULL,
+			'VNU_virtual_url' => ! empty($this->_req_data['vnu_virtual_url']) ? $this->_req_data['vnu_virtual_url'] : NULL,
+			'VNU_enable_for_gmap' => ! empty($this->_req_data['vnu_enable_for_gmap']) ? TRUE : FALSE,
+			'VNU_google_map_link' => ! empty($this->_req_data['vnu_google_map_link']) ? $this->_req_data['vnu_google_map_link'] : NULL
 			);
 
 		//update venue
-		$success = $this->_venue_model->update( $venue_values, array( $wheres ) );
+		$success = $this->_venue_model->update($venue_values, array($wheres));
 
 		//get venue_object for other metaboxes that might be added via the filter... though it would seem to make sense to just use $this->_venue_model->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
-		$get_one_where = array( $this->_venue_model->primary_key_name() => $post_id, 'status' => $post->post_status  );
-		$venue = $this->_venue_model->get_one( array( $get_one_where ) );
+		$get_one_where = array($this->_venue_model->primary_key_name() => $post_id, 'status' => $post->post_status);
+		$venue = $this->_venue_model->get_one(array($get_one_where));
 
 		//notice we've applied a filter for venue metabox callbacks but we don't actually have any default venue metaboxes in use.  So this is just here for addons to more easily hook into venue saves.
-		$venue_update_callbacks = apply_filters( 'FHEE__Venues_Admin_Page___insert_update_cpt_item__venue_update_callbacks', array() );
+		$venue_update_callbacks = apply_filters('FHEE__Venues_Admin_Page___insert_update_cpt_item__venue_update_callbacks', array());
 
 		$att_success = TRUE;
 
-		foreach ( $venue_update_callbacks as $v_callback ) {
-			$_succ = call_user_func_array( $v_callback, array( $venue,  $this->_req_data ) );
-			$att_success = !$att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
+		foreach ($venue_update_callbacks as $v_callback) {
+			$_succ = call_user_func_array($v_callback, array($venue, $this->_req_data));
+			$att_success = ! $att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
 		}
 
 		//any errors?
-		if ( $success && !$att_success ) {
-			EE_Error::add_error( __('Venue Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-		} else if ( $success === FALSE ) {
-			EE_Error::add_error( __('Venue Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ($success && ! $att_success) {
+			EE_Error::add_error(__('Venue Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+		} else if ($success === FALSE) {
+			EE_Error::add_error(__('Venue Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -856,9 +856,9 @@ 
 
 
 
-	public function trash_cpt_item( $post_id ) {
+	public function trash_cpt_item($post_id) {
 		$this->_req_data['VNU_ID'] = $post_id;
-		$this->_trash_or_restore_venue( 'trash', FALSE );
+		$this->_trash_or_restore_venue('trash', FALSE);
 	}
 
 
@@ -866,18 +866,18 @@ 
 
 
 
-	public function restore_cpt_item( $post_id ) {
+	public function restore_cpt_item($post_id) {
 		$this->_req_data['VNU_ID'] = $post_id;
-		$this->_trash_or_restore_venue( 'draft', FALSE );
+		$this->_trash_or_restore_venue('draft', FALSE);
 	}
 
 
 
 
 
-	public function delete_cpt_item( $post_id ) {
+	public function delete_cpt_item($post_id) {
 		$this->_req_data['VNU_ID'] = $post_id;
-		$this->_delete_venue( FALSE );
+		$this->_delete_venue(FALSE);
 	}
 
 
@@ -892,15 +892,15 @@ 
 
 
 
-	protected function _trash_or_restore_venue( $venue_status = 'trash', $redirect_after = TRUE ) {
-		$VNU_ID = isset( $this->_req_data['VNU_ID'] ) ? absint( $this->_req_data['VNU_ID'] ) : FALSE;
+	protected function _trash_or_restore_venue($venue_status = 'trash', $redirect_after = TRUE) {
+		$VNU_ID = isset($this->_req_data['VNU_ID']) ? absint($this->_req_data['VNU_ID']) : FALSE;
 
 		//loop thru venues
-		if ( $VNU_ID ) {
+		if ($VNU_ID) {
 			//clean status
-			$venue_status = sanitize_key( $venue_status );
+			$venue_status = sanitize_key($venue_status);
 			// grab status
-			if (!empty($venue_status)) {
+			if ( ! empty($venue_status)) {
 				$success = $this->_change_venue_status($VNU_ID, $venue_status);
 			} else {
 				$success = FALSE;
@@ -914,7 +914,7 @@ 
 		}
 		$action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
 
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Venue', $action, array('action' => 'default'));
 
 	}
@@ -923,11 +923,11 @@ 
 
 
 
-	protected function _trash_or_restore_venues( $venue_status = 'trash' ) {
+	protected function _trash_or_restore_venues($venue_status = 'trash') {
 		// clean status
 		$venue_status = sanitize_key($venue_status);
 		// grab status
-		if (!empty($venue_status)) {
+		if ( ! empty($venue_status)) {
 			$success = TRUE;
 			//determine the event id and set to array.
 			$VNU_IDs = isset($this->_req_data['venue_id']) ? (array) $this->_req_data['venue_id'] : array();
@@ -967,20 +967,20 @@ 
 	 * @param  string $venue_status
 	 * @return void
 	 */
-	private function _change_venue_status( $VNU_ID = 0, $venue_status = '' ) {
+	private function _change_venue_status($VNU_ID = 0, $venue_status = '') {
 		// grab venue id
-		if (! $VNU_ID) {
+		if ( ! $VNU_ID) {
 			$msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		$this->_cpt_model_obj = EEM_Venue::instance()->get_one_by_ID( $VNU_ID );
+		$this->_cpt_model_obj = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
 
 		// clean status
 		$venue_status = sanitize_key($venue_status);
 		// grab status
-		if ( ! $venue_status ) {
+		if ( ! $venue_status) {
 			$msg = __('An error occurred. No Venue Status or an invalid Venue Status was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
@@ -1001,7 +1001,7 @@ 
 				$hook = FALSE;
 		}
 		//use class to change status
-		$this->_cpt_model_obj->set_status( $venue_status );
+		$this->_cpt_model_obj->set_status($venue_status);
 		$success = $this->_cpt_model_obj->save();
 
 		if ($success === FALSE) {
@@ -1020,21 +1020,21 @@ 
 	 * @param  bool $redirect_after
 	 * @return void
 	 */
-	protected function _delete_venue( $redirect_after = true ) {
+	protected function _delete_venue($redirect_after = true) {
 		//determine the venue id and set to array.
 		$VNU_ID = isset($this->_req_data['VNU_ID']) ? absint($this->_req_data['VNU_ID']) : NULL;
-		$VNU_ID = isset( $this->_req_data['post'] ) ? absint( $this->_req_data['post'] ) : $VNU_ID;
+		$VNU_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : $VNU_ID;
 
 
 		// loop thru venues
 		if ($VNU_ID) {
-			$success = $this->_delete_or_trash_venue( $VNU_ID );
+			$success = $this->_delete_or_trash_venue($VNU_ID);
 		} else {
 			$success = FALSE;
 			$msg = __('An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Venue', 'deleted', array('action' => 'default'));
 	}
 
@@ -1066,7 +1066,7 @@ 
 	//todo: put in parent
 	private function _delete_or_trash_venue($VNU_ID = FALSE) {
 		// grab event id
-		if (!$VNU_ID = absint($VNU_ID)) {
+		if ( ! $VNU_ID = absint($VNU_ID)) {
 			$msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
@@ -1086,7 +1086,7 @@ 
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		do_action( 'AHEE__Venues_Admin_Page___delete_or_trash_venue__after_venue_deleted' );
+		do_action('AHEE__Venues_Admin_Page___delete_or_trash_venue__after_venue_deleted');
 		return TRUE;
 	}
 
@@ -1097,11 +1097,11 @@ 
 	/* QUERIES */
 
 
-	public function get_venues( $per_page = 10, $count = FALSE ) {
+	public function get_venues($per_page = 10, $count = FALSE) {
 
-		$_orderby = !empty( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : '';
+		$_orderby = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
 
-		switch ( $_orderby ) {
+		switch ($_orderby) {
 			case 'id':
 				$orderby = 'VNU_ID';
 				break;
@@ -1119,43 +1119,43 @@ 
 		}
 
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $per_page ) && !empty( $per_page ) ? $per_page : 10;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($per_page) && ! empty($per_page) ? $per_page : 10;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 
-		$offset = ($current_page-1)*$per_page;
+		$offset = ($current_page - 1) * $per_page;
 		$limit = array($offset, $per_page);
 
-		$category = isset( $this->_req_data['category'] ) && $this->_req_data['category'] > 0 ? $this->_req_data['category'] : NULL;
+		$category = isset($this->_req_data['category']) && $this->_req_data['category'] > 0 ? $this->_req_data['category'] : NULL;
 		$where = array();
 
 		//only set initial status if it is in the incoming request.  Otherwise the "all" view display's all statuses.
-		if ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] != 'all' ) {
+		if (isset($this->_req_data['status']) && $this->_req_data['status'] != 'all') {
 			$where['status'] = $this->_req_data['status'];
 		}
 
-		if ( isset( $this->_req_data['venue_status'] ) ) {
+		if (isset($this->_req_data['venue_status'])) {
 			$where['status'] = $this->_req_data['venue_status'];
 		}
 
 
-		if ( $category ) {
+		if ($category) {
 			$where['Term_Taxonomy.taxonomy'] = 'espresso_venue_categories';
 			$where['Term_Taxonomy.term_id'] = $category;
 		}
 
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_venues', 'get_venues' ) ) {
-			$where['VNU_wp_user'] =  get_current_user_id();
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
+			$where['VNU_wp_user'] = get_current_user_id();
 		} else {
-				if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_venues', 'get_venues' ) ) {
+				if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
 					$where['OR'] = array(
-						'status*restrict_private' => array( '!=', 'private' ),
+						'status*restrict_private' => array('!=', 'private'),
 						'AND'                     => array(
-							'status*inclusive' => array( '=', 'private' ),
+							'status*inclusive' => array('=', 'private'),
 							'VNU_wp_user'      => get_current_user_id()
 						)
 					);
@@ -1165,30 +1165,30 @@ 
 
 
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'VNU_name' => array('LIKE',$sstr ),
-				'VNU_desc' => array('LIKE',$sstr ),
-				'VNU_short_desc' => array( 'LIKE',$sstr ),
-				'VNU_address' => array( 'LIKE', $sstr ),
-				'VNU_address2' => array( 'LIKE', $sstr ),
-				'VNU_city' => array( 'LIKE', $sstr ),
-				'VNU_zip' => array( 'LIKE', $sstr ),
-				'VNU_phone' => array( 'LIKE', $sstr ),
-				'VNU_url' => array( 'LIKE', $sstr ),
-				'VNU_virtual_phone' => array( 'LIKE', $sstr ),
-				'VNU_virtual_url' => array( 'LIKE', $sstr ),
-				'VNU_google_map_link' => array( 'LIKE', $sstr ),
-				'Event.EVT_name' => array('LIKE', $sstr ),
-				'Event.EVT_desc' => array('LIKE', $sstr ),
-				'Event.EVT_phone' => array('LIKE', $sstr ),
-				'Event.EVT_external_URL' => array('LIKE', $sstr ),
+				'VNU_name' => array('LIKE', $sstr),
+				'VNU_desc' => array('LIKE', $sstr),
+				'VNU_short_desc' => array('LIKE', $sstr),
+				'VNU_address' => array('LIKE', $sstr),
+				'VNU_address2' => array('LIKE', $sstr),
+				'VNU_city' => array('LIKE', $sstr),
+				'VNU_zip' => array('LIKE', $sstr),
+				'VNU_phone' => array('LIKE', $sstr),
+				'VNU_url' => array('LIKE', $sstr),
+				'VNU_virtual_phone' => array('LIKE', $sstr),
+				'VNU_virtual_url' => array('LIKE', $sstr),
+				'VNU_google_map_link' => array('LIKE', $sstr),
+				'Event.EVT_name' => array('LIKE', $sstr),
+				'Event.EVT_desc' => array('LIKE', $sstr),
+				'Event.EVT_phone' => array('LIKE', $sstr),
+				'Event.EVT_external_URL' => array('LIKE', $sstr),
 				);
 		}
 
 
-		$venues = $count ? $this->_venue_model->count( array($where), 'VNU_ID' ) : $this->_venue_model->get_all( array( $where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $sort ) );
+		$venues = $count ? $this->_venue_model->count(array($where), 'VNU_ID') : $this->_venue_model->get_all(array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $sort));
 
 		return $venues;
 
@@ -1206,22 +1206,22 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
+		if (isset($this->_category->id) && ! empty($this->_category->id))
 			return; //already have the category object so get out.
 
 		//set default category object
 		$this->_set_empty_category_object();
 
 		//only set if we've got an id
-		if ( !isset($this->_req_data['VEN_CAT_ID'] ) ) {
+		if ( ! isset($this->_req_data['VEN_CAT_ID'])) {
 			return;
 		}
 
 		$category_id = absint($this->_req_data['VEN_CAT_ID']);
-		$term = get_term( $category_id, 'espresso_venue_categories' );
+		$term = get_term($category_id, 'espresso_venue_categories');
 
 
-		if ( !empty( $term ) ) {
+		if ( ! empty($term)) {
 			$this->_category->category_name = $term->name;
 			$this->_category->category_identifier = $term->slug;
 			$this->_category->category_desc = $term->description;
@@ -1235,14 +1235,14 @@ 
 
 	private function _set_empty_category_object() {
 		$this->_category = new stdClass();
-		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc  = '';
+		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = '';
 		$this->_category->id = $this->_category->parent = 0;
 	}
 
 
 
 	protected function _category_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_admin_page_title .= $this->get_action_link_or_button('add_category', 'add_category', array(), 'add-new-h2');
 		$this->_search_btn_label = __('Venue Categories', 'event_espresso');
 		$this->display_admin_list_table_page_with_sidebar();
@@ -1258,13 +1258,13 @@ 
 		$this->_set_add_edit_form_tags($route);
 
 		$this->_set_category_object();
-		$id = !empty($this->_category->id) ? $this->_category->id : '';
+		$id = ! empty($this->_category->id) ? $this->_category->id : '';
 
 		$delete_action = 'delete_category';
 
-		$redirect = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'category_list' ), $this->_admin_base_url );
+		$redirect = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'category_list'), $this->_admin_base_url);
 
-		$this->_set_publish_post_box_vars( 'VEN_CAT_ID', $id, $delete_action, $redirect );
+		$this->_set_publish_post_box_vars('VEN_CAT_ID', $id, $delete_action, $redirect);
 
 		//take care of contents
 		$this->_template_args['admin_page_content'] = $this->_category_details_content();
@@ -1278,25 +1278,25 @@ 
 			'type' => 'wp_editor',
 			'value' => EEH_Formatter::admin_format_content($this->_category->category_desc),
 			'class' => 'my_editor_custom',
-			'wpeditor_args' => array( 'media_buttons' => FALSE )
+			'wpeditor_args' => array('media_buttons' => FALSE)
 		);
-		$_wp_editor = $this->_generate_admin_form_fields( $editor_args, 'array' );
+		$_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array');
 
-		$all_terms = get_terms( array('espresso_venue_categories' ), array( 'hide_empty' => 0, 'exclude' => array( $this->_category->id ) ) );
+		$all_terms = get_terms(array('espresso_venue_categories'), array('hide_empty' => 0, 'exclude' => array($this->_category->id)));
 
 		//setup category select for term parents.
 		$category_select_values[] = array(
 			'text' => __('No Parent', 'event_espresso'),
 			'id' => 0
 			);
-		foreach ( $all_terms as $term ) {
+		foreach ($all_terms as $term) {
 			$category_select_values[] = array(
 				'text' => $term->name,
 				'id' => $term->term_id
 				);
 		}
 
-		$category_select = EEH_Form_Fields::select_input( 'category_parent', $category_select_values, $this->_category->parent );
+		$category_select = EEH_Form_Fields::select_input('category_parent', $category_select_values, $this->_category->parent);
 		$template_args = array(
 			'category' => $this->_category,
 			'category_select' => $category_select,
@@ -1305,15 +1305,15 @@ 
 			'disable' => '',
 			'disabled_message' =>FALSE
 			);
-		$template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
-		return EEH_Template::display_template($template, $template_args, TRUE );
+		$template = EVENTS_TEMPLATE_PATH.'event_category_details.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 	protected function _delete_categories() {
-		$cat_ids = isset( $this->_req_data['VEN_CAT_ID'] ) ? (array) $this->_req_data['VEN_CAT_ID'] : (array) $this->_req_data['category_id'];
+		$cat_ids = isset($this->_req_data['VEN_CAT_ID']) ? (array) $this->_req_data['VEN_CAT_ID'] : (array) $this->_req_data['category_id'];
 
-		foreach ( $cat_ids as $cat_id ) {
+		foreach ($cat_ids as $cat_id) {
 			$this->_delete_category($cat_id);
 		}
 
@@ -1321,7 +1321,7 @@ 
 		$query_args = array(
 			'action' => 'category_list'
 			);
-		$this->_redirect_after_action(0,'','',$query_args);
+		$this->_redirect_after_action(0, '', '', $query_args);
 
 	}
 
@@ -1330,58 +1330,58 @@ 
 
 
 	protected function _delete_category($cat_id) {
-		$cat_id = absint( $cat_id );
-		wp_delete_term( $cat_id, 'espresso_venue_categories' );
+		$cat_id = absint($cat_id);
+		wp_delete_term($cat_id, 'espresso_venue_categories');
 	}
 
 
 
 	protected function _insert_or_update_category($new_category) {
 
-		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category( TRUE );
+		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(TRUE);
 		$success = 0; //we already have a success message so lets not send another.
-		if ( $cat_id ) {
+		if ($cat_id) {
 			$query_args = array(
 				'action'     => 'edit_category',
 				'VEN_CAT_ID' => $cat_id
 			);
 		} else {
-			$query_args = array( 'action' => 'add_category' );
+			$query_args = array('action' => 'add_category');
 		}
-		$this->_redirect_after_action( $success, '','', $query_args, TRUE );
+		$this->_redirect_after_action($success, '', '', $query_args, TRUE);
 
 	}
 
 
 
-	private function _insert_category( $update = FALSE ) {
+	private function _insert_category($update = FALSE) {
 		$cat_id = $update ? $this->_req_data['VEN_CAT_ID'] : '';
-		$category_name= isset( $this->_req_data['category_name'] ) ? $this->_req_data['category_name'] : '';
-		$category_desc= isset( $this->_req_data['category_desc'] ) ? $this->_req_data['category_desc'] : '';
-		$category_parent = isset( $this->_req_data['category_parent'] ) ? $this->_req_data['category_parent'] : 0;
+		$category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : '';
+		$category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : '';
+		$category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0;
 
-		if ( empty( $category_name ) ) {
-			$msg = __( 'You must add a name for the category.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($category_name)) {
+			$msg = __('You must add a name for the category.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 
-		$term_args=array(
+		$term_args = array(
 			'name'=>$category_name,
 			'description'=>$category_desc,
 			'parent'=>$category_parent
 		);
 
-		$insert_ids = $update ? wp_update_term( $cat_id, 'espresso_venue_categories', $term_args ) :wp_insert_term( $category_name, 'espresso_venue_categories', $term_args );
+		$insert_ids = $update ? wp_update_term($cat_id, 'espresso_venue_categories', $term_args) : wp_insert_term($category_name, 'espresso_venue_categories', $term_args);
 
-		if ( !is_array( $insert_ids ) ) {
-			$msg = __( 'An error occurred and the category has not been saved to the database.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_array($insert_ids)) {
+			$msg = __('An error occurred and the category has not been saved to the database.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			$cat_id = $insert_ids['term_id'];
-			$msg = sprintf ( __('The category %s was successfully created', 'event_espresso'), $category_name );
-			EE_Error::add_success( $msg );
+			$msg = sprintf(__('The category %s was successfully created', 'event_espresso'), $category_name);
+			EE_Error::add_success($msg);
 		}
 
 		return $cat_id;
@@ -1401,11 +1401,11 @@ 
 			'category_ids' => $this->_req_data['VEN_CAT_ID']
 			);
 
-		$this->_req_data = array_merge( $this->_req_data, $new_request_args );
+		$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-		if ( is_readable( EE_CLASSES . 'EE_Export.class.php') ) {
-			require_once( EE_CLASSES . 'EE_Export.class.php');
-			$EE_Export = EE_Export::instance( $this->_req_data );
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
+			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
 
@@ -1417,7 +1417,7 @@ 
 
 	protected function _import_categories() {
 
-		require_once(EE_CLASSES . 'EE_Import.class.php');
+		require_once(EE_CLASSES.'EE_Import.class.php');
 		EE_Import::instance()->import();
 
 	}
@@ -1425,29 +1425,29 @@ 
 
 
 
-	public function get_categories( $per_page = 10, $current_page = 1, $count = FALSE ) {
+	public function get_categories($per_page = 10, $current_page = 1, $count = FALSE) {
 
 		//testing term stuff
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'Term.term_id';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'DESC';
-		$limit = ($current_page-1)*$per_page;
-		$where = array( 'taxonomy' => 'espresso_venue_categories' );
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC';
+		$limit = ($current_page - 1) * $per_page;
+		$where = array('taxonomy' => 'espresso_venue_categories');
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'Term.name' => array( 'LIKE', $sstr),
-				'description' => array( 'LIKE', $sstr )
+				'Term.name' => array('LIKE', $sstr),
+				'description' => array('LIKE', $sstr)
 				);
 		}
 
 		$query_params = array(
 			$where,
-			'order_by' => array( $orderby => $order ),
-			'limit' => $limit . ',' . $per_page,
+			'order_by' => array($orderby => $order),
+			'limit' => $limit.','.$per_page,
 			'force_join' => array('Term')
 			);
 
-		$categories = $count ? EEM_Term_Taxonomy::instance()->count( $query_params, 'term_id' ) :EEM_Term_Taxonomy::instance()->get_all( $query_params );
+		$categories = $count ? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id') : EEM_Term_Taxonomy::instance()->get_all($query_params);
 
 		return $categories;
 	}