eventespresso / event-espresso-core

core/admin/templates/admin_details_publish_metabox.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( $publish_box_extra_content ) : ?>
+<?php if ($publish_box_extra_content) : ?>
 <div id="minor-publishing">
 <?php echo $publish_box_extra_content; ?>
 </div>
@@ -13,7 +13,7 @@ 
 	
 	<div id="espresso_major_buttons_wrapper">
 	
-		<?php if ( $publish_delete_link ) : ?>
+		<?php if ($publish_delete_link) : ?>
 		<div id="delete-action">
 			<?php echo $publish_delete_link; ?>
 		</div>

core/admin/templates/admin_general_metabox_contents_espresso_links.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <div class="padding">
 	   	<ul class="infolinks">
 	   		<li>
-	   			<?php echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'.__('Installation', 'event_espresso') . '</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">' . __('Usage Guide').'</a>'; ?>
+	   			<?php echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'.__('Installation', 'event_espresso').'</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">'.__('Usage Guide').'</a>'; ?>
 	   		</li>
 	   		<li>
 		   		<a href="http://eventespresso.com/wiki/put-custom-templates/" target="_blank">
@@ -30,7 +30,7 @@ 
 	   			</a>
 	   		</li>
 	   		<li>
-	   			<?php echo '<a href="http://eventespresso.com/pricing/" target="_blank">'.__('Plugins', 'event_espresso'). '</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">' .__('Add-ons', 'event_espresso').'</a>'; ?><br />
+	   			<?php echo '<a href="http://eventespresso.com/pricing/" target="_blank">'.__('Plugins', 'event_espresso').'</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">'.__('Add-ons', 'event_espresso').'</a>'; ?><br />
 	   			<br />
 	   			<ol>
 	   				<li>

core/admin/templates/admin_reports.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php //EEH_Debug_Tools::printr( $admin_reports, '$admin_reports' ); ?>
 
-<?php foreach ( $admin_reports as $report) : ?>
+<?php foreach ($admin_reports as $report) : ?>
 
 	<div id="<?php echo $report; ?>" class="admin-report-chart-dv" style="width:95%; min-height:420px; margin:20px 4% 40px 1%;"></div>
 

core/admin/templates/status_dropdown.template.php

Spacing +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 	<span id="localized_status_save"><?php echo $localized_status_save; ?></span>
 	<span id="cur_stat_id"><?php echo $cur_status; ?></span>
 	<select name='ee_post_status' id='ee_post_status'>
- 	<?php foreach ( $statuses as $status => $label ) : ?>
-		<option<?php selected( $cur_status, $status ); ?> value='<?php echo $status; ?>'><?php echo $label; ?></option>
+ 	<?php foreach ($statuses as $status => $label) : ?>
+		<option<?php selected($cur_status, $status); ?> value='<?php echo $status; ?>'><?php echo $label; ?></option>
 	<?php
 	endforeach;
 	?>

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_category_details.dmsstage.php

Spacing +7 added lines, -7 removed lines

@@ -6,16 +6,16 @@ 
  * Authorize.net AIM, Bank, Check, Invoice, Paypal Pro and Paypal Standard.
  * 
  */
