eventespresso / event-espresso-core

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

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

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

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_question_groups.dmsstage.php

Spacing +25 added lines, -25 removed lines

@@ -38,7 +38,7 @@ 
 		);
  * 
  */
-class EE_DMS_4_1_0_question_groups extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_question_groups extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_new_table;
 	/**
@@ -49,19 +49,19 @@ 
 	 * @var boolean
 	 */
 	private $_already_got_system_question_group_1 = false;
-	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){
+		foreach ($rows as $question_group) {
 			$new_id = $this->_insert_new_question_group($question_group);
 
 			$this->get_migration_script()->set_mapping($this->_old_table, $question_group['id'], $this->_new_table, $new_id);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -85,24 +85,24 @@ 
 	 * @param array $old_question_group
 	 * @return int
 	 */
-	private function _insert_new_question_group($old_question_group){
+	private function _insert_new_question_group($old_question_group) {
 		global $wpdb;
 		//try to guess what the QST_system int should be... finding the Personal info system
 		//question group is quite easy. But in 3.1 address info WASN'T a system group, it just exitsed by default but
 		//could be easily removed.
-		if($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()){
+		if ($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()) {
 			$guess_at_system_number = 1;
-		}elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
+		}elseif ($old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address') !== FALSE) {
 			$guess_at_system_number = 2;
-		}else{
+		} else {
 			$guess_at_system_number = 0;
 		}
 		//if the question group wasn't made by the normal admin, 
 		//we'd like to keep track of who made it
-		if(intval($old_question_group['wp_user'])!=1){
-			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d",$old_question_group['wp_user']));
+		if (intval($old_question_group['wp_user']) != 1) {
+			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d", $old_question_group['wp_user']));
 			$identifier = $old_question_group['group_identifier']."-by-".$username;
-		}else{
+		} else {
 			$identifier = $old_question_group['group_identifier'];
 		}
 		$cols_n_values = array(
@@ -116,17 +116,17 @@ 
 			'QSG_deleted'=>false
 		);
 		$datatypes = array(
-			'%s',//QSG_name
-			'%s',//QSG_identifier
-			'%s',//QSG_desc
-			'%d',//QSG_order
-			'%d',//QSG_show_group_name
-			'%d',//QSG_show_group_desc
-			'%d',//QSG_system
-			'%d',//QSG_deleted
+			'%s', //QSG_name
+			'%s', //QSG_identifier
+			'%s', //QSG_desc
+			'%d', //QSG_order
+			'%d', //QSG_show_group_name
+			'%d', //QSG_show_group_desc
+			'%d', //QSG_system
+			'%d', //QSG_deleted
 		);
-		$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, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -138,12 +138,12 @@ 
 	 * @global type $wpdb
 	 * @return boolean
 	 */
-	private function _already_got_system_question_group_1(){
-		if( ! $this->_already_got_system_question_group_1 ){
+	private function _already_got_system_question_group_1() {
+		if ( ! $this->_already_got_system_question_group_1) {
 			//check the db
 			global $wpdb;
 			$exists = $wpdb->get_var("SELECT COUNT(*) FROM {$this->_new_table} WHERE QSG_system=1");
-			if(intval($exists)>0){
+			if (intval($exists) > 0) {
 				$this->_already_got_system_question_group_1 = true;
 			}
 		}		

Braces +3 added lines, -3 removed lines

@@ -92,9 +92,9 @@ 
 		//could be easily removed.
 		if($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()){
 			$guess_at_system_number = 1;
-		}elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
+		} elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
 			$guess_at_system_number = 2;
-		}else{
+		} else{
 			$guess_at_system_number = 0;
 		}
 		//if the question group wasn't made by the normal admin, 
@@ -102,7 +102,7 @@ 
 		if(intval($old_question_group['wp_user'])!=1){
 			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d",$old_question_group['wp_user']));
 			$identifier = $old_question_group['group_identifier']."-by-".$username;
-		}else{
+		} else{
 			$identifier = $old_question_group['group_identifier'];
 		}
 		$cols_n_values = array(

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

Indentation +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 /**
  * Goes through all the posts and pages, and converts old shortcodes to new ones
-	
-*/
+ */
 
 class EE_DMS_4_1_0_shortcodes extends EE_Data_Migration_Script_Stage{	
 	function __construct() {

Spacing +12 added lines, -12 removed lines

@@ -5,7 +5,7 @@ 
 	
 */
 
-class EE_DMS_4_1_0_shortcodes extends EE_Data_Migration_Script_Stage{	
+class EE_DMS_4_1_0_shortcodes extends EE_Data_Migration_Script_Stage {	
 	function __construct() {
 		global $wpdb;
 		$this->_pretty_name = __("Shortcodes", "event_espresso");
@@ -15,13 +15,13 @@ 
 	protected function _migrate_old_row($old_row) {
 		$new_post_content = $this->_change_event_list_shortcode($old_row['post_content']);
 		global $wpdb;
-		$wpdb->query($wpdb->prepare("UPDATE ".$this->_old_table." SET post_content=%s WHERE ID=%d",$new_post_content,$old_row['ID']));
+		$wpdb->query($wpdb->prepare("UPDATE ".$this->_old_table." SET post_content=%s WHERE ID=%d", $new_post_content, $old_row['ID']));
 		$slug = $old_row['post_name'];
 		$matches = array();
-		$success = preg_match_all('(ESPRESSO_[^ \]]*)',$new_post_content,$matches);;
-		if($success){
+		$success = preg_match_all('(ESPRESSO_[^ \]]*)', $new_post_content, $matches); ;
+		if ($success) {
 			$shortcodes = $matches[0];
-			foreach($shortcodes as $shortcode){
+			foreach ($shortcodes as $shortcode) {
 				EE_Config::instance()->core->post_shortcodes[$slug][$shortcode] = $old_row['ID'];
 				EE_Config::instance()->core->post_shortcodes['posts'][$shortcode] = $old_row['ID'];
 			}
@@ -41,20 +41,20 @@ 
 	 * replaces [EVENT_LIST... with [ESPRESSO_EVENTS...]
 	 * @param string $old_content
 	 */
-	private function _change_event_list_shortcode($old_content){
-		return str_replace("[EVENT_LIST","[ESPRESSO_EVENTS",$old_content);
+	private function _change_event_list_shortcode($old_content) {
+		return str_replace("[EVENT_LIST", "[ESPRESSO_EVENTS", $old_content);
 	}
 	
-	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 {$this->_sql_to_only_select_non_drafts()} LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table {$this->_sql_to_only_select_non_drafts()} LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 		$items_actually_migrated = 0;
-		foreach($rows as $old_row){
+		foreach ($rows as $old_row) {
 			$this->_migrate_old_row($old_row);
 			$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;
@@ -65,7 +65,7 @@ 
 		return $count;
 	}
 	
-	private function _sql_to_only_select_non_drafts(){
+	private function _sql_to_only_select_non_drafts() {
 		return " WHERE post_type NOT IN ('revision','auto-draft') ";
 	}
 	

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

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_2_0_stages/EE_DMS_4_2_0_datetime_fields.dmsstage.php

Spacing +6 added lines, -6 removed lines

@@ -5,7 +5,7 @@ 
  * The name is set to just be a string representation of the start date (in UTC time for now), and the description is just left blank
 */
 
-class EE_DMS_4_2_0_datetime_fields extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_2_0_datetime_fields extends EE_Data_Migration_Script_Stage_Table {
 	function __construct() {
 		global $wpdb;
 		$this->_pretty_name = __("Datetime Fields", "event_espresso");
@@ -25,14 +25,14 @@ 
 				array(
 					'DTT_ID'=>$old_row['DTT_ID']),
 				array(
-					'%s',//DTT_name,
-					'%s',//DTT_description
+					'%s', //DTT_name,
+					'%s', //DTT_description
 					),
 				array(
-					'%d',//DTT_ID
+					'%d', //DTT_ID
 					));
-		if( FALSE === $updated ){
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting DTT_name = '' and DTT_description = '' where DTT_ID = %d", 'event_espresso'),$old_row['QST_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting DTT_name = '' and DTT_description = '' where DTT_ID = %d", 'event_espresso'), $old_row['QST_ID']));
 		}
 		//nothing to map really
 	}	

core/data_migration_scripts/4_2_0_stages/EE_DMS_4_2_0_question_group_questions.dmsstage.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
  * Populates the QGQ_order (introduced in this version, 4.2.0) from the QST_order
 */
 
-class EE_DMS_4_2_0_question_group_questions extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_2_0_question_group_questions extends EE_Data_Migration_Script_Stage_Table {
 	private $_qgq_table;
 	function __construct() {
 		global $wpdb;
@@ -20,12 +20,12 @@ 
 		$updated = $wpdb->update($this->_qgq_table,
 				array('QGQ_order'=>$old_row['QST_order']),
 				array('QST_ID'=>$old_row['QST_ID']),
-				array('%d',//QGQ_order
+				array('%d', //QGQ_order
 					),
-				array('%d',//QST_ID
+				array('%d', //QST_ID
 					));
-		if( FALSE === $updated ){
-			$this->add_error(sprintf(__("Error in updating table {$this->_qgq_table} setting QGQ_order = %d where QST_ID = %d", 'event_espresso'),$old_row['QST_order'],$old_row['QST_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_qgq_table} setting QGQ_order = %d where QST_ID = %d", 'event_espresso'), $old_row['QST_order'], $old_row['QST_ID']));
 		}
 		//nothing to map really
 	}	

core/data_migration_scripts/4_3_0_stages/EE_DMS_4_3_0_critical_page_shortcode_tracking.dmsstage.php

Spacing +29 added lines, -29 removed lines

@@ -32,7 +32,7 @@ 
 	 * Just initializes the status of the migration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Update Critical Page Shortcode Tracking', 'event_espresso' );
+		$this->_pretty_name = __('Update Critical Page Shortcode Tracking', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -59,24 +59,24 @@ 
 	 * @throws EE_Error
 	 * @return int number of items ACTUALLY migrated
 	 */
-	protected function _migration_step( $num_items = 1 ){
+	protected function _migration_step($num_items = 1) {
 		// if this isn't set then something is really wrong
-		if ( ! EE_Config::instance()->core instanceof EE_Core_Config ) {
-			throw new EE_Error( __( 'It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso' ));
+		if ( ! EE_Config::instance()->core instanceof EE_Core_Config) {
+			throw new EE_Error(__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso'));
 		}
 		// name of the WP Posts Page
 		$posts_page = $this->_get_page_for_posts();
 		// make sure critical pages get removed
-        $this->_update_post_shortcodes( $posts_page );
+        $this->_update_post_shortcodes($posts_page);
         // save updated config, but don't add errors
-		if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE )) {
-			EE_Error::add_error( __( 'The Event Espresso Configuration Settings were not updated when attempting to save the "critical page post shortcodes".', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) {
+			EE_Error::add_error(__('The Event Espresso Configuration Settings were not updated when attempting to save the "critical page post shortcodes".', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		// check for errors
-		$notices = EE_Error::get_notices( FALSE );
+		$notices = EE_Error::get_notices(FALSE);
 		// any errors to report?
-		if( isset( $notices['errors'] )) {
-          foreach($notices as $value){
+		if (isset($notices['errors'])) {
+          foreach ($notices as $value) {
 			  $this->add_error($value);
 		  }
         }
@@ -97,13 +97,13 @@ 
      *  @return 	string
      */
     private function _get_page_for_posts() {
-        $page_for_posts = get_option( 'page_for_posts' );
-        if ( ! $page_for_posts ) {
+        $page_for_posts = get_option('page_for_posts');
+        if ( ! $page_for_posts) {
             return 'posts';
         }
         global $wpdb;
-        $SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
-        return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ));
+        $SQL = 'SELECT post_name from '.$wpdb->posts.' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
+        return $wpdb->get_var($wpdb->prepare($SQL, $page_for_posts));
     }
 
 
@@ -115,45 +115,45 @@ 
      * @param $page_for_posts
      * @return    void
      */
-    private function _update_post_shortcodes( $page_for_posts = '' ) {
+    private function _update_post_shortcodes($page_for_posts = '') {
         // critical page shortcodes that we do NOT want added to the Posts page (blog)
         $critical_shortcodes = EE_Config::instance()->core->get_critical_pages_shortcodes_array();
         // verify that post_shortcodes is set
-        EE_Config::instance()->core->post_shortcodes = isset( EE_Config::instance()->core->post_shortcodes ) && is_array( EE_Config::instance()->core->post_shortcodes ) ? EE_Config::instance()->core->post_shortcodes : array();
+        EE_Config::instance()->core->post_shortcodes = isset(EE_Config::instance()->core->post_shortcodes) && is_array(EE_Config::instance()->core->post_shortcodes) ? EE_Config::instance()->core->post_shortcodes : array();
         //  just in case the site has ever had posts on frontpage at some time, then we should check for a "Posts Page" named "posts"
-        $post_pages_to_check = $page_for_posts == 'posts' ? array( $page_for_posts ) : array( 'posts', $page_for_posts );
+        $post_pages_to_check = $page_for_posts == 'posts' ? array($page_for_posts) : array('posts', $page_for_posts);
         // cycle thru post_shortcodes
-        foreach( $post_pages_to_check as $post_page ){
+        foreach ($post_pages_to_check as $post_page) {
             // cycle thru post_shortcodes
-            foreach( EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ){
+            foreach (EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes) {
                 // are there any shortcodes to track ?
-                if ( ! empty( $shortcodes )) {
+                if ( ! empty($shortcodes)) {
                     // loop thru list of tracked shortcodes
-                    foreach( $shortcodes as $shortcode => $post_id ) {
+                    foreach ($shortcodes as $shortcode => $post_id) {
                         // if shortcode is for a critical page, BUT this is NOT the corresponding critical page for that shortcode
-                        if ( isset( $critical_shortcodes[ $post_id ] ) && $post_name == $post_page ) {
+                        if (isset($critical_shortcodes[$post_id]) && $post_name == $post_page) {
                             // then remove this shortcode, because we don't want critical page shortcodes like ESPRESSO_TXN_PAGE running on the "Posts Page" (blog)
-                            unset( EE_Config::instance()->core->post_shortcodes[ $post_name ][ $shortcode ] );
+                            unset(EE_Config::instance()->core->post_shortcodes[$post_name][$shortcode]);
                         }
                         // skip the posts page, because we want all shortcodes registered for it
-                        if ( $post_name == $post_page ) {
+                        if ($post_name == $post_page) {
                             continue;
                         }
                         // make sure post still exists
-                        $post = get_post( $post_id );
-                        if ( $post ) {
+                        $post = get_post($post_id);
+                        if ($post) {
                             // check that the post name matches what we have saved
-                            if ( $post->post_name == $post_name ) {
+                            if ($post->post_name == $post_name) {
                                 // if so, then break before hitting the unset below
                                 continue;
                             }
                         }
                         // we don't like missing posts around here >:(
-                        unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+                        unset(EE_Config::instance()->core->post_shortcodes[$post_name]);
                     }
                 } else {
                     // you got no shortcodes to keep track of !
-                    unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+                    unset(EE_Config::instance()->core->post_shortcodes[$post_name]);
                 }
             }
         }

Indentation +75 added lines, -75 removed lines

@@ -67,8 +67,8 @@ 
 		// name of the WP Posts Page
 		$posts_page = $this->_get_page_for_posts();
 		// make sure critical pages get removed
-        $this->_update_post_shortcodes( $posts_page );
-        // save updated config, but don't add errors
+		$this->_update_post_shortcodes( $posts_page );
+		// save updated config, but don't add errors
 		if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE )) {
 			EE_Error::add_error( __( 'The Event Espresso Configuration Settings were not updated when attempting to save the "critical page post shortcodes".', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
 		}
@@ -76,87 +76,87 @@ 
 		$notices = EE_Error::get_notices( FALSE );
 		// any errors to report?
 		if( isset( $notices['errors'] )) {
-          foreach($notices as $value){
+		  foreach($notices as $value){
 			  $this->add_error($value);
 		  }
-        }
+		}
 		//regardless of whether it worked or not, we ought to continue the migration
 		$this->set_completed();
-            return 1;
+			return 1;
 	}
 
 
 
-    /**
-     * 	_get_page_for_posts
-     *
-     * 	if the wp-option "show_on_front" is set to "page", then this is the post_name for the post set in the wp-option "page_for_posts", or "posts" if no page is selected
-     *
-     *
-     *  @access 	private
-     *  @return 	string
-     */
-    private function _get_page_for_posts() {
-        $page_for_posts = get_option( 'page_for_posts' );
-        if ( ! $page_for_posts ) {
-            return 'posts';
-        }
-        global $wpdb;
-        $SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
-        return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ));
-    }
-
-
-
-    /**
-     *    _update_post_shortcodes
-     *
-     * @access    private
-     * @param $page_for_posts
-     * @return    void
-     */
-    private function _update_post_shortcodes( $page_for_posts = '' ) {
-        // critical page shortcodes that we do NOT want added to the Posts page (blog)
-        $critical_shortcodes = EE_Config::instance()->core->get_critical_pages_shortcodes_array();
-        // verify that post_shortcodes is set
-        EE_Config::instance()->core->post_shortcodes = isset( EE_Config::instance()->core->post_shortcodes ) && is_array( EE_Config::instance()->core->post_shortcodes ) ? EE_Config::instance()->core->post_shortcodes : array();
-        //  just in case the site has ever had posts on frontpage at some time, then we should check for a "Posts Page" named "posts"
-        $post_pages_to_check = $page_for_posts == 'posts' ? array( $page_for_posts ) : array( 'posts', $page_for_posts );
-        // cycle thru post_shortcodes
-        foreach( $post_pages_to_check as $post_page ){
-            // cycle thru post_shortcodes
-            foreach( EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ){
-                // are there any shortcodes to track ?
-                if ( ! empty( $shortcodes )) {
-                    // loop thru list of tracked shortcodes
-                    foreach( $shortcodes as $shortcode => $post_id ) {
-                        // if shortcode is for a critical page, BUT this is NOT the corresponding critical page for that shortcode
-                        if ( isset( $critical_shortcodes[ $post_id ] ) && $post_name == $post_page ) {
-                            // then remove this shortcode, because we don't want critical page shortcodes like ESPRESSO_TXN_PAGE running on the "Posts Page" (blog)
-                            unset( EE_Config::instance()->core->post_shortcodes[ $post_name ][ $shortcode ] );
-                        }
-                        // skip the posts page, because we want all shortcodes registered for it
-                        if ( $post_name == $post_page ) {
-                            continue;
-                        }
-                        // make sure post still exists
-                        $post = get_post( $post_id );
-                        if ( $post ) {
-                            // check that the post name matches what we have saved
-                            if ( $post->post_name == $post_name ) {
-                                // if so, then break before hitting the unset below
-                                continue;
-                            }
-                        }
-                        // we don't like missing posts around here >:(
-                        unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
-                    }
-                } else {
-                    // you got no shortcodes to keep track of !
-                    unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
-                }
-            }
-        }
+	/**
+	 * 	_get_page_for_posts
+	 *
+	 * 	if the wp-option "show_on_front" is set to "page", then this is the post_name for the post set in the wp-option "page_for_posts", or "posts" if no page is selected
+	 *
+	 *
+	 *  @access 	private
+	 *  @return 	string
+	 */
+	private function _get_page_for_posts() {
+		$page_for_posts = get_option( 'page_for_posts' );
+		if ( ! $page_for_posts ) {
+			return 'posts';
+		}
+		global $wpdb;
+		$SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
+		return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ));
+	}
+
+
+
+	/**
+	 *    _update_post_shortcodes
+	 *
+	 * @access    private
+	 * @param $page_for_posts
+	 * @return    void
+	 */
+	private function _update_post_shortcodes( $page_for_posts = '' ) {
+		// critical page shortcodes that we do NOT want added to the Posts page (blog)
+		$critical_shortcodes = EE_Config::instance()->core->get_critical_pages_shortcodes_array();
+		// verify that post_shortcodes is set
+		EE_Config::instance()->core->post_shortcodes = isset( EE_Config::instance()->core->post_shortcodes ) && is_array( EE_Config::instance()->core->post_shortcodes ) ? EE_Config::instance()->core->post_shortcodes : array();
+		//  just in case the site has ever had posts on frontpage at some time, then we should check for a "Posts Page" named "posts"
+		$post_pages_to_check = $page_for_posts == 'posts' ? array( $page_for_posts ) : array( 'posts', $page_for_posts );
+		// cycle thru post_shortcodes
+		foreach( $post_pages_to_check as $post_page ){
+			// cycle thru post_shortcodes
+			foreach( EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ){
+				// are there any shortcodes to track ?
+				if ( ! empty( $shortcodes )) {
+					// loop thru list of tracked shortcodes
+					foreach( $shortcodes as $shortcode => $post_id ) {
+						// if shortcode is for a critical page, BUT this is NOT the corresponding critical page for that shortcode
+						if ( isset( $critical_shortcodes[ $post_id ] ) && $post_name == $post_page ) {
+							// then remove this shortcode, because we don't want critical page shortcodes like ESPRESSO_TXN_PAGE running on the "Posts Page" (blog)
+							unset( EE_Config::instance()->core->post_shortcodes[ $post_name ][ $shortcode ] );
+						}
+						// skip the posts page, because we want all shortcodes registered for it
+						if ( $post_name == $post_page ) {
+							continue;
+						}
+						// make sure post still exists
+						$post = get_post( $post_id );
+						if ( $post ) {
+							// check that the post name matches what we have saved
+							if ( $post->post_name == $post_name ) {
+								// if so, then break before hitting the unset below
+								continue;
+							}
+						}
+						// we don't like missing posts around here >:(
+						unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+					}
+				} else {
+					// you got no shortcodes to keep track of !
+					unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+				}
+			}
+		}
    }