eventespresso / event-espresso-core

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

Doc Comments -1 removed lines

@@ -245,7 +245,6 @@
 	/**
 	 * Creates a 4.1 member price discount
 	 * @global type $wpdb
-	 * @param type $old_price
 	 * @return int
 	 */
 	private function _insert_new_global_surcharge_price($org_options){

Indentation +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
 			  $c->organization->logo_url = $value;break;
 		  case 'event_page_id':
 
-			    //also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
+				//also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
 			  //to ESPRESSO_THANK_YOU
 			  $reg_page_post = get_post($value);
 			  $reg_page_post->post_content = str_replace("[ESPRESSO_EVENTS]","[ESPRESSO_CHECKOUT]",$reg_page_post->post_content);

Spacing +69 added lines, -69 removed lines

@@ -100,30 +100,30 @@ 
  *
  * @todo: inform clients that messages have COMPLETELY changed in 4.1; themeroller isn't in there; event list page is no more;
  */
-class EE_DMS_4_1_0_org_options extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_org_options extends EE_Data_Migration_Script_Stage {
 
-	function _migration_step($num_items=50){
+	function _migration_step($num_items = 50) {
 
 		$items_actually_migrated = 0;
 		$old_org_options = get_option('events_organization_settings');
-		foreach($this->_org_options_we_know_how_to_migrate as $option_name){
+		foreach ($this->_org_options_we_know_how_to_migrate as $option_name) {
 			//only bother migrating if there's a setting to migrate. Otherwise we'll just use the default
-			if(isset($old_org_options[$option_name])){
+			if (isset($old_org_options[$option_name])) {
 				$this->_handle_org_option($option_name, $old_org_options[$option_name]);
 			}
-			if($option_name=='surcharge'){
+			if ($option_name == 'surcharge') {
 				$this->_insert_new_global_surcharge_price($old_org_options);
 			}
 			$items_actually_migrated++;
 		}
 
-		$success = EE_Config::instance()->update_espresso_config(FALSE,TRUE);
-		if( ! $success ) {
-			$this->add_error( sprintf( __( 'Could not save EE Config during org options stage. Reason: %s', 'event_espresso' ),  EE_Error::get_notices( FALSE )) );
+		$success = EE_Config::instance()->update_espresso_config(FALSE, TRUE);
+		if ( ! $success) {
+			$this->add_error(sprintf(__('Could not save EE Config during org options stage. Reason: %s', 'event_espresso'), EE_Error::get_notices(FALSE)));
 			EE_Error::overwrite_errors();
 		}
-		EE_Network_Config::instance()->update_config(FALSE,FALSE);
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		EE_Network_Config::instance()->update_config(FALSE, FALSE);
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			//we may have added new pages and this might be necessary
 			flush_rewrite_rules();
 			$this->set_completed();
@@ -136,65 +136,65 @@ 
 	}
 	function __construct() {
 		$this->_pretty_name = __("Organization Options/Config", "event_espresso");
-		$this->_org_options_we_know_how_to_migrate = apply_filters( 'FHEE__EE_DMS_4_1_0_org_options__org_options_we_know_how_to_migrate',$this->_org_options_we_know_how_to_migrate );
+		$this->_org_options_we_know_how_to_migrate = apply_filters('FHEE__EE_DMS_4_1_0_org_options__org_options_we_know_how_to_migrate', $this->_org_options_we_know_how_to_migrate);
 		parent::__construct();
 	}
 
-	private function _handle_org_option($option_name,$value){
+	private function _handle_org_option($option_name, $value) {
 		$c = EE_Config::instance();
 		$cn = EE_Network_Config::instance();
-		switch($option_name){
+		switch ($option_name) {
 		  case 'organization':
-			  $c->organization->name = $value;break;
+			  $c->organization->name = $value; break;
 		  case 'organization_street1':
-			  $c->organization->address_1 = $value;break;
+			  $c->organization->address_1 = $value; break;
 		  case 'organization_street2':
-			  $c->organization->address_2 = $value;break;
+			  $c->organization->address_2 = $value; break;
 		  case 'organization_city':
-			  $c->organization->city = $value;break;
+			  $c->organization->city = $value; break;
 		  case 'organization_state':
-			  try{
+			  try {
 			  $state = $this->get_migration_script()->get_or_create_state($value);
 			  $state_id = $state['STA_ID'];
 			  $c->organization->STA_ID = $state_id;
-			  }catch(EE_Error $e){}break;
+			  } catch (EE_Error $e) {}break;
 		  case 'organization_zip':
-			  $c->organization->zip = $value;break;
+			  $c->organization->zip = $value; break;
 		  case 'contact_email':
-			  $c->organization->email = $value;break;
+			  $c->organization->email = $value; break;
 		  case 'default_payment_status':
-			  $c->registration->default_STS_ID =  $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);break;
+			  $c->registration->default_STS_ID = $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value); break;
 		  case 'organization_country':
-			  $iso =$this->get_migration_script()->get_iso_from_3_1_country_id($value);
+			  $iso = $this->get_migration_script()->get_iso_from_3_1_country_id($value);
 			  $c->organization->CNT_ISO = $iso;
 			  $country_row = $this->get_migration_script()->get_or_create_country($iso);
-			  if( ! $country_row){
-				  $this->add_error(sprintf(__("Could not set country's currency config because no country exists for ISO %s", "event_espresso"),$iso));
+			  if ( ! $country_row) {
+				  $this->add_error(sprintf(__("Could not set country's currency config because no country exists for ISO %s", "event_espresso"), $iso));
 			  }
 			  //can't use EE_Currency_Config's handy constructor because the models are off-limits right now (and it uses them)
-			$c->currency->code = $country_row['CNT_cur_code']; 			// currency code: USD, CAD, EUR
-			$c->currency->name = $country_row['CNT_cur_single'];	// Dollar
-			$c->currency->plural = $country_row['CNT_cur_plural']; 	// Dollars
-			$c->currency->sign =  $country_row['CNT_cur_sign']; 			// currency sign: $
-			$c->currency->sign_b4 = intval($country_row['CNT_cur_sign_b4']); 		// currency sign before or after: $TRUE  or  FALSE$
-			$c->currency->dec_plc = intval($country_row['CNT_cur_dec_plc']);	// decimal places: 2 = 0.00  3 = 0.000
-			$c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk'];	// decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-			$c->currency->thsnds = $country_row['CNT_cur_thsnds'];	// thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$c->currency->code = $country_row['CNT_cur_code']; // currency code: USD, CAD, EUR
+			$c->currency->name = $country_row['CNT_cur_single']; // Dollar
+			$c->currency->plural = $country_row['CNT_cur_plural']; // Dollars
+			$c->currency->sign = $country_row['CNT_cur_sign']; // currency sign: $
+			$c->currency->sign_b4 = intval($country_row['CNT_cur_sign_b4']); // currency sign before or after: $TRUE  or  FALSE$
+			$c->currency->dec_plc = intval($country_row['CNT_cur_dec_plc']); // decimal places: 2 = 0.00  3 = 0.000
+			$c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk']; // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+			$c->currency->thsnds = $country_row['CNT_cur_thsnds']; // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 //			  $c->currency = new EE_Currency_Config($c->organization->CNT_ISO);break;
 //		  case 'currency_symbol': ignore the currency symbol. we'll just go by their country.
 //			  $c->currency->sign = $value;break;
 		  case 'show_pending_payment_options':
-			  $c->registration->show_pending_payment_options = ($value == 'Y');break;
+			  $c->registration->show_pending_payment_options = ($value == 'Y'); break;
 		  case 'display_address_in_regform':
-			  $c->template_settings->display_address_in_regform = ($value == 'Y');break;
+			  $c->template_settings->display_address_in_regform = ($value == 'Y'); break;
 		  case 'default_logo_url':
-			  $c->organization->logo_url = $value;break;
+			  $c->organization->logo_url = $value; break;
 		  case 'event_page_id':
 
 			    //also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
 			  //to ESPRESSO_THANK_YOU
 			  $reg_page_post = get_post($value);
-			  $reg_page_post->post_content = str_replace("[ESPRESSO_EVENTS]","[ESPRESSO_CHECKOUT]",$reg_page_post->post_content);
+			  $reg_page_post->post_content = str_replace("[ESPRESSO_EVENTS]", "[ESPRESSO_CHECKOUT]", $reg_page_post->post_content);
 			  wp_update_post($reg_page_post);
 			  $c->core->reg_page_id = $value;
 			  break;
@@ -202,7 +202,7 @@ 
 			  //also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
 			  //to ESPRESSO_THANK_YOU
 			  $thank_you_page_post = get_post($value);
-			  $thank_you_page_post->post_content = str_replace("[ESPRESSO_PAYMENTS]","[ESPRESSO_THANK_YOU]",$thank_you_page_post->post_content);
+			  $thank_you_page_post->post_content = str_replace("[ESPRESSO_PAYMENTS]", "[ESPRESSO_THANK_YOU]", $thank_you_page_post->post_content);
 			  wp_update_post($thank_you_page_post);
 			  $c->core->thank_you_page_id = $value;
 			   break;
@@ -216,15 +216,15 @@ 
 		  case 'use_captcha':
 			  $c->registration->use_captcha = ($value == 'Y'); break;
 		  case 'recaptcha_publickey':
-			  $c->registration->recaptcha_publickey = $value;break;
+			  $c->registration->recaptcha_publickey = $value; break;
 		  case 'recaptcha_privatekey':
-			  $c->registration->recaptcha_privatekey = $value;break;
+			  $c->registration->recaptcha_privatekey = $value; break;
 		  case 'recaptcha_theme':
-			  $c->registration->recaptcha_theme = $value;break;
+			  $c->registration->recaptcha_theme = $value; break;
 		  case 'recaptcha_width':
-			  $c->registration->recaptcha_width = $value;break;
+			  $c->registration->recaptcha_width = $value; break;
 		  case 'recaptcha_language':
-			  $c->registration->recaptcha_language = $value;break;
+			  $c->registration->recaptcha_language = $value; break;
 		  case 'espresso_dashboard_widget':
 			  $c->admin->use_dashboard_widget = ($value == 'Y'); break;
 		  case 'use_personnel_manager':
@@ -232,13 +232,13 @@ 
 		  case 'use_event_timezones':
 			  $c->admin->use_event_timezones = ($value == 'Y'); break;
 		  case 'full_logging':
-			  $c->admin->use_full_logging = ($value == 'Y');break;
+			  $c->admin->use_full_logging = ($value == 'Y'); break;
 		  case 'affiliate_id':
-			  $c->admin->affiliate_id = $value;break;
+			  $c->admin->affiliate_id = $value; break;
 		  case 'site_license_key':
-			  $cn->core->site_license_key = $value;break;
+			  $cn->core->site_license_key = $value; break;
 		  default:
-			  do_action( 'AHEE__EE_DMS_4_1_0__handle_org_option',$option_name,$value );
+			  do_action('AHEE__EE_DMS_4_1_0__handle_org_option', $option_name, $value);
 		}
 	}
 
@@ -248,15 +248,15 @@ 
 	 * @param type $old_price
 	 * @return int
 	 */
-	private function _insert_new_global_surcharge_price($org_options){
+	private function _insert_new_global_surcharge_price($org_options) {
 		$amount = floatval($org_options['surcharge']);
 		//dont createa a price if the surcharge is 0
-		if($amount <=.01){
+		if ($amount <= .01) {
 			return 0;
 		}
-		if($org_options['surcharge_type'] == 'flat_rate'){
+		if ($org_options['surcharge_type'] == 'flat_rate') {
 			$price_type = EE_DMS_4_1_0_prices::price_type_flat_surcharge;
-		}else{
+		} else {
 			$price_type = EE_DMS_4_1_0_prices::price_type_percent_surcharge;
 		}
 		global $wpdb;
@@ -272,18 +272,18 @@ 
 
 		);
 		$datatypes = array(
-			'%d',//PRT_ID
-			'%f',//PRT_amount
-			'%s',//PRC_name
-			'%d',//PRC_is_default
-			'%d',//PRC_overrides
-			'%d',//PRC_order
-			'%d',//PRC_deleted
-			'%d',//PRC_parent
+			'%d', //PRT_ID
+			'%f', //PRT_amount
+			'%s', //PRC_name
+			'%d', //PRC_is_default
+			'%d', //PRC_overrides
+			'%d', //PRC_order
+			'%d', //PRC_deleted
+			'%d', //PRC_parent
 		);
 		$price_table = $wpdb->prefix."esp_price";
-		$success = $wpdb->insert($price_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($price_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion('org_options',
 					array(
 						'surcharge'=>$org_options['surcharge'],
@@ -308,8 +308,8 @@ 
 	  'payment_message',
 	  'message',
 	  'default_payment_status',
-	  'surcharge',//unused?
-	  'country_id',//unused?
+	  'surcharge', //unused?
+	  'country_id', //unused?
 	  'organization_country',
 //	  'currency_symbol',
 	  'expire_on_registration_end',
@@ -321,13 +321,13 @@ 
 	  'show_pending_payment_options',
 	  'show_reg_footer',
 	  'skip_confirmation_page',
-	  'allow_mer_discounts',//no equiv
-	  'allow_mer_vouchers',//no equiv
+	  'allow_mer_discounts', //no equiv
+	  'allow_mer_vouchers', //no equiv
 	  'display_short_description_in_event_list',
 	  'display_description_on_multi_reg_page',
 	  'display_address_in_event_list',
 	  'display_address_in_regform',
-	  'use_custom_post_types',//no equiv
+	  'use_custom_post_types', //no equiv
 	  'display_ical_download',
 	  'display_featured_image',
 	  'themeroller',
@@ -346,11 +346,11 @@ 
 	  'espresso_dashboard_widget',
 	  'time_reg_limit',
 //	  'use_attendee_pre_approval', removed in 4.1- instead this is factored into the default reg status
-	  'use_personnel_manager',//no equiv
+	  'use_personnel_manager', //no equiv
 	  'use_event_timezones',
 	  'full_logging',
-	  'surcharge_type',//unused
-	  'surcharge_text',//unused
+	  'surcharge_type', //unused
+	  'surcharge_text', //unused
 	  'affiliate_id',
 	  'site_license_key',
 	);

Braces +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
 			  $state = $this->get_migration_script()->get_or_create_state($value);
 			  $state_id = $state['STA_ID'];
 			  $c->organization->STA_ID = $state_id;
-			  }catch(EE_Error $e){}break;
+			  } catch(EE_Error $e){}break;
 		  case 'organization_zip':
 			  $c->organization->zip = $value;break;
 		  case 'contact_email':
@@ -256,7 +256,7 @@ 
 		}
 		if($org_options['surcharge_type'] == 'flat_rate'){
 			$price_type = EE_DMS_4_1_0_prices::price_type_flat_surcharge;
-		}else{
+		} else{
 			$price_type = EE_DMS_4_1_0_prices::price_type_percent_surcharge;
 		}
 		global $wpdb;

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

Doc Comments +3 added lines, -4 removed lines

@@ -345,8 +345,8 @@ 
 	/**
 	 * Adds a join between a ticket and a price
 	 * @global type $wpdb
-	 * @param type $new_ticket_id
-	 * @param type $new_price_id
+	 * @param integer $new_ticket_id
+	 * @param integer $new_price_id
 	 * @return int
 	 */
 	private function _insert_ticket_price_relation($new_ticket_id,$new_price_id){
@@ -371,8 +371,7 @@ 
 	/**
 	 * Adds a join between a ticket and a datetime
 	 * @global type $wpdb
-	 * @param type $new_ticket_id
-	 * @param type $new_price_id
+	 * @param integer $new_ticket_id
 	 * @return int
 	 */
 	private function _insert_datetime_ticket_relation($new_datetime_id,$new_ticket_id){

Spacing +74 added lines, -74 removed lines

@@ -86,7 +86,7 @@ 
 			));
  */
 
-class EE_DMS_4_1_0_prices extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_1_0_prices extends EE_Data_Migration_Script_Stage_Table {
 	private $_new_price_table;
 	private $_new_ticket_table;
 	private $_new_ticket_price_table;
@@ -122,10 +122,10 @@ 
 //			$member_price_discount_id = 0;
 //		}
 		//create the surcharge if there is any
-		if(floatval($old_row['surcharge']) >= 0.01){
+		if (floatval($old_row['surcharge']) >= 0.01) {
 			$surcharge_price_id = $this->_insert_new_surcharge_price($old_row);
-			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id,$surcharge_price_id));
-		}else{
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id, $surcharge_price_id));
+		} else {
 			$surcharge_price_id = 0;
 			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id));
 		}
@@ -145,7 +145,7 @@ 
 //		}
 		//create a ticket for each old price -old datetime combo
 		$tickets_for_old_price = array();
-		foreach($this->_get_datetime_ids_for_old_event_id($old_row['event_id']) as $new_datetime_id){
+		foreach ($this->_get_datetime_ids_for_old_event_id($old_row['event_id']) as $new_datetime_id) {
 			$ticket_id = $this->_insert_new_ticket($old_row);
 			$tickets_for_old_price[] = $ticket_id;
 			//associate to old prices
@@ -162,7 +162,7 @@ 
 	 * @param type $old_price
 	 * @return int
 	 */
-	private function _insert_new_price($old_price){
+	private function _insert_new_price($old_price) {
 		global $wpdb;
 		$cols_n_values = array(
 			'PRT_ID'=>self::price_type_base,
@@ -176,17 +176,17 @@ 
 
 		);
 		$datatypes = array(
-			'%d',//PRT_ID
-			'%f',//PRT_amount
-			'%s',//PRC_name
-			'%d',//PRC_is_default
-			'%d',//PRC_overrides
-			'%d',//PRC_order
-			'%d',//PRC_deleted
-			'%d',//PRC_parent
+			'%d', //PRT_ID
+			'%f', //PRT_amount
+			'%s', //PRC_name
+			'%d', //PRC_is_default
+			'%d', //PRC_overrides
+			'%d', //PRC_order
+			'%d', //PRC_deleted
+			'%d', //PRC_parent
 		);
-		$success = $wpdb->insert($this->_new_price_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -237,11 +237,11 @@ 
 	 * @param type $old_price
 	 * @return int
 	 */
-	private function _insert_new_surcharge_price($old_price){
+	private function _insert_new_surcharge_price($old_price) {
 
-		if($old_price['surcharge_type'] == 'flat_rate'){
+		if ($old_price['surcharge_type'] == 'flat_rate') {
 			$price_type = self::price_type_flat_surcharge;
-		}else{
+		} else {
 			$price_type = self::price_type_percent_surcharge;
 		}
 		global $wpdb;
@@ -257,17 +257,17 @@ 
 
 		);
 		$datatypes = array(
-			'%d',//PRT_ID
-			'%f',//PRT_amount
-			'%s',//PRC_name
-			'%d',//PRC_is_default
-			'%d',//PRC_overrides
-			'%d',//PRC_order
-			'%d',//PRC_deleted
-			'%d',//PRC_parent
+			'%d', //PRT_ID
+			'%f', //PRT_amount
+			'%s', //PRC_name
+			'%d', //PRC_is_default
+			'%d', //PRC_overrides
+			'%d', //PRC_order
+			'%d', //PRC_deleted
+			'%d', //PRC_parent
 		);
-		$success = $wpdb->insert($this->_new_price_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -282,18 +282,18 @@ 
 	 * @param $new_surcharge_id int
 	 * @return int new ticket id
 	 */
-	private function _insert_new_ticket($old_price_row){
+	private function _insert_new_ticket($old_price_row) {
 		global $wpdb;
 		$event_row = $this->_get_event_row($old_price_row['event_id']);
-		if($old_price_row['surcharge_type'] == 'flat_rate'){
+		if ($old_price_row['surcharge_type'] == 'flat_rate') {
 			$final_ticket_price = floatval($old_price_row['event_cost']) + floatval($old_price_row['surcharge']);
-		}else{//percent surcharge
-			$final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge'])/100);
+		} else {//percent surcharge
+			$final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge']) / 100);
 		}
 		$start_date = $event_row['registration_start']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_startT']);
-		$start_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$old_price_row,$start_date,$event_row['timezone_string']);
+		$start_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $start_date, $event_row['timezone_string']);
 		$end_date = $event_row['registration_end']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_endT']);
-		$end_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$old_price_row,$end_date,$event_row['timezone_string']);
+		$end_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $end_date, $event_row['timezone_string']);
 		$cols_n_values = array(
 			'TTM_ID'=>0,
 			'TKT_name'=>$old_price_row['price_type'],
@@ -303,38 +303,38 @@ 
 			'TKT_min'=>0,
 			'TKT_max'=>-1,
 			'TKT_price'=>$final_ticket_price,
-			'TKT_sold'=> 0,//note: this will get calculated as we actually add registrations during the migration
+			'TKT_sold'=> 0, //note: this will get calculated as we actually add registrations during the migration
 			'TKT_qty'=> -1,
 			'TKT_uses'=> 1,
-			'TKT_taxable'=>false,//so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
+			'TKT_taxable'=>false, //so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
 			'TKT_is_default'=>false,
 			'TKT_order'=>$this->_get_ticket_count(),
-			'TKT_row'=>0,//doesn't matter because UI reset this on first save anyways
+			'TKT_row'=>0, //doesn't matter because UI reset this on first save anyways
 			'TKT_deleted'=>false,
 			'TKT_parent'=>0
 
 		);
 		$datatypes = array(
-			'%d',//TTM_ID
-			'%s',//TKT_name
-			'%s',//TKT_description
-			'%s',//TKT_start_date
-			'%s',//TKT_end_date
-			'%d',//TKT_min
-			'%d',//TKT_max
-			'%f',//TKT_price
-			'%d',//TKT_sold
-			'%d',//TKT_qty
-			'%d',//TKT_uses
-			'%d',//TKT_taxable
-			'%d',//TKT_is_default
-			'%d',//TKT_order
-			'%d',//TKT_row
-			'%d',//TKT_deleted
-			'%d',//TKT_parent
+			'%d', //TTM_ID
+			'%s', //TKT_name
+			'%s', //TKT_description
+			'%s', //TKT_start_date
+			'%s', //TKT_end_date
+			'%d', //TKT_min
+			'%d', //TKT_max
+			'%f', //TKT_price
+			'%d', //TKT_sold
+			'%d', //TKT_qty
+			'%d', //TKT_uses
+			'%d', //TKT_taxable
+			'%d', //TKT_is_default
+			'%d', //TKT_order
+			'%d', //TKT_row
+			'%d', //TKT_deleted
+			'%d', //TKT_parent
 		);
-		$success = $wpdb->insert($this->_new_ticket_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_ticket_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price_row, $this->_new_ticket_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -349,19 +349,19 @@ 
 	 * @param type $new_price_id
 	 * @return int
 	 */
-	private function _insert_ticket_price_relation($new_ticket_id,$new_price_id){
+	private function _insert_ticket_price_relation($new_ticket_id, $new_price_id) {
 		global $wpdb;
 		$cols_n_values = array(
 			'TKT_ID'=>$new_ticket_id,
 			'PRC_ID'=>$new_price_id,
 		);
 		$datatypes = array(
-			'%d',//TKT_ID
-			'%d',//PRC_ID
+			'%d', //TKT_ID
+			'%d', //PRC_ID
 		);
-		$success = $wpdb->insert($this->_new_ticket_price_table,$cols_n_values,$datatypes);
-		if ( ! $success){
-			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id,'price id'=>$new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
+		$success = $wpdb->insert($this->_new_ticket_price_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id, 'price id'=>$new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
 			return 0;
 		}
 		$new_id = $wpdb->insert_id;
@@ -375,19 +375,19 @@ 
 	 * @param type $new_price_id
 	 * @return int
 	 */
-	private function _insert_datetime_ticket_relation($new_datetime_id,$new_ticket_id){
+	private function _insert_datetime_ticket_relation($new_datetime_id, $new_ticket_id) {
 		global $wpdb;
 		$cols_n_values = array(
 			'TKT_ID'=>$new_ticket_id,
 			'DTT_ID'=>$new_datetime_id,
 		);
 		$datatypes = array(
-			'%d',//TKT_ID
-			'%d',//DTT_ID
+			'%d', //TKT_ID
+			'%d', //DTT_ID
 		);
-		$success = $wpdb->insert($this->_new_datetime_ticket_table,$cols_n_values,$datatypes);
-		if ( ! $success){
-			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id,'datetime id'=>$new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
+		$success = $wpdb->insert($this->_new_datetime_ticket_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id, 'datetime id'=>$new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
 			return 0;
 		}
 		$new_id = $wpdb->insert_id;
@@ -400,17 +400,17 @@ 
 	 * @param type $event_id
 	 * @return array
 	 */
-	private function _get_event_row($event_id){
+	private function _get_event_row($event_id) {
 		global $wpdb;
 		$old_event_table = $wpdb->prefix."events_detail";
-		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $old_event_table WHERE id=%d",$event_id),ARRAY_A);
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $old_event_table WHERE id=%d", $event_id), ARRAY_A);
 	}
 	/**
 	 * Gets a higher ticket count than last time it was called (and is persisted between HTTP requests).
 	 * Yes we COULD run a query joining events->datetimes->ticket_datetimes->tickets, but this should work fine too
 	 * @return int
 	 */
-	private function _get_ticket_count(){
+	private function _get_ticket_count() {
 		return $this->_ticket_count++;
 	}
 
@@ -419,10 +419,10 @@ 
 	 * @param int $old_event_id
 	 * @return array where values are datetime ids
 	 */
-	private function _get_datetime_ids_for_old_event_id($old_event_id){
+	private function _get_datetime_ids_for_old_event_id($old_event_id) {
 		global $wpdb;
 		$new_cpt_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_id, $wpdb->posts);
-		$datetime_ids = $wpdb->get_col($wpdb->prepare("SELECT DTT_ID FROM {$wpdb->prefix}esp_datetime WHERE EVT_ID=%d",$new_cpt_id));
+		$datetime_ids = $wpdb->get_col($wpdb->prepare("SELECT DTT_ID FROM {$wpdb->prefix}esp_datetime WHERE EVT_ID=%d", $new_cpt_id));
 		return $datetime_ids;
 	}
 }

Braces +3 added lines, -3 removed lines

@@ -125,7 +125,7 @@ 
 		if(floatval($old_row['surcharge']) >= 0.01){
 			$surcharge_price_id = $this->_insert_new_surcharge_price($old_row);
 			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id,$surcharge_price_id));
-		}else{
+		} else{
 			$surcharge_price_id = 0;
 			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id));
 		}
@@ -241,7 +241,7 @@ 
 
 		if($old_price['surcharge_type'] == 'flat_rate'){
 			$price_type = self::price_type_flat_surcharge;
-		}else{
+		} else{
 			$price_type = self::price_type_percent_surcharge;
 		}
 		global $wpdb;
@@ -287,7 +287,7 @@ 
 		$event_row = $this->_get_event_row($old_price_row['event_id']);
 		if($old_price_row['surcharge_type'] == 'flat_rate'){
 			$final_ticket_price = floatval($old_price_row['event_cost']) + floatval($old_price_row['surcharge']);
-		}else{//percent surcharge
+		} else{//percent surcharge
 			$final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge'])/100);
 		}
 		$start_date = $event_row['registration_start']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_startT']);

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

Doc Comments +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 	 * being address info, and 0 being neither)
 	 * @global type $wpdb
 	 * @param type $new_question_group_id
-	 * @return boolean
+	 * @return integer
 	 */
 	private function _is_system_question_group($new_question_group_id){
 		global $wpdb;

Indentation -2 removed lines

@@ -12,8 +12,6 @@
   KEY `group_id` (`group_id`),
   KEY `question_id` (`question_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8$$
-
-
  * 4.1 question group question model's tables and fields:
  $this->_tables = array(
 			'Question_Group_Question'=>new EE_Primary_Table('esp_question_group_question','QGQ_ID')

Spacing +25 added lines, -25 removed lines

@@ -27,20 +27,20 @@ 
 		);
  * 
  */
-class EE_DMS_4_1_0_question_group_question extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_question_group_question 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 $question_group_question){
+		foreach ($rows as $question_group_question) {
 			$this->_insert_new_question_group_question($question_group_question);
 			$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;
@@ -64,39 +64,39 @@ 
 	 * @param array $old_question_group_question
 	 * @return int
 	 */
-	private function _insert_new_question_group_question($old_question_group_question){
+	private function _insert_new_question_group_question($old_question_group_question) {
 		global $wpdb;
 		$new_question_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_question", $old_question_group_question['question_id'], $wpdb->prefix."esp_question");
 		$new_question_group_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_qst_group", $old_question_group_question['group_id'], $wpdb->prefix."esp_question_group");
-		if( ! $new_question_id){
-			$this->add_error(sprintf(__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"),$old_question_group_question['question_id']));
+		if ( ! $new_question_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"), $old_question_group_question['question_id']));
 			return 0;
 		}
-		if( ! $new_question_group_id){
-			$this->add_error(sprintf(__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"),$old_question_group_question['group_id']));
+		if ( ! $new_question_group_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"), $old_question_group_question['group_id']));
 			return 0;
 		}
 		//if it's a system question, it needs to be in the right system group. otherwise no dice!
-		if(
-				($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id) )
+		if (
+				($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id))
 				||
 				! $this->_is_system_question_for_question_group($new_question_id)
-			){
+			) {
 			$cols_n_values = array(
 				'QSG_ID'=>$new_question_group_id,
 				'QST_ID'=>$new_question_id
 			);
 			$datatypes = array(
-				'%d',//QSG_ID
-				'%d',//QST_ID
+				'%d', //QSG_ID
+				'%d', //QST_ID
 			);
-			$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_question_group_question, $this->_new_table, $cols_n_values, $datatypes));
 				return 0;
 			}
 			return $wpdb->insert_id;
-		}else{
+		} else {
 			return false;
 		}
 		
@@ -109,14 +109,14 @@ 
 	 * @param type $new_question_id
 	 * @return int
 	 */
-	private function _is_system_question_for_question_group($new_question_id){
+	private function _is_system_question_for_question_group($new_question_id) {
 		global $wpdb;
-		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM ".$wpdb->prefix."esp_question WHERE QST_ID=%d",$new_question_id));
-		if(in_array($system_id, array('fname','lname','email'))){
+		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM ".$wpdb->prefix."esp_question WHERE QST_ID=%d", $new_question_id));
+		if (in_array($system_id, array('fname', 'lname', 'email'))) {
 			return 1;
-		}elseif($system_id!='' && $system_id){
+		}elseif ($system_id != '' && $system_id) {
 			return 2;
-		}else{
+		} else {
 			return 0;
 		}
 	}
@@ -128,9 +128,9 @@ 
 	 * @param type $new_question_group_id
 	 * @return boolean
 	 */
-	private function _is_system_question_group($new_question_group_id){
+	private function _is_system_question_group($new_question_group_id) {
 		global $wpdb;
-		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM ".$wpdb->prefix."esp_question_group WHERE QSG_ID=%d",$new_question_group_id));
+		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM ".$wpdb->prefix."esp_question_group WHERE QSG_ID=%d", $new_question_group_id));
 		return intval($system_id);
 	}
 

Braces +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
 				return 0;
 			}
 			return $wpdb->insert_id;
-		}else{
+		} else{
 			return false;
 		}
 		
@@ -114,9 +114,9 @@ 
 		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM ".$wpdb->prefix."esp_question WHERE QST_ID=%d",$new_question_id));
 		if(in_array($system_id, array('fname','lname','email'))){
 			return 1;
-		}elseif($system_id!='' && $system_id){
+		} elseif($system_id!='' && $system_id){
 			return 2;
-		}else{
+		} else{
 			return 0;
 		}
 	}

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

Doc Comments +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
 
 	/**
 	 * Inserts into the venue_meta table
-	 * @param type $cpt_id
+	 * @param integer $cpt_id
 	 * @param type $old_venue
 	 * @return int
 	 */

Braces +2 added lines, -2 removed lines

@@ -206,7 +206,7 @@ 
 		try{
 			$country = $this->get_migration_script()->get_or_create_country(stripslashes($old_venue['country']));
 			$country_iso = $country['CNT_ISO'];
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"),$e->getMessage(),$this->_json_encode($old_venue)));
 			$country_iso = null;
 		}
@@ -214,7 +214,7 @@ 
 		try{
 			$state = $this->get_migration_script()->get_or_create_state(stripslashes($old_venue['state']),isset($country['CNT_name']) ? $country['CNT_name'] : strip_tags($old_venue['country']));
 			$state_id = $state['STA_ID'];
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"),$e->getMessage(),$this->_json_encode($old_venue)));
 			$state_id = 0;
 		}

Spacing +79 added lines, -79 removed lines

@@ -61,44 +61,44 @@ 
 //			));
  *
  */
-class EE_DMS_4_1_0_venues extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_venues extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_new_table;
 	private $_new_meta_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 $old_venue){
-		if ( ! $new_id = $this->_insert_into_posts($old_venue)){
+	foreach ($rows as $old_venue) {
+		if ( ! $new_id = $this->_insert_into_posts($old_venue)) {
 			$items_actually_migrated++;
 			continue;
 		}
 		$this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_table, $new_id);
-		if( ! $new_meta_id = $this->_insert_into_meta_table($new_id,$old_venue)){
+		if ( ! $new_meta_id = $this->_insert_into_meta_table($new_id, $old_venue)) {
 			$items_actually_migrated++;
 			continue;
 		}
 		$this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_meta_table, $new_meta_id);
 		//lastly, save the 'contact' as post meta, because it doesn't exist anywhere else but someone may still want it
 		$venue_meta = maybe_unserialize($old_venue['meta']);
-		if(isset($venue_meta['contact']) && $venue_meta['contact']){
-			add_post_meta($new_id,'contact',$venue_meta['contact']);
+		if (isset($venue_meta['contact']) && $venue_meta['contact']) {
+			add_post_meta($new_id, 'contact', $venue_meta['contact']);
 		}
 		//is there an image on this venue?
 		$guid = isset($venue_meta['image']) && $venue_meta['image'] ? $venue_meta['image'] : NULL;
-		if($guid){
-			$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid,$new_id,$this);
+		if ($guid) {
+			$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this);
 		}
 		$items_actually_migrated++;
-		if($guid){
+		if ($guid) {
 			//if there was an image, we may have had to download it etc and it may have taken
 			//longer, then let's not bother migrating anymore on this step
 			break;
 		}
 	}
-	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;
@@ -122,42 +122,42 @@ 
 	 * @param array $old_venue keys are cols, values are col values
 	 * @return int
 	 */
-	private function _insert_into_posts($old_venue){
+	private function _insert_into_posts($old_venue) {
 		global $wpdb;
 		$meta = maybe_unserialize($old_venue['meta']);
-		$slug = $this->_find_unique_slug( $old_venue[ 'name' ], $old_venue[ 'identifier' ] );
+		$slug = $this->_find_unique_slug($old_venue['name'], $old_venue['identifier']);
 		$insertion_array = array(
-					'post_title'=>stripslashes($old_venue['name']),//VNU_name
-					'post_content'=>isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '',//VNU_desc
-					'post_name'=> $slug,//VNU_identifier
-					'post_date'=>current_time('mysql'),//VNU_created
-					'post_date_gmt'=>  current_time('mysql',true),
-					'post_excerpt'=>'',//wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitraty only 50 characters
-					'post_modified'=>current_time('mysql'),//VNU_modified
-					'post_modified_gmt'=>current_time('mysql',true),
-					'post_author'=>$old_venue['wp_user'],//VNU_wp_user
-					'post_parent'=>0,//parent
-					'menu_order'=>0,//VNU_order
+					'post_title'=>stripslashes($old_venue['name']), //VNU_name
+					'post_content'=>isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '', //VNU_desc
+					'post_name'=> $slug, //VNU_identifier
+					'post_date'=>current_time('mysql'), //VNU_created
+					'post_date_gmt'=>  current_time('mysql', true),
+					'post_excerpt'=>'', //wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitraty only 50 characters
+					'post_modified'=>current_time('mysql'), //VNU_modified
+					'post_modified_gmt'=>current_time('mysql', true),
+					'post_author'=>$old_venue['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($this->_new_table,
 				$insertion_array,
 				$datatypes_array);
-		if( ! $success ){
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_table, $insertion_array, $datatypes_array));
 			return 0;
 		}
@@ -171,11 +171,11 @@ 
 	 * @param string $post_name
 	 * @return string
 	 */
-	private function _find_unique_slug($post_name, $old_identifier = '' ){
+	private function _find_unique_slug($post_name, $old_identifier = '') {
 		$count = 0;
-		$original_name = $post_name ? sanitize_title( $post_name ) : $old_identifier;
+		$original_name = $post_name ? sanitize_title($post_name) : $old_identifier;
 		$event_slug = $original_name;
-		while( $this->_other_post_exists_with_that_slug($event_slug) && $count<50){
+		while ($this->_other_post_exists_with_that_slug($event_slug) && $count < 50) {
 			$event_slug = sanitize_title($original_name."-".++$count);
 		}
 		return $event_slug;
@@ -187,11 +187,11 @@ 
 	 * @param type $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);
 	}
 
 	/**
@@ -200,60 +200,60 @@ 
 	 * @param type $old_venue
 	 * @return int
 	 */
-	private function _insert_into_meta_table($cpt_id,$old_venue){
+	private function _insert_into_meta_table($cpt_id, $old_venue) {
 		global $wpdb;
 		//get a country with the same name, or insert one
-		try{
+		try {
 			$country = $this->get_migration_script()->get_or_create_country(stripslashes($old_venue['country']));
 			$country_iso = $country['CNT_ISO'];
-		}catch(EE_Error $e){
-			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"),$e->getMessage(),$this->_json_encode($old_venue)));
+		} catch (EE_Error $e) {
+			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"), $e->getMessage(), $this->_json_encode($old_venue)));
 			$country_iso = null;
 		}
 		//get a state with the same name, if possible
-		try{
-			$state = $this->get_migration_script()->get_or_create_state(stripslashes($old_venue['state']),isset($country['CNT_name']) ? $country['CNT_name'] : strip_tags($old_venue['country']));
+		try {
+			$state = $this->get_migration_script()->get_or_create_state(stripslashes($old_venue['state']), isset($country['CNT_name']) ? $country['CNT_name'] : strip_tags($old_venue['country']));
 			$state_id = $state['STA_ID'];
-		}catch(EE_Error $e){
-			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"),$e->getMessage(),$this->_json_encode($old_venue)));
+		} catch (EE_Error $e) {
+			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"), $e->getMessage(), $this->_json_encode($old_venue)));
 			$state_id = 0;
 		}
 		$meta = maybe_unserialize($old_venue['meta']);
 		//now insert into meta table
 		$insertion_array = array(
-			'VNU_ID'=>$cpt_id,//VNU_ID_fk
-			'VNU_address'=>stripslashes($old_venue['address']),//VNU_address
-			'VNU_address2'=>stripslashes($old_venue['address2']),//VNU_address2
-			'VNU_city'=>stripslashes($old_venue['city']),//VNU_city
-			'STA_ID'=>$state_id,//STA_ID
-			'CNT_ISO'=>$country_iso,//CNT_ISO
-			'VNU_zip'=>stripslashes($old_venue['zip']),//VNU_zip
-			'VNU_phone'=>isset($meta['phone']) ? stripslashes($meta['phone']) : '',//VNU_phone
-			'VNU_capacity'=>-1,//VNU_capacity
-			'VNU_url'=>isset($meta['website']) ? stripslashes($meta['website']) : '',//VNU_url
-			'VNU_virtual_phone'=>'',//VNU_virtual_phone
-			'VNU_virtual_url'=>'',//VNU_virtual_url
-			'VNU_google_map_link'=>'',//VNU_google_map_link
+			'VNU_ID'=>$cpt_id, //VNU_ID_fk
+			'VNU_address'=>stripslashes($old_venue['address']), //VNU_address
+			'VNU_address2'=>stripslashes($old_venue['address2']), //VNU_address2
+			'VNU_city'=>stripslashes($old_venue['city']), //VNU_city
+			'STA_ID'=>$state_id, //STA_ID
+			'CNT_ISO'=>$country_iso, //CNT_ISO
+			'VNU_zip'=>stripslashes($old_venue['zip']), //VNU_zip
+			'VNU_phone'=>isset($meta['phone']) ? stripslashes($meta['phone']) : '', //VNU_phone
+			'VNU_capacity'=>-1, //VNU_capacity
+			'VNU_url'=>isset($meta['website']) ? stripslashes($meta['website']) : '', //VNU_url
+			'VNU_virtual_phone'=>'', //VNU_virtual_phone
+			'VNU_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($this->_new_meta_table,$insertion_array,$datatypes);
-		if( ! $success ){
+		$success = $wpdb->insert($this->_new_meta_table, $insertion_array, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_meta_table, $insertion_array, $datatypes));
 			return 0;
 		}

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_payment_method_currencies.dmsstage.php

Doc Comments +3 added lines, -2 removed lines

@@ -128,6 +128,9 @@ 
 		return $items_actually_migrated;
 	}
 
+	/**
+	 * @param integer $num_items_to_migrate
+	 */
 	private function _gather_relations_to_add($num_items_to_migrate) {
 		$relations_to_add_this_step = array();
 		$migrate_up_to_count = $this->count_records_migrated() + $num_items_to_migrate;
@@ -158,8 +161,6 @@ 
 
 	/**
 	 * Adds teh relation between the payment method and the currencies it can be used for
-	 * @param int $id
-	 * @param string $gateway_slug
 	 */
 	private function _add_currency_relations($pm_id,$currency_code){
 		global $wpdb;

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -13,7 +13,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_DMS_4_6_0_payment_method_currencies extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_6_0_payment_method_currencies extends EE_Data_Migration_Script_Stage {
 	protected $_currency_table_name;
 	protected $_currency_payment_method_table_name;
 	protected $_payment_method_table_name;
@@ -89,7 +89,7 @@ 
 	);
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'Payment Method Currencies', 'event_espresso' );
+		$this->_pretty_name = __('Payment Method Currencies', 'event_espresso');
 		$this->_payment_method_table_name = $wpdb->prefix.'esp_payment_method';
 		$this->_currency_payment_method_table_name = $wpdb->prefix.'esp_currency_payment_method';
 		$this->_currency_table_name = $wpdb->prefix.'esp_currency';
@@ -98,8 +98,8 @@ 
 
 	protected function _count_records_to_migrate() {
 		$count = 0;
-		foreach($this->_gateway_currencies as $currencies){
-			if( $currencies == 'all'){
+		foreach ($this->_gateway_currencies as $currencies) {
+			if ($currencies == 'all') {
 				$currencies = $this->_get_all_currencies();
 			}
 			$count += count($currencies);
@@ -109,20 +109,20 @@ 
 
 
 
-	protected function _migration_step( $num_items_to_migrate = 50 ) {
+	protected function _migration_step($num_items_to_migrate = 50) {
 		$items_actually_migrated = 0;
 		$relations_to_add_this_step = $this->_gather_relations_to_add($num_items_to_migrate);
-		foreach($relations_to_add_this_step as $pm_slug => $currencies){
+		foreach ($relations_to_add_this_step as $pm_slug => $currencies) {
 
-			$id = $this->get_migration_script()->get_mapping_new_pk( 'EE_Gateway_Config', $pm_slug, $this->_payment_method_table_name );
-			foreach( $currencies as $currency ){
-				if( $id ){
-					$this->_add_currency_relations( $id, $currency );
+			$id = $this->get_migration_script()->get_mapping_new_pk('EE_Gateway_Config', $pm_slug, $this->_payment_method_table_name);
+			foreach ($currencies as $currency) {
+				if ($id) {
+					$this->_add_currency_relations($id, $currency);
 				}
 				$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;
@@ -132,14 +132,14 @@ 
 		$relations_to_add_this_step = array();
 		$migrate_up_to_count = $this->count_records_migrated() + $num_items_to_migrate;
 		$iterator = 0;
-		foreach($this->_gateway_currencies as $pm_slug => $currencies){
-			if( $currencies == 'all' ){
+		foreach ($this->_gateway_currencies as $pm_slug => $currencies) {
+			if ($currencies == 'all') {
 				$currencies = $this->_get_all_currencies();
 			}
-			foreach($currencies as $currency_code){
-				if( $this->count_records_migrated() <= $iterator &&
-						$iterator < $migrate_up_to_count ){
-					$relations_to_add_this_step[ $pm_slug ] [] = $currency_code;
+			foreach ($currencies as $currency_code) {
+				if ($this->count_records_migrated() <= $iterator &&
+						$iterator < $migrate_up_to_count) {
+					$relations_to_add_this_step[$pm_slug] [] = $currency_code;
 				}
 				$iterator++;
 			}
@@ -150,7 +150,7 @@ 
 	 * Gets all the currency codes in the database
 	 * @return array
 	 */
-	private function _get_all_currencies(){
+	private function _get_all_currencies() {
 		global $wpdb;
 		$currencies = $wpdb->get_col("SELECT CUR_code FROM {$this->_currency_table_name}");
 		return $currencies;
@@ -161,7 +161,7 @@ 
 	 * @param int $id
 	 * @param string $gateway_slug
 	 */
-	private function _add_currency_relations($pm_id,$currency_code){
+	private function _add_currency_relations($pm_id, $currency_code) {
 		global $wpdb;
 		$cur_pm_relation = array(
 					'CUR_code'=>$currency_code,
@@ -170,11 +170,11 @@ 
 		$success = $wpdb->insert($this->_currency_payment_method_table_name,
 				$cur_pm_relation,
 				array(
-					'%s',//CUR_code
-					'%d',//PMD_ID
+					'%s', //CUR_code
+					'%d', //PMD_ID
 				));
-		if( ! $success ){
-			$this->add_error( sprintf( __( 'Could not add currency relation %s because %s', "event_espresso" ), json_encode( $cur_pm_relation ), $wpdb->last_error ) );
+		if ( ! $success) {
+			$this->add_error(sprintf(__('Could not add currency relation %s because %s', "event_espresso"), json_encode($cur_pm_relation), $wpdb->last_error));
 		}
 	}
 }

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_transactions.dmsstage.php

Doc Comments -1 removed lines

@@ -49,7 +49,6 @@
 	/**
 	 *
 	 * @global type $wpdb
-	 * @param int $id
 	 * @return string
 	 */
 	protected function _get_payment_method_id_by_gateway_name( $gateway_name ){

Spacing +20 added lines, -20 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,38 +12,38 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_DMS_4_6_0_transactions extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_6_0_transactions extends EE_Data_Migration_Script_Stage_Table {
 	protected $_transaction_table;
 	protected $_payment_method_table;
-	function __construct(){
+	function __construct() {
 		global $wpdb;
-		$this->_old_table = $wpdb->prefix . 'esp_extra_meta';
-		$this->_transaction_table = $wpdb->prefix . 'esp_transaction';
-		$this->_payment_method_table = $wpdb->prefix . 'esp_payment_method';
+		$this->_old_table = $wpdb->prefix.'esp_extra_meta';
+		$this->_transaction_table = $wpdb->prefix.'esp_transaction';
+		$this->_payment_method_table = $wpdb->prefix.'esp_payment_method';
 		$this->_pretty_name = __('Transaction Payment Method Relations', 'event_espresso');
 		$this->_extra_where_sql = "WHERE EXM_key = 'gateway' AND EXM_type = 'Transaction'";
 		parent::__construct();
 	}
-	protected function _migrate_old_row( $extra_meta_row ) {
+	protected function _migrate_old_row($extra_meta_row) {
 		global $wpdb;
 		//get the payment method's ID
-		$PMD_ID = $this->_get_payment_method_id_by_gateway_name( $extra_meta_row[ 'EXM_value' ] );
-		if( ! $PMD_ID ){
-			$this->add_error( sprintf( __( 'Could not find payment method with PMD_type = \'%1$s\' when migrating extra meta row %2$s', 'event_espresso' ), $extra_meta_row[ 'EXM_value' ], $this->_json_encode( $extra_meta_row ) ) );
+		$PMD_ID = $this->_get_payment_method_id_by_gateway_name($extra_meta_row['EXM_value']);
+		if ( ! $PMD_ID) {
+			$this->add_error(sprintf(__('Could not find payment method with PMD_type = \'%1$s\' when migrating extra meta row %2$s', 'event_espresso'), $extra_meta_row['EXM_value'], $this->_json_encode($extra_meta_row)));
 			return;
 		}
-		$new_values = array( 'PMD_ID' => $PMD_ID );
-		$wheres = array( 'TXN_ID' => $extra_meta_row[ 'OBJ_ID' ] );
-		$new_value_datatypes = array( '%d' );
-		$where_datatypes = array( '%d' );
-		$success = $wpdb->update( $this->_transaction_table,
+		$new_values = array('PMD_ID' => $PMD_ID);
+		$wheres = array('TXN_ID' => $extra_meta_row['OBJ_ID']);
+		$new_value_datatypes = array('%d');
+		$where_datatypes = array('%d');
+		$success = $wpdb->update($this->_transaction_table,
 				$new_values,
 				$wheres,
 				$new_value_datatypes,
 				$where_datatypes
 				);
-		if( ! $success ){
-			$this->add_error( sprintf( __( 'Couldnt set %1$s row in table %2$s where %3$s', 'event_espresso' ), $this->_json_encode( $new_values ), $this->_transaction_table, $this->_json_encode( $wheres ) ) );
+		if ( ! $success) {
+			$this->add_error(sprintf(__('Couldnt set %1$s row in table %2$s where %3$s', 'event_espresso'), $this->_json_encode($new_values), $this->_transaction_table, $this->_json_encode($wheres)));
 		}
 	}
 	/**
@@ -52,9 +52,9 @@ 
 	 * @param int $id
 	 * @return string
 	 */
-	protected function _get_payment_method_id_by_gateway_name( $gateway_name ){
+	protected function _get_payment_method_id_by_gateway_name($gateway_name) {
 		global $wpdb;
-		return $wpdb->get_var( $wpdb->prepare( "SELECT PMD_ID FROM " . $wpdb->prefix . "esp_payment_method WHERE PMD_type = %s", $gateway_name ) );
+		return $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM ".$wpdb->prefix."esp_payment_method WHERE PMD_type = %s", $gateway_name));
 	}
 
 

core/data_migration_scripts/EE_Data_Migration_Class_Base.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -234,7 +234,7 @@
 	 * @param array $old_row_as_array
 	 * @param string $new_table
 	 * @param array $new_row_as_array columns=>values like used in wpdb->insert
-	 * @param array $data_types numerically indexed
+	 * @param string[] $data_types numerically indexed
 	 * @return string
 	 */
 	protected function _create_error_message_for_db_insertion($old_table, $old_row_as_array, $new_table, $new_row_as_array, $data_types){

Indentation +3 added lines, -3 removed lines

@@ -264,9 +264,9 @@
 	/**
 	 * Same as json_encode, just avoids putting
 	 * serialized arrays into the http build query, as that would
-	* @param array $array_of_data
-	* @return string
-	*/
+	 * @param array $array_of_data
+	 * @return string
+	 */
 	protected function _json_encode($array_of_data){
 		//we'd rather NOT serialize the transaction details
 		$fields_to_include = array();

Spacing +46 added lines, -46 removed lines

@@ -17,7 +17,7 @@ 
 
 
 
-abstract class EE_Data_Migration_Class_Base{
+abstract class EE_Data_Migration_Class_Base {
 	/**
 	 * @var $records_to_migrate int count of all that have been migrated
 	 */
@@ -50,7 +50,7 @@ 
 	 * Just initializes the status of the migration
 	 * @throws EE_Error
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->set_status(EE_Data_Migration_Manager::status_continue);
 	}
 
@@ -61,9 +61,9 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function pretty_name(){
-		if($this->_pretty_name === null){
-			throw new EE_Error(sprintf(__("Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor", "event_espresso"),get_class($this)));
+	public function pretty_name() {
+		if ($this->_pretty_name === null) {
+			throw new EE_Error(sprintf(__("Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor", "event_espresso"), get_class($this)));
 		}
 		return $this->_pretty_name;
 	}
@@ -71,8 +71,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function count_records_to_migrate(){
-		if( $this->_records_to_migrate == null){
+	public function count_records_to_migrate() {
+		if ($this->_records_to_migrate == null) {
 			$this->_records_to_migrate = $this->_count_records_to_migrate();
 		}
 		return $this->_records_to_migrate;
@@ -92,9 +92,9 @@ 
 	 * @return string one of EE_Data_Migration_Manager::status_* constants
 	 * @throws EE_Error
 	 */
-	public function get_status(){
-		if($this->_status === null){
-			throw new EE_Error(sprintf(__("Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.", "event_espresso"),get_class($this)));
+	public function get_status() {
+		if ($this->_status === null) {
+			throw new EE_Error(sprintf(__("Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.", "event_espresso"), get_class($this)));
 		}
 		return $this->_status;
 	}
@@ -103,7 +103,7 @@ 
 	 * @param string $status
 	 * @return void
 	 */
-	protected function set_status($status){
+	protected function set_status($status) {
 		$this->_status = $status;
 	}
 	/**
@@ -115,11 +115,11 @@ 
 	 * Returns the last error that occurred. If none occurred, returns null
 	 * @return string
 	 */
-	public function get_last_error(){
+	public function get_last_error() {
 		$errors = $this->get_errors();
-		if($errors){
+		if ($errors) {
 			return end($errors);
-		}else{
+		} else {
 			return null;
 		}
 	}
@@ -128,26 +128,26 @@ 
 	 * @param string $error a string describing the error that will be useful for debugging. Consider including all the data that led to the error, and a stack trace etc.
 	 * @param boolean $force force the error to be added (because otherwise we have a limit). If forcing and errors are already at their limit, we will purposefully forget the first half
 	 */
-	public function add_error($error, $force = FALSE ){
-		if( ! defined( 'EE_DMS_ERROR_LIMIT' ) ){
+	public function add_error($error, $force = FALSE) {
+		if ( ! defined('EE_DMS_ERROR_LIMIT')) {
 			$limit = 50;
-		}else{
+		} else {
 			$limit = EE_DMS_ERROR_LIMIT;
 		}
 		//make sure errors is an array, see ticket #8261
-		if( is_string( $this->_errors ) ){
-			$this->_errors = array( $this->_errors );
+		if (is_string($this->_errors)) {
+			$this->_errors = array($this->_errors);
 		}
-		if(count($this->_errors) >= $limit ){
-			if( $force ){
+		if (count($this->_errors) >= $limit) {
+			if ($force) {
 				//get rid of the first half of the errors and any above the limit
-				$this->_errors = array_slice( $this->_errors, $limit / 2, $limit / 2 );
+				$this->_errors = array_slice($this->_errors, $limit / 2, $limit / 2);
 				$this->_errors[] = "Limit reached; removed first half of errors to save space";
 				$this->_errors[] = $error;
-			}else{
-				$this->_errors[ $limit ] = 'More, but limit reached...';
+			} else {
+				$this->_errors[$limit] = 'More, but limit reached...';
 			}
-		}else{
+		} else {
 			$this->_errors[] = $error;
 		}
 	}
@@ -156,57 +156,57 @@ 
 	 * Indicates there was a fatal error and the migration cannot possibly continue
 	 * @return boolean
 	 */
-	public function is_broken(){
+	public function is_broken() {
 		return $this->get_status() == EE_Data_Migration_Manager::status_fatal_error;
 	}
 	/**
 	 * @deprecated since 4.6.12
 	 */
-	public function is_borked(){
-		EE_Error::doing_it_wrong('is_borked', __( 'The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso' ), '4.6.12');
+	public function is_borked() {
+		EE_Error::doing_it_wrong('is_borked', __('The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso'), '4.6.12');
 		return $this->is_broken();
 	}
 	/**
 	 * Sets the status to as having a fatal error
 	 */
-	public function set_broken(){
+	public function set_broken() {
 		$this->_status = EE_Data_Migration_Manager::status_fatal_error;
 	}
 	/**
 	 *
 	 * @deprecated since 4.6.12
 	 */
-	public function set_borked(){
-		EE_Error::doing_it_wrong('is_borked', __( 'The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso' ), '4.6.12');
+	public function set_borked() {
+		EE_Error::doing_it_wrong('is_borked', __('The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso'), '4.6.12');
 		return $this->set_broken();
 	}
 	/**
 	 * Checks if this thing believes it is completed
 	 * @return boolean
 	 */
-	public function is_completed(){
+	public function is_completed() {
 		return $this->get_status() == EE_Data_Migration_Manager::status_completed;
 	}
 	/**
 	 * Checks if the current script has more to do or not (ie, if it's status is CONTINUE)
 	 * @return boolean
 	 */
-	public function has_more_to_do(){
+	public function has_more_to_do() {
 		return $this->get_status() == EE_Data_Migration_Manager::status_continue;
 	}
 	/**
 	 * Marks that we believe this migration thing is completed
 	 */
-	public function set_completed(){
+	public function set_completed() {
 		$this->_status = EE_Data_Migration_Manager::status_completed;
 	}
 
 	/**
 	 * Marks that we think this migration class can continue to migrate
 	 */
-	public function reattempt(){
+	public function reattempt() {
 		$this->_status = EE_Data_Migration_Manager::status_continue;
-		$this->add_error( __( 'Reattempt migration', 'event_espresso' ), TRUE );
+		$this->add_error(__('Reattempt migration', 'event_espresso'), TRUE);
 	}
 
 	/**
@@ -215,8 +215,8 @@ 
 	 * possible that this class is defined when it goes to sleep, but NOT available when it
 	 * awakes (eg, this class is part of an addon that is deactivated at some point).
 	 */
-	public function properties_as_array(){
-		$properties =  get_object_vars($this);
+	public function properties_as_array() {
+		$properties = get_object_vars($this);
 		$properties['class'] = get_class($this);
 		unset($properties['_migration_script']);
 		return $properties;
@@ -237,22 +237,22 @@ 
 	 * @param array $data_types numerically indexed
 	 * @return string
 	 */
-	protected function _create_error_message_for_db_insertion($old_table, $old_row_as_array, $new_table, $new_row_as_array, $data_types){
+	protected function _create_error_message_for_db_insertion($old_table, $old_row_as_array, $new_table, $new_row_as_array, $data_types) {
 		global $wpdb;
 		$old_columns_and_values_for_string = array();
-		foreach($old_row_as_array as $column => $value){
+		foreach ($old_row_as_array as $column => $value) {
 			$old_columns_and_values_for_string[] = "$column => $value";
 		}
 		$new_columns_and_values_for_string = array();
 		$count = 0;
-		foreach($new_row_as_array as $column => $value){
+		foreach ($new_row_as_array as $column => $value) {
 			$new_columns_and_values_for_string[] = " $column => $value (".$data_types[$count++].")";
 		}
 		return sprintf(
 			__('Received error "%6$s" inserting row %5$s %1$s %5$s into table %2$s.%5$s Data used was %5$s %3$s %5$s from table %4%s.', "event_espresso"),
-			implode(", ",$new_columns_and_values_for_string),
+			implode(", ", $new_columns_and_values_for_string),
 			$new_table,
-			implode(", ",$old_columns_and_values_for_string),
+			implode(", ", $old_columns_and_values_for_string),
 			$old_table,
 			'<br/>',
 			$wpdb->last_error
@@ -267,12 +267,12 @@ 
 	* @param array $array_of_data
 	* @return string
 	*/
-	protected function _json_encode($array_of_data){
+	protected function _json_encode($array_of_data) {
 		//we'd rather NOT serialize the transaction details
 		$fields_to_include = array();
-		foreach($array_of_data as $name => $value){
+		foreach ($array_of_data as $name => $value) {
 			$unserialized_data = @unserialize($value);
-			if($unserialized_data === FALSE){
+			if ($unserialized_data === FALSE) {
 				$fields_to_include[$name] = $value;
 			}
 		}

Braces +4 added lines, -4 removed lines

@@ -119,7 +119,7 @@ 
 		$errors = $this->get_errors();
 		if($errors){
 			return end($errors);
-		}else{
+		} else{
 			return null;
 		}
 	}
@@ -131,7 +131,7 @@ 
 	public function add_error($error, $force = FALSE ){
 		if( ! defined( 'EE_DMS_ERROR_LIMIT' ) ){
 			$limit = 50;
-		}else{
+		} else{
 			$limit = EE_DMS_ERROR_LIMIT;
 		}
 		//make sure errors is an array, see ticket #8261
@@ -144,10 +144,10 @@ 
 				$this->_errors = array_slice( $this->_errors, $limit / 2, $limit / 2 );
 				$this->_errors[] = "Limit reached; removed first half of errors to save space";
 				$this->_errors[] = $error;
-			}else{
+			} else{
 				$this->_errors[ $limit ] = 'More, but limit reached...';
 			}
-		}else{
+		} else{
 			$this->_errors[] = $error;
 		}
 	}

core/data_migration_scripts/EE_DMS_Core_4_1_0.dms.php

Doc Comments +2 added lines, -3 removed lines

@@ -1434,7 +1434,6 @@ 
 	/**
 	 * Makes sure the 3.1's image url is converted to an image attachment post to the 4.1 CPT event
 	 * and sets it as the featured image on the CPT event
-	 * @param type $old_event
 	 * @param type $new_cpt_id
 	 * @param  EE_Data_Migration_Script_Stage $migration_stage the stage which called this, where errors should be added
 	 * @return boolean whether or not we had to do the big job of creating an image attachment
@@ -1482,7 +1481,7 @@ 
 	/**
 	 * Creates an image attachment post for the GUID. If the GUID points to a remote image,
 	 * we download it to our uploads directory so that it can be properly processed (eg, creates different sizes of thumbnails)
-	 * @param type $guid
+	 * @param string $guid
 	 * @param EE_Data_Migration_Script_Stage $migration_stage
 	 * @return int
 	 */
@@ -1558,7 +1557,7 @@ 
 	/**
 	 * Returns a mysql-formatted DATETIME in UTC time, given a $DATETIME_string
 	 * (and optionally a timezone; if none is given, the wp DEFAULT is used)
-	 * @param EE_Data_Migration_Script_base $stage
+	 * @param EE_Data_Migration_Script_Stage $stage
 	 * @param array $row_of_data, the row from the DB (as an array) we're trying to find the UTC time for
 	 * @param string $DATETIME_string
 	 * @param string $timezone

Indentation +13 added lines, -13 removed lines

@@ -1607,19 +1607,19 @@
 	private function timezone_convert_to_string_from_offset($offset){
 		//shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did NOT work as expected - its not reliable
 		$offset *= 3600; // convert hour offset to seconds
-        $abbrarray = timezone_abbreviations_list();
-        foreach ($abbrarray as $abbr){
-                foreach ($abbr as $city)
-                {
-                        if ($city['offset'] == $offset)
-                        {
-
-                                return $city['timezone_id'];
-                        }
-                }
-        }
-
-        return FALSE;
+		$abbrarray = timezone_abbreviations_list();
+		foreach ($abbrarray as $abbr){
+				foreach ($abbr as $city)
+				{
+						if ($city['offset'] == $offset)
+						{
+
+								return $city['timezone_id'];
+						}
+				}
+		}
+
+		return FALSE;
 	}
 
 	public function migration_page_hooks(){

Braces +10 added lines, -10 removed lines

@@ -72,7 +72,7 @@ 
 		$results = $wpdb->get_results("SHOW TABLES LIKE '".$wpdb->prefix."events_attendee_checkin"."'");
 		if($results){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -81,12 +81,12 @@ 
 		if($version_string < '4.0.0' && $version_string > '3.1.26' ){
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		} elseif( ! $version_string ){
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.1
 			//because since 4.1 we're
 			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+		} else{
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -1088,7 +1088,7 @@ 
 		try{
 			$country = $this->get_or_create_country($country_name);
 			$country_iso = $country['CNT_ISO'];
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			$country_iso = $this->get_default_country_iso();
 		}
 		global $wpdb;
@@ -1132,7 +1132,7 @@ 
 		if( ! $matches || count($matches)<3){
 			$hour = '00';
 			$minutes = '00';
-		}else{
+		} else{
 			$hour = intval($matches[1]);
 			$minutes = $matches[2];
 		}
@@ -1408,7 +1408,7 @@ 
 		//EE team can read the related discussion: https://app.asana.com/0/2400967562914/9418495544455
 		if($this_thing_required_pre_approval){
 				return 'RNA';
-		}else{
+		} else{
 				$mapping = $default_reg_stati_conversions=array(
 			'Completed'=>'RAP',
 			''=>'RPP',
@@ -1453,7 +1453,7 @@ 
 			//double-check we actually have an attachment post
 			if( $attachment_post_id){
 				update_post_meta($new_cpt_id,'_thumbnail_id',$attachment_post_id);
-			}else{
+			} else{
 				$migration_stage->add_error(sprintf(__("Could not update event image %s for CPT with ID %d, but attachments post ID is %d", "event_espresso"),$guid,$new_cpt_id,$attachment_post_id));
 			}
 		}
@@ -1474,7 +1474,7 @@ 
 		$head_response = wp_remote_head($original_guid);
 		if( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK'){
 			return $original_guid;
-		}else{
+		} else{
 			return $guid_in_old_event;
 		}
 	}
@@ -1510,7 +1510,7 @@ 
 			fwrite($savefile, $contents);
 			fclose($savefile);
 			$guid = str_replace($wp_upload_dir['path'],$wp_upload_dir['url'],$local_filepath);
-		}else{
+		} else{
 			$local_filepath = str_replace($wp_upload_dir['url'],$wp_upload_dir['path'],$guid);
 		}
 
@@ -1576,7 +1576,7 @@ 
 		try{
 			$date_obj = new DateTime( $DATETIME_string, new DateTimeZone( $timezone ) );
 			$date_obj->setTimezone(new DateTimeZone('UTC'));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$stage->add_error(sprintf(__("Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.", "event_espresso"),$DATETIME_string,$timezone));
 			$date_obj = new DateTime();
 		}

Spacing +204 added lines, -204 removed lines

@@ -8,15 +8,15 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_1_0_stages/*');
 $class_to_filepath = array();
-if ( ! empty( $stages ) ) {
-	foreach($stages as $filepath){
+if ( ! empty($stages)) {
+	foreach ($stages as $filepath) {
 		$matches = array();
-		preg_match('~4_1_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+		preg_match('~4_1_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 		$class_to_filepath[$matches[1]] = $filepath;
 	}
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_1_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_1_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
 /**
@@ -34,7 +34,7 @@ 
  * --a function named update_espresso_config() which saves the EE_Config object to the database
  * --...and all its subclasses... really, you're best off copying the whole thin gwhen 4.1 is released into this file and wrapping its declaration in if( ! class_exists()){...}
  */
-class EE_DMS_Core_4_1_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_1_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -67,26 +67,26 @@ 
 	 * @global type $wpdb
 	 * @return boolean
 	 */
-	private function _checkin_table_exists(){
+	private function _checkin_table_exists() {
 		global $wpdb;
 		$results = $wpdb->get_results("SHOW TABLES LIKE '".$wpdb->prefix."events_attendee_checkin"."'");
-		if($results){
+		if ($results) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if($version_string < '4.0.0' && $version_string > '3.1.26' ){
+		if ($version_string < '4.0.0' && $version_string > '3.1.26') {
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.1
 			//because since 4.1 we're
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -96,15 +96,15 @@ 
 	}
 	public function schema_changes_before_migration() {
 		//relies on 4.1's EEH_Activation::create_table
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
 
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -144,7 +144,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -165,7 +165,7 @@ 
 
 
 
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -182,41 +182,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT UNSIGNED NOT NULL,
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID INT(11) DEFAULT NULL,
 				EXM_type VARCHAR(45) DEFAULT NULL,
 				EXM_key VARCHAR(45) DEFAULT NULL,
 				EXM_value TEXT,
 				PRIMARY KEY  (EXM_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
 				TXN_ID INT(11) DEFAULT NULL,
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -232,7 +232,7 @@ 
 				OBJ_ID INT(11) DEFAULT NULL,
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_message_template';
 		$sql = "MTP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -259,7 +259,7 @@ 
 					PRIMARY KEY  (GRP_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_is_new_in_this_version( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -367,8 +367,8 @@ 
 
 
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -380,12 +380,12 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -396,27 +396,27 @@ 
 					QSG_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -449,8 +449,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT(10) UNSIGNED NOT NULL,
 					DTT_ID INT(10) UNSIGNED NOT NULL,
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -557,12 +557,12 @@ 
 
 		global $wpdb;
 		$state_table = $wpdb->prefix."esp_state";
-		if ( EEH_Activation::table_exists( $state_table ) ) {
+		if (EEH_Activation::table_exists($state_table)) {
 
-			$SQL = "SELECT COUNT('STA_ID') FROM " . $state_table;
+			$SQL = "SELECT COUNT('STA_ID') FROM ".$state_table;
 			$states = $wpdb->get_var($SQL);
-			if ( ! $states ) {
-				$SQL = "INSERT INTO " . $state_table . "
+			if ( ! $states) {
+				$SQL = "INSERT INTO ".$state_table."
 				(STA_ID, CNT_ISO, STA_abbrev, STA_name, STA_active) VALUES
 				(1, 'US', 'AK', 'Alaska', 1),
 				(2, 'US', 'AL', 'Alabama', 1),
@@ -649,12 +649,12 @@ 
 
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
-		if ( EEH_Activation::table_exists( $country_table ) ) {
+		if (EEH_Activation::table_exists($country_table)) {
 
-			$SQL = "SELECT COUNT('CNT_ISO') FROM " . $country_table;
+			$SQL = "SELECT COUNT('CNT_ISO') FROM ".$country_table;
 			$countries = $wpdb->get_var($SQL);
-			if ( ! $countries ) {
-				$SQL = "INSERT INTO " . $country_table . "
+			if ( ! $countries) {
+				$SQL = "INSERT INTO ".$country_table."
 				(CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active) VALUES
 				('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
 				('AE', 'ARE', 0, 'United Arab Emirates', 'AED', 'Dirham', 'Dirhams', 'د.إ', 1, 2, '+971', 0, 0),
@@ -901,20 +901,20 @@ 
 		global $wpdb;
 		$price_type_table = $wpdb->prefix."esp_price_type";
 
-		if ( EEH_Activation::table_exists( $price_type_table ) ) {
+		if (EEH_Activation::table_exists($price_type_table)) {
 
-			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
-			$price_types_exist = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table;
+			$price_types_exist = $wpdb->get_var($SQL);
 
-			if ( ! $price_types_exist ) {
+			if ( ! $price_types_exist) {
 				$SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_deleted ) VALUES
-							(1, '" . __('Base Price', 'event_espresso') . "', 1,  0, 0, 0),
-							(2, '" . __('Percent Discount', 'event_espresso') . "', 2,  1, 20, 0),
-							(3, '" . __('Fixed Discount', 'event_espresso') . "', 2,  0, 30, 0),
-							(4, '" . __('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, 0),
-							(5, '" . __('Fixed Surcharge', 'event_espresso') . "', 3,  0, 50, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL );
-				$wpdb->query( $SQL );
+							(1, '".__('Base Price', 'event_espresso')."', 1,  0, 0, 0),
+							(2, '" . __('Percent Discount', 'event_espresso')."', 2,  1, 20, 0),
+							(3, '" . __('Fixed Discount', 'event_espresso')."', 2,  0, 30, 0),
+							(4, '" . __('Percent Surcharge', 'event_espresso')."', 3,  1, 40, 0),
+							(5, '" . __('Fixed Surcharge', 'event_espresso')."', 3,  0, 50, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL);
+				$wpdb->query($SQL);
 			}
 		}
 	}
@@ -934,16 +934,16 @@ 
 		global $wpdb;
 		$price_table = $wpdb->prefix."esp_price";
 
-		if ( EEH_Activation::table_exists(  $price_table ) ) {
+		if (EEH_Activation::table_exists($price_table)) {
 
-			$SQL = 'SELECT COUNT(PRC_ID) FROM ' .$price_table;
-			$prices_exist = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRC_ID) FROM '.$price_table;
+			$prices_exist = $wpdb->get_var($SQL);
 
-			if ( ! $prices_exist ) {
+			if ( ! $prices_exist) {
 				$SQL = "INSERT INTO $price_table
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_order, PRC_deleted, PRC_parent ) VALUES
 							(1, 1, '0.00', 'Free Admission', '', 1, NULL, 0, 0, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
@@ -960,34 +960,34 @@ 
 
 		global $wpdb;
 		$ticket_table = $wpdb->prefix."esp_ticket";
-		if ( EEH_Activation::table_exists( $ticket_table ) ) {
+		if (EEH_Activation::table_exists($ticket_table)) {
 
-			$SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+			$SQL = 'SELECT COUNT(TKT_ID) FROM '.$ticket_table;
 			$tickets_exist = $wpdb->get_var($SQL);
 
-			if ( ! $tickets_exist ) {
+			if ( ! $tickets_exist) {
 				$SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_deleted ) VALUES
-					( 1, 0, '" . __("Free Ticket", "event_espresso") . "', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL );
+					( 1, 0, '".__("Free Ticket", "event_espresso")."', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
 		$ticket_price_table = $wpdb->prefix."esp_ticket_price";
 
-		if ( EEH_Activation::table_exists( $ticket_price_table ) ) {
+		if (EEH_Activation::table_exists($ticket_price_table)) {
 
-			$SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+			$SQL = 'SELECT COUNT(TKP_ID) FROM '.$ticket_price_table;
 			$ticket_prc_exist = $wpdb->get_var($SQL);
 
-			if ( ! $ticket_prc_exist ) {
+			if ( ! $ticket_prc_exist) {
 
 				$SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
 				";
 
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
@@ -1000,20 +1000,20 @@ 
 	 * @param string $country_name
 	 * @return array where keys are columns, values are column values
 	 */
-	public function get_or_create_country($country_name){
-		if( ! $country_name ){
+	public function get_or_create_country($country_name) {
+		if ( ! $country_name) {
 			throw new EE_Error(__("Could not get a country because country name is blank", "event_espresso"));
 		}
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
-		if(is_int($country_name)){
+		if (is_int($country_name)) {
 			$country_name = $this->get_iso_from_3_1_country_id($country_name);
 		}
 		$country = $wpdb->get_row($wpdb->prepare("SELECT * FROM $country_table WHERE
 			CNT_ISO LIKE %s OR
 			CNT_ISO3 LIKE %s OR
-			CNT_name LIKE %s LIMIT 1",$country_name,$country_name,$country_name),ARRAY_A);
-		if( ! $country ){
+			CNT_name LIKE %s LIMIT 1", $country_name, $country_name, $country_name), ARRAY_A);
+		if ( ! $country) {
 			//insert a new one then
 			$cols_n_values = array(
 				'CNT_ISO'=> $this->_find_available_country_iso(2),
@@ -1033,26 +1033,26 @@ 
 				'CNT_active'=>true
 			);
 			$data_types = array(
-				'%s',//CNT_ISO
-				'%s',//CNT_ISO3
-				'%d',//RGN_ID
-				'%s',//CNT_name
-				'%s',//CNT_cur_code
-				'%s',//CNT_cur_single
-				'%s',//CNT_cur_plural
-				'%s',//CNT_cur_sign
-				'%d',//CNT_cur_sign_b4
-				'%d',//CNT_cur_dec_plc
-				'%s',//CNT_cur_dec_mrk
-				'%s',//CNT_cur_thsnds
-				'%s',//CNT_tel_code
-				'%d',//CNT_is_EU
-				'%d',//CNT_active
+				'%s', //CNT_ISO
+				'%s', //CNT_ISO3
+				'%d', //RGN_ID
+				'%s', //CNT_name
+				'%s', //CNT_cur_code
+				'%s', //CNT_cur_single
+				'%s', //CNT_cur_plural
+				'%s', //CNT_cur_sign
+				'%d', //CNT_cur_sign_b4
+				'%d', //CNT_cur_dec_plc
+				'%s', //CNT_cur_dec_mrk
+				'%s', //CNT_cur_thsnds
+				'%s', //CNT_tel_code
+				'%d', //CNT_is_EU
+				'%d', //CNT_active
 			);
 			$success = $wpdb->insert($country_table,
 					$cols_n_values,
 					$data_types);
-			if( ! $success){
+			if ( ! $success) {
 				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('country_id'=>$country_name), $country_table, $cols_n_values, $data_types));
 			}
 			$country = $cols_n_values;
@@ -1064,13 +1064,13 @@ 
 	 * @global type $wpdb
 	 * @return string
 	 */
-	private function _find_available_country_iso($num_letters = 2){
+	private function _find_available_country_iso($num_letters = 2) {
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
-		do{
+		do {
 			$current_iso = strtoupper(wp_generate_password($num_letters, false));
-			$country_with_that_iso = $wpdb->get_var($wpdb->prepare("SELECT count(CNT_ISO) FROM ".$country_table." WHERE CNT_ISO=%s",$current_iso));
-		}while(intval($country_with_that_iso));
+			$country_with_that_iso = $wpdb->get_var($wpdb->prepare("SELECT count(CNT_ISO) FROM ".$country_table." WHERE CNT_ISO=%s", $current_iso));
+		}while (intval($country_with_that_iso));
 		return $current_iso;
 	}
 
@@ -1081,14 +1081,14 @@ 
 	 * @param string $state_name
 	 * @return array where keys are columns, values are column values
 	 */
-	public function get_or_create_state($state_name,$country_name = ''){
-		if( ! $state_name ){
+	public function get_or_create_state($state_name, $country_name = '') {
+		if ( ! $state_name) {
 			throw new EE_Error(__("Could not get-or-create state because no state name was provided", "event_espresso"));
 		}
-		try{
+		try {
 			$country = $this->get_or_create_country($country_name);
 			$country_iso = $country['CNT_ISO'];
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$country_iso = $this->get_default_country_iso();
 		}
 		global $wpdb;
@@ -1096,24 +1096,24 @@ 
 		$state = $wpdb->get_row($wpdb->prepare("SELECT * FROM $state_table WHERE
 			(STA_abbrev LIKE %s OR
 			STA_name LIKE %s) AND
-			CNT_ISO LIKE %s LIMIT 1",$state_name,$state_name,$country_iso),ARRAY_A);
-		if ( ! $state){
+			CNT_ISO LIKE %s LIMIT 1", $state_name, $state_name, $country_iso), ARRAY_A);
+		if ( ! $state) {
 			//insert a new one then
 			$cols_n_values = array(
 				'CNT_ISO'=>$country_iso,
-				'STA_abbrev'=>substr($state_name,0,6),
+				'STA_abbrev'=>substr($state_name, 0, 6),
 				'STA_name'=>$state_name,
 				'STA_active'=>true
 			);
 			$data_types = array(
-				'%s',//CNT_ISO
-				'%s',//STA_abbrev
-				'%s',//STA_name
-				'%d',//STA_active
+				'%s', //CNT_ISO
+				'%s', //STA_abbrev
+				'%s', //STA_name
+				'%d', //STA_active
 			);
-			$success = $wpdb->insert($state_table,$cols_n_values,$data_types);
-			if ( ! $success ){
-				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('state'=>$state_name,'country_id'=>$country_name), $state_table, $cols_n_values, $data_types));
+			$success = $wpdb->insert($state_table, $cols_n_values, $data_types);
+			if ( ! $success) {
+				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('state'=>$state_name, 'country_id'=>$country_name), $state_table, $cols_n_values, $data_types));
 			}
 			$state = $cols_n_values;
 			$state['STA_ID'] = $wpdb->insert_id;
@@ -1126,21 +1126,21 @@ 
 	 * @param type $timeString
 	 * @return string in the php DATETIME format: "G:i" (24-hour format hour with leading zeros, a colon, and minutes with leading zeros)
 	 */
-	public function convertTimeFromAMPM($timeString){
+	public function convertTimeFromAMPM($timeString) {
 		$matches = array();
-		preg_match("~(\\d*):(\\d*)~",$timeString,$matches);
-		if( ! $matches || count($matches)<3){
+		preg_match("~(\\d*):(\\d*)~", $timeString, $matches);
+		if ( ! $matches || count($matches) < 3) {
 			$hour = '00';
 			$minutes = '00';
-		}else{
+		} else {
 			$hour = intval($matches[1]);
 			$minutes = $matches[2];
 		}
-		if(strpos($timeString, 'PM') || strpos($timeString, 'pm')){
+		if (strpos($timeString, 'PM') || strpos($timeString, 'pm')) {
 			$hour = intval($hour) + 12;
 		}
-		$hour = str_pad( "$hour", 2, '0',STR_PAD_LEFT);
-		$minutes = str_pad( "$minutes", 2, '0',STR_PAD_LEFT);
+		$hour = str_pad("$hour", 2, '0', STR_PAD_LEFT);
+		$minutes = str_pad("$minutes", 2, '0', STR_PAD_LEFT);
 		return "$hour:$minutes";
 	}
 
@@ -1149,7 +1149,7 @@ 
 	 * @param int $country_id
 	 * @return string the country's ISO3 code
 	 */
-	public function get_iso_from_3_1_country_id($country_id){
+	public function get_iso_from_3_1_country_id($country_id) {
 		$old_countries = array(
 			array(64, 'United States', 'US', 'USA', 1),
 			array(15, 'Australia', 'AU', 'AUS', 1),
@@ -1375,9 +1375,9 @@ 
 			array(226, 'Zimbabwe', 'ZW', 'ZWE', 1));
 
 		$country_iso = 'US';
-		foreach($old_countries as $country_array){
+		foreach ($old_countries as $country_array) {
 			//note: index 0 is the 3.1 country ID
-			if($country_array[0] == $country_id){
+			if ($country_array[0] == $country_id) {
 				//note: index 2 is the ISO
 				$country_iso = $country_array[2];
 				break;
@@ -1390,8 +1390,8 @@ 
 	 * Gets the ISO3 for the
 	 * @return string
 	 */
-	public function get_default_country_iso(){
-		$old_org_options= get_option('events_organization_settings');
+	public function get_default_country_iso() {
+		$old_org_options = get_option('events_organization_settings');
 		$iso = $this->get_iso_from_3_1_country_id($old_org_options['organization_country']);
 		return $iso;
 	}
@@ -1403,13 +1403,13 @@ 
 	 * the event's DEFAULT payment status, or the attendee's payment status) required pre-approval.
 	 * @return string STS_ID for use in 4.1
 	 */
-	public function convert_3_1_payment_status_to_4_1_STS_ID($payment_status, $this_thing_required_pre_approval = false){
+	public function convert_3_1_payment_status_to_4_1_STS_ID($payment_status, $this_thing_required_pre_approval = false) {
 
 		//EE team can read the related discussion: https://app.asana.com/0/2400967562914/9418495544455
-		if($this_thing_required_pre_approval){
+		if ($this_thing_required_pre_approval) {
 				return 'RNA';
-		}else{
-				$mapping = $default_reg_stati_conversions=array(
+		} else {
+				$mapping = $default_reg_stati_conversions = array(
 			'Completed'=>'RAP',
 			''=>'RPP',
 			'Incomplete'=>'RPP',
@@ -1439,22 +1439,22 @@ 
 	 * @param  EE_Data_Migration_Script_Stage $migration_stage the stage which called this, where errors should be added
 	 * @return boolean whether or not we had to do the big job of creating an image attachment
 	 */
-	public function convert_image_url_to_attachment_and_attach_to_post($guid,$new_cpt_id,  EE_Data_Migration_Script_Stage $migration_stage){
+	public function convert_image_url_to_attachment_and_attach_to_post($guid, $new_cpt_id, EE_Data_Migration_Script_Stage $migration_stage) {
 		$created_attachment_post = false;
 		$guid = $this->_get_original_guid($guid);
-		if($guid){
+		if ($guid) {
 			//check for an existing attachment post with this guid
 			$attachment_post_id = $this->_get_image_attachment_id_by_GUID($guid);
-			if( ! $attachment_post_id){
+			if ( ! $attachment_post_id) {
 				//post thumbnail with that GUID doesn't exist, we should create one
 				$attachment_post_id = $this->_create_image_attachment_from_GUID($guid, $migration_stage);
 				$created_attachment_post = true;
 			}
 			//double-check we actually have an attachment post
-			if( $attachment_post_id){
-				update_post_meta($new_cpt_id,'_thumbnail_id',$attachment_post_id);
-			}else{
-				$migration_stage->add_error(sprintf(__("Could not update event image %s for CPT with ID %d, but attachments post ID is %d", "event_espresso"),$guid,$new_cpt_id,$attachment_post_id));
+			if ($attachment_post_id) {
+				update_post_meta($new_cpt_id, '_thumbnail_id', $attachment_post_id);
+			} else {
+				$migration_stage->add_error(sprintf(__("Could not update event image %s for CPT with ID %d, but attachments post ID is %d", "event_espresso"), $guid, $new_cpt_id, $attachment_post_id));
 			}
 		}
 		return $created_attachment_post;
@@ -1468,13 +1468,13 @@ 
 	 * @param string $guid_in_old_event
 	 * @return string either the original guid, or $guid_in_old_event if we couldn't figure out what the original was
 	 */
-	private function _get_original_guid($guid_in_old_event){
-		$original_guid = preg_replace('~-\d*x\d*\.~','.',$guid_in_old_event,1);
+	private function _get_original_guid($guid_in_old_event) {
+		$original_guid = preg_replace('~-\d*x\d*\.~', '.', $guid_in_old_event, 1);
 		//do a head request to verify the file exists
 		$head_response = wp_remote_head($original_guid);
-		if( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK'){
+		if ( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
 			return $original_guid;
-		}else{
+		} else {
 			return $guid_in_old_event;
 		}
 	}
@@ -1486,32 +1486,32 @@ 
 	 * @param EE_Data_Migration_Script_Stage $migration_stage
 	 * @return int
 	 */
-	private function _create_image_attachment_from_GUID($guid, EE_Data_Migration_Script_Stage $migration_stage){
-		if ( ! $guid){
+	private function _create_image_attachment_from_GUID($guid, EE_Data_Migration_Script_Stage $migration_stage) {
+		if ( ! $guid) {
 			$migration_stage->add_error(sprintf(__("Cannot create image attachment for a blank GUID!", "event_espresso")));
 			return 0;
 		}
-		$wp_filetype = wp_check_filetype(basename($guid), null );
+		$wp_filetype = wp_check_filetype(basename($guid), null);
 		$wp_upload_dir = wp_upload_dir();
 		//if the file is located remotely, download it to our uploads DIR, because wp_genereate_attachmnet_metadata needs the file to be local
-		if(strpos($guid,$wp_upload_dir['url']) === FALSE){
+		if (strpos($guid, $wp_upload_dir['url']) === FALSE) {
 			//image is located remotely. download it and place it in the uploads directory
-			if( ! is_readable($guid)){
-				$migration_stage->add_error(sprintf(__("Could not create image attachment from non-existent file: %s", "event_espresso"),$guid));
+			if ( ! is_readable($guid)) {
+				$migration_stage->add_error(sprintf(__("Could not create image attachment from non-existent file: %s", "event_espresso"), $guid));
 				return 0;
 			}
-			$contents= file_get_contents($guid);
-			if($contents === FALSE){
-				$migration_stage->add_error(sprintf(__("Could not read image at %s, and therefore couldnt create an attachment post for it.", "event_espresso"),$guid));
+			$contents = file_get_contents($guid);
+			if ($contents === FALSE) {
+				$migration_stage->add_error(sprintf(__("Could not read image at %s, and therefore couldnt create an attachment post for it.", "event_espresso"), $guid));
 				return false;
 			}
-			$local_filepath  = $wp_upload_dir['path'].DS.basename($guid);
+			$local_filepath = $wp_upload_dir['path'].DS.basename($guid);
 			$savefile = fopen($local_filepath, 'w');
 			fwrite($savefile, $contents);
 			fclose($savefile);
-			$guid = str_replace($wp_upload_dir['path'],$wp_upload_dir['url'],$local_filepath);
-		}else{
-			$local_filepath = str_replace($wp_upload_dir['url'],$wp_upload_dir['path'],$guid);
+			$guid = str_replace($wp_upload_dir['path'], $wp_upload_dir['url'], $local_filepath);
+		} else {
+			$local_filepath = str_replace($wp_upload_dir['url'], $wp_upload_dir['path'], $guid);
 		}
 
 		$attachment = array(
@@ -1521,24 +1521,24 @@ 
 		   'post_content' => '',
 		   'post_status' => 'inherit'
 		);
-		$attach_id = wp_insert_attachment( $attachment, $guid );
-		if( ! $attach_id ){
-			$migration_stage->add_error(sprintf(__("Could not create image attachment post from image '%s'. Attachment data was %s.", "event_espresso"),$guid,$this->_json_encode($attachment)));
+		$attach_id = wp_insert_attachment($attachment, $guid);
+		if ( ! $attach_id) {
+			$migration_stage->add_error(sprintf(__("Could not create image attachment post from image '%s'. Attachment data was %s.", "event_espresso"), $guid, $this->_json_encode($attachment)));
 			return $attach_id;
 		}
 
 		// you must first include the image.php file
 		// for the function wp_generate_attachment_metadata() to work
-		require_once(ABSPATH . 'wp-admin/includes/image.php');
+		require_once(ABSPATH.'wp-admin/includes/image.php');
 
-		$attach_data = wp_generate_attachment_metadata( $attach_id, $local_filepath );
-		if( ! $attach_data){
-			$migration_stage->add_error(sprintf(__("Coudl not genereate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.", "event_espresso"),$attach_id,$local_filepath,$guid));
+		$attach_data = wp_generate_attachment_metadata($attach_id, $local_filepath);
+		if ( ! $attach_data) {
+			$migration_stage->add_error(sprintf(__("Coudl not genereate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.", "event_espresso"), $attach_id, $local_filepath, $guid));
 			return $attach_id;
 		}
-		$metadata_save_result = wp_update_attachment_metadata( $attach_id, $attach_data );
-		if( ! $metadata_save_result ){
-			$migration_stage->add_error(sprintf(__("Could not update attachment metadata for attachment %d with data %s", "event_espresso"),$attach_id,$this->_json_encode($attach_data)));
+		$metadata_save_result = wp_update_attachment_metadata($attach_id, $attach_data);
+		if ( ! $metadata_save_result) {
+			$migration_stage->add_error(sprintf(__("Could not update attachment metadata for attachment %d with data %s", "event_espresso"), $attach_id, $this->_json_encode($attach_data)));
 		}
 		return $attach_id;
 	}
@@ -1550,9 +1550,9 @@ 
 	 * @param string $guid
 	 * @return int
 	 */
-	private function _get_image_attachment_id_by_GUID($guid){
+	private function _get_image_attachment_id_by_GUID($guid) {
 		global $wpdb;
-		$attachment_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1",$guid));
+		$attachment_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1", $guid));
 		return $attachment_id;
 	}
 	/**
@@ -1564,20 +1564,20 @@ 
 	 * @param string $timezone
 	 * @return string
 	 */
-	public function convert_date_string_to_utc(EE_Data_Migration_Script_Stage $stage, $row_of_data, $DATETIME_string,$timezone = null){
+	public function convert_date_string_to_utc(EE_Data_Migration_Script_Stage $stage, $row_of_data, $DATETIME_string, $timezone = null) {
 		$original_tz = $timezone;
-		if( ! $timezone){
+		if ( ! $timezone) {
 			$timezone = $this->_get_wp_timezone();
 		}
-		if( ! $timezone){
-			$stage->add_error(sprintf(__("Could not find timezone given %s for %s", "event_espresso"),$original_tz,$row_of_data));
+		if ( ! $timezone) {
+			$stage->add_error(sprintf(__("Could not find timezone given %s for %s", "event_espresso"), $original_tz, $row_of_data));
 			$timezone = 'UTC';
 		}
-		try{
-			$date_obj = new DateTime( $DATETIME_string, new DateTimeZone( $timezone ) );
+		try {
+			$date_obj = new DateTime($DATETIME_string, new DateTimeZone($timezone));
 			$date_obj->setTimezone(new DateTimeZone('UTC'));
-		}catch(Exception $e){
-			$stage->add_error(sprintf(__("Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.", "event_espresso"),$DATETIME_string,$timezone));
+		} catch (Exception $e) {
+			$stage->add_error(sprintf(__("Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.", "event_espresso"), $DATETIME_string, $timezone));
 			$date_obj = new DateTime();
 		}
 
@@ -1588,14 +1588,14 @@ 
 	 * Gets the DEFAULT timezone string from wordpress (even if they set a gmt offset)
 	 * @return string
 	 */
-	private function _get_wp_timezone(){
-		$timezone = empty( $timezone ) ? get_option('timezone_string') : $timezone;
+	private function _get_wp_timezone() {
+		$timezone = empty($timezone) ? get_option('timezone_string') : $timezone;
 
 		//if timezone is STILL empty then let's get the GMT offset and then set the timezone_string using our converter
-		if ( empty( $timezone ) ) {
+		if (empty($timezone)) {
 			//let's get a the WordPress UTC offset
 			$offset = get_option('gmt_offset');
-			$timezone = $this->timezone_convert_to_string_from_offset( $offset );
+			$timezone = $this->timezone_convert_to_string_from_offset($offset);
 		}
 		return $timezone;
 	}
@@ -1604,11 +1604,11 @@ 
 	 * @param int $offset
 	 * @return boolean
 	 */
-	private function timezone_convert_to_string_from_offset($offset){
+	private function timezone_convert_to_string_from_offset($offset) {
 		//shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did NOT work as expected - its not reliable
 		$offset *= 3600; // convert hour offset to seconds
         $abbrarray = timezone_abbreviations_list();
-        foreach ($abbrarray as $abbr){
+        foreach ($abbrarray as $abbr) {
                 foreach ($abbr as $city)
                 {
                         if ($city['offset'] == $offset)
@@ -1622,32 +1622,32 @@ 
         return FALSE;
 	}
 
-	public function migration_page_hooks(){
-		add_filter('FHEE__ee_migration_page__header',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_filter('FHEE__ee_migration_page__p_after_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__option_1_main',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_filter('FHEE__ee_migration_page__option_1_button_text',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_action('AHEE__ee_migration_page__option_1_extra_details',array($this,'_migration_page_hook_option_1_extra_details'),10,3);
-		add_filter('FHEE__ee_migration_page__option_2_main',array($this,'_migrate_page_hook_simplify_version_strings'),10,4);
-		add_filter('FHEE__ee_migration_page__option_2_button_text',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__option_2_details',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_action('AHEE__ee_migration_page__after_migration_options_table',array($this,'_migration_page_hook_after_migration_options_table'));
-		add_filter('FHEE__ee_migration_page__done_migration_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__p_after_done_migration_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
+	public function migration_page_hooks() {
+		add_filter('FHEE__ee_migration_page__header', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_filter('FHEE__ee_migration_page__p_after_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__option_1_main', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_filter('FHEE__ee_migration_page__option_1_button_text', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_action('AHEE__ee_migration_page__option_1_extra_details', array($this, '_migration_page_hook_option_1_extra_details'), 10, 3);
+		add_filter('FHEE__ee_migration_page__option_2_main', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 4);
+		add_filter('FHEE__ee_migration_page__option_2_button_text', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__option_2_details', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_action('AHEE__ee_migration_page__after_migration_options_table', array($this, '_migration_page_hook_after_migration_options_table'));
+		add_filter('FHEE__ee_migration_page__done_migration_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__p_after_done_migration_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
 	}
 
-	public function _migrate_page_hook_simplify_version_strings($old_content,$current_db_state,$next_db_state,$ultimate_db_state = NULL){
-		return str_replace(array($current_db_state,$next_db_state,$ultimate_db_state),array(__('EE3','event_espresso'),__('EE4','event_espresso'),  __("EE4", 'event_espresso')),$old_content);
+	public function _migrate_page_hook_simplify_version_strings($old_content, $current_db_state, $next_db_state, $ultimate_db_state = NULL) {
+		return str_replace(array($current_db_state, $next_db_state, $ultimate_db_state), array(__('EE3', 'event_espresso'), __('EE4', 'event_espresso'), __("EE4", 'event_espresso')), $old_content);
 	}
-	public function _migration_page_hook_simplify_next_db_state($old_content,$next_db_state){
-		return str_replace($next_db_state,  __("EE4", 'event_espresso'),$old_content);
+	public function _migration_page_hook_simplify_next_db_state($old_content, $next_db_state) {
+		return str_replace($next_db_state, __("EE4", 'event_espresso'), $old_content);
 	}
-	public function _migration_page_hook_option_1_extra_details(){
-		?><p><?php	printf(__("Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents", "event_espresso"));?></p><?php
+	public function _migration_page_hook_option_1_extra_details() {
+		?><p><?php	printf(__("Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents", "event_espresso")); ?></p><?php
 	}
-	public function _migration_page_hook_after_migration_options_table(){
+	public function _migration_page_hook_after_migration_options_table() {
 		?><p class="ee-attention">
-				<strong><span class="reminder-spn"><?php _e("Important note to those using Event Espresso 3 addons: ", "event_espresso");?></span></strong><br/><?php _e("Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.", "event_espresso");	?>
+				<strong><span class="reminder-spn"><?php _e("Important note to those using Event Espresso 3 addons: ", "event_espresso"); ?></span></strong><br/><?php _e("Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.", "event_espresso"); ?>
 			</p><?php
 	}
 }

core/db_classes/EE_CSV.class.php

Doc Comments +6 added lines, -8 removed lines

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

Braces +12 added lines, -9 removed lines

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

Indentation +1 added lines, -1 removed lines

@@ -315,7 +315,7 @@
 //		header("Content-Type: application/download");
 		header('Content-disposition: attachment; filename='.$filename);
 		header("Content-Type: text/csv; charset=utf-8");
-                do_action( 'AHEE__EE_CSV__begin_sending_csv__headers' );
+				do_action( 'AHEE__EE_CSV__begin_sending_csv__headers' );
 		echo apply_filters('FHEE__EE_CSV__begin_sending_csv__start_writing', "\xEF\xBB\xBF" ); // makes excel open it as UTF-8. UTF-8 BOM, see http://stackoverflow.com/a/4440143/2773835
 		$fh = fopen('php://output', 'w');
 		return $fh;

Spacing +114 added lines, -114 removed lines

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