eventespresso / event-espresso-core

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

Doc Comments -1 removed lines

@@ -59,7 +59,6 @@
 	/**
 	 * Creates a 4.1 price base type
 	 * @global type $wpdb
-	 * @param array $old_price
 	 * @param int $new_reg_id
 	 * @return int
 	 */

Spacing +16 added lines, -16 removed lines

@@ -30,7 +30,7 @@ 
 			));
 */
 
-class EE_DMS_4_1_0_answers extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_1_0_answers extends EE_Data_Migration_Script_Stage_Table {
 	private $_new_answer_table;
 	private $_new_question_table;
 	function __construct() {
@@ -47,13 +47,13 @@ 
 		$old_attendee_table = $wpdb->prefix."events_attendee";
 		$new_reg_table = $wpdb->prefix."esp_registration";
 		$regs = $this->get_migration_script()->get_mapping_new_pk($old_attendee_table, $old_row['attendee_id'], $new_reg_table);
-		if( ! $regs){
-			$this->add_error(sprintf(__("Could not find new registrations for old attendee %d when creating answer %s", "event_espresso"),$old_row['attendee_id'],  $this->_json_encode($old_row)));
+		if ( ! $regs) {
+			$this->add_error(sprintf(__("Could not find new registrations for old attendee %d when creating answer %s", "event_espresso"), $old_row['attendee_id'], $this->_json_encode($old_row)));
 			return false;
 		}
 		//as inefficient as this sounds, we create an answer per REGISTRATION, (even if the registrations use the same attendee)
-		foreach($regs as $new_reg_id){
-			$new_answer_id = $this->_insert_new_answer($old_row,$new_reg_id);
+		foreach ($regs as $new_reg_id) {
+			$new_answer_id = $this->_insert_new_answer($old_row, $new_reg_id);
 		}
 	}
 	/**
@@ -63,15 +63,15 @@ 
 	 * @param int $new_reg_id
 	 * @return int
 	 */
-	private function _insert_new_answer($old_answer,$new_reg_id){
+	private function _insert_new_answer($old_answer, $new_reg_id) {
 		global $wpdb;
 		$old_question_table = $wpdb->prefix."events_question";
 		$new_question_id = $this->get_migration_script()->get_mapping_new_pk($old_question_table, $old_answer['question_id'], $this->_new_question_table);
 
 		$question_type = $this->_get_question_type($new_question_id);
-		if(in_array($question_type,array('MULTIPLE'))){
-			$ans_value = serialize(explode(",",stripslashes($old_answer['answer'])));
-		}else{
+		if (in_array($question_type, array('MULTIPLE'))) {
+			$ans_value = serialize(explode(",", stripslashes($old_answer['answer'])));
+		} else {
 			$ans_value = stripslashes($old_answer['answer']);
 		}
 		$cols_n_values = array(
@@ -80,12 +80,12 @@ 
 			'ANS_value'=>$ans_value
 		);
 		$datatypes = array(
-			'%d',//REG_ID
-			'%d',//QST_ID
-			'%s',//ANS_value
+			'%d', //REG_ID
+			'%d', //QST_ID
+			'%s', //ANS_value
 		);
-		$success = $wpdb->insert($this->_new_answer_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_answer_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_answer, $this->_new_answer_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -99,9 +99,9 @@ 
 	 * @param type $question_id
 	 * @return string
 	 */
-	private function _get_question_type($question_id){
+	private function _get_question_type($question_id) {
 		global $wpdb;
-		$type = $wpdb->get_var($wpdb->prepare("SELECT QST_type FROM ".$this->_new_question_table." WHERE QST_ID=%d LIMIT 1",$question_id));
+		$type = $wpdb->get_var($wpdb->prepare("SELECT QST_type FROM ".$this->_new_question_table." WHERE QST_ID=%d LIMIT 1", $question_id));
 		return $type;
 	}
 

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

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

Doc Comments +6 added lines, -2 removed lines

@@ -565,8 +565,8 @@ 
 	 * that they WILL be added (because the attendees stage runs nearly last during
 	 * the migration script)
 	 * @param type $new_ticket_id
-	 * @param type $sold
-	 * @param type $STS_ID
+	 * @param string $STS_ID
+	 * @param integer $quantity_sold
 	 * @return boolean whether they were successfully updated or not
 	 */
 	protected function _add_regs_to_ticket_and_datetimes($new_ticket_id,$quantity_sold,$STS_ID){
@@ -744,6 +744,10 @@ 
 		}
 		return $count;
 	}
+
+	/**
+	 * @param integer $new_txn_id
+	 */
 	private function _insert_new_payment($old_attendee,$new_txn_id){
 		global $wpdb;
 		//only add a payment for primary attendees

Braces +5 added lines, -5 removed lines

@@ -339,13 +339,13 @@ 
 		try{
 			$new_country = $this->get_migration_script()->get_or_create_country(stripslashes($old_attendee['country_id']));
 			$new_country_iso = $new_country['CNT_ISO'];
-		}catch(EE_Error $exception){
+		} catch(EE_Error $exception){
 			$new_country_iso = $this->get_migration_script()->get_default_country_iso();
 		}
 		try{
 			$new_state = $this->get_migration_script()->get_or_create_state(stripslashes($old_attendee['state']),$new_country_iso);
 			$new_state_id = $new_state['STA_ID'];
-		}catch(EE_Error $exception){
+		} catch(EE_Error $exception){
 			$new_state_id = 0;
 		}
 		$cols_n_values = array(
@@ -459,7 +459,7 @@ 
 
 			if( $wpdb->get_var("SHOW TABLES LIKE '{$this->_old_mer_table}'") != $this->_old_mer_table){
 				$this->_mer_tables_exist = false;
-			}else{
+			} else{
 				$this->_mer_tables_exist = true;
 			}
 		}
@@ -584,7 +584,7 @@ 
 			if( ! $success_update_dateimtes){
 				$this->add_error(sprintf(__("Could not update datetimes related to ticket with ID %d's TKT_sold by %d because %s", "event_espresso"),$new_ticket_id,$quantity_sold,$wpdb->last_error));
 			}
-		}else{
+		} else{
 			$this->add_error(sprintf(__("Could not update ticket with ID %d's TKT_sold by %d because %s", "event_espresso"),$new_ticket_id,$quantity_sold,$wpdb->last_error));
 		}
 		return true;
@@ -791,7 +791,7 @@ 
 			$new_id = $wpdb->insert_id;
 			return $new_id;
 
-		}else{
+		} else{
 			return 0;
 		}
 

Indentation -3 removed lines

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

Spacing +182 added lines, -182 removed lines

@@ -214,7 +214,7 @@ 
 			)
 		);
  */
-class EE_DMS_4_1_0_attendees extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_1_0_attendees extends EE_Data_Migration_Script_Stage_Table {
 	private $_new_attendee_cpt_table;
 	private $_new_attendee_meta_table;
 	private $_new_reg_table;
@@ -237,7 +237,7 @@ 
 		global $wpdb;
 		$this->_pretty_name = __("Attendees", "event_espresso");
 		$this->_old_table = $wpdb->prefix."events_attendee";
-		$this->_old_mer_table = $wpdb->prefix."events_multi_event_registration_id_group";;
+		$this->_old_mer_table = $wpdb->prefix."events_multi_event_registration_id_group"; ;
 		$this->_new_attendee_cpt_table = $wpdb->posts;
 		$this->_new_attendee_meta_table = $wpdb->prefix."esp_attendee_meta";
 		$this->_new_reg_table = $wpdb->prefix."esp_registration";
@@ -256,34 +256,34 @@ 
 	protected function _migrate_old_row($old_row) {
 		//first check if there's already a new attendee with similar characteristics
 		$new_att_id = $this->_find_attendee_cpt_matching($old_row);
-		if( ! $new_att_id ){
+		if ( ! $new_att_id) {
 			$new_att_id = $this->_insert_new_attendee_cpt($old_row);
-			if( ! $new_att_id){
+			if ( ! $new_att_id) {
 				//if we couldnt even make an attendee, abandon all hope
 				return false;
 			}
 			$new_att_meta_id = $this->_insert_attendee_meta_row($old_row, $new_att_id);
-			if($new_att_meta_id){
+			if ($new_att_meta_id) {
 				$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_attendee_meta_table, $new_att_meta_id);
 			}
 		}
 		$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_attendee_cpt_table, $new_att_id);
 
 		$txn_id = $this->_insert_new_transaction($old_row);
-		if( ! $txn_id){
+		if ( ! $txn_id) {
 			//if we couldnt make the transaction, also abandon all hope
 			return false;
 		}
-		$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_transaction_table, $txn_id);$pay_id = $this->_insert_new_payment($old_row,$txn_id);
-		if($pay_id){
-			$this->get_migration_script()->set_mapping($this->_old_table,$old_row['id'],$this->_new_payment_table,$pay_id);
+		$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_transaction_table, $txn_id); $pay_id = $this->_insert_new_payment($old_row, $txn_id);
+		if ($pay_id) {
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_payment_table, $pay_id);
 		}
 
 
 		//even if there was no payment, we can go ahead with adding the reg
-		$new_regs = $this->_insert_new_registrations($old_row,$new_att_id,$txn_id);
-		if($new_regs){
-			$this->get_migration_script()->set_mapping($this->_old_table,$old_row['id'],$this->_new_reg_table,$new_regs);
+		$new_regs = $this->_insert_new_registrations($old_row, $new_att_id, $txn_id);
+		if ($new_regs) {
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_reg_table, $new_regs);
 		}
 	}
 	/**
@@ -293,39 +293,39 @@ 
 	 * @param array $old_attendee
 	 * @return int
 	 */
-	private function _find_attendee_cpt_matching($old_attendee){
+	private function _find_attendee_cpt_matching($old_attendee) {
 		global $wpdb;
-		$existing_attendee_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".$this->_new_attendee_cpt_table." AS cpt INNER JOIN ".$this->_new_attendee_meta_table." AS meta ON cpt.ID = meta.ATT_ID WHERE meta.ATT_fname = %s AND meta.ATT_lname = %s AND meta.ATT_email = %s LIMIT 1",$old_attendee['fname'],$old_attendee['lname'],$old_attendee['email']));
+		$existing_attendee_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".$this->_new_attendee_cpt_table." AS cpt INNER JOIN ".$this->_new_attendee_meta_table." AS meta ON cpt.ID = meta.ATT_ID WHERE meta.ATT_fname = %s AND meta.ATT_lname = %s AND meta.ATT_email = %s LIMIT 1", $old_attendee['fname'], $old_attendee['lname'], $old_attendee['email']));
 		return intval($existing_attendee_id);
 	}
-	private function _insert_new_attendee_cpt($old_attendee){
+	private function _insert_new_attendee_cpt($old_attendee) {
 		global $wpdb;
 		$cols_n_values = array(
-			'post_title'=>stripslashes($old_attendee['fname']." ".$old_attendee['lname']),//ATT_full_name
-			'post_content'=>'',//ATT_bio
-			'post_name'=>sanitize_title($old_attendee['fname']."-".$old_attendee['lname']),//ATT_slug
-			'post_date'=>$this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,$old_attendee['date']),//ATT_created
-			'post_excerpt'=>'',//ATT_short_bio
-			'post_modified'=>$this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,$old_attendee['date']),//ATT_modified
-			'post_author'=>0,//ATT_author
-			'post_parent'=>0,//ATT_parent
-			'post_type'=>'espresso_attendees',//post_type
+			'post_title'=>stripslashes($old_attendee['fname']." ".$old_attendee['lname']), //ATT_full_name
+			'post_content'=>'', //ATT_bio
+			'post_name'=>sanitize_title($old_attendee['fname']."-".$old_attendee['lname']), //ATT_slug
+			'post_date'=>$this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']), //ATT_created
+			'post_excerpt'=>'', //ATT_short_bio
+			'post_modified'=>$this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']), //ATT_modified
+			'post_author'=>0, //ATT_author
+			'post_parent'=>0, //ATT_parent
+			'post_type'=>'espresso_attendees', //post_type
 			'post_status'=>'publish'//status
 		);
 		$datatypes = array(
-			'%s',//ATT_full_name
-			'%s',//ATT_bio
-			'%s',//ATT_slug
-			'%s',//ATT_created
-			'%s',//ATT_short_bio
-			'%s',//ATT_modified
-			'%d',//ATT_author
-			'%d',//ATT_parent
-			'%s',//post_type
-			'%s',//status
+			'%s', //ATT_full_name
+			'%s', //ATT_bio
+			'%s', //ATT_slug
+			'%s', //ATT_created
+			'%s', //ATT_short_bio
+			'%s', //ATT_modified
+			'%d', //ATT_author
+			'%d', //ATT_parent
+			'%s', //post_type
+			'%s', //status
 		);
-		$success = $wpdb->insert($this->_new_attendee_cpt_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_attendee_cpt_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_attendee_cpt_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -333,19 +333,19 @@ 
 		return $new_id;
 	}
 
-	private function _insert_attendee_meta_row($old_attendee,$new_attendee_cpt_id){
+	private function _insert_attendee_meta_row($old_attendee, $new_attendee_cpt_id) {
 		global $wpdb;
 		//get the state and country ids from the old row
-		try{
+		try {
 			$new_country = $this->get_migration_script()->get_or_create_country(stripslashes($old_attendee['country_id']));
 			$new_country_iso = $new_country['CNT_ISO'];
-		}catch(EE_Error $exception){
+		} catch (EE_Error $exception) {
 			$new_country_iso = $this->get_migration_script()->get_default_country_iso();
 		}
-		try{
-			$new_state = $this->get_migration_script()->get_or_create_state(stripslashes($old_attendee['state']),$new_country_iso);
+		try {
+			$new_state = $this->get_migration_script()->get_or_create_state(stripslashes($old_attendee['state']), $new_country_iso);
 			$new_state_id = $new_state['STA_ID'];
-		}catch(EE_Error $exception){
+		} catch (EE_Error $exception) {
 			$new_state_id = 0;
 		}
 		$cols_n_values = array(
@@ -362,20 +362,20 @@ 
 			'ATT_phone'=>stripslashes($old_attendee['phone']),
 		);
 		$datatypes = array(
-			'%d',//ATT_ID
-			'%s',//ATT_fname
-			'%s',//ATT_lname
-			'%s',//ATT_address
-			'%s',//ATT_address2
-			'%s',//ATT_city
-			'%d',//STA_ID
-			'%s',//CNT_ISO
-			'%s',//ATT_zip
-			'%s',//ATT_email
-			'%s',//ATT_phone
+			'%d', //ATT_ID
+			'%s', //ATT_fname
+			'%s', //ATT_lname
+			'%s', //ATT_address
+			'%s', //ATT_address2
+			'%s', //ATT_city
+			'%d', //STA_ID
+			'%s', //CNT_ISO
+			'%s', //ATT_zip
+			'%s', //ATT_email
+			'%s', //ATT_phone
 		);
-		$success = $wpdb->insert($this->_new_attendee_meta_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_attendee_meta_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_attendee_meta_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -391,28 +391,28 @@ 
 	 * @param type $old_attendee
 	 * @return int new transaction id
 	 */
-	private function _insert_new_transaction($old_attendee){
+	private function _insert_new_transaction($old_attendee) {
 		global $wpdb;
 
 		//first: let's check for an existing transaction for this old attendee
-		if( intval( $old_attendee[ 'is_primary' ] ) ) {//primary attendee, so create txn
-			$txn_id = $this->get_migration_script()->get_mapping_new_pk( $this->_old_table, intval($old_attendee['id']), $this->_new_transaction_table );
+		if (intval($old_attendee['is_primary'])) {//primary attendee, so create txn
+			$txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, intval($old_attendee['id']), $this->_new_transaction_table);
 		} else { //non-primary attendee, so find its primary attendee's transaction
-			$primary_attendee_old_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".$this->_old_table." WHERE is_primary=1 and registration_id=%s",$old_attendee['registration_id']));
-			if( ! $primary_attendee_old_id){
+			$primary_attendee_old_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".$this->_old_table." WHERE is_primary=1 and registration_id=%s", $old_attendee['registration_id']));
+			if ( ! $primary_attendee_old_id) {
 				$primary_attendee = $this->_find_mer_primary_attendee_using_mer_tables($old_attendee['registration_id']);
 				$primary_attendee_old_id = is_array($primary_attendee) ? $primary_attendee['id'] : NULL;
 			}
 			$txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, intval($primary_attendee_old_id), $this->_new_transaction_table);
-			if( ! $txn_id){
-				$this->add_error(sprintf(__("Could not find primary attendee's new transaction. Current attendee is: %s, we think the 3.1 primary attendee for it has id %d, but there's no 4.1 transaction for that primary attendee id.", "event_espresso"),  $this->_json_encode($old_attendee),$primary_attendee_old_id));
+			if ( ! $txn_id) {
+				$this->add_error(sprintf(__("Could not find primary attendee's new transaction. Current attendee is: %s, we think the 3.1 primary attendee for it has id %d, but there's no 4.1 transaction for that primary attendee id.", "event_espresso"), $this->_json_encode($old_attendee), $primary_attendee_old_id));
 				$txn_id = 0;
 			}
 		}
 		//if there isn't yet a transaction row for this, create one
 		//(so even if it was a non-primary attendee with no EE3 primary attendee,
 		// it ought to have SOME transaction, so we'll make one)
-		if( ! $txn_id ) {
+		if ( ! $txn_id) {
 			//maps 3.1 payment stati onto 4.1 transaction stati
 			$txn_status_mapping = array(
 				'Completed'=>'TCM',
@@ -425,21 +425,21 @@ 
 			);
 			$STS_ID = isset($txn_status_mapping[$old_attendee['payment_status']]) ? $txn_status_mapping[$old_attendee['payment_status']] : 'TIN';
 			$cols_n_values = array(
-				'TXN_timestamp'=>$this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,$old_attendee['date']),
+				'TXN_timestamp'=>$this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
 				'TXN_total'=>floatval($old_attendee['total_cost']),
 				'TXN_paid'=>floatval($old_attendee['amount_pd']),
 				'STS_ID'=>$STS_ID,
 				'TXN_hash_salt'=>$old_attendee['hashSalt']
 			);
 			$datatypes = array(
-				'%s',//TXN_timestamp
-				'%f',//TXN_total
-				'%f',//TXN_paid
-				'%s',//STS_ID
-				'%s',//TXN_hash_salt
+				'%s', //TXN_timestamp
+				'%f', //TXN_total
+				'%f', //TXN_paid
+				'%s', //STS_ID
+				'%s', //TXN_hash_salt
 			);
-			$success = $wpdb->insert($this->_new_transaction_table,$cols_n_values,$datatypes);
-			if ( ! $success){
+			$success = $wpdb->insert($this->_new_transaction_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_transaction_table, $cols_n_values, $datatypes));
 				return 0;
 			}
@@ -453,13 +453,13 @@ 
 	 * @global type $wpdb
 	 * @return boolean
 	 */
-	private function _mer_tables_exist(){
-		if( $this->_mer_tables_exist === NULL){
+	private function _mer_tables_exist() {
+		if ($this->_mer_tables_exist === NULL) {
 			global $wpdb;
 
-			if( $wpdb->get_var("SHOW TABLES LIKE '{$this->_old_mer_table}'") != $this->_old_mer_table){
+			if ($wpdb->get_var("SHOW TABLES LIKE '{$this->_old_mer_table}'") != $this->_old_mer_table) {
 				$this->_mer_tables_exist = false;
-			}else{
+			} else {
 				$this->_mer_tables_exist = true;
 			}
 		}
@@ -473,10 +473,10 @@ 
 	 * @param type $old_attendee_row
 	 * @return string
 	 */
-	private function _get_reg_status_for_old_payment_status($old_attendee_row){
+	private function _get_reg_status_for_old_payment_status($old_attendee_row) {
 		//need event default reg status and if pre_approval was required
 		global $wpdb;
-		$event_required_pre_approval = $wpdb->get_var($wpdb->prepare("SELECT require_pre_approval FROM ".$wpdb->prefix."events_detail WHERE id = %d",$old_attendee_row['event_id']));
+		$event_required_pre_approval = $wpdb->get_var($wpdb->prepare("SELECT require_pre_approval FROM ".$wpdb->prefix."events_detail WHERE id = %d", $old_attendee_row['event_id']));
 		return $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($old_attendee_row['payment_status'],
 				intval($event_required_pre_approval) && intval($old_attendee_row['pre_approve']));
 	}
@@ -489,19 +489,19 @@ 
 	 * @param int $new_txn_id
 	 * @return array of new registratio ids
 	 */
-	private function _insert_new_registrations($old_attendee,$new_attendee_id,$new_txn_id){
+	private function _insert_new_registrations($old_attendee, $new_attendee_id, $new_txn_id) {
 		global $wpdb;
 
 		$STS_ID = $this->_get_reg_status_for_old_payment_status($old_attendee);
 		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix.'events_detail', $old_attendee['event_id'], $wpdb->posts);
-		if( ! $new_event_id){
-			$this->add_error(sprintf(__("Could not find NEW event CPT ID for old event '%d' on old attendee %s", "event_espresso"),$old_attendee['event_id'],$this->_json_encode($old_attendee)));
+		if ( ! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find NEW event CPT ID for old event '%d' on old attendee %s", "event_espresso"), $old_attendee['event_id'], $this->_json_encode($old_attendee)));
 		}
 
-		$ticket_id = $this->_try_to_find_new_ticket_id($old_attendee,$new_event_id);
-		if( ! $ticket_id){
-			$ticket_id = $this->_insert_new_ticket_because_none_found( $old_attendee, $new_event_id );
-			$this->add_error( sprintf( __( 'Could not find a ticket for old attendee with id %d for new event %d, so created a new ticket with id %d', 'event_espresso' ), $old_attendee['id'], $new_event_id, $ticket_id ) );
+		$ticket_id = $this->_try_to_find_new_ticket_id($old_attendee, $new_event_id);
+		if ( ! $ticket_id) {
+			$ticket_id = $this->_insert_new_ticket_because_none_found($old_attendee, $new_event_id);
+			$this->add_error(sprintf(__('Could not find a ticket for old attendee with id %d for new event %d, so created a new ticket with id %d', 'event_espresso'), $old_attendee['id'], $new_event_id, $ticket_id));
 		}
 		$regs_on_this_row = intval($old_attendee['quantity']);
 		$new_regs = array();
@@ -510,50 +510,50 @@ 
 		//Y old attendee_details rows with a quantity of 1 (no mer) joined by their common registration_id
 		//Y old attendee_details rows with a quantity of x (because of mer)
 		//Y old attendee_details rows with a quantity of 1 (because of mer) joined by wp_events_multi_event_registration_id_group
-		for($count = 1; $count <= $regs_on_this_row; $count++){
+		for ($count = 1; $count <= $regs_on_this_row; $count++) {
 			//sum regs on older rows
-			$regs_on_this_event_and_txn = $this->_sum_old_attendees_on_old_txn($old_attendee,true);
+			$regs_on_this_event_and_txn = $this->_sum_old_attendees_on_old_txn($old_attendee, true);
 			$cols_n_values = array(
 				'EVT_ID'=>$new_event_id,
 				'ATT_ID'=>$new_attendee_id,
 				'TXN_ID'=>$new_txn_id,
 				'TKT_ID'=>$ticket_id,
 				'STS_ID'=>$STS_ID,
-				'REG_date'=>$this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,$old_attendee['date']),
+				'REG_date'=>$this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
 				'REG_final_price'=>$old_attendee['final_price'],
-				'REG_session'=> substr( $old_attendee['attendee_session'], 0, 44 ),
+				'REG_session'=> substr($old_attendee['attendee_session'], 0, 44),
 				'REG_code'=>sanitize_key($old_attendee['registration_id']),
 				'REG_url_link'=>  sanitize_key($old_attendee['registration_id'].'-'.$count),
 				'REG_count'=>$regs_on_this_event_and_txn + $count,
-				'REG_group_size'=>$this->_sum_old_attendees_on_old_txn($old_attendee,false),
+				'REG_group_size'=>$this->_sum_old_attendees_on_old_txn($old_attendee, false),
 				'REG_att_is_going'=>true,
 				'REG_deleted'=>false
 			);
 			$datatypes = array(
-				'%d',//EVT_ID
-				'%d',//ATT_ID
-				'%d',//TXN_ID
-				'%d',//TKT_ID
-				'%s',//STS_ID
-				'%s',//REG_date
-				'%f',//REG_final_price
-				'%s',//REG_session
-				'%s',//REG_code
-				'%s',//REG_url_link
-				'%d',//REG_count
-				'%d',//REG_group_size
-				'%d',//REG_att_is_going
-				'%d',//REG_deleted
+				'%d', //EVT_ID
+				'%d', //ATT_ID
+				'%d', //TXN_ID
+				'%d', //TKT_ID
+				'%s', //STS_ID
+				'%s', //REG_date
+				'%f', //REG_final_price
+				'%s', //REG_session
+				'%s', //REG_code
+				'%s', //REG_url_link
+				'%d', //REG_count
+				'%d', //REG_group_size
+				'%d', //REG_att_is_going
+				'%d', //REG_deleted
 			);
-			$success = $wpdb->insert($this->_new_reg_table,$cols_n_values,$datatypes);
-			if ( ! $success){
+			$success = $wpdb->insert($this->_new_reg_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;
 			}
 			$cols_n_values['REG_ID'] = $wpdb->insert_id;
 			$new_regs[] = $wpdb->insert_id;
 		}
-		$this->_add_regs_to_ticket_and_datetimes($ticket_id,count($new_regs),$STS_ID);
+		$this->_add_regs_to_ticket_and_datetimes($ticket_id, count($new_regs), $STS_ID);
 		return $new_regs;
 	}
 
@@ -569,23 +569,23 @@ 
 	 * @param type $STS_ID
 	 * @return boolean whether they were successfully updated or not
 	 */
-	protected function _add_regs_to_ticket_and_datetimes($new_ticket_id,$quantity_sold,$STS_ID){
-		if($STS_ID != 'RAP'){
+	protected function _add_regs_to_ticket_and_datetimes($new_ticket_id, $quantity_sold, $STS_ID) {
+		if ($STS_ID != 'RAP') {
 			return true;
 		}
 		global $wpdb;
-		$success = $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} SET TKT_sold=TKT_sold+%d WHERE TKT_ID=%d",$quantity_sold,$new_ticket_id));
-		if($success){
+		$success = $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} SET TKT_sold=TKT_sold+%d WHERE TKT_ID=%d", $quantity_sold, $new_ticket_id));
+		if ($success) {
 			//get the ticket's datetimes, and increment them too
-			$success_update_dateimtes =  $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} TKT
+			$success_update_dateimtes = $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} TKT
 				INNER JOIN {$this->_new_ticket_datetime_table} as DTK ON TKT.TKT_ID = DTK.TKT_ID
 				INNER JOIN {$this->_new_datetime_table} as DTT ON DTK.DTT_ID = DTT.DTT_ID
-				SET DTT.DTT_sold = DTT.DTT_sold + %d WHERE TKT.TKT_ID = %d",$quantity_sold,$new_ticket_id));
-			if( ! $success_update_dateimtes){
-				$this->add_error(sprintf(__("Could not update datetimes related to ticket with ID %d's TKT_sold by %d because %s", "event_espresso"),$new_ticket_id,$quantity_sold,$wpdb->last_error));
+				SET DTT.DTT_sold = DTT.DTT_sold + %d WHERE TKT.TKT_ID = %d", $quantity_sold, $new_ticket_id));
+			if ( ! $success_update_dateimtes) {
+				$this->add_error(sprintf(__("Could not update datetimes related to ticket with ID %d's TKT_sold by %d because %s", "event_espresso"), $new_ticket_id, $quantity_sold, $wpdb->last_error));
 			}
-		}else{
-			$this->add_error(sprintf(__("Could not update ticket with ID %d's TKT_sold by %d because %s", "event_espresso"),$new_ticket_id,$quantity_sold,$wpdb->last_error));
+		} else {
+			$this->add_error(sprintf(__("Could not update ticket with ID %d's TKT_sold by %d because %s", "event_espresso"), $new_ticket_id, $quantity_sold, $wpdb->last_error));
 		}
 		return true;
 	}
@@ -597,7 +597,7 @@ 
 	 * and lastly if none of that works, just use the first ticket for the event we find
 	 * @param array $old_attendee
 	 */
-	private function _try_to_find_new_ticket_id($old_attendee,$new_event_id){
+	private function _try_to_find_new_ticket_id($old_attendee, $new_event_id) {
 		global $wpdb;
 		$tickets_table = $this->_new_ticket_table;
 		$datetime_tickets_table = $this->_new_ticket_datetime_table;
@@ -608,24 +608,24 @@ 
 
 		$old_att_start_date = $old_attendee['start_date'];
 		$old_att_start_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
-		$old_att_datetime = $this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,"$old_att_start_date $old_att_start_time:00");
+		$old_att_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_start_date $old_att_start_time:00");
 		//add all conditions to an array from which we can SHIFT conditions off in order to widen our search
 		//the most important condition should be last, as it will be array_shift'ed off last
 		$conditions = array(
-			$wpdb->prepare("$datetime_table.DTT_EVT_start = %s",$old_att_datetime),//times match?
-			$wpdb->prepare("$tickets_table.TKT_price = %f",$old_att_price),//prices match?
-			$wpdb->prepare("$tickets_table.TKT_name = %s",$old_att_price_option),//names match?
-			$wpdb->prepare("$datetime_table.EVT_ID = %d",$new_event_id),//events match?
+			$wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime), //times match?
+			$wpdb->prepare("$tickets_table.TKT_price = %f", $old_att_price), //prices match?
+			$wpdb->prepare("$tickets_table.TKT_name = %s", $old_att_price_option), //names match?
+			$wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id), //events match?
 		);
 		$select_and_join_part = "SELECT $tickets_table.TKT_ID FROM $tickets_table INNER JOIN
 			$datetime_tickets_table ON $tickets_table.TKT_ID = $datetime_tickets_table.TKT_ID INNER JOIN
 			$datetime_table ON $datetime_tickets_table.DTT_ID = $datetime_table.DTT_ID";
 		//start running queries, widening search each time by removing a condition
-		do{
-			$full_query = $select_and_join_part." WHERE ".implode(" AND ",$conditions)." LIMIT 1";
+		do {
+			$full_query = $select_and_join_part." WHERE ".implode(" AND ", $conditions)." LIMIT 1";
 			$ticket_id_found = $wpdb->get_var($full_query);
 			array_shift($conditions);
-		}while( ! $ticket_id_found && $conditions);
+		}while ( ! $ticket_id_found && $conditions);
 		return $ticket_id_found;
 
 	}
@@ -636,23 +636,23 @@ 
 	 * the new ticket to that datetime and price.
 	 * @return int ticket id
 	 */
-	private function _insert_new_ticket_because_none_found( $old_attendee, $new_event_id ) {
+	private function _insert_new_ticket_because_none_found($old_attendee, $new_event_id) {
 		global $wpdb;
 		$old_att_price_option = $old_attendee['price_option'];
 		$old_att_price = floatval($old_attendee['orig_price']);
 
 		$old_att_start_date = $old_attendee['start_date'];
 		$old_att_start_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
-		$old_att_start_datetime = $this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,"$old_att_start_date $old_att_start_time:00");
+		$old_att_start_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_start_date $old_att_start_time:00");
 
 
 		//insert new datetime unless we find one
-		$datetime_id = $wpdb->get_var( $wpdb->prepare( "SELECT DTT_ID FROM " . $this->_new_datetime_table . " WHERE DTT_EVT_start=%s AND EVT_ID=%d LIMIT 1", $old_att_start_datetime, $new_event_id ), ARRAY_A );
-		if( ! $datetime_id ) {
+		$datetime_id = $wpdb->get_var($wpdb->prepare("SELECT DTT_ID FROM ".$this->_new_datetime_table." WHERE DTT_EVT_start=%s AND EVT_ID=%d LIMIT 1", $old_att_start_datetime, $new_event_id), ARRAY_A);
+		if ( ! $datetime_id) {
 			$old_att_end_date = $old_attendee['start_date'];
 			$old_att_end_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
-			$old_att_end_datetime = $this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,"$old_att_end_date $old_att_end_time:00");
-			$wpdb->insert( $this->_new_datetime_table,
+			$old_att_end_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_end_date $old_att_end_time:00");
+			$wpdb->insert($this->_new_datetime_table,
 					array(
 						'EVT_ID' => $new_event_id,
 						'DTT_EVT_start' => $old_att_start_datetime,
@@ -660,44 +660,44 @@ 
 						'DTT_deleted' => TRUE
 					),
 					array(
-						'%d',//EVT_ID
-						'%s',//DTT_EVT_start
-						'%s',//DTT_EVT_end
-						'%d',//DTT_deleted
+						'%d', //EVT_ID
+						'%s', //DTT_EVT_start
+						'%s', //DTT_EVT_end
+						'%d', //DTT_deleted
 					));
 			$datetime_id = $wpdb->insert_id;
 		}
 
 		//insert new ticket
-		$success = $wpdb->insert( $wpdb->prefix . 'esp_ticket',
+		$success = $wpdb->insert($wpdb->prefix.'esp_ticket',
 				array(
 					'TKT_name' => $old_att_price_option,
 					'TKT_qty' => -1,
 					'TKT_price' => $old_att_price,
-					'TKT_start_date' => $old_att_start_datetime,//we really have no clue what the time should be, but at least it was available when they attended
+					'TKT_start_date' => $old_att_start_datetime, //we really have no clue what the time should be, but at least it was available when they attended
 					'TKT_end_date' => $old_att_end_datetime,
 
 				),
 				array(
-					'%s',//name
-					'%d',//qty
-					'%d',//price
-					'%s',//start_date
-					'%s',//end_date
+					'%s', //name
+					'%d', //qty
+					'%d', //price
+					'%s', //start_date
+					'%s', //end_date
 				));
 		$ticket_id = $wpdb->insert_id;
 		//associate the ticket with the datetime we found earlier
-		$wpdb->insert( $this->_new_datetime_ticket_table,
+		$wpdb->insert($this->_new_datetime_ticket_table,
 				array(
 					'DTT_ID' => $datetime_id,
 					'TKT_ID' => $ticket_id
 				),
 				array(
-					'%d',//DTT_ID
-					'%d',//TKT_ID
+					'%d', //DTT_ID
+					'%d', //TKT_ID
 				));
 		//insert new price
-		$wpdb->insert( $this->_new_price_table,
+		$wpdb->insert($this->_new_price_table,
 				array(
 					'PRC_amount' => $old_att_price,
 					'PRT_ID' => EE_DMS_4_1_0_prices::price_type_base,
@@ -705,22 +705,22 @@ 
 					'PRC_deleted' => TRUE
 				),
 				array(
-					'%d',//PRC_amount
-					'%d',//PRT_ID
-					'%s',//PRC_name
-					'%d',//PRC_deleted
+					'%d', //PRC_amount
+					'%d', //PRT_ID
+					'%s', //PRC_name
+					'%d', //PRC_deleted
 				));
 		$price_id = $wpdb->insert_id;
 		//associate the price to the ticket
-		$wpdb->insert( $this->_new_ticket_price_table,
+		$wpdb->insert($this->_new_ticket_price_table,
 				array(
 					'TKT_ID' => $ticket_id,
 					'PRC_ID' => $price_id
 				),
 				array(
-					'%d',//TKT_ID
-					'%d',//PRC_ID
-				) );
+					'%d', //TKT_ID
+					'%d', //PRC_ID
+				));
 		return $ticket_id;
 	}
 	/**
@@ -731,12 +731,12 @@ 
 	 * @param boolean $count_only_older true if you want the running count (ie, the total up to this row), and false if you want ALL
 	 * @return int
 	 */
-	private function _sum_old_attendees_on_old_txn($old_attendee_row,$count_only_older = false){
+	private function _sum_old_attendees_on_old_txn($old_attendee_row, $count_only_older = false) {
 		global $wpdb;
-		$count_only_older_sql = $count_only_older ? $wpdb->prepare(" AND id<%d",$old_attendee_row['id']) : '';
-		$count = intval($wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM ".$this->_old_table." WHERE registration_id=%s $count_only_older_sql",$old_attendee_row['registration_id'])));
+		$count_only_older_sql = $count_only_older ? $wpdb->prepare(" AND id<%d", $old_attendee_row['id']) : '';
+		$count = intval($wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM ".$this->_old_table." WHERE registration_id=%s $count_only_older_sql", $old_attendee_row['registration_id'])));
 
-		if( $this->_mer_tables_exist()){
+		if ($this->_mer_tables_exist()) {
 			//if MER exists, then its a little tricky.
 			//when users registered by adding items to the cart, and it was a
 			//group registration requiring additional attendee INFO, then the attendee rows
@@ -745,17 +745,17 @@ 
 			//BUT we want to count all the MER attendee rows for the same registration
 			$primary_attendee = $this->_find_mer_primary_attendee_using_mer_tables($old_attendee_row['registration_id']);
 
-			$count_using_mer_table = $wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM {$this->_old_table} att INNER JOIN {$this->_old_mer_table} mer ON att.registration_id = mer.registration_id WHERE att.event_id=%d AND mer.primary_registration_id = %s $count_only_older_sql",$old_attendee_row['event_id'],$primary_attendee['registration_id']));
-			$count = max($count_using_mer_table,$count);
+			$count_using_mer_table = $wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM {$this->_old_table} att INNER JOIN {$this->_old_mer_table} mer ON att.registration_id = mer.registration_id WHERE att.event_id=%d AND mer.primary_registration_id = %s $count_only_older_sql", $old_attendee_row['event_id'], $primary_attendee['registration_id']));
+			$count = max($count_using_mer_table, $count);
 		}
 		return $count;
 	}
-	private function _insert_new_payment($old_attendee,$new_txn_id){
+	private function _insert_new_payment($old_attendee, $new_txn_id) {
 		global $wpdb;
 		//only add a payment for primary attendees
-		$old_pay_stati_indicating_no_payment = array('Pending','Incomplete','Not Completed');
+		$old_pay_stati_indicating_no_payment = array('Pending', 'Incomplete', 'Not Completed');
 		//if this is for a primary 3.1 attendee which WASN'T free and has a completed, cancelled, or declined payment...
-		if(intval($old_attendee['is_primary']) && floatval($old_attendee['total_cost']) && ! in_array($old_attendee['payment_status'], $old_pay_stati_indicating_no_payment)){
+		if (intval($old_attendee['is_primary']) && floatval($old_attendee['total_cost']) && ! in_array($old_attendee['payment_status'], $old_pay_stati_indicating_no_payment)) {
 			$pay_status_mapping = array(
 				'Completed'=>'PAP',
 				'Payment Declined'=>'PDC',
@@ -763,41 +763,41 @@ 
 				'Declined'=>'PDC'
 			);
 			$by_admin = $old_attendee['payment'] == 'Admin';
-			$STS_ID = isset($pay_status_mapping[$old_attendee['payment_status']]) ? $pay_status_mapping[$old_attendee['payment_status']] : 'PFL';//IE, if we don't recognize the status, assume payment failed
+			$STS_ID = isset($pay_status_mapping[$old_attendee['payment_status']]) ? $pay_status_mapping[$old_attendee['payment_status']] : 'PFL'; //IE, if we don't recognize the status, assume payment failed
 			$cols_n_values = array(
 				'TXN_ID'=>$new_txn_id,
 				'STS_ID'=>$STS_ID,
-				'PAY_timestamp'=>$this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,$old_attendee['date']),
+				'PAY_timestamp'=>$this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
 				'PAY_method'=>'CART',
 				'PAY_amount'=>$old_attendee['amount_pd'],
 				'PAY_gateway'=>$old_attendee['txn_type'],
 				'PAY_gateway_response'=>'',
-				'PAY_txn_id_chq_nmbr'=>substr( $old_attendee['txn_id'], 0, 32 ),
+				'PAY_txn_id_chq_nmbr'=>substr($old_attendee['txn_id'], 0, 32),
 				'PAY_via_admin'=>$by_admin,
 				'PAY_details'=>$old_attendee['transaction_details']
 
 			);
 			$datatypes = array(
-				'%d',//TXN_Id
-				'%s',//STS_ID
-				'%s',//PAY_timestamp
-				'%s',//PAY_method
-				'%f',//PAY_amount
-				'%s',//PAY_gateway
-				'%s',//PAY_gateway_response
-				'%s',//PAY_txn_id_chq_nmbr
-				'%d',//PAY_via_admin
-				'%s',//PAY_details
+				'%d', //TXN_Id
+				'%s', //STS_ID
+				'%s', //PAY_timestamp
+				'%s', //PAY_method
+				'%f', //PAY_amount
+				'%s', //PAY_gateway
+				'%s', //PAY_gateway_response
+				'%s', //PAY_txn_id_chq_nmbr
+				'%d', //PAY_via_admin
+				'%s', //PAY_details
 			);
-			$success = $wpdb->insert($this->_new_payment_table,$cols_n_values,$datatypes);
-			if ( ! $success){
+			$success = $wpdb->insert($this->_new_payment_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_attendee_cpt_table, $cols_n_values, $datatypes));
 				return 0;
 			}
 			$new_id = $wpdb->insert_id;
 			return $new_id;
 
-		}else{
+		} else {
 			return 0;
 		}
 
@@ -810,12 +810,12 @@ 
 	 * @param type $old_registration_id
 	 * @return array
 	 */
-	private function _find_mer_primary_attendee_using_mer_tables($old_registration_id){
-		if (! $this->_mer_tables_exist()){
+	private function _find_mer_primary_attendee_using_mer_tables($old_registration_id) {
+		if ( ! $this->_mer_tables_exist()) {
 			return false;
 		}
 		global $wpdb;
-		$old_att_for_primary_reg = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$this->_old_mer_table} AS mer INNER JOIN {$this->_old_table} AS att ON mer.primary_registration_id = att.registration_id WHERE mer.registration_id=%s LIMIT 1",$old_registration_id),ARRAY_A);
+		$old_att_for_primary_reg = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$this->_old_mer_table} AS mer INNER JOIN {$this->_old_table} AS att ON mer.primary_registration_id = att.registration_id WHERE mer.registration_id=%s LIMIT 1", $old_registration_id), ARRAY_A);
 return $old_att_for_primary_reg;
 	}
 

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

Doc Comments +2 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
 	 * (because we know the attendee was for an event as a specific time, and we know
 	 * the event's OLD ID...)
 	 * @global type $wpdb
-	 * @param array $old_attendee_row
+	 * @param array $old_attendee
 	 * @return array row of datetime from DB
 	 */
 	private function _try_to_find_datetime($old_attendee){
@@ -113,8 +113,7 @@ 
 	/**
 	 * Adds a new Check-in/checkout record according for $new_reg_id,$new_datetime_id,$checking_in, and $timestmap
 	 * @param int $new_reg_id
-	 * @param int $new_datetime_id
-	 * @param string $timestamp mysql datetime
+	 * @param int $new_datetime
 	 * @return int new Check-in id
 	 */
 	private function _insert_checkin_record($new_reg_id,$new_datetime){

Spacing +29 added lines, -29 removed lines

@@ -24,7 +24,7 @@ 
 		);
 */
 
-class EE_DMS_4_1_0_checkins extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_1_0_checkins extends EE_Data_Migration_Script_Stage_Table {
 	private $_new_table;
 	function __construct() {
 		global $wpdb;
@@ -37,10 +37,10 @@ 
 		global $wpdb;
 		$new_reg_table = $wpdb->prefix."esp_registration";
 
-		$num_to_checkin_at_this_time = max(array(intval($old_row['checked_in_quantity']),intval($old_row['checked_in']))) ;
+		$num_to_checkin_at_this_time = max(array(intval($old_row['checked_in_quantity']), intval($old_row['checked_in'])));
 
 		$new_registrations_for_attendee = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $new_reg_table);
-		if( ! $new_registrations_for_attendee){
+		if ( ! $new_registrations_for_attendee) {
 			$new_registrations_for_attendee = array();
 		}
 		$new_datetime = $this->_try_to_find_datetime($old_row);
@@ -48,26 +48,26 @@ 
 		//make sure registrations array is numerically indexed starting at 0 (it probably already is)
 		$new_registrations_for_attendee = array_values($new_registrations_for_attendee);
 		$new_checkin_ids = array();
-		for($i = 0; $i<abs($num_to_checkin_at_this_time); $i++){
+		for ($i = 0; $i < abs($num_to_checkin_at_this_time); $i++) {
 			$new_reg_id = $new_registrations_for_attendee[$i];
-			if( ! $new_reg_id){
+			if ( ! $new_reg_id) {
 				$this->add_error(sprintf(__('It appears we wanted to check-in more registrations than actually exist. The old attendee record (%1$s) indicated we should check-in %2$d registrations, but there are only %3$d registrations for that attendee (%4$s)', "event_espresso"),
-					$this->_json_encode($old_row),abs($num_to_checkin_at_this_time),count($new_registrations_for_attendee),  $this->_json_encode($new_registrations_for_attendee)));
+					$this->_json_encode($old_row), abs($num_to_checkin_at_this_time), count($new_registrations_for_attendee), $this->_json_encode($new_registrations_for_attendee)));
 				break;
 			}
-			$new_last_checkin_record = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->_new_table WHERE REG_ID = %d ORDER BY CHK_ID DESC LIMIT 1",$new_reg_id));
-			if( ! $new_last_checkin_record ){
+			$new_last_checkin_record = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->_new_table WHERE REG_ID = %d ORDER BY CHK_ID DESC LIMIT 1", $new_reg_id));
+			if ( ! $new_last_checkin_record) {
 				$is_checked_in = FALSE;
-			}else{
+			} else {
 				$is_checked_in = intval($new_last_checkin_record['CHK_in']);
 			}
 			$new_id = $this->_insert_checkin_record($new_reg_id, $new_datetime);
-			if($new_id){
-				$new_checkin_ids[]= $new_id;
+			if ($new_id) {
+				$new_checkin_ids[] = $new_id;
 			}
 
 		}
-		if ($new_checkin_ids){
+		if ($new_checkin_ids) {
 			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_table, $new_checkin_ids);
 		}
 	}
@@ -81,32 +81,32 @@ 
 	 * @param array $old_attendee_row
 	 * @return array row of datetime from DB
 	 */
-	private function _try_to_find_datetime($old_attendee){
+	private function _try_to_find_datetime($old_attendee) {
 		global $wpdb;
 
 		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_attendee['event_id'], $wpdb->posts);
-		if ( ! $new_event_id){
-			$this->add_error(sprintf(__("Could nto find new event ID with old event id '%d', on attendee row %s; and because of that couldnt find the correct datetime for Check-in", "event_espresso"),$old_attendee['event_id'],$this->_json_encode($old_attendee)));
+		if ( ! $new_event_id) {
+			$this->add_error(sprintf(__("Could nto find new event ID with old event id '%d', on attendee row %s; and because of that couldnt find the correct datetime for Check-in", "event_espresso"), $old_attendee['event_id'], $this->_json_encode($old_attendee)));
 			return 0;
 		}
 		$old_att_start_date = $old_attendee['start_date'];
 		$old_att_start_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
-		$old_att_datetime = $this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,"$old_att_start_date $old_att_start_time:00");
+		$old_att_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_start_date $old_att_start_time:00");
 
 		$datetime_table = $wpdb->prefix."esp_datetime";
 		//add all conditions to an array from which we can SHIFT conditions off in order to widen our search
 		//the most important condition should be last, as it will be array_shift'ed off last
 		$conditions = array(
-			$wpdb->prepare("$datetime_table.DTT_EVT_start = %s",$old_att_datetime),//times match?
-			$wpdb->prepare("$datetime_table.EVT_ID = %d",$new_event_id),//events match?
+			$wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime), //times match?
+			$wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id), //events match?
 		);
 		//start running queries, widening search each time by removing a condition
 		$datetime_found = NULL;
-		do{
-			$full_query = "SELECT * FROM $datetime_table WHERE ".implode(" AND ",$conditions)." LIMIT 1";
-			$datetime_found = $wpdb->get_row($full_query,ARRAY_A);
+		do {
+			$full_query = "SELECT * FROM $datetime_table WHERE ".implode(" AND ", $conditions)." LIMIT 1";
+			$datetime_found = $wpdb->get_row($full_query, ARRAY_A);
 			array_shift($conditions);
-		}while( ! $datetime_found && $conditions);
+		}while ( ! $datetime_found && $conditions);
 		return $datetime_found;
 	}
 
@@ -117,7 +117,7 @@ 
 	 * @param string $timestamp mysql datetime
 	 * @return int new Check-in id
 	 */
-	private function _insert_checkin_record($new_reg_id,$new_datetime){
+	private function _insert_checkin_record($new_reg_id, $new_datetime) {
 		global $wpdb;
 
 
@@ -129,13 +129,13 @@ 
 			'CHK_timestamp'=>$new_datetime['DTT_EVT_start']
 		);
 		$datatypes = array(
-			'%d',//REG_ID
-			'%d',//DTT_ID
-			'%d',//CHK_in
-			'%s',//CHK_timestamp
+			'%d', //REG_ID
+			'%d', //DTT_ID
+			'%d', //CHK_in
+			'%s', //CHK_timestamp
 		);
-		$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_checkin, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}

Braces +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		if( $normalized_value ){
 			if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false){
 				throw new EE_Validation_Error( $this->get_validation_error_message(), 'invalid_url');
-			}else{
+			} else{
 				EE_Registry::instance()->load_helper('URL');
 				if( ! EEH_URL::remote_file_exists(
 						$normalized_value,

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

Doc Comments +3 added lines

@@ -94,6 +94,9 @@
 		$this->get_migration_script()->set_mapping($this->_old_table, $old_event['id'], $this->_new_table, $new_event_question_group_ids);
 	}
 
+	/**
+	 * @param boolean $primary
+	 */
 	private function _insert_event_question_group($old_event,$old_question_group_id,$primary){
 		global $wpdb;
 		$new_question_group_id =$this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_qst_group", intval($old_question_group_id), $wpdb->prefix."esp_question_group");

Spacing +22 added lines, -22 removed lines

@@ -20,7 +20,7 @@ 
 
  *
  */
-class EE_DMS_4_1_0_event_question_group extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_1_0_event_question_group extends EE_Data_Migration_Script_Stage_Table {
 	private $_new_table;
 	function _migrate_old_row($old_row) {
 //		$txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $this->_new_transaction_table);
@@ -67,23 +67,23 @@ 
 	 * @param array $old_event
 	 * @return void
 	 */
-	private function _insert_new_event_question_groups($old_event){
+	private function _insert_new_event_question_groups($old_event) {
 		$new_event_question_group_ids = array();
 		$question_groups_for_primary = maybe_unserialize($old_event['question_groups']);
-		if( is_array($question_groups_for_primary ) ){
-			foreach($question_groups_for_primary as $old_question_group_id){
-				$new_id = $this->_insert_event_question_group($old_event,$old_question_group_id,true);
-				if($new_id){
+		if (is_array($question_groups_for_primary)) {
+			foreach ($question_groups_for_primary as $old_question_group_id) {
+				$new_id = $this->_insert_event_question_group($old_event, $old_question_group_id, true);
+				if ($new_id) {
 					$new_event_question_group_ids[] = $new_id;
 				}
 			}
 		}
 		$event_meta = maybe_unserialize($old_event['event_meta']);
-		if(isset($event_meta['add_attendee_question_groups'])){
-			if( is_array( $event_meta['add_attendee_question_groups'] )){
-				foreach($event_meta['add_attendee_question_groups'] as $old_question_group_id){
-					$new_id = $this->_insert_event_question_group($old_event,$old_question_group_id,false);
-					if($new_id){
+		if (isset($event_meta['add_attendee_question_groups'])) {
+			if (is_array($event_meta['add_attendee_question_groups'])) {
+				foreach ($event_meta['add_attendee_question_groups'] as $old_question_group_id) {
+					$new_id = $this->_insert_event_question_group($old_event, $old_question_group_id, false);
+					if ($new_id) {
 						$new_event_question_group_ids[] = $new_id;
 					}
 				}
@@ -94,17 +94,17 @@ 
 		$this->get_migration_script()->set_mapping($this->_old_table, $old_event['id'], $this->_new_table, $new_event_question_group_ids);
 	}
 
-	private function _insert_event_question_group($old_event,$old_question_group_id,$primary){
+	private function _insert_event_question_group($old_event, $old_question_group_id, $primary) {
 		global $wpdb;
-		$new_question_group_id =$this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_qst_group", intval($old_question_group_id), $wpdb->prefix."esp_question_group");
+		$new_question_group_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_qst_group", intval($old_question_group_id), $wpdb->prefix."esp_question_group");
 
-		if( ! $new_question_group_id){
-			$this->add_error(sprintf(__("Could not find 4.1 question ID for 3.1 question id #%s on event $%s", "event_espresso"),$old_question_group_id,$old_event['id']));
+		if ( ! $new_question_group_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 question ID for 3.1 question id #%s on event $%s", "event_espresso"), $old_question_group_id, $old_event['id']));
 			return 0;
 		}
 		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", intval($old_event['id']), $wpdb->posts);
-			if( ! $new_question_group_id){
-			$this->add_error(sprintf(__("Could not find 4.1 event 3.1 event id #%s", "event_espresso"),$old_event['id']));
+			if ( ! $new_question_group_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 event 3.1 event id #%s", "event_espresso"), $old_event['id']));
 			return 0;
 		}
 		$cols_n_values = array(
@@ -113,12 +113,12 @@ 
 			'EQG_primary'=>$primary
 		);
 		$datatypes = array(
-			'%d',//EVT_ID
-			'%d',//QSG_ID
-			'%d',//EQG_primary
+			'%d', //EVT_ID
+			'%d', //QSG_ID
+			'%d', //EQG_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, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}

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')

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

Doc Comments +6 added lines, -3 removed lines

@@ -483,7 +483,7 @@ 
 
 	/**
 	 * Inserts the CPT
-	 * @param array $old_venue keys are cols, values are col values
+	 * @param array $old_event keys are cols, values are col values
 	 * @return int
 	 */
 	private function _insert_venue_into_posts($old_event){
@@ -528,7 +528,7 @@ 
 
 	/**
 	 * Inserts into the venue_meta table
-	 * @param type $cpt_id
+	 * @param integer $cpt_id
 	 * @param type $old_event
 	 * @return int
 	 */
@@ -596,6 +596,9 @@ 
 		return $wpdb->insert_id;
 	}
 
+	/**
+	 * @param integer $new_venue_id
+	 */
 	private function _insert_new_venue_to_event($new_event_id,$new_venue_id){
 		global $wpdb;
 		if( ! $new_event_id){
@@ -654,7 +657,7 @@ 
 	 * Inserts a 4.1 datetime given the 3.1 start_end db row and event_details row
 	 * @param type $start_end_time_row
 	 * @param type $old_event_row
-	 * @param type $new_cpt_id
+	 * @param integer $new_cpt_id
 	 * @return int ID of new datetime
 	 */
 	private function _insert_new_datetime($start_end_time_row,$old_event_row,$new_cpt_id){

Indentation -5 removed lines

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

Braces +3 added lines, -3 removed lines

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

Spacing +199 added lines, -199 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
  * Takes the old array of 3.1 gateway settings for this gateway and converts it
  * into an array with all the 4.1 gateway setting array keys (often the keys were
  * changed from 3.1 to 4.1)
- * @param array $old_gateway_settings
+ * @param string $old_gateway_settings
  * @param string $new_gateway_slug
  * @return array
  */

Spacing +27 added lines, -27 removed lines

@@ -11,52 +11,52 @@ 
  * which are both arrays
  * -a function named update_espresso_config() which saves the EE_Config object to the database
  */
-class EE_DMS_4_1_0_gateways extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_gateways extends EE_Data_Migration_Script_Stage {
 
 private $_converted_active_gateways = false;
 
-function _migration_step($num_items=50){
+function _migration_step($num_items = 50) {
 	//loads existing EE_CONfig from DB, if it exists
 	$new_gateway_config_obj = EE_Config::instance()->gateway;
 	$items_actually_migrated = 0;
 	//convert settings
-	$gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate,$this->_gateways_we_leave_alone);
+	$gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
 	//just do a part of them on this request
-	$gateways_to_deal_with = array_slice($gateways_to_deal_with,$this->count_records_migrated(),$num_items);// $this->_gateways_we_know_how_to_migrate;
-	foreach($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug){
+	$gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items); // $this->_gateways_we_know_how_to_migrate;
+	foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
 		$old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-		if(isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])){
+		if (isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])) {
 			//determine the old option's name
 			$old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
-			if( ! $old_gateway_settings){
+			if ( ! $old_gateway_settings) {
 				//no settings existed for this gateway anyways... weird...
 				$items_actually_migrated++;
 				continue;
 			}
 			//now prepare the settings to make sure they're in the 4.1 format
-			$new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings,$new_gateway_slug);
+			$new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
 			$new_gateway_config_obj->payment_settings[$new_gateway_slug] = $new_gateway_settings;
 			//and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
 			//I think it's ok to do right away this time (we wont need gateway settings elsewhere)
 			delete_option($old_gateway_wp_option_name);
-		}else{//it must be one of the ones we mostly leave alone
+		} else {//it must be one of the ones we mostly leave alone
 			global $wpdb;
 			//yeah we could do this all in one query... and if you're reading this and would liek to, go ahead. Although you'll
 			//only be saving users 50 milliseconds the one time this runs...
-			$wpdb->query($wpdb->prepare("UPDATE ".$wpdb->options." SET autoload='no' WHERE option_name=%s",$old_gateway_wp_option_name));
+			$wpdb->query($wpdb->prepare("UPDATE ".$wpdb->options." SET autoload='no' WHERE option_name=%s", $old_gateway_wp_option_name));
 		}
 		
 		$items_actually_migrated++;
 	}
 	//if we can keep going, and it hasn' tbeen done yet, convert active gateways
-	if($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways){
+	if ($items_actually_migrated < $num_items && ! $this->_converted_active_gateways) {
 		$this->_convert_active_gateways();
 		$this->_converted_active_gateways = true;
 		$items_actually_migrated++;
 	}
 	
-	EE_Config::instance()->update_espresso_config(false,false);
-	if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+	EE_Config::instance()->update_espresso_config(false, false);
+	if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 		$this->set_completed();
 	}
 	return $items_actually_migrated;
@@ -66,7 +66,7 @@ 
 	$step_of_setting_active_gateways = 1;
 	$count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
 //	$button_images_to_update = 
-	return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
+	return $count_of_gateways_to_convert + $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
 }
 function __construct() {
 	$this->_pretty_name = __("Gateways", "event_espresso");
@@ -81,9 +81,9 @@ 
  * @param string $new_gateway_slug
  * @return array
  */
-private function _convert_gateway_settings($old_gateway_settings,$new_gateway_slug){
+private function _convert_gateway_settings($old_gateway_settings, $new_gateway_slug) {
 	$new_gateway_settings = $old_gateway_settings;
-	switch($new_gateway_slug){
+	switch ($new_gateway_slug) {
 			case 'Bank':
 				$new_gateway_settings['account_number'] = $old_gateway_settings['bank_account'];
 				$new_gateway_settings['page_title'] = $old_gateway_settings['bank_title'];
@@ -96,7 +96,7 @@ 
 				$new_gateway_settings['username'] = $old_gateway_settings['paypal_api_username'];
 				$new_gateway_settings['password'] = $old_gateway_settings['paypal_api_password'];
 				$new_gateway_settings['signature'] = $old_gateway_settings['paypal_api_signature'];
-				$new_gateway_settings['credit_cards'] = explode(",",$old_gateway_settings['paypal_api_credit_cards']);
+				$new_gateway_settings['credit_cards'] = explode(",", $old_gateway_settings['paypal_api_credit_cards']);
 				$new_gateway_settings['use_sandbox'] = $old_gateway_settings['paypal_pro_use_sandbox'];
 				break;
 		}
@@ -107,9 +107,9 @@ 
  * @param string $new_gateway_slug
  * @return string
  */
-private function _get_old_gateway_option($new_gateway_slug){
+private function _get_old_gateway_option($new_gateway_slug) {
 	$option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-	$settings =  get_option($option_name, NULL);
+	$settings = get_option($option_name, NULL);
 //	if( ! $settings){
 //		$this->add_error(sprintf(__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
 //	}
@@ -121,12 +121,12 @@ 
  * @param string $new_gateway_slug
  * @return string
  */
-private function _get_old_gateway_option_name($new_gateway_slug){
-	$new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate,$this->_gateways_we_leave_alone));
+private function _get_old_gateway_option_name($new_gateway_slug) {
+	$new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
 	$old_gateway_slug = $new_gateway_slugs_to_new[$new_gateway_slug];
 	$normal_option_prefix = 'event_espresso_';
 	$normal_option_postfix = '_settings';
-	switch($new_gateway_slug){
+	switch ($new_gateway_slug) {
 		case 'Bank':
 			$option_name = $normal_option_prefix.'bank_deposit'.$normal_option_postfix;
 			break;
@@ -152,18 +152,18 @@ 
 			$option_name = 'espresso_usaepay_onsite'.$normal_option_postfix;
 			break;
 		default:
-			$option_name = apply_filters( 'FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option',$normal_option_prefix.$old_gateway_slug.$normal_option_postfix );
+			$option_name = apply_filters('FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option', $normal_option_prefix.$old_gateway_slug.$normal_option_postfix);
 	}
 	return $option_name;
 }
 
-private function _convert_active_gateways(){
+private function _convert_active_gateways() {
 	//just does it all one big swoop
 	$old_active_gateways = get_option('event_espresso_active_gateways');
 	$new_active_gateways = EE_Config::instance()->gateway->active_gateways;
-	foreach($old_active_gateways as $old_gateway_slug => $filepath){
-		if( ! isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])){
-			$this->add_error(sprintf(__("The %s gateway does not exist in EE 4.1", "event_espresso"),$old_gateway_slug));
+	foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
+		if ( ! isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])) {
+			$this->add_error(sprintf(__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
 			continue;
 		}
 		$new_gateway_slug = $this->_gateways_we_know_how_to_migrate[$old_gateway_slug];

Braces +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 			//and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
 			//I think it's ok to do right away this time (we wont need gateway settings elsewhere)
 			delete_option($old_gateway_wp_option_name);
-		}else{//it must be one of the ones we mostly leave alone
+		} else{//it must be one of the ones we mostly leave alone
 			global $wpdb;
 			//yeah we could do this all in one query... and if you're reading this and would liek to, go ahead. Although you'll
 			//only be saving users 50 milliseconds the one time this runs...

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

Doc Comments -1 removed lines

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

Indentation +1 added lines, -1 removed lines

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

Spacing +69 added lines, -69 removed lines

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

Braces +2 added lines, -2 removed lines

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

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

Doc Comments +3 added lines, -4 removed lines

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

Spacing +74 added lines, -74 removed lines

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

Braces +3 added lines, -3 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

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

Indentation -2 removed lines

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

Spacing +25 added lines, -25 removed lines

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

Braces +3 added lines, -3 removed lines

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