eventespresso / event-espresso-core

core/db_classes/EE_Import.class.php

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;
 	}

core/db_classes/EE_Export.class.php

Spacing +192 added lines, -192 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_Export class
  *
@@ -41,11 +41,11 @@ 
 	  * @access private
 	  * @param array $request_data
 	  */
- 	private function __construct( $request_data = array() ) {
+ 	private function __construct($request_data = array()) {
 		$this->_req_data = $request_data;
-		$this->today = date("Y-m-d",time());
-		require_once( EE_CLASSES . 'EE_CSV.class.php' );
-		$this->EE_CSV= EE_CSV::instance();
+		$this->today = date("Y-m-d", time());
+		require_once(EE_CLASSES.'EE_CSV.class.php');
+		$this->EE_CSV = EE_CSV::instance();
 	}
 
 
@@ -57,10 +57,10 @@ 
 	  * @param array $request_data
 	  * @return \EE_Export
 	  */
-	public static function instance( $request_data = array() ) {
+	public static function instance($request_data = array()) {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Export )) {
-			self::$_instance = new self( $request_data );
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Export)) {
+			self::$_instance = new self($request_data);
 		}
 		return self::$_instance;
 	}
@@ -74,15 +74,15 @@ 
 	public function export() {
 
 		// in case of bulk exports, the "actual" action will be in action2, but first check regular action for "export" keyword
-		if ( isset( $this->_req_data['action'] ) && strpos( $this->_req_data['action'], 'export' ) === FALSE ) {
+		if (isset($this->_req_data['action']) && strpos($this->_req_data['action'], 'export') === FALSE) {
 			// check if action2 has export action
-			if ( isset( $this->_req_data['action2'] ) && strpos( $this->_req_data['action2'], 'export' ) !== FALSE ) {
+			if (isset($this->_req_data['action2']) && strpos($this->_req_data['action2'], 'export') !== FALSE) {
 				// whoop! there it is!
 				$this->_req_data['action'] = $this->_req_data['action2'];
 			}
 		}
 
-		$this->_req_data['export'] = isset( $this->_req_data['export'] ) ? $this->_req_data['export'] : '';
+		$this->_req_data['export'] = isset($this->_req_data['export']) ? $this->_req_data['export'] : '';
 
 		switch ($this->_req_data['export']) {
 			case 'report':
@@ -99,7 +99,7 @@ 
 					break;
 
 					case 'registrations_report_for_event':
-						$this->report_registrations_for_event( $this->_req_data['EVT_ID'] );
+						$this->report_registrations_for_event($this->_req_data['EVT_ID']);
 					break;
 
 					case 'attendees':
@@ -111,7 +111,7 @@ 
 					break;
 
 					default:
-						EE_Error::add_error(__('An error occurred! The requested export report could not be found.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ ) ;
+						EE_Error::add_error(__('An error occurred! The requested export report could not be found.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 						return FALSE;
 					break;
 
@@ -139,12 +139,12 @@ 
 
 		$models_to_export = EE_Registry::instance()->non_abstract_db_models;
 
-		$table_data = $this->_get_export_data_for_models( array_keys( $models_to_export ) );
+		$table_data = $this->_get_export_data_for_models(array_keys($models_to_export));
 
-		$filename = $this->generate_filename ( 'full-db-export' );
+		$filename = $this->generate_filename('full-db-export');
 
-		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename,$table_data )) {
-			EE_Error::add_error(__("An error occurred and the Event details could not be exported from the database.", "event_espresso"), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $table_data)) {
+			EE_Error::add_error(__("An error occurred and the Event details could not be exported from the database.", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -152,7 +152,7 @@ 
 	 * Downloads a CSV file with all the columns, but no data. This should be used for importing
 	 * @return null kills execution
 	 */
-	function export_sample(){
+	function export_sample() {
 		$event = EEM_Event::instance()->get_one();
 		$this->_req_data['EVT_ID'] = $event->ID();
 		$this->export_all_event_data();
@@ -179,23 +179,23 @@ 
 		$question_group_query_params = array();
 		$question_query_params = array();
 		$related_through_mtg_params = array();
-		if ( isset( $this->_req_data['EVT_ID'] )) {
+		if (isset($this->_req_data['EVT_ID'])) {
 			// do we have an array of IDs ?
 
-			if ( is_array( $this->_req_data['EVT_ID'] )) {
-				$EVT_IDs =  array_map( 'sanitize_text_field', $this->_req_data['EVT_ID'] );
-				$value_to_equal = array('IN',$EVT_IDs);
+			if (is_array($this->_req_data['EVT_ID'])) {
+				$EVT_IDs = array_map('sanitize_text_field', $this->_req_data['EVT_ID']);
+				$value_to_equal = array('IN', $EVT_IDs);
 				$filename = 'events';
 			} else {
 				// generate regular where = clause
-				$EVT_ID = absint( $this->_req_data['EVT_ID'] );
+				$EVT_ID = absint($this->_req_data['EVT_ID']);
 				$value_to_equal = $EVT_ID;
 				$event = EE_Registry::instance()->load_model('Event')->get_one_by_ID($EVT_ID);
 
-				$filename = 'event-' . ( $event instanceof EE_Event ? $event->slug() : __( 'unknown', 'event_espresso' ) );
+				$filename = 'event-'.($event instanceof EE_Event ? $event->slug() : __('unknown', 'event_espresso'));
 
 			}
-			$event_query_params[0]['EVT_ID'] =$value_to_equal;
+			$event_query_params[0]['EVT_ID'] = $value_to_equal;
 			$related_models_query_params[0]['Event.EVT_ID'] = $value_to_equal;
 			$related_through_reg_query_params[0]['Registration.EVT_ID'] = $value_to_equal;
 			$datetime_ticket_query_params[0]['Datetime.EVT_ID'] = $value_to_equal;
@@ -205,7 +205,7 @@ 
 			$state_country_query_params[0]['Venue.Event.EVT_ID'] = $value_to_equal;
 			$question_group_query_params[0]['Event.EVT_ID'] = $value_to_equal;
 			$question_query_params[0]['Question_Group.Event.EVT_ID'] = $value_to_equal;
-			$related_through_mtg_params[0]['Message_Template_Group.Event.EVT_ID' ] = $value_to_equal;
+			$related_through_mtg_params[0]['Message_Template_Group.Event.EVT_ID'] = $value_to_equal;
 
 		} else {
 			$filename = 'all-events';
@@ -246,18 +246,18 @@ 
 		//and we want to specify what things we want to update (because some of that data we'd rather
 		//not update, just insert if it doesn't exist
 		$models_to_update = $models_to_export;
-		unset( $models_to_update['Ticket_Template'] );
-		unset( $models_to_update['Price_Type'] );
-		unset( $models_to_update['Term'] );
-		unset( $models_to_update['Country'] );
-		unset( $models_to_update['State'] );
-		unset( $models_to_update['Question_Group'] );
-		unset( $models_to_update['Event_Question_Group'] );
-		unset( $models_to_update['Question'] );
-		unset( $models_to_update['Question_Group_Question'] );
-		unset( $models_to_update['Message_Template_Group'] );
-		unset( $models_to_update['Message_Template'] );
-		$models_to_update = array_keys( $models_to_update );
+		unset($models_to_update['Ticket_Template']);
+		unset($models_to_update['Price_Type']);
+		unset($models_to_update['Term']);
+		unset($models_to_update['Country']);
+		unset($models_to_update['State']);
+		unset($models_to_update['Question_Group']);
+		unset($models_to_update['Event_Question_Group']);
+		unset($models_to_update['Question']);
+		unset($models_to_update['Question_Group_Question']);
+		unset($models_to_update['Message_Template_Group']);
+		unset($models_to_update['Message_Template']);
+		$models_to_update = array_keys($models_to_update);
 
 
 
@@ -266,37 +266,37 @@ 
 		//and won't get any non-events; also
 		//we can forego the default query params
 
-		$model_data = $this->_get_export_data_for_models( $models_to_export );
+		$model_data = $this->_get_export_data_for_models($models_to_export);
 
-		$filename = $this->generate_filename ( $filename );
+		$filename = $this->generate_filename($filename);
 
-		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $model_data, $models_to_update )) {
-			EE_Error::add_error(__("'An error occurred and the Event details could not be exported from the database.'", "event_espresso"), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $model_data, $models_to_update)) {
+			EE_Error::add_error(__("'An error occurred and the Event details could not be exported from the database.'", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
-	function report_attendees(){
-		$attendee_rows = EEM_Attendee::instance()->get_all_wpdb_results( array( 'force_join' => array( 'State', 'Country' ) ) );
+	function report_attendees() {
+		$attendee_rows = EEM_Attendee::instance()->get_all_wpdb_results(array('force_join' => array('State', 'Country')));
 		$csv_data = array();
-		foreach( $attendee_rows as $attendee_row ){
+		foreach ($attendee_rows as $attendee_row) {
 			$csv_row = array();
-			foreach( EEM_Attendee::instance()->field_settings() as $field_name => $field_obj ){
-				if( $field_name == 'STA_ID' ){
-					$state_name_field = EEM_State::instance()->field_settings_for( 'STA_name' );
-					$csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ];
-				}elseif( $field_name == 'CNT_ISO' ){
-					$country_name_field = EEM_Country::instance()->field_settings_for( 'CNT_name' );
-					$csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ];
-				}else{
-					$csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ];
+			foreach (EEM_Attendee::instance()->field_settings() as $field_name => $field_obj) {
+				if ($field_name == 'STA_ID') {
+					$state_name_field = EEM_State::instance()->field_settings_for('STA_name');
+					$csv_row[__('State', 'event_espresso')] = $attendee_row[$state_name_field->get_qualified_column()];
+				}elseif ($field_name == 'CNT_ISO') {
+					$country_name_field = EEM_Country::instance()->field_settings_for('CNT_name');
+					$csv_row[__('Country', 'event_espresso')] = $attendee_row[$country_name_field->get_qualified_column()];
+				} else {
+					$csv_row[$field_obj->get_nicename()] = $attendee_row[$field_obj->get_qualified_column()];
 				}
 			}
 			$csv_data[] = $csv_row;
 		}
 
-		$filename = $this->generate_filename ( 'contact-list-report' );
+		$filename = $this->generate_filename('contact-list-report');
 
-		$handle = $this->EE_CSV->begin_sending_csv( $filename);
+		$handle = $this->EE_CSV->begin_sending_csv($filename);
 		$this->EE_CSV->write_data_array_to_csv($handle, $csv_data);
 		$this->EE_CSV->end_sending_csv($handle);
 	}
@@ -313,19 +313,19 @@ 
 		$countries_that_have_an_attendee = EEM_Country::instance()->get_all(array(0=>array('Attendee.ATT_ID'=>array('IS NOT NULL'))));
 //		$states_to_export_query_params
 		$models_to_export = array(
-			'Country'=>array(array('CNT_ISO'=>array('IN',array_keys($countries_that_have_an_attendee)))),
-			'State'=>array(array('STA_ID'=>array('IN',array_keys($states_that_have_an_attendee)))),
+			'Country'=>array(array('CNT_ISO'=>array('IN', array_keys($countries_that_have_an_attendee)))),
+			'State'=>array(array('STA_ID'=>array('IN', array_keys($states_that_have_an_attendee)))),
 			'Attendee'=>array(),
 		);
-		$models_to_update = array( 'Attendee' );
+		$models_to_update = array('Attendee');
 
 
 
-		$model_data = $this->_get_export_data_for_models( $models_to_export );
-		$filename = $this->generate_filename ( 'all-attendees' );
+		$model_data = $this->_get_export_data_for_models($models_to_export);
+		$filename = $this->generate_filename('all-attendees');
 
-		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $model_data, $models_to_update )) {
-			EE_Error::add_error(__('An error occurred and the Attendee data could not be exported from the database.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $model_data, $models_to_update)) {
+			EE_Error::add_error(__('An error occurred and the Attendee data could not be exported from the database.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -337,19 +337,19 @@ 
 	 * @param boolean|string $pretty_schema true to display pretty, a string to use a specific "Schema", or false to NOT display pretty
 	 * @return string
 	 */
-	protected function _prepare_value_from_db_for_display( $model, $field_name,  $raw_db_value, $pretty_schema = true ) {
-		$field_obj = $model->field_settings_for( $field_name );
-		$value_on_model_obj = $field_obj->prepare_for_set_from_db( $raw_db_value );
-		if( $field_obj instanceof EE_Datetime_Field ) {
-			$field_obj->set_date_format( EE_CSV::instance()->get_date_format_for_csv( $field_obj->get_date_format( $pretty_schema ) ), $pretty_schema );
-			$field_obj->set_time_format( EE_CSV::instance()->get_time_format_for_csv( $field_obj->get_time_format( $pretty_schema ) ), $pretty_schema );
+	protected function _prepare_value_from_db_for_display($model, $field_name, $raw_db_value, $pretty_schema = true) {
+		$field_obj = $model->field_settings_for($field_name);
+		$value_on_model_obj = $field_obj->prepare_for_set_from_db($raw_db_value);
+		if ($field_obj instanceof EE_Datetime_Field) {
+			$field_obj->set_date_format(EE_CSV::instance()->get_date_format_for_csv($field_obj->get_date_format($pretty_schema)), $pretty_schema);
+			$field_obj->set_time_format(EE_CSV::instance()->get_time_format_for_csv($field_obj->get_time_format($pretty_schema)), $pretty_schema);
 		}
-		if( $pretty_schema === true){
-			return $field_obj->prepare_for_pretty_echoing( $value_on_model_obj );
-		}elseif( is_string( $pretty_schema ) ) {
-			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema );
-		}else{
-			return $field_obj->prepare_for_get( $value_on_model_obj );
+		if ($pretty_schema === true) {
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj);
+		}elseif (is_string($pretty_schema)) {
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema);
+		} else {
+			return $field_obj->prepare_for_get($value_on_model_obj);
 		}
 	}
 
@@ -358,7 +358,7 @@ 
 	 * and the questions associated with the registrations
 	 * @param int $event_id
 	 */
-	function report_registrations_for_event( $event_id = NULL ){
+	function report_registrations_for_event($event_id = NULL) {
 		$reg_fields_to_include = array(
 				'TXN_ID',
 				'ATT_ID',
@@ -390,125 +390,125 @@ 
 				array(
 					'OR' => array(
 						//don't include registrations from failed or abandoned transactions...
-						'Transaction.STS_ID' => array( 'NOT IN', array( EEM_Transaction::failed_status_code, EEM_Transaction::abandoned_status_code ) ),
+						'Transaction.STS_ID' => array('NOT IN', array(EEM_Transaction::failed_status_code, EEM_Transaction::abandoned_status_code)),
 						//unless the registration is approved, in which case include it regardless of transaction status
 						'STS_ID' => EEM_Registration::status_id_approved
 						),
-					'Ticket.TKT_deleted' => array( 'IN', array( true, false ) )
+					'Ticket.TKT_deleted' => array('IN', array(true, false))
 					),
-				'order_by' => array('Transaction.TXN_ID'=>'asc','REG_count'=>'asc'),
-				'force_join' => array( 'Transaction', 'Ticket', 'Attendee' )
+				'order_by' => array('Transaction.TXN_ID'=>'asc', 'REG_count'=>'asc'),
+				'force_join' => array('Transaction', 'Ticket', 'Attendee')
 			),
 			$event_id
 		);
-		if( $event_id ){
-			$query_params[0]['EVT_ID'] =  $event_id;
-		}else{
-			$query_params[ 'force_join' ][] = 'Event';
+		if ($event_id) {
+			$query_params[0]['EVT_ID'] = $event_id;
+		} else {
+			$query_params['force_join'][] = 'Event';
 		}
-		$registration_rows = $reg_model->get_all_wpdb_results( $query_params );
+		$registration_rows = $reg_model->get_all_wpdb_results($query_params);
 		//get all questions which relate to someone in this group
 		$registration_ids = array();
-		foreach( $registration_rows as $reg_row ) {
-			$registration_ids[] = intval( $reg_row[ 'Registration.REG_ID'] );
+		foreach ($registration_rows as $reg_row) {
+			$registration_ids[] = intval($reg_row['Registration.REG_ID']);
 		}
 //		EEM_Question::instance()->show_next_x_db_queries();
-		$questions_for_these_regs_rows = EEM_Question::instance()->get_all_wpdb_results(array(array('Answer.REG_ID'=>array('IN',$registration_ids))));
-		foreach($registration_rows as $reg_row){
-			if ( is_array( $reg_row ) ) {
+		$questions_for_these_regs_rows = EEM_Question::instance()->get_all_wpdb_results(array(array('Answer.REG_ID'=>array('IN', $registration_ids))));
+		foreach ($registration_rows as $reg_row) {
+			if (is_array($reg_row)) {
 				$reg_csv_array = array();
-				if( ! $event_id ){
+				if ( ! $event_id) {
 					//get the event's name and Id
-					$reg_csv_array[ __( 'Event', 'event_espresso' ) ] = sprintf( __( '%1$s (%2$s)', 'event_espresso' ), $this->_prepare_value_from_db_for_display( EEM_Event::instance(), 'EVT_name', $reg_row[ 'Event_CPT.post_title'] ), $reg_row[ 'Event_CPT.ID' ] );
+					$reg_csv_array[__('Event', 'event_espresso')] = sprintf(__('%1$s (%2$s)', 'event_espresso'), $this->_prepare_value_from_db_for_display(EEM_Event::instance(), 'EVT_name', $reg_row['Event_CPT.post_title']), $reg_row['Event_CPT.ID']);
 				}
-				$is_primary_reg = $reg_row[ 'Registration.REG_count' ] == '1' ? true : false;
+				$is_primary_reg = $reg_row['Registration.REG_count'] == '1' ? true : false;
 				/*@var $reg_row EE_Registration */
-				foreach($reg_fields_to_include as $field_name){
+				foreach ($reg_fields_to_include as $field_name) {
 					$field = $reg_model->field_settings_for($field_name);
-					if($field_name == 'REG_final_price'){
-						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_final_price'], 'localized_float' );
-					}elseif( $field_name == 'REG_count' ){
-						$value = sprintf( __( '%s of %s', 'event_espresso' ), $this->_prepare_value_from_db_for_display( $reg_model, 'REG_count', $reg_row['Registration.REG_count'] ), $this->_prepare_value_from_db_for_display( $reg_model, 'REG_group_size', $reg_row['Registration.REG_group_size' ] ) );
-					}elseif( $field_name == 'REG_date' ) {
-						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_date'], 'no_html' );
-					}else{
-						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ $field->get_qualified_column() ] );
+					if ($field_name == 'REG_final_price') {
+						$value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row['Registration.REG_final_price'], 'localized_float');
+					}elseif ($field_name == 'REG_count') {
+						$value = sprintf(__('%s of %s', 'event_espresso'), $this->_prepare_value_from_db_for_display($reg_model, 'REG_count', $reg_row['Registration.REG_count']), $this->_prepare_value_from_db_for_display($reg_model, 'REG_group_size', $reg_row['Registration.REG_group_size']));
+					}elseif ($field_name == 'REG_date') {
+						$value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row['Registration.REG_date'], 'no_html');
+					} else {
+						$value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row[$field->get_qualified_column()]);
 					}
 					$reg_csv_array[$this->_get_column_name_for_field($field)] = $value;
-					if($field_name == 'REG_final_price'){
+					if ($field_name == 'REG_final_price') {
 						//add a column named Currency after the final price
 						$reg_csv_array[__("Currency", "event_espresso")] = EE_Config::instance()->currency->code;
 					}
 				}
 				//get pretty status
-				$stati = EEM_Status::instance()->localized_status( array(
-					$reg_row[ 'Registration.STS_ID' ] => __( 'unknown', 'event_espresso' ),
-					$reg_row[ 'Transaction.STS_ID' ] => __( 'unknown', 'event_espresso' ) ),
+				$stati = EEM_Status::instance()->localized_status(array(
+					$reg_row['Registration.STS_ID'] => __('unknown', 'event_espresso'),
+					$reg_row['Transaction.STS_ID'] => __('unknown', 'event_espresso') ),
 						FALSE,
-						'sentence' );
-				$reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[ $reg_row[ 'Registration.STS_ID' ] ];
+						'sentence');
+				$reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[$reg_row['Registration.STS_ID']];
 				//get pretty trnasaction status
-				$reg_csv_array[__("Transaction Status", 'event_espresso')] = $stati[ $reg_row[ 'Transaction.STS_ID' ] ];
-				$reg_csv_array[ __( 'Transaction Amount Due', 'event_espresso' ) ] = $is_primary_reg ? $this->_prepare_value_from_db_for_display( EEM_Transaction::instance(), 'TXN_total', $reg_row[ 'Transaction.TXN_total' ], 'localized_float' ) : '0.00';
-				$reg_csv_array[ __( 'Amount Paid', 'event_espresso' )] = $is_primary_reg ? $this->_prepare_value_from_db_for_display( EEM_Transaction::instance(), 'TXN_paid', $reg_row[ 'Transaction.TXN_paid' ], 'localized_float' ) : '0.00';
+				$reg_csv_array[__("Transaction Status", 'event_espresso')] = $stati[$reg_row['Transaction.STS_ID']];
+				$reg_csv_array[__('Transaction Amount Due', 'event_espresso')] = $is_primary_reg ? $this->_prepare_value_from_db_for_display(EEM_Transaction::instance(), 'TXN_total', $reg_row['Transaction.TXN_total'], 'localized_float') : '0.00';
+				$reg_csv_array[__('Amount Paid', 'event_espresso')] = $is_primary_reg ? $this->_prepare_value_from_db_for_display(EEM_Transaction::instance(), 'TXN_paid', $reg_row['Transaction.TXN_paid'], 'localized_float') : '0.00';
 				$payment_methods = array();
 				$gateway_txn_ids_etc = array();
 				$payment_times = array();
-				if( $is_primary_reg && $reg_row[ 'Transaction.TXN_ID' ] ){
+				if ($is_primary_reg && $reg_row['Transaction.TXN_ID']) {
 					$payments_info = EEM_Payment::instance()->get_all_wpdb_results(
 							array(
 								array(
-									'TXN_ID' => $reg_row[ 'Transaction.TXN_ID' ],
+									'TXN_ID' => $reg_row['Transaction.TXN_ID'],
 									'STS_ID' => EEM_Payment::status_id_approved
 								),
-								'force_join' => array( 'Payment_Method' ),
+								'force_join' => array('Payment_Method'),
 
 							),
 							ARRAY_A,
 							'Payment_Method.PMD_admin_name as name, Payment.PAY_txn_id_chq_nmbr as gateway_txn_id, Payment.PAY_timestamp as payment_time' );
 
-					foreach( $payments_info as $payment_method_and_gateway_txn_id ){
-						$payment_methods[] = isset( $payment_method_and_gateway_txn_id[ 'name' ] ) ? $payment_method_and_gateway_txn_id[ 'name' ] : __( 'Unknown', 'event_espresso' );
-						$gateway_txn_ids_etc[] = isset( $payment_method_and_gateway_txn_id[ 'gateway_txn_id' ] ) ? $payment_method_and_gateway_txn_id[ 'gateway_txn_id' ] : '';
-						$payment_times[] = isset( $payment_method_and_gateway_txn_id[ 'payment_time' ] ) ? $payment_method_and_gateway_txn_id[ 'payment_time' ] : '';
+					foreach ($payments_info as $payment_method_and_gateway_txn_id) {
+						$payment_methods[] = isset($payment_method_and_gateway_txn_id['name']) ? $payment_method_and_gateway_txn_id['name'] : __('Unknown', 'event_espresso');
+						$gateway_txn_ids_etc[] = isset($payment_method_and_gateway_txn_id['gateway_txn_id']) ? $payment_method_and_gateway_txn_id['gateway_txn_id'] : '';
+						$payment_times[] = isset($payment_method_and_gateway_txn_id['payment_time']) ? $payment_method_and_gateway_txn_id['payment_time'] : '';
 					}
 
 				}
-				$reg_csv_array[ __( 'Payment Date(s)', 'event_espresso' ) ] = implode( ',', $payment_times );
-				$reg_csv_array[ __( 'Payment Method(s)', 'event_espresso' ) ] = implode( ",", $payment_methods );
-				$reg_csv_array[ __( 'Gateway Transaction ID(s)', 'event_espresso' )] = implode( ',', $gateway_txn_ids_etc );
+				$reg_csv_array[__('Payment Date(s)', 'event_espresso')] = implode(',', $payment_times);
+				$reg_csv_array[__('Payment Method(s)', 'event_espresso')] = implode(",", $payment_methods);
+				$reg_csv_array[__('Gateway Transaction ID(s)', 'event_espresso')] = implode(',', $gateway_txn_ids_etc);
 
 				//get whether or not the user has checked in
-				$reg_csv_array[__("Check-Ins", "event_espresso")] = $reg_model->count_related( $reg_row[ 'Registration.REG_ID'] , 'Checkin' );
+				$reg_csv_array[__("Check-Ins", "event_espresso")] = $reg_model->count_related($reg_row['Registration.REG_ID'], 'Checkin');
 				//get ticket of registration and its price
 				$ticket_model = EE_Registry::instance()->load_model('Ticket');
-				if( $reg_row[ 'Ticket.TKT_ID'] ) {
-					$ticket_name = $this->_prepare_value_from_db_for_display( $ticket_model, 'TKT_name', $reg_row[ 'Ticket.TKT_name' ] );
+				if ($reg_row['Ticket.TKT_ID']) {
+					$ticket_name = $this->_prepare_value_from_db_for_display($ticket_model, 'TKT_name', $reg_row['Ticket.TKT_name']);
 					$datetimes_strings = array();
-					foreach( EEM_Datetime::instance()->get_all_wpdb_results( array( array( 'Ticket.TKT_ID' => $reg_row[ 'Ticket.TKT_ID' ] ), 'order_by' => array( 'DTT_EVT_start' => 'ASC' ), 'default_where_conditions' => 'none' ) ) as $datetime){
-						$datetimes_strings[] = $this->_prepare_value_from_db_for_display( EEM_Datetime::instance(), 'DTT_EVT_start', $datetime[ 'Datetime.DTT_EVT_start'] );
+					foreach (EEM_Datetime::instance()->get_all_wpdb_results(array(array('Ticket.TKT_ID' => $reg_row['Ticket.TKT_ID']), 'order_by' => array('DTT_EVT_start' => 'ASC'), 'default_where_conditions' => 'none')) as $datetime) {
+						$datetimes_strings[] = $this->_prepare_value_from_db_for_display(EEM_Datetime::instance(), 'DTT_EVT_start', $datetime['Datetime.DTT_EVT_start']);
 					}
 
 				} else {
-					$ticket_name = __( 'Unknown', 'event_espresso' );
-					$datetimes_strings = array( __( 'Unknown', 'event_espresso' ) );
+					$ticket_name = __('Unknown', 'event_espresso');
+					$datetimes_strings = array(__('Unknown', 'event_espresso'));
 				}
 				$reg_csv_array[$ticket_model->field_settings_for('TKT_name')->get_nicename()] = $ticket_name;
 				$reg_csv_array[__("Datetimes of Ticket", "event_espresso")] = implode(", ", $datetimes_strings);
 				//get datetime(s) of registration
 
 				//add attendee columns
-				foreach($att_fields_to_include as $att_field_name){
+				foreach ($att_fields_to_include as $att_field_name) {
 					$field_obj = EEM_Attendee::instance()->field_settings_for($att_field_name);
-					if( $reg_row[ 'Attendee_CPT.ID' ]){
-						if($att_field_name == 'STA_ID'){
-							$value = EEM_State::instance()->get_var( array( array( 'STA_ID' => $reg_row[ 'Attendee_Meta.STA_ID' ] ) ), 'STA_name' );
-						}elseif($att_field_name == 'CNT_ISO'){
-							$value = EEM_Country::instance()->get_var( array( array( 'CNT_ISO' => $reg_row[ 'Attendee_Meta.CNT_ISO' ] ) ), 'CNT_name' );
-						}else{
-							$value = $this->_prepare_value_from_db_for_display( EEM_Attendee::instance(), $att_field_name, $reg_row[ $field_obj->get_qualified_column() ] );
+					if ($reg_row['Attendee_CPT.ID']) {
+						if ($att_field_name == 'STA_ID') {
+							$value = EEM_State::instance()->get_var(array(array('STA_ID' => $reg_row['Attendee_Meta.STA_ID'])), 'STA_name');
+						}elseif ($att_field_name == 'CNT_ISO') {
+							$value = EEM_Country::instance()->get_var(array(array('CNT_ISO' => $reg_row['Attendee_Meta.CNT_ISO'])), 'CNT_name');
+						} else {
+							$value = $this->_prepare_value_from_db_for_display(EEM_Attendee::instance(), $att_field_name, $reg_row[$field_obj->get_qualified_column()]);
 						}
-					}else{
+					} else {
 						$value = '';
 					}
 
@@ -516,56 +516,56 @@ 
 				}
 
 				//make sure each registration has the same questions in the same order
-				foreach($questions_for_these_regs_rows as $question_row){
-					if( ! isset($reg_csv_array[$question_row[ 'Question.QST_admin_label']])){
-						$reg_csv_array[$question_row[ 'Question.QST_admin_label' ] ] = null;
+				foreach ($questions_for_these_regs_rows as $question_row) {
+					if ( ! isset($reg_csv_array[$question_row['Question.QST_admin_label']])) {
+						$reg_csv_array[$question_row['Question.QST_admin_label']] = null;
 					}
 				}
 				//now fill out the questions THEY answered
-				foreach( EEM_Answer::instance()->get_all_wpdb_results( array( array( 'REG_ID' => $reg_row[ 'Registration.REG_ID' ] ), 'force_join' => array( 'Question' ) ) ) as $answer_row){
+				foreach (EEM_Answer::instance()->get_all_wpdb_results(array(array('REG_ID' => $reg_row['Registration.REG_ID']), 'force_join' => array('Question'))) as $answer_row) {
 					/* @var $answer EE_Answer */
-					if( $answer_row[ 'Question.QST_ID' ] ){
-						$question_label = $this->_prepare_value_from_db_for_display( EEM_Question::instance(), 'QST_admin_label', $answer_row[ 'Question.QST_admin_label' ] );
-					}else{
-						$question_label = sprintf( __( 'Question $s', 'event_espresso' ), $answer_row[ 'Answer.QST_ID' ] );
+					if ($answer_row['Question.QST_ID']) {
+						$question_label = $this->_prepare_value_from_db_for_display(EEM_Question::instance(), 'QST_admin_label', $answer_row['Question.QST_admin_label']);
+					} else {
+						$question_label = sprintf(__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
 					}
-                                        if( isset( $answer_row[ 'Question.QST_type'] ) && $answer_row[ 'Question.QST_type' ] == EEM_Question::QST_type_state ) {
-                                            $reg_csv_array[ $question_label ] = EEM_State::instance()->get_state_name_by_ID( $answer_row[ 'Answer.ANS_value' ] );
+                                        if (isset($answer_row['Question.QST_type']) && $answer_row['Question.QST_type'] == EEM_Question::QST_type_state) {
+                                            $reg_csv_array[$question_label] = EEM_State::instance()->get_state_name_by_ID($answer_row['Answer.ANS_value']);
                                         } else {
-                                            $reg_csv_array[ $question_label ] = $this->_prepare_value_from_db_for_display( EEM_Answer::instance(), 'ANS_value', $answer_row[ 'Answer.ANS_value' ] );
+                                            $reg_csv_array[$question_label] = $this->_prepare_value_from_db_for_display(EEM_Answer::instance(), 'ANS_value', $answer_row['Answer.ANS_value']);
                                         }
 				}
-				$registrations_csv_ready_array[] = apply_filters( 'FHEE__EE_Export__report_registrations__reg_csv_array', $reg_csv_array, $reg_row );
+				$registrations_csv_ready_array[] = apply_filters('FHEE__EE_Export__report_registrations__reg_csv_array', $reg_csv_array, $reg_row);
 			}
 		}
 
 		//if we couldn't export anything, we want to at least show the column headers
-		if(empty($registrations_csv_ready_array)){
+		if (empty($registrations_csv_ready_array)) {
 			$reg_csv_array = array();
 			$model_and_fields_to_include = array(
 				'Registration' => $reg_fields_to_include,
 				'Attendee' => $att_fields_to_include
 			);
-			foreach($model_and_fields_to_include as $model_name => $field_list){
+			foreach ($model_and_fields_to_include as $model_name => $field_list) {
 				$model = EE_Registry::instance()->load_model($model_name);
-				foreach($field_list as $field_name){
+				foreach ($field_list as $field_name) {
 					$field = $model->field_settings_for($field_name);
-					$reg_csv_array[$this->_get_column_name_for_field($field)] = null;//$registration->get($field->get_name());
+					$reg_csv_array[$this->_get_column_name_for_field($field)] = null; //$registration->get($field->get_name());
 				}
 			}
 			$registrations_csv_ready_array [] = $reg_csv_array;
 		}
-		if( $event_id ){
-			$event_slug =  EEM_Event::instance()->get_var( array( array( 'EVT_ID' => $event_id ) ), 'EVT_slug' );
-			if( ! $event_slug ) {
-				$event_slug = __( 'unknown', 'event_espresso' );
+		if ($event_id) {
+			$event_slug = EEM_Event::instance()->get_var(array(array('EVT_ID' => $event_id)), 'EVT_slug');
+			if ( ! $event_slug) {
+				$event_slug = __('unknown', 'event_espresso');
 			}
-		}else{
-			$event_slug = __( 'all', 'event_espresso' );
+		} else {
+			$event_slug = __('all', 'event_espresso');
 		}
-		$filename = sprintf( "registrations-for-%s", $event_slug );
+		$filename = sprintf("registrations-for-%s", $event_slug);
 
-		$handle = $this->EE_CSV->begin_sending_csv( $filename);
+		$handle = $this->EE_CSV->begin_sending_csv($filename);
 		$this->EE_CSV->write_data_array_to_csv($handle, $registrations_csv_ready_array);
 		$this->EE_CSV->end_sending_csv($handle);
 	}
@@ -575,7 +575,7 @@ 
 	 * @param EE_Model_Field_Base $field
 	 * @return string
 	 */
-	protected function _get_column_name_for_field(EE_Model_Field_Base $field){
+	protected function _get_column_name_for_field(EE_Model_Field_Base $field) {
 		return $field->get_nicename()."[".$field->get_name()."]";
 	}
 
@@ -588,17 +588,17 @@ 
 	function export_categories() {
 		// are any Event IDs set?
 		$query_params = array();
-		if ( isset( $this->_req_data['EVT_CAT_ID'] )) {
+		if (isset($this->_req_data['EVT_CAT_ID'])) {
 			// do we have an array of IDs ?
-			if ( is_array( $this->_req_data['EVT_CAT_ID'] )) {
+			if (is_array($this->_req_data['EVT_CAT_ID'])) {
 				// generate an "IN (CSV)" where clause
-				$EVT_CAT_IDs = array_map( 'sanitize_text_field', $this->_req_data['EVT_CAT_ID'] );
+				$EVT_CAT_IDs = array_map('sanitize_text_field', $this->_req_data['EVT_CAT_ID']);
 				$filename = 'event-categories';
-				$query_params[0]['term_taxonomy_id'] = array('IN',$EVT_CAT_IDs);
+				$query_params[0]['term_taxonomy_id'] = array('IN', $EVT_CAT_IDs);
 			} else {
 				// generate regular where = clause
-				$EVT_CAT_ID = absint( $this->_req_data['EVT_CAT_ID'] );
-				$filename = 'event-category#' . $EVT_CAT_ID;
+				$EVT_CAT_ID = absint($this->_req_data['EVT_CAT_ID']);
+				$filename = 'event-category#'.$EVT_CAT_ID;
 				$query_params[0]['term_taxonomy_id'] = $EVT_CAT_ID;
 			}
 		} else {
@@ -610,11 +610,11 @@ 
 				'Term_Taxonomy' => $query_params
 			);
 
-		$table_data = $this->_get_export_data_for_models( $tables_to_export );
-		$filename = $this->generate_filename ( $filename );
+		$table_data = $this->_get_export_data_for_models($tables_to_export);
+		$filename = $this->generate_filename($filename);
 
-		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $table_data )) {
-			EE_Error::add_error(__('An error occurred and the Category details could not be exported from the database.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $table_data)) {
+			EE_Error::add_error(__('An error occurred and the Category details could not be exported from the database.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -625,13 +625,13 @@ 
 	 *		  @param string - export_name
 	 *			@return string on success, FALSE on fail
 	 */
-	private function generate_filename ( $export_name = '' ) {
-		if ( $export_name != '' ) {
-			$filename = get_bloginfo('name') . '-' . $export_name;
-			$filename = sanitize_key( $filename ) . '-' . $this->today;
+	private function generate_filename($export_name = '') {
+		if ($export_name != '') {
+			$filename = get_bloginfo('name').'-'.$export_name;
+			$filename = sanitize_key($filename).'-'.$this->today;
 			return $filename;
-		}	 else {
-			EE_Error::add_error(__("No filename was provided", "event_espresso"), __FILE__, __FUNCTION__, __LINE__ );
+		} else {
+			EE_Error::add_error(__("No filename was provided", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return false;
 	}
@@ -644,37 +644,37 @@ 
 	 *	@param array $models_to_export keys are model names (eg 'Event', 'Attendee', etc.) and values are arrays of query params like on EEM_Base::get_all
 	 *	@return array on success, FALSE on fail
 	 */
-	private function _get_export_data_for_models( $models_to_export = array() ) {
+	private function _get_export_data_for_models($models_to_export = array()) {
 		$table_data = FALSE;
-		if ( is_array( $models_to_export ) ) {
-			foreach ( $models_to_export as $model_name => $query_params ) {
+		if (is_array($models_to_export)) {
+			foreach ($models_to_export as $model_name => $query_params) {
 				//check for a numerically-indexed array. in that case, $model_name is the value!!
-				if(is_int($model_name)){
+				if (is_int($model_name)) {
 					$model_name = $query_params;
 					$query_params = array();
 				}
-				if( ! isset( $query_params[ 'default_where_conditions'] ) ) {
-					$query_params[ 'default_where_conditions' ] = 'minimum';
+				if ( ! isset($query_params['default_where_conditions'])) {
+					$query_params['default_where_conditions'] = 'minimum';
 				}
 				$model = EE_Registry::instance()->load_model($model_name);
 				$model_objects = $model->get_all($query_params);
 
 
 				$table_data[$model_name] = array();
-				foreach($model_objects as $model_object){
+				foreach ($model_objects as $model_object) {
 					$model_data_array = array();
 					$fields = $model->field_settings();
-					foreach($fields as $field){
+					foreach ($fields as $field) {
 						$column_name = $field->get_nicename()."[".$field->get_name()."]";
-						if($field instanceof EE_Datetime_Field){
+						if ($field instanceof EE_Datetime_Field) {
 //							$field->set_date_format('Y-m-d');
 //							$field->set_time_format('H:i:s');
-							$model_data_array[$column_name] = $model_object->get_datetime($field->get_name(),'Y-m-d','H:i:s');
-						} elseif( $field instanceof EE_Infinite_Integer_Field &&
-								$model_object->get( $field->get_name() ) === EE_INF ) {
+							$model_data_array[$column_name] = $model_object->get_datetime($field->get_name(), 'Y-m-d', 'H:i:s');
+						} elseif ($field instanceof EE_Infinite_Integer_Field &&
+								$model_object->get($field->get_name()) === EE_INF) {
 							$model_data_array[$column_name] = "";
 						}
-						else{
+						else {
 							$model_data_array[$column_name] = $model_object->get($field->get_name());
 						}
 					}

core/db_models/strategies/EE_CPT_Where_Conditions.strategy.php

Spacing +12 added lines, -12 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');
 }
 
 /*
@@ -11,7 +11,7 @@ 
  * @subpackage		core/db_models/strategies/
  * @author				Michael Nelson
  */
-class EE_CPT_Where_Conditions extends EE_Default_Where_Conditions{
+class EE_CPT_Where_Conditions extends EE_Default_Where_Conditions {
 
 	protected $_post_type;
 	protected $_meta_field;
@@ -23,10 +23,10 @@ 
 	 * @param string $meta_field_to_chk
 	 * @param array $custom_where_conditions
 	 */
-	function __construct( $post_type, $meta_field_to_chk, $custom_where_conditions = array() ){
+	function __construct($post_type, $meta_field_to_chk, $custom_where_conditions = array()) {
 		$this->_post_type = $post_type;
 		$this->_meta_field = $meta_field_to_chk;
-		parent::__construct( $custom_where_conditions );
+		parent::__construct($custom_where_conditions);
 	}
 
 
@@ -39,16 +39,16 @@ 
 	 * @return \EE_Model_Field_Base
 	 * @throws \EE_Error
 	 */
-	protected function _get_field_on_column( $column ){
-		$all_fields = $this->_model->field_settings( true );
-		foreach ( $all_fields as $field_obj ) {
-			if ( $column == $field_obj->get_table_column() ) {
+	protected function _get_field_on_column($column) {
+		$all_fields = $this->_model->field_settings(true);
+		foreach ($all_fields as $field_obj) {
+			if ($column == $field_obj->get_table_column()) {
 				return $field_obj;
 			}
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'Model EE_CPT_Where_Conditions misconfigured. Looking for a field with column %1$s on model %2$s but none found.', 'event_espresso'),
+				__('Model EE_CPT_Where_Conditions misconfigured. Looking for a field with column %1$s on model %2$s but none found.', 'event_espresso'),
 				$column,
 				$this->_model->get_this_model_name()
 			)
@@ -62,7 +62,7 @@ 
 	 * CPT models, otherwise we could get rows which aren't of this post type
 	 * @return array
 	 */
-	function _get_minimum_where_conditions(){
+	function _get_minimum_where_conditions() {
 		return array(
 			$this->_get_field_on_column('post_type')->get_name() => $this->_post_type
 		);
@@ -79,7 +79,7 @@ 
 		$status_field = $this->_get_field_on_column('post_status');
 		return  array_replace_recursive(
 			$this->_get_minimum_where_conditions(),
-			array( $status_field->get_name() => array('NOT IN',array('auto-draft','trash')))
+			array($status_field->get_name() => array('NOT IN', array('auto-draft', 'trash')))
 		);
 	}
 }