eventespresso / event-espresso-core

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

Spacing +7 added lines, -7 removed lines

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

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

Indentation -2 removed lines

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

Spacing +20 added lines, -20 removed lines

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

Braces +1 added lines, -1 removed lines

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

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

Indentation -3 removed lines

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

Spacing +17 added lines, -17 removed lines

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

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

Spacing +38 added lines, -38 removed lines

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

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_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 ] );
+				}
+			}
+		}
    }