-class EE_DMS_4_1_0_category_details extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_category_details extends EE_Data_Migration_Script_Stage {
 private $_old_table;
 private $_new_table;
 private $_new_term_table;
-function _migration_step($num_items=50){
+function _migration_step($num_items = 50) {
 	global $wpdb;
 	$start_at_record = $this->count_records_migrated();
-	$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+	$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 	$items_actually_migrated = 0;
-	foreach($rows as $category_detail_row){
+	foreach ($rows as $category_detail_row) {
 		$term_and_taxonomy_ids = wp_insert_term(
 				stripslashes($category_detail_row['category_name']),
 				'espresso_event_categories',
@@ -23,8 +23,8 @@ 
 					'description'=>  stripslashes($category_detail_row['category_desc']),
 					'slug'=>$category_detail_row['category_identifier']
 				));
-		if($term_and_taxonomy_ids instanceof WP_Error){
-			$this->add_error(sprintf(__("Could not create WP Term_Taxonomy from old category: %s. The Error was: %s", "event_espresso"),  $this->_json_encode($category_detail_row),$term_and_taxonomy_ids->get_error_message()));
+		if ($term_and_taxonomy_ids instanceof WP_Error) {
+			$this->add_error(sprintf(__("Could not create WP Term_Taxonomy from old category: %s. The Error was: %s", "event_espresso"), $this->_json_encode($category_detail_row), $term_and_taxonomy_ids->get_error_message()));
 			$items_actually_migrated++;
 			continue;
 		}
@@ -34,7 +34,7 @@ 
 		$this->get_migration_script()->set_mapping($this->_old_table, $category_detail_row['id'], $this->_new_table, $term_taxonomy_id);
 		$items_actually_migrated++;
 	}
-	if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+	if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 		$this->set_completed();
 	}
 	return $items_actually_migrated;

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_event_category.dmsstage.php

Indentation -2 removed lines

@@ -24,8 +24,6 @@
 				'term_taxonomy_id'=>new EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID','event_espresso'), false, 0, 'Term_Taxonomy'),
 				'term_order'=>new EE_Integer_Field('term_order', __('Term Order','event_espresso'), false, 0)
 			));
-
-
  *
  */
 class EE_DMS_4_1_0_event_category extends EE_Data_Migration_Script_Stage{

Spacing +20 added lines, -20 removed lines

@@ -28,22 +28,22 @@ 
 
  *
  */
-class EE_DMS_4_1_0_event_category extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_event_category extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_new_table;
-	function _migration_step($num_items=50){
+	function _migration_step($num_items = 50) {
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 		$items_actually_migrated = 0;
-		foreach($rows as $event_venue_rel){
+		foreach ($rows as $event_venue_rel) {
 			$term_relation_id = $this->_add_relation_from_event_to_term_taxonomy($event_venue_rel);
-			if($term_relation_id){
+			if ($term_relation_id) {
 				$this->get_migration_script()->set_mapping($this->_old_table, $event_venue_rel['id'], $this->_new_table, $term_relation_id);
 			}
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -67,16 +67,16 @@ 
 	 * @param array $old_event_cat_relation
 	 * @return int
 	 */
-	private function _add_relation_from_event_to_term_taxonomy($old_event_cat_relation){
+	private function _add_relation_from_event_to_term_taxonomy($old_event_cat_relation) {
 		global $wpdb;
 		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", intval($old_event_cat_relation['event_id']), $wpdb->prefix."posts");
 		$new_term_taxonomy_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_category_detail", intval($old_event_cat_relation['cat_id']), $wpdb->prefix."term_taxonomy");
-		if( ! $new_event_id){
-			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),$old_event_cat_relation['event_id']));
+		if ( ! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_cat_relation['event_id']));
 			return 0;
 		}
-		if( ! $new_term_taxonomy_id){
-			$this->add_error(sprintf(__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"),$old_event_cat_relation['cat_id']));
+		if ( ! $new_term_taxonomy_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"), $old_event_cat_relation['cat_id']));
 			return 0;
 		}
 		$cols_n_values = array(
@@ -85,19 +85,19 @@ 
 			'term_order'=>0
 		);
 		$datatypes = array(
-			'%d',//object_id
-			'%d',//term_taxonomy_id
-			'%d',//term_order
+			'%d', //object_id
+			'%d', //term_taxonomy_id
+			'%d', //term_order
 		);
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
-		}else{
+		} else {
 			//increment the term-taxonomie's count
-			$success = $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id ) );
-			if( ! $success ){
-				$this->add_error(sprintf( __( 'Could not increment term_taxonomy\'s count because %s', 'event_espresso' ),$wpdb->last_error));
+			$success = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id));
+			if ( ! $success) {
+				$this->add_error(sprintf(__('Could not increment term_taxonomy\'s count because %s', 'event_espresso'), $wpdb->last_error));
 			}
 		}
 		return $wpdb->insert_id;

Braces +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 		if ( ! $success){
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
-		}else{
+		} else{
 			//increment the term-taxonomie's count
 			$success = $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id ) );
 			if( ! $success ){

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_event_venue.dmsstage.php

Indentation -3 removed lines

@@ -25,9 +25,6 @@
 				
 			)
 		);
-
-
-
  * 
  */
 class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage{

Spacing +17 added lines, -17 removed lines

@@ -30,20 +30,20 @@ 
 
  * 
  */
-class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_new_table;
-	function _migration_step($num_items=50){
+	function _migration_step($num_items = 50) {
 		
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 		$items_actually_migrated = 0;
-		foreach($rows as $event_venue_rel){
+		foreach ($rows as $event_venue_rel) {
 			$this->_insert_new_event_to_venue_rel($event_venue_rel);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -67,26 +67,26 @@ 
 	 * @param array $old_event_venue_rel
 	 * @return int
 	 */
-	private function _insert_new_event_to_venue_rel($old_event_venue_rel){
+	private function _insert_new_event_to_venue_rel($old_event_venue_rel) {
 		global $wpdb;
 		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_venue_rel['event_id'], $wpdb->prefix."posts");
 		$new_venue_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_venue", $old_event_venue_rel['venue_id'], $wpdb->prefix."posts");
-		if( ! $new_event_id){
-			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),$old_event_venue_rel['event_id']));
+		if ( ! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_venue_rel['event_id']));
 			return 0;
 		}
-		if( ! $new_venue_id){
-			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"),$old_event_venue_rel['venue_id']));
+		if ( ! $new_venue_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $old_event_venue_rel['venue_id']));
 			return 0;
 		}
 		//first ensure there are no other relation entries for this event
 		//because although EE4 supports it, EE3 didn't really
-		$wpdb->delete( $this->_new_table, 
+		$wpdb->delete($this->_new_table, 
 				array(
 					'EVT_ID' => $new_event_id,
 				),
 				array(
-					'%d',//EVT_ID
+					'%d', //EVT_ID
 				));
 //		echo "last query". $wpdb->last_query;die;
 		$cols_n_values = array(
@@ -95,12 +95,12 @@ 
 			'EVV_primary'=>true
 		);
 		$datatypes = array(
-			'%d',//EVT_ID
-			'%d',//VNU_ID
-			'%d',//EVT_primary
+			'%d', //EVT_ID
+			'%d', //VNU_ID
+			'%d', //EVT_primary
 		);
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_venue_rel, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_events.dmsstage.php

Indentation -5 removed lines

@@ -84,8 +84,6 @@ 
   KEY `submitted` (`submitted`),
   KEY `likes` (`likes`)
 ) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=utf8$$
-
-
  *
  * 4.1 Event model:
  * $this->_tables = array(
@@ -124,7 +122,6 @@ 
 				'EVT_donations'=>new EE_Boolean_Field('EVT_donations', __("Accept Donations?", "event_espresso"), false, false)
 
 			));
-
  *
  * 3.1's start end table
  *
@@ -137,8 +134,6 @@ 
   PRIMARY KEY (`id`),
   KEY `event_id` (`event_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8$$
-
-
  *
  * and 4.1 Datetime model's tables and fields:
  * $this->_tables = array(

Braces +3 added lines, -3 removed lines

@@ -444,7 +444,7 @@ 
 			//we don't bother recording the conversion from old events to venues as that
 			//will complicate finding the conversion from old venues to new events
 			return $new_id;
-		}else{
+		} else{
 			return 0;
 		}
 	}
@@ -541,7 +541,7 @@ 
 		if( ! $old_event['state']){
 			$old_org_options = get_option('events_organization_settings');
 			$state_name = stripslashes($old_org_options['organization_state']);
-		}else{
+		} else{
 			$state_name = $old_event['state'];
 		}
 		if ( ! $state_name ){
@@ -551,7 +551,7 @@ 
 		try{
 			$state = $this->get_migration_script()->get_or_create_state($state_name,$country_iso);
 			$state_id = $state['STA_ID'];
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			$this->add_error($e->getMessage());
 			$state_id = 0;
 		}

Doc Comments +3 added lines, -3 removed lines

@@ -419,7 +419,7 @@ 
 
 	/**
 	 * @param $old_event
-	 * @param $new_cpt_id
+	 * @param integer $new_cpt_id
 	 * @return int
 	 */
 	private function _insert_event_meta( $old_event, $new_cpt_id){
@@ -676,8 +676,8 @@ 
 
 
 	/**
-	 * @param $new_event_id
-	 * @param $new_venue_id
+	 * @param integer $new_event_id
+	 * @param integer $new_venue_id
 	 * @return int
 	 */
 	private function _insert_new_venue_to_event( $new_event_id, $new_venue_id){

Spacing +206 added lines, -206 removed lines

@@ -158,7 +158,7 @@ 
 				'DTT_deleted' => new EE_Trashed_Flag_Field('DTT_deleted', __('Flag indicating datetime is archived', 'event_espresso'), false, false ),
 			));
  */
-class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_old_start_end_table;
 	private $_new_table;
@@ -205,43 +205,43 @@ 
 	 * @param int $num_items_to_migrate
 	 * @return int number of items ACTUALLY migrated
 	 */
-	protected function _migration_step( $num_items_to_migrate = 50) {
+	protected function _migration_step($num_items_to_migrate = 50) {
 		global $wpdb;
 		//because the migration of each event can be a LOT more work, make each step smaller
-		$num_items_to_migrate = max(1,$num_items_to_migrate/5);
-		$events = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$this->count_records_migrated(),$num_items_to_migrate),ARRAY_A);
+		$num_items_to_migrate = max(1, $num_items_to_migrate / 5);
+		$events = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $this->count_records_migrated(), $num_items_to_migrate), ARRAY_A);
 		$items_migrated_this_step = 0;
 
-		foreach($events as $event_row){
+		foreach ($events as $event_row) {
 			$guid = null;
 			//insert new 4.1 Attendee object using $wpdb
 			$post_id = $this->_insert_cpt($event_row);
-			if($post_id){
+			if ($post_id) {
 				$this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_table, $post_id);
 				$meta_id = $this->_insert_event_meta($event_row, $post_id);
-				if($meta_id){
+				if ($meta_id) {
 					$this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_meta_table, $meta_id);
 				}
-				$this->_convert_start_end_times($event_row,$post_id);
+				$this->_convert_start_end_times($event_row, $post_id);
 				$event_meta = maybe_unserialize($event_row['event_meta']);
 				$guid = isset($event_meta['event_thumbnail_url']) ? $event_meta['event_thumbnail_url'] : null;
-				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid,$post_id,$this);
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $post_id, $this);
 
 				//maybe create a venue from info on the event?
 				$new_venue_id = $this->_maybe_create_venue($event_row);
-				if($new_venue_id){
-					$this->_insert_new_venue_to_event($post_id,$new_venue_id);
+				if ($new_venue_id) {
+					$this->_insert_new_venue_to_event($post_id, $new_venue_id);
 				}
 				$this->_add_post_metas($event_row, $post_id);
 			}
 			$items_migrated_this_step++;
-			if($guid){
+			if ($guid) {
 				//if we had to check for an image attachment
 				//then let's call it a day (avoid timing out, because this took a long time)
 				break;
 			}
 		}
-		if($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()) {
 			$this->set_status(EE_Data_Migration_Manager::status_completed);
 		}
 		return $items_migrated_this_step;
@@ -253,28 +253,28 @@ 
 	 * @param int $post_id
 	 * @return void
 	 */
-	private function _add_post_metas($old_event,$post_id){
+	private function _add_post_metas($old_event, $post_id) {
 		$event_meta = maybe_unserialize($old_event['event_meta']);
-		if( ! $event_meta || ! is_array( $event_meta ) ){
+		if ( ! $event_meta || ! is_array($event_meta)) {
 			return;
 		}
-		unset($event_meta['date_submitted']);//factored into CPT
-		unset($event_meta['additional_attendee_reg_info']);//factored into event meta table
-		unset($event_meta['default_payment_status']);//dido
-		unset($event_meta['event_thumbnail_url']);//used to find post featured image
-		foreach($event_meta as $meta_key => $meta_value){
-			if ($meta_key){//if the meta key is just an empty string, ignore it
-				$success = add_post_meta($post_id,$meta_key,$meta_value,true);
-				if( ! $success ){
-					$this->add_error(sprintf(__("Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s", "event_espresso"),$post_id,$meta_key,$meta_value,implode(",",$old_event)));
+		unset($event_meta['date_submitted']); //factored into CPT
+		unset($event_meta['additional_attendee_reg_info']); //factored into event meta table
+		unset($event_meta['default_payment_status']); //dido
+		unset($event_meta['event_thumbnail_url']); //used to find post featured image
+		foreach ($event_meta as $meta_key => $meta_value) {
+			if ($meta_key) {//if the meta key is just an empty string, ignore it
+				$success = add_post_meta($post_id, $meta_key, $meta_value, true);
+				if ( ! $success) {
+					$this->add_error(sprintf(__("Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s", "event_espresso"), $post_id, $meta_key, $meta_value, implode(",", $old_event)));
 				}
 			}
 		}
-		if($old_event['alt_email']){
-			add_post_meta($post_id,'alt_email',$old_event['alt_email']);
+		if ($old_event['alt_email']) {
+			add_post_meta($post_id, 'alt_email', $old_event['alt_email']);
 		}
-		if($old_event['recurrence_id']){
-			add_post_meta($post_id,'recurrence_id',$old_event['recurrence_id']);
+		if ($old_event['recurrence_id']) {
+			add_post_meta($post_id, 'recurrence_id', $old_event['recurrence_id']);
 		}
 	}
 
@@ -289,10 +289,10 @@ 
 	 * @param string $new_post_status a post status
 	 * @return string
 	 */
-	private function _find_unique_slug($event_name, $old_identifier = '', $new_post_status = 'publish'){
+	private function _find_unique_slug($event_name, $old_identifier = '', $new_post_status = 'publish') {
 		$count = 0;
 		$original_name = $event_name ? sanitize_title($event_name) : $old_identifier;
-		return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0 );
+		return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0);
 	}
 
 	/**
@@ -301,11 +301,11 @@ 
 	 * @param string $slug
 	 * @return boolean
 	 */
-	private function _other_post_exists_with_that_slug($slug){
+	private function _other_post_exists_with_that_slug($slug) {
 		global $wpdb;
-		$query = $wpdb->prepare("SELECT COUNT(ID) FROM {$this->_new_table} WHERE post_name = %s",$slug);
+		$query = $wpdb->prepare("SELECT COUNT(ID) FROM {$this->_new_table} WHERE post_name = %s", $slug);
 		$count = $wpdb->get_var($query);
-		return (boolean)intval($count);
+		return (boolean) intval($count);
 	}
 
 
@@ -314,7 +314,7 @@ 
 	 * @param $old_event
 	 * @return int
 	 */
-	private function _insert_cpt( $old_event ){
+	private function _insert_cpt($old_event) {
 		global $wpdb;
 		//convert 3.1 event status to 4.1 CPT status
 		//for reference, 3.1 event stati available for setting are:
@@ -333,66 +333,66 @@ 
 //		and 3 custom ones: cancelled,postponed,sold_out
 		$status_conversions = array(
 			'R'=>'draft',
-			'X'=>'draft',//4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
+			'X'=>'draft', //4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
 			'P'=>'pending',
-			'IA'=>'draft',//draft and in the past
+			'IA'=>'draft', //draft and in the past
 //IA=inactive in 3.1: events were switched to this when they expired. in 4.1 that's just calculated
-			'O'=>'publish',//@todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
+			'O'=>'publish', //@todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
 			'A'=>'publish',
-			'S'=>'draft',//@todo: is it ok to just mark secondary/waitlist events as DRAFTS?
+			'S'=>'draft', //@todo: is it ok to just mark secondary/waitlist events as DRAFTS?
 			'D'=>'trash',
 		);
 		$post_status = $status_conversions[$old_event['event_status']];
 		//check if we've sold out
-		if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])){
+		if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
 			$post_status = 'sold_out';
 		}
 //		FYI postponed and cancelled don't exist in 3.1
 		$cols_n_values = array(
-			'post_title'=>stripslashes($old_event['event_name']),//EVT_name
-			'post_content'=>stripslashes($old_event['event_desc']),//EVT_desc
-			'post_name'=>$this->_find_unique_slug($old_event['event_name'], $old_event['event_identifier'], $post_status ),//EVT_slug
-			'post_date'=>$old_event['submitted'],//EVT_created NOT
+			'post_title'=>stripslashes($old_event['event_name']), //EVT_name
+			'post_content'=>stripslashes($old_event['event_desc']), //EVT_desc
+			'post_name'=>$this->_find_unique_slug($old_event['event_name'], $old_event['event_identifier'], $post_status), //EVT_slug
+			'post_date'=>$old_event['submitted'], //EVT_created NOT
 			'post_date_gmt'=>get_gmt_from_date($old_event['submitted']),
-			'post_excerpt'=>'',//EVT_short_desc
-			'post_modified'=>$old_event['submitted'],//EVT_modified
+			'post_excerpt'=>'', //EVT_short_desc
+			'post_modified'=>$old_event['submitted'], //EVT_modified
 			'post_modified_gmt'=>get_gmt_from_date($old_event['submitted']),
-			'post_author'=>$old_event['wp_user'],//EVT_wp_user
-			'post_parent'=>0,//parent maybe get this from some REM field?
-			'menu_order'=>0,//EVT_order
-			'post_type'=>'espresso_events',//post_type
-			'post_status'=>$post_status,//status
+			'post_author'=>$old_event['wp_user'], //EVT_wp_user
+			'post_parent'=>0, //parent maybe get this from some REM field?
+			'menu_order'=>0, //EVT_order
+			'post_type'=>'espresso_events', //post_type
+			'post_status'=>$post_status, //status
 		);
 		$cols_n_values_with_no_invalid_text = array();
-		foreach( $cols_n_values as $col => $value ) {
-			$value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column( $this->_new_table, $col, $value );
-			if( ! is_wp_error( $value_sans_invalid_chars ) ) {
-				$cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
+		foreach ($cols_n_values as $col => $value) {
+			$value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
+			if ( ! is_wp_error($value_sans_invalid_chars)) {
+				$cols_n_values_with_no_invalid_text[$col] = $value_sans_invalid_chars;
 			} else {
 				//otherwise leave it as-is. It will blow everything up and stop the migration
-				$cols_n_values_with_no_invalid_text[ $col ] = $value;
+				$cols_n_values_with_no_invalid_text[$col] = $value;
 			}
 		}
 		$cols_n_values = $cols_n_values_with_no_invalid_text;
 		$datatypes = array(
-			'%s',//EVT_name
-			'%s',//EVT_desc
-			'%s',//EVT_slug
-			'%s',//EVT_created
+			'%s', //EVT_name
+			'%s', //EVT_desc
+			'%s', //EVT_slug
+			'%s', //EVT_created
 			'%s',
-			'%s',//EVT_short_desc
-			'%s',//EVT_modified
+			'%s', //EVT_short_desc
+			'%s', //EVT_modified
 			'%s',
-			'%s',//EVT_wp_user
-			'%d',//post_parent
-			'%d',//EVT_order
-			'%s',//post_type
-			'%s',//status
+			'%s', //EVT_wp_user
+			'%d', //post_parent
+			'%d', //EVT_order
+			'%s', //post_type
+			'%s', //status
 		);
 		$success = $wpdb->insert($this->_new_table,
 				$cols_n_values,
 				$datatypes);
-		if( ! $success ){
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -405,9 +405,9 @@ 
 	 * @param int $event_id
 	 * @return int
 	 */
-	public static function count_registrations($event_id){
+	public static function count_registrations($event_id) {
 		global $wpdb;
-		$count = $wpdb->get_var($wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d",$event_id));
+		$count = $wpdb->get_var($wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d", $event_id));
 		return intval($count);
 	}
 
@@ -418,7 +418,7 @@ 
 	 * @param $new_cpt_id
 	 * @return int
 	 */
-	private function _insert_event_meta( $old_event, $new_cpt_id){
+	private function _insert_event_meta($old_event, $new_cpt_id) {
 		global $wpdb;
 		$event_meta = maybe_unserialize($old_event['event_meta']);
 //		for reference, 3.1 'default_payment_status' are: $default_payment_status = array(
@@ -429,10 +429,10 @@ 
 //);
 		$default_reg_status = $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(isset($event_meta['default_payment_status']) ? $event_meta['default_payment_status'] : '', intval($old_event['require_pre_approval']));
 		$cols_n_values = array(
-			'EVT_ID'=>$new_cpt_id,//EVT_ID_fk
+			'EVT_ID'=>$new_cpt_id, //EVT_ID_fk
 			'EVT_display_desc'=> 'Y' == $old_event['display_desc'],
-			'EVT_display_ticket_selector'=> 'Y'== $old_event['display_reg_form'],
-			'EVT_visible_on'=> $this->get_migration_script()->convert_date_string_to_utc($this,$old_event,current_time('mysql'),$old_event['timezone_string']),//don't use the old 'visible_on', as it wasn't ever used
+			'EVT_display_ticket_selector'=> 'Y' == $old_event['display_reg_form'],
+			'EVT_visible_on'=> $this->get_migration_script()->convert_date_string_to_utc($this, $old_event, current_time('mysql'), $old_event['timezone_string']), //don't use the old 'visible_on', as it wasn't ever used
 			'EVT_additional_limit'=> $old_event['allow_multiple'] == 'N' ? 1 : $old_event['additional_limit'],
 			'EVT_default_registration_status' => $default_reg_status,
 			'EVT_member_only'=>$old_event['member_only'],
@@ -444,23 +444,23 @@ 
 
 		);
 		$datatypes = array(
-			'%s',//EVT_ID
-			'%d',//EVT_display_desc
-			'%d',//EVT_display_ticket_selector
-			'%s',//EVT_visible_on
-			'%d',//EVT_additional_limit
-			'%s',//EVT_default_registration_status
-			'%d',//EVT_member_only
-			'%s',//EVT_phone
-			'%d',//EVT_allow_overflow
-			'%s',//EVT_timezone_string
-			'%s',//EVT_external_URL
-			'%d',//EVT_donations
+			'%s', //EVT_ID
+			'%d', //EVT_display_desc
+			'%d', //EVT_display_ticket_selector
+			'%s', //EVT_visible_on
+			'%d', //EVT_additional_limit
+			'%s', //EVT_default_registration_status
+			'%d', //EVT_member_only
+			'%s', //EVT_phone
+			'%d', //EVT_allow_overflow
+			'%s', //EVT_timezone_string
+			'%s', //EVT_external_URL
+			'%d', //EVT_donations
 		);
 		$success = $wpdb->insert($this->_new_meta_table,
 				$cols_n_values,
 				$datatypes);
-		if( ! $success ){
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -473,8 +473,8 @@ 
 	 * @param $old_event
 	 * @return int
 	 */
-	private function _maybe_create_venue( $old_event){
-		if(		$old_event['address'] ||
+	private function _maybe_create_venue($old_event) {
+		if ($old_event['address'] ||
 				$old_event['address2'] ||
 				$old_event['city'] ||
 				$old_event['state'] ||
@@ -485,21 +485,21 @@ 
 				$old_event['venue_phone'] ||
 				$old_event['virtual_url'] ||
 				$old_event['virtual_phone']
-				){
-			$old_id = $this->_duplicate_venue_exists( $old_event );
-			if( $old_id ){
+				) {
+			$old_id = $this->_duplicate_venue_exists($old_event);
+			if ($old_id) {
 				return $old_id;
 			}
 			$new_id = $this->_insert_venue_into_posts($old_event);
-			if( $new_id ){
+			if ($new_id) {
 				$this->_insert_venue_into_meta_table($new_id, $old_event);
-				$guid = isset($old_event['venue_image']) ? $old_event['venue_image']  : null;
-				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id,$this);
+				$guid = isset($old_event['venue_image']) ? $old_event['venue_image'] : null;
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this);
 			}
 			//we don't bother recording the conversion from old events to venues as that
 			//will complicate finding the conversion from old venues to new events
 			return $new_id;
-		}else{
+		} else {
 			return 0;
 		}
 	}
@@ -510,29 +510,29 @@ 
 	 * @param array $old_event
 	 * @return int duplicate venue id
 	 */
-	private function _duplicate_venue_exists($old_event){
+	private function _duplicate_venue_exists($old_event) {
 		global $wpdb;
 		$conditions = array(
-			'VNU_address' => $old_event [ 'address' ],
-			'VNU_address2' => $old_event[ 'address2' ],
-			'VNU_city' => $old_event[ 'city' ],
-			'VNU_zip' => $old_event[ 'zip' ],
-			'post_title'=> $this->_get_venue_title_for_event( $old_event ),
-			'VNU_phone'=>$old_event['venue_phone'],//VNU_phone
-			'VNU_url'=>$old_event['venue_url'],//VNU_url
-			'VNU_virtual_phone'=>$old_event['virtual_phone'],//VNU_virtual_phone
-			'VNU_virtual_url'=>$old_event['virtual_url'],//VNU_virtual_url
+			'VNU_address' => $old_event ['address'],
+			'VNU_address2' => $old_event['address2'],
+			'VNU_city' => $old_event['city'],
+			'VNU_zip' => $old_event['zip'],
+			'post_title'=> $this->_get_venue_title_for_event($old_event),
+			'VNU_phone'=>$old_event['venue_phone'], //VNU_phone
+			'VNU_url'=>$old_event['venue_url'], //VNU_url
+			'VNU_virtual_phone'=>$old_event['virtual_phone'], //VNU_virtual_phone
+			'VNU_virtual_url'=>$old_event['virtual_url'], //VNU_virtual_url
 		);
 		$sql_conditions = array();
-		foreach($conditions as $column => $value){
-			$sql_conditions [] = $wpdb->prepare("$column = %s", $value );
+		foreach ($conditions as $column => $value) {
+			$sql_conditions [] = $wpdb->prepare("$column = %s", $value);
 		}
 		$query = "SELECT VNU_ID
 					FROM
 		{$wpdb->posts} as p INNER JOIN
 		{$wpdb->prefix}esp_venue_meta as v ON p.ID = v.VNU_ID
-			WHERE " . implode( " AND ",$sql_conditions ) . " LIMIT 1";
-		$id = $wpdb->get_var( $query );
+			WHERE ".implode(" AND ", $sql_conditions)." LIMIT 1";
+		$id = $wpdb->get_var($query);
 		return $id;
 	}
 
@@ -541,8 +541,8 @@ 
 	 * @param array $event_data_array keys are events_details columns and values are their values
 	 * @return string
 	 */
-	protected function _get_venue_title_for_event( $event_data_array ) {
-		return $event_data_array['venue_title'] ? stripslashes($event_data_array['venue_title']) : stripslashes( sprintf( __( 'Venue of %s', 'event_espresso' ), $event_data_array['event_name']));
+	protected function _get_venue_title_for_event($event_data_array) {
+		return $event_data_array['venue_title'] ? stripslashes($event_data_array['venue_title']) : stripslashes(sprintf(__('Venue of %s', 'event_espresso'), $event_data_array['event_name']));
 	}
 
 	/**
@@ -551,40 +551,40 @@ 
 	 * @param array $old_event keys are cols, values are col values
 	 * @return int
 	 */
-	private function _insert_venue_into_posts($old_event){
+	private function _insert_venue_into_posts($old_event) {
 		global $wpdb;
 		$insertion_array = array(
-					'post_title'=> $this->_get_venue_title_for_event( $old_event ),//VNU_name
-					'post_content'=>'',//VNU_desc
-					'post_name'=> $this->_find_unique_slug( $old_event['venue_title'], sanitize_title( 'venue-of-' . $old_event['event_name'] ) ),//VNU_identifier
-					'post_date'=>current_time('mysql'),//VNU_created
+					'post_title'=> $this->_get_venue_title_for_event($old_event), //VNU_name
+					'post_content'=>'', //VNU_desc
+					'post_name'=> $this->_find_unique_slug($old_event['venue_title'], sanitize_title('venue-of-'.$old_event['event_name'])), //VNU_identifier
+					'post_date'=>current_time('mysql'), //VNU_created
 					'post_date_gmt'=>get_gmt_from_date(current_time('mysql')),
-					'post_excerpt'=>'',//VNU_short_desc arbitrary only 50 characters
-					'post_modified'=>current_time('mysql'),//VNU_modified
+					'post_excerpt'=>'', //VNU_short_desc arbitrary only 50 characters
+					'post_modified'=>current_time('mysql'), //VNU_modified
 					'post_modified_gmt'=>get_gmt_from_date(current_time('mysql')),
-					'post_author'=>$old_event['wp_user'],//VNU_wp_user
-					'post_parent'=>0,//parent
-					'menu_order'=>0,//VNU_order
+					'post_author'=>$old_event['wp_user'], //VNU_wp_user
+					'post_parent'=>0, //parent
+					'menu_order'=>0, //VNU_order
 					'post_type'=>'espresso_venues'//post_type
 				);
 		$datatypes_array = array(
-					'%s',//VNU_name
-					'%s',//VNU_desc
-					'%s',//VNU_identifier
-					'%s',//VNU_created
+					'%s', //VNU_name
+					'%s', //VNU_desc
+					'%s', //VNU_identifier
+					'%s', //VNU_created
 					'%s',
-					'%s',//VNU_short_desc
-					'%s',//VNU_modified
+					'%s', //VNU_short_desc
+					'%s', //VNU_modified
 					'%s',
-					'%d',//VNU_wp_user
-					'%d',//parent
-					'%d',//VNU_order
-					'%s',//post_type
+					'%d', //VNU_wp_user
+					'%d', //parent
+					'%d', //VNU_order
+					'%s', //post_type
 				);
 		$success = $wpdb->insert($wpdb->posts,
 				$insertion_array,
 				$datatypes_array);
-		if( ! $success ){
+		if ( ! $success) {
 			$this->add_error(
 				$this->get_migration_script()->_create_error_message_for_db_insertion(
 					$this->_old_table,
@@ -605,64 +605,64 @@ 
 	 * @param array $old_event
 	 * @return int
 	 */
-	private function _insert_venue_into_meta_table($cpt_id,$old_event){
+	private function _insert_venue_into_meta_table($cpt_id, $old_event) {
 		global $wpdb;
 
 		//assume the country is the same as the organization's old settings
 		$country_iso = $this->get_migration_script()->get_default_country_iso();
 		//find the state from the venue, or the organization, or just guess california
-		if( ! $old_event['state']){
+		if ( ! $old_event['state']) {
 			$old_org_options = get_option('events_organization_settings');
 			$state_name = stripslashes($old_org_options['organization_state']);
-		}else{
+		} else {
 			$state_name = $old_event['state'];
 		}
-		if ( ! $state_name ){
+		if ( ! $state_name) {
 			$state_name = 'CA';
 		}
 		//get a state ID with the same name, if possible
-		try{
-			$state = $this->get_migration_script()->get_or_create_state($state_name,$country_iso);
+		try {
+			$state = $this->get_migration_script()->get_or_create_state($state_name, $country_iso);
 			$state_id = $state['STA_ID'];
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$this->add_error($e->getMessage());
 			$state_id = 0;
 		}
 		//now insert into meta table
 		$insertion_array = array(
-			'VNU_ID'=>$cpt_id,//VNU_ID_fk
-			'VNU_address'=>stripslashes($old_event['address']),//VNU_address
-			'VNU_address2'=>stripslashes($old_event['address2']),//VNU_address2
-			'VNU_city'=>stripslashes($old_event['city']),//VNU_city
-			'STA_ID'=>$state_id,//STA_ID
-			'CNT_ISO'=>$country_iso,//CNT_ISO
-			'VNU_zip'=>$old_event['zip'],//VNU_zip
-			'VNU_phone'=>$old_event['venue_phone'],//VNU_phone
-			'VNU_capacity'=>-1,//VNU_capacity
-			'VNU_url'=>$old_event['venue_url'],//VNU_url
-			'VNU_virtual_phone'=>$old_event['virtual_phone'],//VNU_virtual_phone
-			'VNU_virtual_url'=>$old_event['virtual_url'],//VNU_virtual_url
-			'VNU_google_map_link'=>'',//VNU_google_map_link
+			'VNU_ID'=>$cpt_id, //VNU_ID_fk
+			'VNU_address'=>stripslashes($old_event['address']), //VNU_address
+			'VNU_address2'=>stripslashes($old_event['address2']), //VNU_address2
+			'VNU_city'=>stripslashes($old_event['city']), //VNU_city
+			'STA_ID'=>$state_id, //STA_ID
+			'CNT_ISO'=>$country_iso, //CNT_ISO
+			'VNU_zip'=>$old_event['zip'], //VNU_zip
+			'VNU_phone'=>$old_event['venue_phone'], //VNU_phone
+			'VNU_capacity'=>-1, //VNU_capacity
+			'VNU_url'=>$old_event['venue_url'], //VNU_url
+			'VNU_virtual_phone'=>$old_event['virtual_phone'], //VNU_virtual_phone
+			'VNU_virtual_url'=>$old_event['virtual_url'], //VNU_virtual_url
+			'VNU_google_map_link'=>'', //VNU_google_map_link
 			'VNU_enable_for_gmap'=>true	//VNU_enable_for_gmap
 		);
 		$datatypes = array(
-			'%d',//VNU_ID_fk
-			'%s',//VNU_address
-			'%s',//VNU_address2
-			'%s',//VNU_city
-			'%d',//STA_ID
-			'%s',//CNT_ISO
-			'%s',//VNU_zip
-			'%s',//VNU_phone
-			'%d',//VNU_capacity
-			'%s',//VNU_url
-			'%s',//VNU_virtual_phone
-			'%s',//VNU_virtual_url
-			'%s',//VNU_google_map_link
-			'%d',//VNU_enable_for_gmap
+			'%d', //VNU_ID_fk
+			'%s', //VNU_address
+			'%s', //VNU_address2
+			'%s', //VNU_city
+			'%d', //STA_ID
+			'%s', //CNT_ISO
+			'%s', //VNU_zip
+			'%s', //VNU_phone
+			'%d', //VNU_capacity
+			'%s', //VNU_url
+			'%s', //VNU_virtual_phone
+			'%s', //VNU_virtual_url
+			'%s', //VNU_google_map_link
+			'%d', //VNU_enable_for_gmap
 		);
-		$success = $wpdb->insert($wpdb->prefix."esp_venue_meta",$insertion_array,$datatypes);
-		if( ! $success ){
+		$success = $wpdb->insert($wpdb->prefix."esp_venue_meta", $insertion_array, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $insertion_array, $datatypes));
 			return 0;
 		}
@@ -676,14 +676,14 @@ 
 	 * @param $new_venue_id
 	 * @return int
 	 */
-	private function _insert_new_venue_to_event( $new_event_id, $new_venue_id){
+	private function _insert_new_venue_to_event($new_event_id, $new_venue_id) {
 		global $wpdb;
-		if( ! $new_event_id){
-			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),$new_event_id));
+		if ( ! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id));
 			return 0;
 		}
-		if( ! $new_venue_id){
-			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"),$new_venue_id));
+		if ( ! $new_venue_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id));
 			return 0;
 		}
 		$cols_n_values = array(
@@ -692,12 +692,12 @@ 
 			'EVV_primary'=>true
 		);
 		$datatypes = array(
-			'%d',//EVT_ID
-			'%d',//VNU_ID
-			'%d',//EVT_primary
+			'%d', //EVT_ID
+			'%d', //VNU_ID
+			'%d', //EVT_primary
 		);
-		$success = $wpdb->insert($wpdb->prefix."esp_event_venue",$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($wpdb->prefix."esp_event_venue", $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error(
 				$this->get_migration_script()->_create_error_message_for_db_insertion(
 					$this->_old_table,
@@ -719,11 +719,11 @@ 
 	 * @param int $new_cpt_id new post ID
 	 * @return void (if there are errors though, adds them to the stage's error list
 	 */
-	private function _convert_start_end_times($old_event,$new_cpt_id){
+	private function _convert_start_end_times($old_event, $new_cpt_id) {
 		$start_end_times = $this->_get_old_start_end_times($old_event['id']);
-		foreach($start_end_times as $start_end_time){
-			$datetime_id = $this->_insert_new_datetime($start_end_time,$old_event,$new_cpt_id);
-			if($datetime_id){
+		foreach ($start_end_times as $start_end_time) {
+			$datetime_id = $this->_insert_new_datetime($start_end_time, $old_event, $new_cpt_id);
+			if ($datetime_id) {
 				$this->get_migration_script()->set_mapping($this->_old_start_end_table, $start_end_time['id'], $this->_new_datetime_table, $datetime_id);
 			}
 		}
@@ -734,9 +734,9 @@ 
 	 * @param int $old_event_id
 	 * @return array
 	 */
-	private function _get_old_start_end_times($old_event_id){
+	private function _get_old_start_end_times($old_event_id) {
 		global $wpdb;
-		return $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d",$old_event_id),ARRAY_A);
+		return $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d", $old_event_id), ARRAY_A);
 	}
 	/**
 	 * Inserts a 4.1 datetime given the 3.1 start_end db row and event_details row
@@ -745,40 +745,40 @@ 
 	 * @param int $new_cpt_id
 	 * @return int ID of new datetime
 	 */
-	private function _insert_new_datetime($start_end_time_row,$old_event_row,$new_cpt_id){
+	private function _insert_new_datetime($start_end_time_row, $old_event_row, $new_cpt_id) {
 		global $wpdb;
 		$start_date = $old_event_row['start_date'];
 		$start_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['start_time']);
 		$end_date = $old_event_row['end_date'];
 		$end_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['end_time']);
 		$existing_datetimes = $this->_count_other_datetimes_exist_for_new_event($new_cpt_id);
-		$start_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$start_end_time_row,"$start_date $start_time:00",$old_event_row['timezone_string']);
-		$end_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$start_end_time_row,"$end_date $end_time:00",$old_event_row['timezone_string']);
+		$start_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$start_date $start_time:00", $old_event_row['timezone_string']);
+		$end_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$end_date $end_time:00", $old_event_row['timezone_string']);
 		$cols_n_values = array(
-			'EVT_ID'=>$new_cpt_id,//EVT_ID
-			'DTT_EVT_start'=>$start_datetime_utc,//DTT_EVT_start
-			'DTT_EVT_end'=> $end_datetime_utc,//DTT_EVT_end
-			'DTT_reg_limit'=>intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'],//DTT_reg_limit
-			'DTT_sold'=>0,//note: we will increment this as registrations are added during the migration
+			'EVT_ID'=>$new_cpt_id, //EVT_ID
+			'DTT_EVT_start'=>$start_datetime_utc, //DTT_EVT_start
+			'DTT_EVT_end'=> $end_datetime_utc, //DTT_EVT_end
+			'DTT_reg_limit'=>intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'], //DTT_reg_limit
+			'DTT_sold'=>0, //note: we will increment this as registrations are added during the migration
 //			'DTT_is_primary'=> 0 == $existing_datetimes ,//DTT_is_primary... if count==0, then we'll call it the 'primary'
-			'DTT_order'=> $existing_datetimes,//DTT_order, just give it the same order as the count of how many datetimes already exist
+			'DTT_order'=> $existing_datetimes, //DTT_order, just give it the same order as the count of how many datetimes already exist
 			'DTT_parent'=>0,
 			'DTT_deleted'=>false
 		);
 		$datatypes = array(
-			'%d',//EVT_Id
-			'%s',//DTT_EVT_start
-			'%s',//DTT_EVT_end
-			'%d',//DTT_reg_limit
-			'%d',//DTT_sold
+			'%d', //EVT_Id
+			'%s', //DTT_EVT_start
+			'%s', //DTT_EVT_end
+			'%d', //DTT_reg_limit
+			'%d', //DTT_sold
 //			'%d',//DTT_is_primary
-			'%d',//DTT_order
-			'%d',//DTT_parent
-			'%d',//DTT_deleted
+			'%d', //DTT_order
+			'%d', //DTT_parent
+			'%d', //DTT_deleted
 		);
-		$success = $wpdb->insert($this->_new_datetime_table,$cols_n_values,$datatypes);
-		if ( ! $success){
-			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_start_end_table, array_merge($old_event_row,$start_end_time_row), $this->_new_datetime_table, $cols_n_values, $datatypes));
+		$success = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_start_end_table, array_merge($old_event_row, $start_end_time_row), $this->_new_datetime_table, $cols_n_values, $datatypes));
 			return 0;
 		}
 		return $wpdb->insert_id;
@@ -791,9 +791,9 @@ 
 	 * @param int $cpt_event_id
 	 * @return int
 	 */
-	private function _count_other_datetimes_exist_for_new_event($cpt_event_id){
+	private function _count_other_datetimes_exist_for_new_event($cpt_event_id) {
 		global $wpdb;
-		$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d",$cpt_event_id));
+		$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d", $cpt_event_id));
 		return intval($count);
 	}
 

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_line_items.dmsstage.php

Spacing +38 added lines, -38 removed lines

@@ -36,7 +36,7 @@ 
 			)
 		);
  */
-class EE_DMS_4_1_0_line_items extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_1_0_line_items extends EE_Data_Migration_Script_Stage_Table {
 	private $_new_line_table;
 	private $_new_transaction_table;
 	private $_new_reg_table;
@@ -52,21 +52,21 @@ 
 	
 	protected function _migrate_old_row($old_row) {
 		//insert line items if its a primary id
-		if(intval($old_row['is_primary'])){
+		if (intval($old_row['is_primary'])) {
 			$txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $this->_new_transaction_table);
-			if ( ! $txn_id ){
-				$this->add_error(sprintf(__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"),$old_row['id'],$this->_json_encode($old_row)));
+			if ( ! $txn_id) {
+				$this->add_error(sprintf(__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"), $old_row['id'], $this->_json_encode($old_row)));
 				return;
 			}
 			$txn = $this->_get_txn($txn_id);
-			$new_line_items = $this->_insert_new_line_items($txn,$old_row);
-			$this->get_migration_script()->set_mapping($this->_old_table,$old_row['id'],$this->_new_line_table,$new_line_items);
+			$new_line_items = $this->_insert_new_line_items($txn, $old_row);
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_line_table, $new_line_items);
 		}
 	}
 	
-	private function _get_txn($txn_id){
+	private function _get_txn($txn_id) {
 		global $wpdb;
-		$txn = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->_new_transaction_table WHERE TXN_ID=%d",$txn_id),ARRAY_A);
+		$txn = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->_new_transaction_table WHERE TXN_ID=%d", $txn_id), ARRAY_A);
 		return $txn;
 	}
 	
@@ -77,9 +77,9 @@ 
 	 * @param array $transaction
 	 * @return array new line item ids
 	 */
-	private function _insert_new_line_items($transaction,$old_attendee){
+	private function _insert_new_line_items($transaction, $old_attendee) {
 		global $wpdb;
-		$regs_on_this_transaction = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_new_reg_table." WHERE TXN_ID=%d",$transaction['TXN_ID']),ARRAY_A);
+		$regs_on_this_transaction = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_new_reg_table." WHERE TXN_ID=%d", $transaction['TXN_ID']), ARRAY_A);
 		$new_line_item_ids = array();
 		//create a totla line item
 		$total_line_item_id = $this->_insert_new_line_item(array(
@@ -90,11 +90,11 @@ 
 			'LIN_type'=>'total',
 			'OBJ_ID'=>$transaction['TXN_ID'],
 			'OBJ_type'=>'Transaction'
-		),$old_attendee);
+		), $old_attendee);
 		$new_line_item_ids[] = $total_line_item_id;
 		//create a subtotal line item
 		$reg_total = 0;
-		foreach($regs_on_this_transaction as $new_reg){
+		foreach ($regs_on_this_transaction as $new_reg) {
 			$reg_total += floatval($new_reg['REG_final_price']);
 		}
 		$subtotal_line_item_id = $this->_insert_new_line_item(array(
@@ -104,26 +104,26 @@ 
 			'LIN_total'=>$reg_total,
 			'LIN_parent'=>$total_line_item_id,
 			'LIN_type'=>'sub-total',
-		),$old_attendee);
+		), $old_attendee);
 		$new_line_item_ids[] = $subtotal_line_item_id;
 		//group REGs by TKT_ID
 		$regs_by_tkt = array();
-		foreach($regs_on_this_transaction as $new_reg){
+		foreach ($regs_on_this_transaction as $new_reg) {
 			$regs_by_tkt[$new_reg['TKT_ID']][] = $new_reg;
 		}
 		
 		//create individual line items
 		
-		foreach($regs_by_tkt as $ticket_id => $regs){
+		foreach ($regs_by_tkt as $ticket_id => $regs) {
 			$count = count($regs);
 			$line_total = 0;
-			foreach($regs as $new_reg){
+			foreach ($regs as $new_reg) {
 				$line_total += $new_reg['REG_final_price'];
 			}
 			$a_reg = reset($regs);
 			$new_ticket = $this->_get_new_ticket_row($a_reg['TKT_ID']);
 			$reg_line_item_id = $this->_insert_new_line_item(array(
-				'LIN_code'=> md5( 'Ticket' . $ticket_id . time() ),
+				'LIN_code'=> md5('Ticket'.$ticket_id.time()),
 				'TXN_ID'=>$transaction['TXN_ID'],
 				'LIN_name'=>$new_ticket['TKT_name'],
 				'LIN_unit_price'=>$a_reg['REG_final_price'],
@@ -133,7 +133,7 @@ 
 				'LIN_parent'=>$subtotal_line_item_id,
 				'OBJ_ID'=>$ticket_id,
 				'OBJ_type'=>'Ticket'
-			),$old_attendee);
+			), $old_attendee);
 			$new_line_item_ids[] = $reg_line_item_id;
 		}
 		
@@ -147,13 +147,13 @@ 
 	 * @param type $new_ticket_id
 	 * @return array
 	 */
-	private function _get_new_ticket_row($new_ticket_id){
+	private function _get_new_ticket_row($new_ticket_id) {
 		global $wpdb;
-		$ticket_row = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."esp_ticket WHERE TKT_ID=%d",$new_ticket_id),ARRAY_A);
+		$ticket_row = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."esp_ticket WHERE TKT_ID=%d", $new_ticket_id), ARRAY_A);
 		return $ticket_row;
 	}
 	
-	private function _insert_new_line_item($cols_n_values,$old_attendee){
+	private function _insert_new_line_item($cols_n_values, $old_attendee) {
 		global $wpdb;
 		$default_cols_n_values = array(
 			'LIN_code'=>'',
@@ -171,25 +171,25 @@ 
 			'OBJ_ID'=>null,
 			'OBJ_type'=>null
 		);
-		$cols_n_values = array_merge($default_cols_n_values,$cols_n_values);
+		$cols_n_values = array_merge($default_cols_n_values, $cols_n_values);
 			$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
-				'%d',//OBJ_ID
-				'%s',//OBJ_type
+				'%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
+				'%d', //OBJ_ID
+				'%s', //OBJ_type
 			);
-			$success = $wpdb->insert($this->_new_line_table,$cols_n_values,$datatypes);
-			if ( ! $success){
+			$success = $wpdb->insert($this->_new_line_table, $cols_n_values, $datatypes);
+			if ( ! $success) {
 				$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_reg_table, $cols_n_values, $datatypes));
 				return 0;
 			}