eventespresso / event-espresso-core

core/data_migration_scripts/EE_DMS_Core_4_8_0.dms.php

Indentation +357 added lines, -357 removed lines

@@ -17,9 +17,9 @@ 
 $stages = glob(EE_CORE . 'data_migration_scripts/4_8_0_stages/*');
 $class_to_filepath = array();
 foreach ($stages as $filepath) {
-    $matches = array();
-    preg_match('~4_8_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[ $matches[1] ] = $filepath;
+	$matches = array();
+	preg_match('~4_8_0_stages/(.*).dmsstage.php~', $filepath, $matches);
+	$class_to_filepath[ $matches[1] ] = $filepath;
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_8_0__autoloaded_stages', $class_to_filepath);
@@ -38,71 +38,71 @@ 
 class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base
 {
 
-    /**
-     * return EE_DMS_Core_4_8_0
-     *
-     * @param TableManager  $table_manager
-     * @param TableAnalysis $table_analysis
-     */
-    public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
-    {
-        $this->_pretty_name = esc_html__("Data Update to Event Espresso 4.8.0", "event_espresso");
-        $this->_priority = 10;
-        $this->_migration_stages = array(
-            new EE_DMS_4_8_0_pretax_totals(),
-            new EE_DMS_4_8_0_event_subtotals(),
-        );
-        parent::__construct($table_manager, $table_analysis);
-    }
+	/**
+	 * return EE_DMS_Core_4_8_0
+	 *
+	 * @param TableManager  $table_manager
+	 * @param TableAnalysis $table_analysis
+	 */
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
+	{
+		$this->_pretty_name = esc_html__("Data Update to Event Espresso 4.8.0", "event_espresso");
+		$this->_priority = 10;
+		$this->_migration_stages = array(
+			new EE_DMS_4_8_0_pretax_totals(),
+			new EE_DMS_4_8_0_event_subtotals(),
+		);
+		parent::__construct($table_manager, $table_analysis);
+	}
 
 
 
-    /**
-     * Because this is being done at basically the same time as the MER-ready branch
-     * of core, it's possible people might have installed MEr-ready branch first,
-     * and then this one, in which case we still want to perform this migration,
-     * even though the version might not have increased
-     *
-     * @param array $version_array
-     * @return bool
-     */
-    public function can_migrate_from_version($version_array)
-    {
-        $version_string = $version_array['Core'];
-        if (version_compare($version_string, '4.8.0', '<=') && version_compare($version_string, '4.7.0', '>=')) {
+	/**
+	 * Because this is being done at basically the same time as the MER-ready branch
+	 * of core, it's possible people might have installed MEr-ready branch first,
+	 * and then this one, in which case we still want to perform this migration,
+	 * even though the version might not have increased
+	 *
+	 * @param array $version_array
+	 * @return bool
+	 */
+	public function can_migrate_from_version($version_array)
+	{
+		$version_string = $version_array['Core'];
+		if (version_compare($version_string, '4.8.0', '<=') && version_compare($version_string, '4.7.0', '>=')) {
 //          echo "$version_string can be migrated from";
-            return true;
-        } elseif (! $version_string) {
+			return true;
+		} elseif (! $version_string) {
 //          echo "no version string provided: $version_string";
-            // no version string provided... this must be pre 4.3
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
-        } else {
+			// no version string provided... this must be pre 4.3
+			return false;// changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //          echo "$version_string doesnt apply";
-            return false;
-        }
-    }
+			return false;
+		}
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function schema_changes_before_migration()
-    {
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
-        $now_in_mysql = current_time('mysql', true);
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
-        $table_name = 'esp_answer';
-        $sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+	/**
+	 * @return bool
+	 */
+	public function schema_changes_before_migration()
+	{
+		require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+		$now_in_mysql = current_time('mysql', true);
+		require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID),
 					KEY REG_ID (REG_ID),
 					KEY QST_ID (QST_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_attendee_meta';
-        $sql = "ATTM_ID int(10) unsigned NOT	NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_attendee_meta';
+		$sql = "ATTM_ID int(10) unsigned NOT	NULL AUTO_INCREMENT,
 						ATT_ID bigint(20) unsigned NOT NULL,
 						ATT_fname varchar(45) NOT NULL,
 						ATT_lname varchar(45) NOT	NULL,
@@ -119,9 +119,9 @@ 
 								KEY ATT_email (ATT_email),
 								KEY ATT_lname (ATT_lname),
 								KEY ATT_fname (ATT_fname)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_country';
-        $sql = "CNT_ISO varchar(2) collate utf8_bin NOT NULL,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_country';
+		$sql = "CNT_ISO varchar(2) collate utf8_bin NOT NULL,
 					  CNT_ISO3 varchar(3) collate utf8_bin NOT NULL,
 					  RGN_ID tinyint(3) unsigned DEFAULT NULL,
 					  CNT_name varchar(45) collate utf8_bin NOT NULL,
@@ -137,25 +137,25 @@ 
 					  CNT_is_EU tinyint(1) DEFAULT '0',
 					  CNT_active tinyint(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_currency';
-        $sql = "CUR_code varchar(6) collate utf8_bin NOT NULL,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_currency';
+		$sql = "CUR_code varchar(6) collate utf8_bin NOT NULL,
 				CUR_single varchar(45) collate utf8_bin DEFAULT 'dollar',
 				CUR_plural varchar(45) collate utf8_bin DEFAULT 'dollars',
 				CUR_sign varchar(45) collate utf8_bin DEFAULT '$',
 				CUR_dec_plc varchar(1) collate utf8_bin NOT NULL DEFAULT '2',
 				CUR_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_currency_payment_method';
-        $sql = "CPM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_currency_payment_method';
+		$sql = "CPM_ID int(11) NOT NULL AUTO_INCREMENT,
 				CUR_code varchar(6) collate utf8_bin NOT NULL,
 				PMD_ID int(11) NOT NULL,
 				PRIMARY KEY  (CPM_ID),
 				KEY PMD_ID (PMD_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_datetime';
-        $sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_datetime';
+		$sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				  EVT_ID bigint(20) unsigned NOT NULL,
 				  DTT_name varchar(255) NOT NULL DEFAULT '',
 				  DTT_description text NOT NULL,
@@ -171,9 +171,9 @@ 
 						KEY DTT_EVT_start (DTT_EVT_start),
 						KEY EVT_ID (EVT_ID),
 						KEY DTT_is_primary (DTT_is_primary)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_meta';
-        $sql = "
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_meta';
+		$sql = "
 			EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
 			EVT_ID bigint(20) unsigned NOT NULL,
 			EVT_display_desc tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -189,34 +189,34 @@ 
 			EVT_donations tinyint(1) NULL,
 			PRIMARY KEY  (EVTM_ID),
 			KEY EVT_ID (EVT_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_question_group';
-        $sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned NOT NULL,
 					QSG_ID int(10) unsigned NOT NULL,
 					EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY QSG_ID (QSG_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_venue';
-        $sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_extra_meta';
-        $sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
 				EXM_key varchar(45) DEFAULT NULL,
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID),
 				KEY EXM_type (EXM_type,OBJ_ID,EXM_key)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_extra_join';
-        $sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_extra_join';
+		$sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
 				EXJ_first_model_id varchar(6) NOT NULL,
 				EXJ_first_model_name varchar(20) NOT NULL,
 				EXJ_second_model_id varchar(6) NOT NULL,
@@ -224,9 +224,9 @@ 
 				PRIMARY KEY  (EXJ_ID),
 				KEY first_model (EXJ_first_model_name,EXJ_first_model_id),
 				KEY second_model (EXJ_second_model_name,EXJ_second_model_id)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_line_item';
-        $sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(11) DEFAULT NULL,
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -245,9 +245,9 @@ 
 				PRIMARY KEY  (LIN_ID),
 				KEY LIN_code (LIN_code(191)),
 				KEY TXN_ID (TXN_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_log';
-        $sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_log';
+		$sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
 				LOG_time datetime DEFAULT NULL,
 				OBJ_ID varchar(45) DEFAULT NULL,
 				OBJ_type varchar(45) DEFAULT NULL,
@@ -258,18 +258,18 @@ 
 				KEY LOG_time (LOG_time),
 				KEY OBJ (OBJ_type,OBJ_ID),
 				KEY LOG_type (LOG_type)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message_template';
-        $sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message_template';
+		$sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					GRP_ID int(10) unsigned NOT NULL,
 					MTP_context varchar(50) NOT NULL,
 					MTP_template_field varchar(30) NOT NULL,
 					MTP_content text NOT NULL,
 					PRIMARY KEY  (MTP_ID),
 					KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message_template_group';
-        $sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message_template_group';
+		$sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					MTP_user_id int(10) NOT NULL DEFAULT '1',
 					MTP_name varchar(245) NOT NULL DEFAULT '',
 					MTP_description varchar(245) NOT NULL DEFAULT '',
@@ -281,17 +281,17 @@ 
 					MTP_is_active tinyint(1) NOT NULL DEFAULT '1',
 					PRIMARY KEY  (GRP_ID),
 					KEY MTP_user_id (MTP_user_id)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_message_template';
-        $sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_message_template';
+		$sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 					GRP_ID int(10) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_payment';
-        $sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_payment';
+		$sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					TXN_ID int(10) unsigned DEFAULT NULL,
 					STS_ID varchar(3) collate utf8_bin DEFAULT NULL,
 					PAY_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -308,9 +308,9 @@ 
 					PRIMARY KEY  (PAY_ID),
 					KEY PAY_timestamp (PAY_timestamp),
 					KEY TXN_ID (TXN_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_payment_method';
-        $sql = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_payment_method';
+		$sql = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
 				PMD_type varchar(124) DEFAULT NULL,
 				PMD_name varchar(255) DEFAULT NULL,
 				PMD_desc text,
@@ -326,32 +326,32 @@ 
 				PRIMARY KEY  (PMD_ID),
 				UNIQUE KEY PMD_slug_UNIQUE (PMD_slug),
 				KEY PMD_type (PMD_type)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = "esp_ticket_price";
-        $sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = "esp_ticket_price";
+		$sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TKT_ID int(10) unsigned NOT NULL,
 					  PRC_ID int(10) unsigned NOT NULL,
 					  PRIMARY KEY  (TKP_ID),
 					  KEY TKT_ID (TKT_ID),
 					  KEY PRC_ID (PRC_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_datetime_ticket";
-        $sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_datetime_ticket";
+		$sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  DTT_ID int(10) unsigned NOT NULL,
 					  TKT_ID int(10) unsigned NOT NULL,
 					  PRIMARY KEY  (DTK_ID),
 					  KEY DTT_ID (DTT_ID),
 					  KEY TKT_ID (TKT_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_ticket_template";
-        $sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_ticket_template";
+		$sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TTM_name varchar(45) NOT NULL,
 					  TTM_description text,
 					  TTM_file varchar(45),
 					  PRIMARY KEY  (TTM_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question';
-        $sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question';
+		$sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QST_display_text text NOT NULL,
 					QST_admin_label varchar(255) NOT NULL,
 					QST_system varchar(25) NOT NULL DEFAULT "",
@@ -365,18 +365,18 @@ 
 					QST_deleted tinyint(2) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID),
 					KEY QST_order (QST_order)';
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_group_question';
-        $sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					QGQ_order int(10) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID),
 					KEY QST_ID (QST_ID),
 					KEY QSG_ID_order (QSG_ID,QGQ_order)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_option';
-        $sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSO_value varchar(255) NOT NULL,
 					QSO_desc text NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
@@ -386,9 +386,9 @@ 
 					PRIMARY KEY  (QSO_ID),
 					KEY QST_ID (QST_ID),
 					KEY QSO_order (QSO_order)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_registration';
-        $sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_registration';
+		$sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  EVT_ID bigint(20) unsigned NOT NULL,
 					  ATT_ID bigint(20) unsigned NOT NULL,
 					  TXN_ID int(10) unsigned NOT NULL,
@@ -412,18 +412,18 @@ 
 					  KEY TKT_ID (TKT_ID),
 					  KEY EVT_ID (EVT_ID),
 					  KEY STS_ID (STS_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_registration_payment';
-        $sql = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_registration_payment';
+		$sql = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  REG_ID int(10) unsigned NOT NULL,
 					  PAY_ID int(10) unsigned NULL,
 					  RPY_amount decimal(10,3) NOT NULL DEFAULT '0.00',
 					  PRIMARY KEY  (RPY_ID),
 					  KEY REG_ID (REG_ID),
 					  KEY PAY_ID (PAY_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_checkin';
-        $sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					DTT_ID int(10) unsigned NOT NULL,
 					CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -431,9 +431,9 @@ 
 					PRIMARY KEY  (CHK_ID),
 					KEY REG_ID (REG_ID),
 					KEY DTT_ID (DTT_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_state';
-        $sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_state';
+		$sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
 					  CNT_ISO varchar(2) collate utf8_bin NOT NULL,
 					  STA_abbrev varchar(24) collate utf8_bin NOT NULL,
 					  STA_name varchar(100) collate utf8_bin NOT NULL,
@@ -441,9 +441,9 @@ 
 					  PRIMARY KEY  (STA_ID),
 					  KEY STA_abbrev (STA_abbrev),
 					  KEY CNT_ISO (CNT_ISO)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_status';
-        $sql = "STS_ID varchar(3) NOT NULL,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_status';
+		$sql = "STS_ID varchar(3) NOT NULL,
 					  STS_code varchar(45) NOT NULL,
 					  STS_type varchar(45) NOT NULL,
 					  STS_can_edit tinyint(1) NOT NULL DEFAULT 0,
@@ -451,9 +451,9 @@ 
 					  STS_open tinyint(1) NOT NULL DEFAULT 1,
 					  UNIQUE KEY STS_ID_UNIQUE (STS_ID),
 					  KEY STS_type (STS_type)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_transaction';
-        $sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_transaction';
+		$sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TXN_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 					  TXN_total decimal(10,3) DEFAULT '0.00',
 					  TXN_paid decimal(10,3) NOT NULL DEFAULT '0.00',
@@ -465,9 +465,9 @@ 
 					  PRIMARY KEY  (TXN_ID),
 					  KEY TXN_timestamp (TXN_timestamp),
 					  KEY STS_ID (STS_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_venue_meta';
-        $sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_venue_meta';
+		$sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
 			VNU_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 			VNU_address varchar(255) DEFAULT NULL,
 			VNU_address2 varchar(255) DEFAULT NULL,
@@ -486,10 +486,10 @@ 
 			KEY VNU_ID (VNU_ID),
 			KEY STA_ID (STA_ID),
 			KEY CNT_ISO (CNT_ISO)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        // modified tables
-        $table_name = "esp_price";
-        $sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		// modified tables
+		$table_name = "esp_price";
+		$sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  PRT_ID tinyint(3) unsigned NOT NULL,
 					  PRC_amount decimal(10,3) NOT NULL DEFAULT '0.00',
 					  PRC_name varchar(245) NOT NULL,
@@ -502,9 +502,9 @@ 
 					  PRC_parent int(10) unsigned DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID),
 					  KEY PRT_ID (PRT_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_price_type";
-        $sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_price_type";
+		$sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
 				  PRT_name varchar(45) NOT NULL,
 				  PBT_ID tinyint(3) unsigned NOT NULL DEFAULT '1',
 				  PRT_is_percent tinyint(1) NOT NULL DEFAULT '0',
@@ -513,9 +513,9 @@ 
 				  PRT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				  UNIQUE KEY PRT_name_UNIQUE (PRT_name),
 				  PRIMARY KEY  (PRT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = "esp_ticket";
-        $sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = "esp_ticket";
+		$sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TTM_ID int(10) unsigned NOT NULL,
 					  TKT_name varchar(245) NOT NULL DEFAULT '',
 					  TKT_description text NOT NULL,
@@ -537,9 +537,9 @@ 
 					  TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 					  PRIMARY KEY  (TKT_ID),
 					  KEY TKT_start_date (TKT_start_date)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_group';
-        $sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_group';
+		$sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_name varchar(255) NOT NULL,
 					QSG_identifier varchar(100) NOT NULL,
 					QSG_desc text NULL,
@@ -552,223 +552,223 @@ 
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier),
 					KEY QSG_order (QSG_order)';
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        /** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
-        $script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
-        // (because many need to convert old string states to foreign keys into the states table)
-        $script_4_1_defaults->insert_default_states();
-        $script_4_1_defaults->insert_default_countries();
-        /** @var EE_DMS_Core_4_5_0 $script_4_5_defaults */
-        $script_4_5_defaults = EE_Registry::instance()->load_dms('Core_4_5_0');
-        $script_4_5_defaults->insert_default_price_types();
-        $script_4_5_defaults->insert_default_prices();
-        $script_4_5_defaults->insert_default_tickets();
-        /** @var EE_DMS_Core_4_6_0 $script_4_6_defaults */
-        $script_4_6_defaults = EE_Registry::instance()->load_dms('Core_4_6_0');
-        $script_4_6_defaults->add_default_admin_only_payments();
-        $script_4_6_defaults->insert_default_currencies();
-        $this->verify_new_countries();
-        $this->verify_new_currencies();
-        return true;
-    }
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		/** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
+		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
+		// (because many need to convert old string states to foreign keys into the states table)
+		$script_4_1_defaults->insert_default_states();
+		$script_4_1_defaults->insert_default_countries();
+		/** @var EE_DMS_Core_4_5_0 $script_4_5_defaults */
+		$script_4_5_defaults = EE_Registry::instance()->load_dms('Core_4_5_0');
+		$script_4_5_defaults->insert_default_price_types();
+		$script_4_5_defaults->insert_default_prices();
+		$script_4_5_defaults->insert_default_tickets();
+		/** @var EE_DMS_Core_4_6_0 $script_4_6_defaults */
+		$script_4_6_defaults = EE_Registry::instance()->load_dms('Core_4_6_0');
+		$script_4_6_defaults->add_default_admin_only_payments();
+		$script_4_6_defaults->insert_default_currencies();
+		$this->verify_new_countries();
+		$this->verify_new_currencies();
+		return true;
+	}
 
 
 
-    /**
-     * @return boolean
-     */
-    public function schema_changes_after_migration()
-    {
-        $this->fix_non_default_taxes();
-        // this is actually the same as the last DMS
-        /** @var EE_DMS_Core_4_7_0 $script_4_7_defaults */
-        $script_4_7_defaults = EE_Registry::instance()->load_dms('Core_4_7_0');
-        return $script_4_7_defaults->schema_changes_after_migration();
-    }
+	/**
+	 * @return boolean
+	 */
+	public function schema_changes_after_migration()
+	{
+		$this->fix_non_default_taxes();
+		// this is actually the same as the last DMS
+		/** @var EE_DMS_Core_4_7_0 $script_4_7_defaults */
+		$script_4_7_defaults = EE_Registry::instance()->load_dms('Core_4_7_0');
+		return $script_4_7_defaults->schema_changes_after_migration();
+	}
 
 
 
-    public function migration_page_hooks()
-    {
-    }
+	public function migration_page_hooks()
+	{
+	}
 
 
 
-    /**
-     * verifies each of the new countries exists that somehow we missed in 4.1
-     */
-    public function verify_new_countries()
-    {
-        // a list of countries (and specifically some which were missed in another list):https://gist.github.com/adhipg/1600028
-        // how many decimal places? https://en.wikipedia.org/wiki/ISO_4217
-        // currency symbols: http://www.xe.com/symbols.php
-        // CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active
-        // ('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
-        $newer_countries = array(
-            array('AX', 'ALA', 0, '&#197;land Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0),
-            array('BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
-            array('CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0),
-            array('GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0),
-            array('IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
-            array('JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
-            array('MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
-            array('ME', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+382', 0, 0),
-            array('RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+381', 1, 0),
-            array('SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0),
-            array('SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0),
-            array('XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+383', 0, 0),
-            array('YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0),
-            array(
-                'BQ',
-                'BES',
-                0,
-                'Bonaire, Saint Eustatius and Saba',
-                'USD',
-                'Dollar',
-                'Dollars',
-                '$',
-                1,
-                2,
-                '+599',
-                0,
-                0,
-            ),
-            array('BV', 'BVT', 0, 'Bouvet Island', 'NOK', 'Krone', 'Krones', 'kr', 1, 2, '+47', 0, 0),
-            array('IO', 'IOT', 0, 'British Indian Ocean Territory', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+246', 0, 0),
-            array('CX', 'CXR', 0, 'Christmas Island', 'AUD', 'Dollar', 'Dollars', '$', 1, 2, '+61', 0, 0),
-            array('CC', 'CCK', 0, 'Cocos (Keeling) Islands', 'AUD', 'Dollar', 'Dollars', '$', 1, 2, '+891', 0, 0),
-            array(
-                'HM',
-                'HMD',
-                0,
-                'Heard Island and McDonald Islands',
-                'AUD',
-                'Dollar',
-                'Dollars',
-                '$',
-                1,
-                2,
-                '+891',
-                0,
-                0,
-            ),
-            array('PS', 'PSE', 0, 'Palestinian Territory', 'ILS', 'Shekel', 'Shekels', '₪', 1, 2, '+970', 0, 0),
-            array(
-                'GS',
-                'SGS',
-                0,
-                'South Georgia and the South Sandwich Islands',
-                'GBP',
-                'Pound',
-                'Pounds',
-                '£',
-                1,
-                2,
-                '+500',
-                0,
-                0,
-            ),
-            array('TL', 'TLS', 0, 'Timor-Leste', 'USD', 'Dollar', 'Dollars', '$', 1, 2, '+670', 0, 0),
-            array('TF', 'ATF', 0, 'French Southern Territories', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+262', 0, 0),
-            array(
-                'UM',
-                'UMI',
-                0,
-                'United States Minor Outlying Islands',
-                'USD',
-                'Dollar',
-                'Dollars',
-                '$',
-                1,
-                2,
-                '+1',
-                0,
-                0,
-            ),
-        );
-        global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
-        $country_format = array(
-            "CNT_ISO"         => '%s',
-            "CNT_ISO3"        => '%s',
-            "RGN_ID"          => '%d',
-            "CNT_name"        => '%s',
-            "CNT_cur_code"    => '%s',
-            "CNT_cur_single"  => '%s',
-            "CNT_cur_plural"  => '%s',
-            "CNT_cur_sign"    => '%s',
-            "CNT_cur_sign_b4" => '%d',
-            "CNT_cur_dec_plc" => '%d',
-            "CNT_tel_code"    => '%s',
-            "CNT_is_EU"       => '%d',
-            "CNT_active"      => '%d',
-        );
-        if ($this->_get_table_analysis()->tableExists($country_table)) {
-            foreach ($newer_countries as $country) {
-                $SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1";
-                $countries = $wpdb->get_var($SQL);
-                if (! $countries) {
-                    $wpdb->insert(
-                        $country_table,
-                        array_combine(array_keys($country_format), $country),
-                        $country_format
-                    );
-                }
-            }
-        }
-    }
+	/**
+	 * verifies each of the new countries exists that somehow we missed in 4.1
+	 */
+	public function verify_new_countries()
+	{
+		// a list of countries (and specifically some which were missed in another list):https://gist.github.com/adhipg/1600028
+		// how many decimal places? https://en.wikipedia.org/wiki/ISO_4217
+		// currency symbols: http://www.xe.com/symbols.php
+		// CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active
+		// ('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
+		$newer_countries = array(
+			array('AX', 'ALA', 0, '&#197;land Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0),
+			array('BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
+			array('CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0),
+			array('GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0),
+			array('IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
+			array('JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
+			array('MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
+			array('ME', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+382', 0, 0),
+			array('RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+381', 1, 0),
+			array('SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0),
+			array('SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0),
+			array('XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+383', 0, 0),
+			array('YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0),
+			array(
+				'BQ',
+				'BES',
+				0,
+				'Bonaire, Saint Eustatius and Saba',
+				'USD',
+				'Dollar',
+				'Dollars',
+				'$',
+				1,
+				2,
+				'+599',
+				0,
+				0,
+			),
+			array('BV', 'BVT', 0, 'Bouvet Island', 'NOK', 'Krone', 'Krones', 'kr', 1, 2, '+47', 0, 0),
+			array('IO', 'IOT', 0, 'British Indian Ocean Territory', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+246', 0, 0),
+			array('CX', 'CXR', 0, 'Christmas Island', 'AUD', 'Dollar', 'Dollars', '$', 1, 2, '+61', 0, 0),
+			array('CC', 'CCK', 0, 'Cocos (Keeling) Islands', 'AUD', 'Dollar', 'Dollars', '$', 1, 2, '+891', 0, 0),
+			array(
+				'HM',
+				'HMD',
+				0,
+				'Heard Island and McDonald Islands',
+				'AUD',
+				'Dollar',
+				'Dollars',
+				'$',
+				1,
+				2,
+				'+891',
+				0,
+				0,
+			),
+			array('PS', 'PSE', 0, 'Palestinian Territory', 'ILS', 'Shekel', 'Shekels', '₪', 1, 2, '+970', 0, 0),
+			array(
+				'GS',
+				'SGS',
+				0,
+				'South Georgia and the South Sandwich Islands',
+				'GBP',
+				'Pound',
+				'Pounds',
+				'£',
+				1,
+				2,
+				'+500',
+				0,
+				0,
+			),
+			array('TL', 'TLS', 0, 'Timor-Leste', 'USD', 'Dollar', 'Dollars', '$', 1, 2, '+670', 0, 0),
+			array('TF', 'ATF', 0, 'French Southern Territories', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+262', 0, 0),
+			array(
+				'UM',
+				'UMI',
+				0,
+				'United States Minor Outlying Islands',
+				'USD',
+				'Dollar',
+				'Dollars',
+				'$',
+				1,
+				2,
+				'+1',
+				0,
+				0,
+			),
+		);
+		global $wpdb;
+		$country_table = $wpdb->prefix . "esp_country";
+		$country_format = array(
+			"CNT_ISO"         => '%s',
+			"CNT_ISO3"        => '%s',
+			"RGN_ID"          => '%d',
+			"CNT_name"        => '%s',
+			"CNT_cur_code"    => '%s',
+			"CNT_cur_single"  => '%s',
+			"CNT_cur_plural"  => '%s',
+			"CNT_cur_sign"    => '%s',
+			"CNT_cur_sign_b4" => '%d',
+			"CNT_cur_dec_plc" => '%d',
+			"CNT_tel_code"    => '%s',
+			"CNT_is_EU"       => '%d',
+			"CNT_active"      => '%d',
+		);
+		if ($this->_get_table_analysis()->tableExists($country_table)) {
+			foreach ($newer_countries as $country) {
+				$SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1";
+				$countries = $wpdb->get_var($SQL);
+				if (! $countries) {
+					$wpdb->insert(
+						$country_table,
+						array_combine(array_keys($country_format), $country),
+						$country_format
+					);
+				}
+			}
+		}
+	}
 
 
 
-    /**
-     * verifies each of the new currencies exists that somehow we missed in 4.6
-     */
-    public function verify_new_currencies()
-    {
-        // a list of countries (and specifically some which were missed in another list):https://gist.github.com/adhipg/1600028
-        // how many decimal places? https://en.wikipedia.org/wiki/ISO_4217
-        // currency symbols: http://www.xe.com/symbols.php
-        // CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active
-        // ( 'EUR',  'Euro',  'Euros',  '€',  2,1),
-        $newer_currencies = array(
-            array('RSD', 'Dinar', 'Dinars', '', 3, 1),
-        );
-        global $wpdb;
-        $currency_table = $wpdb->prefix . "esp_currency";
-        $currency_format = array(
-            "CUR_code"    => '%s',
-            "CUR_single"  => '%s',
-            "CUR_plural"  => '%s',
-            "CUR_sign"    => '%s',
-            "CUR_dec_plc" => '%d',
-            "CUR_active"  => '%d',
-        );
-        if ($this->_get_table_analysis()->tableExists($currency_table)) {
-            foreach ($newer_currencies as $currency) {
-                $SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1";
-                $countries = $wpdb->get_var($SQL);
-                if (! $countries) {
-                    $wpdb->insert(
-                        $currency_table,
-                        array_combine(array_keys($currency_format), $currency),
-                        $currency_format
-                    );
-                }
-            }
-        }
-    }
+	/**
+	 * verifies each of the new currencies exists that somehow we missed in 4.6
+	 */
+	public function verify_new_currencies()
+	{
+		// a list of countries (and specifically some which were missed in another list):https://gist.github.com/adhipg/1600028
+		// how many decimal places? https://en.wikipedia.org/wiki/ISO_4217
+		// currency symbols: http://www.xe.com/symbols.php
+		// CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active
+		// ( 'EUR',  'Euro',  'Euros',  '€',  2,1),
+		$newer_currencies = array(
+			array('RSD', 'Dinar', 'Dinars', '', 3, 1),
+		);
+		global $wpdb;
+		$currency_table = $wpdb->prefix . "esp_currency";
+		$currency_format = array(
+			"CUR_code"    => '%s',
+			"CUR_single"  => '%s',
+			"CUR_plural"  => '%s',
+			"CUR_sign"    => '%s',
+			"CUR_dec_plc" => '%d',
+			"CUR_active"  => '%d',
+		);
+		if ($this->_get_table_analysis()->tableExists($currency_table)) {
+			foreach ($newer_currencies as $currency) {
+				$SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1";
+				$countries = $wpdb->get_var($SQL);
+				if (! $countries) {
+					$wpdb->insert(
+						$currency_table,
+						array_combine(array_keys($currency_format), $currency),
+						$currency_format
+					);
+				}
+			}
+		}
+	}
 
 
 
-    /**
-     * addresses https://events.codebasehq.com/projects/event-espresso/tickets/8731
-     * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;
-     * we should be able to stop doing this in 4.9
-     */
-    public function fix_non_default_taxes()
-    {
-        global $wpdb;
-        $query = $wpdb->prepare("UPDATE
+	/**
+	 * addresses https://events.codebasehq.com/projects/event-espresso/tickets/8731
+	 * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;
+	 * we should be able to stop doing this in 4.9
+	 */
+	public function fix_non_default_taxes()
+	{
+		global $wpdb;
+		$query = $wpdb->prepare("UPDATE
 				{$wpdb->prefix}esp_price p INNER JOIN
 				{$wpdb->prefix}esp_price_type pt ON p.PRT_ID = pt.PRT_ID
 			SET
@@ -777,6 +777,6 @@ 
 				p.PRC_is_default = 0 AND
 				pt.PBT_ID = %d
 					", EEM_Price_Type::base_type_tax);
-        $wpdb->query($query);
-    }
+		$wpdb->query($query);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -14,12 +14,12 @@ 
 // unfortunately, this needs to be done upon INCLUSION of this file,
 // instead of construction, because it only gets constructed on first page load
 // (all other times it gets resurrected from a wordpress option)
-$stages = glob(EE_CORE . 'data_migration_scripts/4_8_0_stages/*');
+$stages = glob(EE_CORE.'data_migration_scripts/4_8_0_stages/*');
 $class_to_filepath = array();
 foreach ($stages as $filepath) {
     $matches = array();
     preg_match('~4_8_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[ $matches[1] ] = $filepath;
+    $class_to_filepath[$matches[1]] = $filepath;
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_8_0__autoloaded_stages', $class_to_filepath);
@@ -72,10 +72,10 @@ 
         if (version_compare($version_string, '4.8.0', '<=') && version_compare($version_string, '4.7.0', '>=')) {
 //          echo "$version_string can be migrated from";
             return true;
-        } elseif (! $version_string) {
+        } elseif ( ! $version_string) {
 //          echo "no version string provided: $version_string";
             // no version string provided... this must be pre 4.3
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
+            return false; // changed mind. dont want people thinking they should migrate yet because they cant
         } else {
 //          echo "$version_string doesnt apply";
             return false;
@@ -89,9 +89,9 @@ 
      */
     public function schema_changes_before_migration()
     {
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+        require_once(EE_HELPERS.'EEH_Activation.helper.php');
         $now_in_mysql = current_time('mysql', true);
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+        require_once(EE_HELPERS.'EEH_Activation.helper.php');
         $table_name = 'esp_answer';
         $sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
@@ -687,7 +687,7 @@ 
             ),
         );
         global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
+        $country_table = $wpdb->prefix."esp_country";
         $country_format = array(
             "CNT_ISO"         => '%s',
             "CNT_ISO3"        => '%s',
@@ -707,7 +707,7 @@ 
             foreach ($newer_countries as $country) {
                 $SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1";
                 $countries = $wpdb->get_var($SQL);
-                if (! $countries) {
+                if ( ! $countries) {
                     $wpdb->insert(
                         $country_table,
                         array_combine(array_keys($country_format), $country),
@@ -734,7 +734,7 @@ 
             array('RSD', 'Dinar', 'Dinars', '', 3, 1),
         );
         global $wpdb;
-        $currency_table = $wpdb->prefix . "esp_currency";
+        $currency_table = $wpdb->prefix."esp_currency";
         $currency_format = array(
             "CUR_code"    => '%s',
             "CUR_single"  => '%s',
@@ -747,7 +747,7 @@ 
             foreach ($newer_currencies as $currency) {
                 $SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1";
                 $countries = $wpdb->get_var($SQL);
-                if (! $countries) {
+                if ( ! $countries) {
                     $wpdb->insert(
                         $currency_table,
                         array_combine(array_keys($currency_format), $currency),

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

Indentation +49 added lines, -49 removed lines

@@ -8,53 +8,53 @@
  */
 class EE_DMS_4_1_0_category_details extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_new_table;
-    private $_new_term_table;
-    public 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);
-        $items_actually_migrated = 0;
-        foreach ($rows as $category_detail_row) {
-            $term_and_taxonomy_ids = wp_insert_term(
-                stripslashes($category_detail_row['category_name']),
-                'espresso_event_categories',
-                array(
-                    'description'=>  stripslashes($category_detail_row['category_desc']),
-                    'slug'=>$category_detail_row['category_identifier']
-                )
-            );
-            if ($term_and_taxonomy_ids instanceof WP_Error) {
-                $this->add_error(sprintf(__("Could not create WP Term_Taxonomy from old category: %s. The Error was: %s", "event_espresso"), $this->_json_encode($category_detail_row), $term_and_taxonomy_ids->get_error_message()));
-                $items_actually_migrated++;
-                continue;
-            }
-            $term_id = $term_and_taxonomy_ids['term_id'];
-            $term_taxonomy_id = $term_and_taxonomy_ids['term_taxonomy_id'];
-            $this->get_migration_script()->set_mapping($this->_old_table, $category_detail_row['id'], $this->_new_term_table, $term_id);
-            $this->get_migration_script()->set_mapping($this->_old_table, $category_detail_row['id'], $this->_new_table, $term_taxonomy_id);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM $this->_old_table");
-        return $count;
-    }
-    public function __construct()
-    {
-        $this->_pretty_name = __("Category Details", "event_espresso");
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix."events_category_detail";
-        $this->_new_table = $wpdb->prefix."term_taxonomy";
-        $this->_new_term_table = $wpdb->prefix."terms";
-        parent::__construct();
-    }
+	private $_old_table;
+	private $_new_table;
+	private $_new_term_table;
+	public 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);
+		$items_actually_migrated = 0;
+		foreach ($rows as $category_detail_row) {
+			$term_and_taxonomy_ids = wp_insert_term(
+				stripslashes($category_detail_row['category_name']),
+				'espresso_event_categories',
+				array(
+					'description'=>  stripslashes($category_detail_row['category_desc']),
+					'slug'=>$category_detail_row['category_identifier']
+				)
+			);
+			if ($term_and_taxonomy_ids instanceof WP_Error) {
+				$this->add_error(sprintf(__("Could not create WP Term_Taxonomy from old category: %s. The Error was: %s", "event_espresso"), $this->_json_encode($category_detail_row), $term_and_taxonomy_ids->get_error_message()));
+				$items_actually_migrated++;
+				continue;
+			}
+			$term_id = $term_and_taxonomy_ids['term_id'];
+			$term_taxonomy_id = $term_and_taxonomy_ids['term_taxonomy_id'];
+			$this->get_migration_script()->set_mapping($this->_old_table, $category_detail_row['id'], $this->_new_term_table, $term_id);
+			$this->get_migration_script()->set_mapping($this->_old_table, $category_detail_row['id'], $this->_new_table, $term_taxonomy_id);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$count = $wpdb->get_var("SELECT COUNT(id) FROM $this->_old_table");
+		return $count;
+	}
+	public function __construct()
+	{
+		$this->_pretty_name = __("Category Details", "event_espresso");
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix."events_category_detail";
+		$this->_new_table = $wpdb->prefix."term_taxonomy";
+		$this->_new_term_table = $wpdb->prefix."terms";
+		parent::__construct();
+	}
 }

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

Indentation +76 added lines, -78 removed lines

@@ -24,87 +24,85 @@
                 'term_taxonomy_id'=>new EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID','event_espresso'), false, 0, 'Term_Taxonomy'),
                 'term_order'=>new EE_Integer_Field('term_order', __('Term Order','event_espresso'), false, 0)
             ));
-
-
  *
  */
 class EE_DMS_4_1_0_event_category extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_new_table;
-    public 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);
-        $items_actually_migrated = 0;
-        foreach ($rows as $event_venue_rel) {
-            $term_relation_id = $this->_add_relation_from_event_to_term_taxonomy($event_venue_rel);
-            if ($term_relation_id) {
-                $this->get_migration_script()->set_mapping($this->_old_table, $event_venue_rel['id'], $this->_new_table, $term_relation_id);
-            }
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
-        return $count;
-    }
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix."events_category_rel";
-        $this->_new_table = $wpdb->prefix."term_relationships";
-        $this->_pretty_name = __("Event to Category (4.1 Term Relationships)", "event_espresso");
-        parent::__construct();
-    }
+	private $_old_table;
+	private $_new_table;
+	public 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);
+		$items_actually_migrated = 0;
+		foreach ($rows as $event_venue_rel) {
+			$term_relation_id = $this->_add_relation_from_event_to_term_taxonomy($event_venue_rel);
+			if ($term_relation_id) {
+				$this->get_migration_script()->set_mapping($this->_old_table, $event_venue_rel['id'], $this->_new_table, $term_relation_id);
+			}
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
+		return $count;
+	}
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix."events_category_rel";
+		$this->_new_table = $wpdb->prefix."term_relationships";
+		$this->_pretty_name = __("Event to Category (4.1 Term Relationships)", "event_espresso");
+		parent::__construct();
+	}
 
-    /**
-     * Attempts to insert a new question group inthe new format given an old one
-     * @global type $wpdb
-     * @param array $old_event_cat_relation
-     * @return int
-     */
-    private function _add_relation_from_event_to_term_taxonomy($old_event_cat_relation)
-    {
-        global $wpdb;
-        $new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", intval($old_event_cat_relation['event_id']), $wpdb->prefix."posts");
-        $new_term_taxonomy_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_category_detail", intval($old_event_cat_relation['cat_id']), $wpdb->prefix."term_taxonomy");
-        if (! $new_event_id) {
-            $this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_cat_relation['event_id']));
-            return 0;
-        }
-        if (! $new_term_taxonomy_id) {
-            $this->add_error(sprintf(__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"), $old_event_cat_relation['cat_id']));
-            return 0;
-        }
-        $cols_n_values = array(
-            'object_id'=>$new_event_id,
-            'term_taxonomy_id'=>$new_term_taxonomy_id,
-            'term_order'=>0
-        );
-        $datatypes = array(
-            '%d',// object_id
-            '%d',// term_taxonomy_id
-            '%d',// term_order
-        );
-        $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
-            return 0;
-        } else {
-            // increment the term-taxonomie's count
-            $success = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id));
-            if (! $success) {
-                $this->add_error(sprintf(__('Could not increment term_taxonomy\'s count because %s', 'event_espresso'), $wpdb->last_error));
-            }
-        }
-        return $wpdb->insert_id;
-    }
+	/**
+	 * Attempts to insert a new question group inthe new format given an old one
+	 * @global type $wpdb
+	 * @param array $old_event_cat_relation
+	 * @return int
+	 */
+	private function _add_relation_from_event_to_term_taxonomy($old_event_cat_relation)
+	{
+		global $wpdb;
+		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", intval($old_event_cat_relation['event_id']), $wpdb->prefix."posts");
+		$new_term_taxonomy_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_category_detail", intval($old_event_cat_relation['cat_id']), $wpdb->prefix."term_taxonomy");
+		if (! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_cat_relation['event_id']));
+			return 0;
+		}
+		if (! $new_term_taxonomy_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"), $old_event_cat_relation['cat_id']));
+			return 0;
+		}
+		$cols_n_values = array(
+			'object_id'=>$new_event_id,
+			'term_taxonomy_id'=>$new_term_taxonomy_id,
+			'term_order'=>0
+		);
+		$datatypes = array(
+			'%d',// object_id
+			'%d',// term_taxonomy_id
+			'%d',// term_order
+		);
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
+			return 0;
+		} else {
+			// increment the term-taxonomie's count
+			$success = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id));
+			if (! $success) {
+				$this->add_error(sprintf(__('Could not increment term_taxonomy\'s count because %s', 'event_espresso'), $wpdb->last_error));
+			}
+		}
+		return $wpdb->insert_id;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -76,11 +76,11 @@ 
         global $wpdb;
         $new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", intval($old_event_cat_relation['event_id']), $wpdb->prefix."posts");
         $new_term_taxonomy_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_category_detail", intval($old_event_cat_relation['cat_id']), $wpdb->prefix."term_taxonomy");
-        if (! $new_event_id) {
+        if ( ! $new_event_id) {
             $this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_cat_relation['event_id']));
             return 0;
         }
-        if (! $new_term_taxonomy_id) {
+        if ( ! $new_term_taxonomy_id) {
             $this->add_error(sprintf(__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"), $old_event_cat_relation['cat_id']));
             return 0;
         }
@@ -90,18 +90,18 @@ 
             'term_order'=>0
         );
         $datatypes = array(
-            '%d',// object_id
-            '%d',// term_taxonomy_id
-            '%d',// term_order
+            '%d', // object_id
+            '%d', // term_taxonomy_id
+            '%d', // term_order
         );
         $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
             return 0;
         } else {
             // increment the term-taxonomie's count
             $success = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id));
-            if (! $success) {
+            if ( ! $success) {
                 $this->add_error(sprintf(__('Could not increment term_taxonomy\'s count because %s', 'event_espresso'), $wpdb->last_error));
             }
         }

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

Indentation +155 added lines, -155 removed lines

@@ -38,168 +38,168 @@
  */
 class EE_DMS_4_1_0_line_items extends EE_Data_Migration_Script_Stage_Table
 {
-    private $_new_line_table;
-    private $_new_transaction_table;
-    private $_new_reg_table;
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __("Line Items", "event_espresso");
-        $this->_old_table = $wpdb->prefix."events_attendee";
-        $this->_new_transaction_table = $wpdb->prefix."esp_transaction";
-        $this->_new_line_table = $wpdb->prefix."esp_line_item";
-        $this->_new_reg_table = $wpdb->prefix."esp_registration";
-        parent::__construct();
-    }
+	private $_new_line_table;
+	private $_new_transaction_table;
+	private $_new_reg_table;
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __("Line Items", "event_espresso");
+		$this->_old_table = $wpdb->prefix."events_attendee";
+		$this->_new_transaction_table = $wpdb->prefix."esp_transaction";
+		$this->_new_line_table = $wpdb->prefix."esp_line_item";
+		$this->_new_reg_table = $wpdb->prefix."esp_registration";
+		parent::__construct();
+	}
     
-    protected function _migrate_old_row($old_row)
-    {
-        // insert line items if its a primary id
-        if (intval($old_row['is_primary'])) {
-            $txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $this->_new_transaction_table);
-            if (! $txn_id) {
-                $this->add_error(sprintf(__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"), $old_row['id'], $this->_json_encode($old_row)));
-                return;
-            }
-            $txn = $this->_get_txn($txn_id);
-            $new_line_items = $this->_insert_new_line_items($txn, $old_row);
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_line_table, $new_line_items);
-        }
-    }
+	protected function _migrate_old_row($old_row)
+	{
+		// insert line items if its a primary id
+		if (intval($old_row['is_primary'])) {
+			$txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $this->_new_transaction_table);
+			if (! $txn_id) {
+				$this->add_error(sprintf(__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"), $old_row['id'], $this->_json_encode($old_row)));
+				return;
+			}
+			$txn = $this->_get_txn($txn_id);
+			$new_line_items = $this->_insert_new_line_items($txn, $old_row);
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_line_table, $new_line_items);
+		}
+	}
     
-    private function _get_txn($txn_id)
-    {
-        global $wpdb;
-        $txn = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->_new_transaction_table WHERE TXN_ID=%d", $txn_id), ARRAY_A);
-        return $txn;
-    }
+	private function _get_txn($txn_id)
+	{
+		global $wpdb;
+		$txn = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->_new_transaction_table WHERE TXN_ID=%d", $txn_id), ARRAY_A);
+		return $txn;
+	}
     
-    /**
-     * In 4.1, we'd normally need more info than just the registrations to make the line items. Ie, we'd need
-     * the transaction, and tax prices at the time of registration. (And probably promotions and other price factors).
-     * But seeing how these are REGs created from 3.1 attendee data, which have
-     * @param array $transaction
-     * @return array new line item ids
-     */
-    private function _insert_new_line_items($transaction, $old_attendee)
-    {
-        global $wpdb;
-        $regs_on_this_transaction = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_new_reg_table." WHERE TXN_ID=%d", $transaction['TXN_ID']), ARRAY_A);
-        $new_line_item_ids = array();
-        // create a totla line item
-        $total_line_item_id = $this->_insert_new_line_item(array(
-            'LIN_code'=>'total',
-            'TXN_ID'=>$transaction['TXN_ID'],
-            'LIN_name'=>  __("Total", "event_espresso"),
-            'LIN_total'=>$transaction['TXN_total'],
-            'LIN_type'=>'total',
-            'OBJ_ID'=>$transaction['TXN_ID'],
-            'OBJ_type'=>'Transaction'
-        ), $old_attendee);
-        $new_line_item_ids[] = $total_line_item_id;
-        // create a subtotal line item
-        $reg_total = 0;
-        foreach ($regs_on_this_transaction as $new_reg) {
-            $reg_total += floatval($new_reg['REG_final_price']);
-        }
-        $subtotal_line_item_id = $this->_insert_new_line_item(array(
-            'LIN_code'=>'sub-total',
-            'TXN_ID'=>$transaction['TXN_ID'],
-            'LIN_name'=>  __("Subtotal", "event_espresso"),
-            'LIN_total'=>$reg_total,
-            'LIN_parent'=>$total_line_item_id,
-            'LIN_type'=>'sub-total',
-        ), $old_attendee);
-        $new_line_item_ids[] = $subtotal_line_item_id;
-        // group REGs by TKT_ID
-        $regs_by_tkt = array();
-        foreach ($regs_on_this_transaction as $new_reg) {
-            $regs_by_tkt[ $new_reg['TKT_ID'] ][] = $new_reg;
-        }
+	/**
+	 * In 4.1, we'd normally need more info than just the registrations to make the line items. Ie, we'd need
+	 * the transaction, and tax prices at the time of registration. (And probably promotions and other price factors).
+	 * But seeing how these are REGs created from 3.1 attendee data, which have
+	 * @param array $transaction
+	 * @return array new line item ids
+	 */
+	private function _insert_new_line_items($transaction, $old_attendee)
+	{
+		global $wpdb;
+		$regs_on_this_transaction = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_new_reg_table." WHERE TXN_ID=%d", $transaction['TXN_ID']), ARRAY_A);
+		$new_line_item_ids = array();
+		// create a totla line item
+		$total_line_item_id = $this->_insert_new_line_item(array(
+			'LIN_code'=>'total',
+			'TXN_ID'=>$transaction['TXN_ID'],
+			'LIN_name'=>  __("Total", "event_espresso"),
+			'LIN_total'=>$transaction['TXN_total'],
+			'LIN_type'=>'total',
+			'OBJ_ID'=>$transaction['TXN_ID'],
+			'OBJ_type'=>'Transaction'
+		), $old_attendee);
+		$new_line_item_ids[] = $total_line_item_id;
+		// create a subtotal line item
+		$reg_total = 0;
+		foreach ($regs_on_this_transaction as $new_reg) {
+			$reg_total += floatval($new_reg['REG_final_price']);
+		}
+		$subtotal_line_item_id = $this->_insert_new_line_item(array(
+			'LIN_code'=>'sub-total',
+			'TXN_ID'=>$transaction['TXN_ID'],
+			'LIN_name'=>  __("Subtotal", "event_espresso"),
+			'LIN_total'=>$reg_total,
+			'LIN_parent'=>$total_line_item_id,
+			'LIN_type'=>'sub-total',
+		), $old_attendee);
+		$new_line_item_ids[] = $subtotal_line_item_id;
+		// group REGs by TKT_ID
+		$regs_by_tkt = array();
+		foreach ($regs_on_this_transaction as $new_reg) {
+			$regs_by_tkt[ $new_reg['TKT_ID'] ][] = $new_reg;
+		}
         
-        // create individual line items
+		// create individual line items
         
-        foreach ($regs_by_tkt as $ticket_id => $regs) {
-            $count = count($regs);
-            $line_total = 0;
-            foreach ($regs as $new_reg) {
-                $line_total += $new_reg['REG_final_price'];
-            }
-            $a_reg = reset($regs);
-            $new_ticket = $this->_get_new_ticket_row($a_reg['TKT_ID']);
-            $reg_line_item_id = $this->_insert_new_line_item(array(
-                'LIN_code'=> md5('Ticket' . $ticket_id . time()),
-                'TXN_ID'=>$transaction['TXN_ID'],
-                'LIN_name'=>$new_ticket['TKT_name'],
-                'LIN_unit_price'=>$a_reg['REG_final_price'],
-                'LIN_is_taxable'=>false,
-                'LIN_total'=>$line_total,
-                'LIN_quantity'=>$count,
-                'LIN_parent'=>$subtotal_line_item_id,
-                'OBJ_ID'=>$ticket_id,
-                'OBJ_type'=>'Ticket'
-            ), $old_attendee);
-            $new_line_item_ids[] = $reg_line_item_id;
-        }
+		foreach ($regs_by_tkt as $ticket_id => $regs) {
+			$count = count($regs);
+			$line_total = 0;
+			foreach ($regs as $new_reg) {
+				$line_total += $new_reg['REG_final_price'];
+			}
+			$a_reg = reset($regs);
+			$new_ticket = $this->_get_new_ticket_row($a_reg['TKT_ID']);
+			$reg_line_item_id = $this->_insert_new_line_item(array(
+				'LIN_code'=> md5('Ticket' . $ticket_id . time()),
+				'TXN_ID'=>$transaction['TXN_ID'],
+				'LIN_name'=>$new_ticket['TKT_name'],
+				'LIN_unit_price'=>$a_reg['REG_final_price'],
+				'LIN_is_taxable'=>false,
+				'LIN_total'=>$line_total,
+				'LIN_quantity'=>$count,
+				'LIN_parent'=>$subtotal_line_item_id,
+				'OBJ_ID'=>$ticket_id,
+				'OBJ_type'=>'Ticket'
+			), $old_attendee);
+			$new_line_item_ids[] = $reg_line_item_id;
+		}
         
             
         
-        return $new_line_item_ids;
-    }
-    /**
-     * Gets the full ticket by ID
-     * @global type $wpdb
-     * @param type $new_ticket_id
-     * @return array
-     */
-    private function _get_new_ticket_row($new_ticket_id)
-    {
-        global $wpdb;
-        $ticket_row = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."esp_ticket WHERE TKT_ID=%d", $new_ticket_id), ARRAY_A);
-        return $ticket_row;
-    }
+		return $new_line_item_ids;
+	}
+	/**
+	 * Gets the full ticket by ID
+	 * @global type $wpdb
+	 * @param type $new_ticket_id
+	 * @return array
+	 */
+	private function _get_new_ticket_row($new_ticket_id)
+	{
+		global $wpdb;
+		$ticket_row = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."esp_ticket WHERE TKT_ID=%d", $new_ticket_id), ARRAY_A);
+		return $ticket_row;
+	}
     
-    private function _insert_new_line_item($cols_n_values, $old_attendee)
-    {
-        global $wpdb;
-        $default_cols_n_values = array(
-            'LIN_code'=>'',
-            'TXN_ID'=>0,
-            'LIN_name'=>'',
-            'LIN_desc'=>'',
-            'LIN_unit_price'=>0,
-            'LIN_percent'=>0,
-            'LIN_is_taxable'=>false,
-            'LIN_order'=>0,
-            'LIN_total'=>0,
-            'LIN_quantity'=>null,
-            'LIN_parent'=>0,
-            'LIN_type'=>'line-item',
-            'OBJ_ID'=>null,
-            'OBJ_type'=>null
-        );
-        $cols_n_values = array_merge($default_cols_n_values, $cols_n_values);
-            $datatypes = array(
-                '%s',// LIN_code
-                '%d',// TXN_ID
-                '%s',// LIN_name
-                '%s',// LIN_desc
-                '%f',// LIN_unit_price
-                '%f',// LIN_percent
-                '%d',// LIN_is_taxable
-                '%d',// LIN_order
-                '%f',// LIN_total
-                '%d',// LIN_quantity
-                '%d',// LIN_parent
-                '%s',// LIN_type
-                '%d',// OBJ_ID
-                '%s',// OBJ_type
-            );
-            $success = $wpdb->insert($this->_new_line_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_reg_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-            return $wpdb->insert_id;
-    }
+	private function _insert_new_line_item($cols_n_values, $old_attendee)
+	{
+		global $wpdb;
+		$default_cols_n_values = array(
+			'LIN_code'=>'',
+			'TXN_ID'=>0,
+			'LIN_name'=>'',
+			'LIN_desc'=>'',
+			'LIN_unit_price'=>0,
+			'LIN_percent'=>0,
+			'LIN_is_taxable'=>false,
+			'LIN_order'=>0,
+			'LIN_total'=>0,
+			'LIN_quantity'=>null,
+			'LIN_parent'=>0,
+			'LIN_type'=>'line-item',
+			'OBJ_ID'=>null,
+			'OBJ_type'=>null
+		);
+		$cols_n_values = array_merge($default_cols_n_values, $cols_n_values);
+			$datatypes = array(
+				'%s',// LIN_code
+				'%d',// TXN_ID
+				'%s',// LIN_name
+				'%s',// LIN_desc
+				'%f',// LIN_unit_price
+				'%f',// LIN_percent
+				'%d',// LIN_is_taxable
+				'%d',// LIN_order
+				'%f',// LIN_total
+				'%d',// LIN_quantity
+				'%d',// LIN_parent
+				'%s',// LIN_type
+				'%d',// OBJ_ID
+				'%s',// OBJ_type
+			);
+			$success = $wpdb->insert($this->_new_line_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_reg_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+			return $wpdb->insert_id;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -57,7 +57,7 @@ 
         // insert line items if its a primary id
         if (intval($old_row['is_primary'])) {
             $txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $this->_new_transaction_table);
-            if (! $txn_id) {
+            if ( ! $txn_id) {
                 $this->add_error(sprintf(__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"), $old_row['id'], $this->_json_encode($old_row)));
                 return;
             }
@@ -114,7 +114,7 @@ 
         // group REGs by TKT_ID
         $regs_by_tkt = array();
         foreach ($regs_on_this_transaction as $new_reg) {
-            $regs_by_tkt[ $new_reg['TKT_ID'] ][] = $new_reg;
+            $regs_by_tkt[$new_reg['TKT_ID']][] = $new_reg;
         }
         
         // create individual line items
@@ -128,7 +128,7 @@ 
             $a_reg = reset($regs);
             $new_ticket = $this->_get_new_ticket_row($a_reg['TKT_ID']);
             $reg_line_item_id = $this->_insert_new_line_item(array(
-                'LIN_code'=> md5('Ticket' . $ticket_id . time()),
+                'LIN_code'=> md5('Ticket'.$ticket_id.time()),
                 'TXN_ID'=>$transaction['TXN_ID'],
                 'LIN_name'=>$new_ticket['TKT_name'],
                 'LIN_unit_price'=>$a_reg['REG_final_price'],
@@ -180,23 +180,23 @@ 
         );
         $cols_n_values = array_merge($default_cols_n_values, $cols_n_values);
             $datatypes = array(
-                '%s',// LIN_code
-                '%d',// TXN_ID
-                '%s',// LIN_name
-                '%s',// LIN_desc
-                '%f',// LIN_unit_price
-                '%f',// LIN_percent
-                '%d',// LIN_is_taxable
-                '%d',// LIN_order
-                '%f',// LIN_total
-                '%d',// LIN_quantity
-                '%d',// LIN_parent
-                '%s',// LIN_type
-                '%d',// OBJ_ID
-                '%s',// OBJ_type
+                '%s', // LIN_code
+                '%d', // TXN_ID
+                '%s', // LIN_name
+                '%s', // LIN_desc
+                '%f', // LIN_unit_price
+                '%f', // LIN_percent
+                '%d', // LIN_is_taxable
+                '%d', // LIN_order
+                '%f', // LIN_total
+                '%d', // LIN_quantity
+                '%d', // LIN_parent
+                '%s', // LIN_type
+                '%d', // OBJ_ID
+                '%s', // OBJ_type
             );
             $success = $wpdb->insert($this->_new_line_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_reg_table, $cols_n_values, $datatypes));
             return 0;
         }

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

Indentation +78 added lines, -81 removed lines

@@ -25,92 +25,89 @@
 
             )
         );
-
-
-
  *
  */
 class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_new_table;
-    public function _migration_step($num_items = 50)
-    {
+	private $_old_table;
+	private $_new_table;
+	public 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);
-        $items_actually_migrated = 0;
-        foreach ($rows as $event_venue_rel) {
-            $this->_insert_new_event_to_venue_rel($event_venue_rel);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
-        return $count;
-    }
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix."events_venue_rel";
-        $this->_new_table = $wpdb->prefix."esp_event_venue";
-        $this->_pretty_name = __("Event to Venue Relations", "event_espresso");
-        parent::__construct();
-    }
+		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);
+		$items_actually_migrated = 0;
+		foreach ($rows as $event_venue_rel) {
+			$this->_insert_new_event_to_venue_rel($event_venue_rel);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
+		return $count;
+	}
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix."events_venue_rel";
+		$this->_new_table = $wpdb->prefix."esp_event_venue";
+		$this->_pretty_name = __("Event to Venue Relations", "event_espresso");
+		parent::__construct();
+	}
     
-    /**
-     * Attempts to insert a new question group inthe new format given an old one
-     * @global type $wpdb
-     * @param array $old_event_venue_rel
-     * @return int
-     */
-    private function _insert_new_event_to_venue_rel($old_event_venue_rel)
-    {
-        global $wpdb;
-        $new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_venue_rel['event_id'], $wpdb->prefix."posts");
-        $new_venue_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_venue", $old_event_venue_rel['venue_id'], $wpdb->prefix."posts");
-        if (! $new_event_id) {
-            $this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_venue_rel['event_id']));
-            return 0;
-        }
-        if (! $new_venue_id) {
-            $this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $old_event_venue_rel['venue_id']));
-            return 0;
-        }
-        // first ensure there are no other relation entries for this event
-        // because although EE4 supports it, EE3 didn't really
-        $wpdb->delete(
-            $this->_new_table,
-            array(
-                    'EVT_ID' => $new_event_id,
-                ),
-            array(
-                    '%d',// EVT_ID
-                )
-        );
+	/**
+	 * Attempts to insert a new question group inthe new format given an old one
+	 * @global type $wpdb
+	 * @param array $old_event_venue_rel
+	 * @return int
+	 */
+	private function _insert_new_event_to_venue_rel($old_event_venue_rel)
+	{
+		global $wpdb;
+		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_venue_rel['event_id'], $wpdb->prefix."posts");
+		$new_venue_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_venue", $old_event_venue_rel['venue_id'], $wpdb->prefix."posts");
+		if (! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_venue_rel['event_id']));
+			return 0;
+		}
+		if (! $new_venue_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $old_event_venue_rel['venue_id']));
+			return 0;
+		}
+		// first ensure there are no other relation entries for this event
+		// because although EE4 supports it, EE3 didn't really
+		$wpdb->delete(
+			$this->_new_table,
+			array(
+					'EVT_ID' => $new_event_id,
+				),
+			array(
+					'%d',// EVT_ID
+				)
+		);
 //      echo "last query". $wpdb->last_query;die;
-        $cols_n_values = array(
-            'EVT_ID'=>$new_event_id,
-            'VNU_ID'=>$new_venue_id,
-            'EVV_primary'=>true
-        );
-        $datatypes = array(
-            '%d',// EVT_ID
-            '%d',// VNU_ID
-            '%d',// EVT_primary
-        );
-        $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_venue_rel, $this->_new_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+		$cols_n_values = array(
+			'EVT_ID'=>$new_event_id,
+			'VNU_ID'=>$new_venue_id,
+			'EVV_primary'=>true
+		);
+		$datatypes = array(
+			'%d',// EVT_ID
+			'%d',// VNU_ID
+			'%d',// EVT_primary
+		);
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_venue_rel, $this->_new_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -76,11 +76,11 @@ 
         global $wpdb;
         $new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_venue_rel['event_id'], $wpdb->prefix."posts");
         $new_venue_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_venue", $old_event_venue_rel['venue_id'], $wpdb->prefix."posts");
-        if (! $new_event_id) {
+        if ( ! $new_event_id) {
             $this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_venue_rel['event_id']));
             return 0;
         }
-        if (! $new_venue_id) {
+        if ( ! $new_venue_id) {
             $this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $old_event_venue_rel['venue_id']));
             return 0;
         }
@@ -92,7 +92,7 @@ 
                     'EVT_ID' => $new_event_id,
                 ),
             array(
-                    '%d',// EVT_ID
+                    '%d', // EVT_ID
                 )
         );
 //      echo "last query". $wpdb->last_query;die;
@@ -102,12 +102,12 @@ 
             'EVV_primary'=>true
         );
         $datatypes = array(
-            '%d',// EVT_ID
-            '%d',// VNU_ID
-            '%d',// EVT_primary
+            '%d', // EVT_ID
+            '%d', // VNU_ID
+            '%d', // EVT_primary
         );
         $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_venue_rel, $this->_new_table, $cols_n_values, $datatypes));
             return 0;
         }

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

Indentation +111 added lines, -111 removed lines

@@ -40,119 +40,119 @@
  */
 class EE_DMS_4_1_0_question_groups extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_new_table;
-    /**
-     * Keeps track of whether or not we've already added a system question group,
-     * in order to avoid adding more than 1 (basically, in 3.1 this would happen
-     * with the Roles & Permissions addon, because each user had their own set of
-     * question groups and questions),
-     * @var boolean
-     */
-    private $_already_got_system_question_group_1 = false;
-    public function _migration_step($num_items = 50)
-    {
+	private $_old_table;
+	private $_new_table;
+	/**
+	 * Keeps track of whether or not we've already added a system question group,
+	 * in order to avoid adding more than 1 (basically, in 3.1 this would happen
+	 * with the Roles & Permissions addon, because each user had their own set of
+	 * question groups and questions),
+	 * @var boolean
+	 */
+	private $_already_got_system_question_group_1 = false;
+	public 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);
-        $items_actually_migrated = 0;
-        foreach ($rows as $question_group) {
-            $new_id = $this->_insert_new_question_group($question_group);
+		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);
+		$items_actually_migrated = 0;
+		foreach ($rows as $question_group) {
+			$new_id = $this->_insert_new_question_group($question_group);
 
-            $this->get_migration_script()->set_mapping($this->_old_table, $question_group['id'], $this->_new_table, $new_id);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
-        return $count;
-    }
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix."events_qst_group";
-        $this->_new_table = $wpdb->prefix."esp_question_group";
-        $this->_pretty_name = __("Question Groups", "event_espresso");
-        parent::__construct();
-    }
+			$this->get_migration_script()->set_mapping($this->_old_table, $question_group['id'], $this->_new_table, $new_id);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
+		return $count;
+	}
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix."events_qst_group";
+		$this->_new_table = $wpdb->prefix."esp_question_group";
+		$this->_pretty_name = __("Question Groups", "event_espresso");
+		parent::__construct();
+	}
     
-    /**
-     * Attempts to insert a new question group inthe new format given an old one
-     * @global type $wpdb
-     * @param array $old_question_group
-     * @return int
-     */
-    private function _insert_new_question_group($old_question_group)
-    {
-        global $wpdb;
-        // try to guess what the QST_system int should be... finding the Personal info system
-        // question group is quite easy. But in 3.1 address info WASN'T a system group, it just exitsed by default but
-        // could be easily removed.
-        if ($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()) {
-            $guess_at_system_number = 1;
-        } elseif ($old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address')!==false) {
-            $guess_at_system_number = 2;
-        } else {
-            $guess_at_system_number = 0;
-        }
-        // if the question group wasn't made by the normal admin,
-        // we'd like to keep track of who made it
-        if (intval($old_question_group['wp_user'])!=1) {
-            $username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d", $old_question_group['wp_user']));
-            $identifier = $old_question_group['group_identifier']."-by-".$username;
-        } else {
-            $identifier = $old_question_group['group_identifier'];
-        }
-        $cols_n_values = array(
-            'QSG_name'=>stripslashes($old_question_group['group_name']),
-            'QSG_identifier'=>$identifier,
-            'QSG_desc'=>stripslashes($old_question_group['group_description']),
-            'QSG_order'=>$old_question_group['group_order'],
-            'QSG_show_group_name'=>$old_question_group['show_group_name'],
-            'QSG_show_group_desc'=>$old_question_group['show_group_description'],
-            'QSG_system'=>$guess_at_system_number,
-            'QSG_deleted'=>false
-        );
-        $datatypes = array(
-            '%s',// QSG_name
-            '%s',// QSG_identifier
-            '%s',// QSG_desc
-            '%d',// QSG_order
-            '%d',// QSG_show_group_name
-            '%d',// QSG_show_group_desc
-            '%d',// QSG_system
-            '%d',// QSG_deleted
-        );
-        $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group, $this->_new_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+	/**
+	 * Attempts to insert a new question group inthe new format given an old one
+	 * @global type $wpdb
+	 * @param array $old_question_group
+	 * @return int
+	 */
+	private function _insert_new_question_group($old_question_group)
+	{
+		global $wpdb;
+		// try to guess what the QST_system int should be... finding the Personal info system
+		// question group is quite easy. But in 3.1 address info WASN'T a system group, it just exitsed by default but
+		// could be easily removed.
+		if ($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()) {
+			$guess_at_system_number = 1;
+		} elseif ($old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address')!==false) {
+			$guess_at_system_number = 2;
+		} else {
+			$guess_at_system_number = 0;
+		}
+		// if the question group wasn't made by the normal admin,
+		// we'd like to keep track of who made it
+		if (intval($old_question_group['wp_user'])!=1) {
+			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d", $old_question_group['wp_user']));
+			$identifier = $old_question_group['group_identifier']."-by-".$username;
+		} else {
+			$identifier = $old_question_group['group_identifier'];
+		}
+		$cols_n_values = array(
+			'QSG_name'=>stripslashes($old_question_group['group_name']),
+			'QSG_identifier'=>$identifier,
+			'QSG_desc'=>stripslashes($old_question_group['group_description']),
+			'QSG_order'=>$old_question_group['group_order'],
+			'QSG_show_group_name'=>$old_question_group['show_group_name'],
+			'QSG_show_group_desc'=>$old_question_group['show_group_description'],
+			'QSG_system'=>$guess_at_system_number,
+			'QSG_deleted'=>false
+		);
+		$datatypes = array(
+			'%s',// QSG_name
+			'%s',// QSG_identifier
+			'%s',// QSG_desc
+			'%d',// QSG_order
+			'%d',// QSG_show_group_name
+			'%d',// QSG_show_group_desc
+			'%d',// QSG_system
+			'%d',// QSG_deleted
+		);
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group, $this->_new_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
     
-    /**
-     * Checks if we've already added a system question 1 to the new question groups table
-     * @global type $wpdb
-     * @return boolean
-     */
-    private function _already_got_system_question_group_1()
-    {
-        if (! $this->_already_got_system_question_group_1) {
-            // check the db
-            global $wpdb;
-            $exists = $wpdb->get_var("SELECT COUNT(*) FROM {$this->_new_table} WHERE QSG_system=1");
-            if (intval($exists)>0) {
-                $this->_already_got_system_question_group_1 = true;
-            }
-        }
-        return $this->_already_got_system_question_group_1;
-    }
+	/**
+	 * Checks if we've already added a system question 1 to the new question groups table
+	 * @global type $wpdb
+	 * @return boolean
+	 */
+	private function _already_got_system_question_group_1()
+	{
+		if (! $this->_already_got_system_question_group_1) {
+			// check the db
+			global $wpdb;
+			$exists = $wpdb->get_var("SELECT COUNT(*) FROM {$this->_new_table} WHERE QSG_system=1");
+			if (intval($exists)>0) {
+				$this->_already_got_system_question_group_1 = true;
+			}
+		}
+		return $this->_already_got_system_question_group_1;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -97,14 +97,14 @@ 
         // could be easily removed.
         if ($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()) {
             $guess_at_system_number = 1;
-        } elseif ($old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address')!==false) {
+        } elseif ($old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address') !== false) {
             $guess_at_system_number = 2;
         } else {
             $guess_at_system_number = 0;
         }
         // if the question group wasn't made by the normal admin,
         // we'd like to keep track of who made it
-        if (intval($old_question_group['wp_user'])!=1) {
+        if (intval($old_question_group['wp_user']) != 1) {
             $username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d", $old_question_group['wp_user']));
             $identifier = $old_question_group['group_identifier']."-by-".$username;
         } else {
@@ -121,17 +121,17 @@ 
             'QSG_deleted'=>false
         );
         $datatypes = array(
-            '%s',// QSG_name
-            '%s',// QSG_identifier
-            '%s',// QSG_desc
-            '%d',// QSG_order
-            '%d',// QSG_show_group_name
-            '%d',// QSG_show_group_desc
-            '%d',// QSG_system
-            '%d',// QSG_deleted
+            '%s', // QSG_name
+            '%s', // QSG_identifier
+            '%s', // QSG_desc
+            '%d', // QSG_order
+            '%d', // QSG_show_group_name
+            '%d', // QSG_show_group_desc
+            '%d', // QSG_system
+            '%d', // QSG_deleted
         );
         $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group, $this->_new_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -145,11 +145,11 @@ 
      */
     private function _already_got_system_question_group_1()
     {
-        if (! $this->_already_got_system_question_group_1) {
+        if ( ! $this->_already_got_system_question_group_1) {
             // check the db
             global $wpdb;
             $exists = $wpdb->get_var("SELECT COUNT(*) FROM {$this->_new_table} WHERE QSG_system=1");
-            if (intval($exists)>0) {
+            if (intval($exists) > 0) {
                 $this->_already_got_system_question_group_1 = true;
             }
         }

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

Indentation +47 added lines, -48 removed lines

@@ -2,58 +2,57 @@
 
 /**
  * Goes through all the posts and pages, and converts old shortcodes to new ones
-
-*/
+ */
 
 class EE_DMS_4_1_0_shortcodes extends EE_Data_Migration_Script_Stage
 {
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __("Shortcodes", "event_espresso");
-        $this->_old_table = $wpdb->posts;
-        parent::__construct();
-    }
-    protected function _migrate_old_row($old_row)
-    {
-        $new_post_content = $this->_change_event_list_shortcode($old_row['post_content']);
-        global $wpdb;
-        $wpdb->query($wpdb->prepare("UPDATE ".$this->_old_table." SET post_content=%s WHERE ID=%d", $new_post_content, $old_row['ID']));
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __("Shortcodes", "event_espresso");
+		$this->_old_table = $wpdb->posts;
+		parent::__construct();
+	}
+	protected function _migrate_old_row($old_row)
+	{
+		$new_post_content = $this->_change_event_list_shortcode($old_row['post_content']);
+		global $wpdb;
+		$wpdb->query($wpdb->prepare("UPDATE ".$this->_old_table." SET post_content=%s WHERE ID=%d", $new_post_content, $old_row['ID']));
+	}
 
-    /**
-     * replaces [EVENT_LIST... with [ESPRESSO_EVENTS...]
-     * @param string $old_content
-     */
-    private function _change_event_list_shortcode($old_content)
-    {
-        return str_replace("[EVENT_LIST", "[ESPRESSO_EVENTS", $old_content);
-    }
+	/**
+	 * replaces [EVENT_LIST... with [ESPRESSO_EVENTS...]
+	 * @param string $old_content
+	 */
+	private function _change_event_list_shortcode($old_content)
+	{
+		return str_replace("[EVENT_LIST", "[ESPRESSO_EVENTS", $old_content);
+	}
 
-    public function _migration_step($num_items = 50)
-    {
-        global $wpdb;
-        $start_at_record = $this->count_records_migrated();
-        $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table {$this->_sql_to_only_select_non_drafts()} LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
-        $items_actually_migrated = 0;
-        foreach ($rows as $old_row) {
-            $this->_migrate_old_row($old_row);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table.$this->_sql_to_only_select_non_drafts());
-        return $count;
-    }
+	public function _migration_step($num_items = 50)
+	{
+		global $wpdb;
+		$start_at_record = $this->count_records_migrated();
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table {$this->_sql_to_only_select_non_drafts()} LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
+		$items_actually_migrated = 0;
+		foreach ($rows as $old_row) {
+			$this->_migrate_old_row($old_row);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table.$this->_sql_to_only_select_non_drafts());
+		return $count;
+	}
 
-    private function _sql_to_only_select_non_drafts()
-    {
-        return " WHERE post_type NOT IN ('revision','auto-draft') ";
-    }
+	private function _sql_to_only_select_non_drafts()
+	{
+		return " WHERE post_type NOT IN ('revision','auto-draft') ";
+	}
 }

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

Indentation +114 added lines, -114 removed lines

@@ -57,119 +57,119 @@
  */
 class EE_DMS_4_1_0_questions extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_new_table;
-    private $_option_table;
-    public 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);
-        $items_actually_migrated = 0;
-        foreach ($rows as $question_row) {
-            $new_id = $this->_insert_new_question($question_row);
-            $this->get_migration_script()->set_mapping($this->_old_table, $question_row['id'], $this->_new_table, $new_id);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
-        return $count;
-    }
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __("Questions", "event_espresso");
-        $this->_old_table = $wpdb->prefix."events_question";
-        $this->_new_table = $wpdb->prefix."esp_question";
-        $this->_option_table = $wpdb->prefix."esp_question_option";
-        parent::__construct();
-    }
-    private function _insert_new_question($old_question)
-    {
-        global $wpdb;
-        // if this pretends to be a 'system' question, check if we already have a
-        // system question for that string. If so, pretend THAT new question
-        // is what we just isnerted
-        if ($old_question['system_name']) {
-            $id_of_new_system_question = intval($wpdb->get_var($wpdb->prepare("SELECT QST_ID FROM {$this->_new_table} WHERE QST_system = %s", $old_question['system_name'])));
-            if ($id_of_new_system_question) {
-                return $id_of_new_system_question;
-            }
-            // ok so this must be the first one. Carry on.
-        }
+	private $_old_table;
+	private $_new_table;
+	private $_option_table;
+	public 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);
+		$items_actually_migrated = 0;
+		foreach ($rows as $question_row) {
+			$new_id = $this->_insert_new_question($question_row);
+			$this->get_migration_script()->set_mapping($this->_old_table, $question_row['id'], $this->_new_table, $new_id);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
+		return $count;
+	}
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __("Questions", "event_espresso");
+		$this->_old_table = $wpdb->prefix."events_question";
+		$this->_new_table = $wpdb->prefix."esp_question";
+		$this->_option_table = $wpdb->prefix."esp_question_option";
+		parent::__construct();
+	}
+	private function _insert_new_question($old_question)
+	{
+		global $wpdb;
+		// if this pretends to be a 'system' question, check if we already have a
+		// system question for that string. If so, pretend THAT new question
+		// is what we just isnerted
+		if ($old_question['system_name']) {
+			$id_of_new_system_question = intval($wpdb->get_var($wpdb->prepare("SELECT QST_ID FROM {$this->_new_table} WHERE QST_system = %s", $old_question['system_name'])));
+			if ($id_of_new_system_question) {
+				return $id_of_new_system_question;
+			}
+			// ok so this must be the first one. Carry on.
+		}
 
-        $cols_n_values = array(
-            'QST_display_text'=>stripslashes($old_question['question']),
-            'QST_admin_label'=> $old_question['system_name'] ? $old_question['system_name'] : sanitize_title($old_question['question']),
-            'QST_system'=>$old_question['system_name'],
-            'QST_type'=>$old_question['question_type'],
-            'QST_required'=> 'Y' == $old_question['required'],
-            'QST_required_text'=>stripslashes($old_question['required_text']),
-            'QST_order'=>$old_question['sequence'],
-            'QST_admin_only'=> 'Y' == $old_question['admin_only'],
-            'QST_wp_user'=>$old_question['wp_user'],
-            'QST_deleted'=>false
-        );
-        $datatypes = array(
-            '%s',// QST_display_text
-            '%s',// QST-admin_label
-            '%s',// QST_system
-            '%s',// QST_type
-            '%d',// QST_required
-            '%s',// QST_required_text
-            '%d',// QST_order
-            '%d',// QST_admin_only
-            '%d',// QST_wp_user
-            '%d',// QST_deleted
-        );
-        $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, $this->_new_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        // now take care of posisbly adding question options
-        if (in_array($old_question['question_type'], array('DROPDOWN','SINGLE','MULTIPLE'))) {
-            $options = explode(",", $old_question['response']);
-            foreach ($options as $option) {
-                $this->_insert_question_option($option, $new_id);
-            }
-        }
-        return $new_id;
-    }
-    /**
-     * Adds a question option to the db
-     * @global type $wpdb
-     * @param string $option
-     * @param int $question_id
-     * @return int
-     */
-    private function _insert_question_option($option, $question_id)
-    {
-        $option = trim($option);
-        global $wpdb;
-        $cols_n_values = array(
-            'QST_ID'=>$question_id,
-            'QSO_value'=>$option,
-            'QSO_deleted'=>false
-        );
-        $datatypes= array(
-            '%d',// QST_ID
-            '%s',// QSO_value
-            '%d',// QSO_deleted
-        );
-        $success = $wpdb->insert($this->_option_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option'=>$option,'new_question_id'=>$question_id), $this->_option_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+		$cols_n_values = array(
+			'QST_display_text'=>stripslashes($old_question['question']),
+			'QST_admin_label'=> $old_question['system_name'] ? $old_question['system_name'] : sanitize_title($old_question['question']),
+			'QST_system'=>$old_question['system_name'],
+			'QST_type'=>$old_question['question_type'],
+			'QST_required'=> 'Y' == $old_question['required'],
+			'QST_required_text'=>stripslashes($old_question['required_text']),
+			'QST_order'=>$old_question['sequence'],
+			'QST_admin_only'=> 'Y' == $old_question['admin_only'],
+			'QST_wp_user'=>$old_question['wp_user'],
+			'QST_deleted'=>false
+		);
+		$datatypes = array(
+			'%s',// QST_display_text
+			'%s',// QST-admin_label
+			'%s',// QST_system
+			'%s',// QST_type
+			'%d',// QST_required
+			'%s',// QST_required_text
+			'%d',// QST_order
+			'%d',// QST_admin_only
+			'%d',// QST_wp_user
+			'%d',// QST_deleted
+		);
+		$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, $this->_new_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		// now take care of posisbly adding question options
+		if (in_array($old_question['question_type'], array('DROPDOWN','SINGLE','MULTIPLE'))) {
+			$options = explode(",", $old_question['response']);
+			foreach ($options as $option) {
+				$this->_insert_question_option($option, $new_id);
+			}
+		}
+		return $new_id;
+	}
+	/**
+	 * Adds a question option to the db
+	 * @global type $wpdb
+	 * @param string $option
+	 * @param int $question_id
+	 * @return int
+	 */
+	private function _insert_question_option($option, $question_id)
+	{
+		$option = trim($option);
+		global $wpdb;
+		$cols_n_values = array(
+			'QST_ID'=>$question_id,
+			'QSO_value'=>$option,
+			'QSO_deleted'=>false
+		);
+		$datatypes= array(
+			'%d',// QST_ID
+			'%s',// QSO_value
+			'%d',// QSO_deleted
+		);
+		$success = $wpdb->insert($this->_option_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option'=>$option,'new_question_id'=>$question_id), $this->_option_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -118,25 +118,25 @@ 
             'QST_deleted'=>false
         );
         $datatypes = array(
-            '%s',// QST_display_text
-            '%s',// QST-admin_label
-            '%s',// QST_system
-            '%s',// QST_type
-            '%d',// QST_required
-            '%s',// QST_required_text
-            '%d',// QST_order
-            '%d',// QST_admin_only
-            '%d',// QST_wp_user
-            '%d',// QST_deleted
+            '%s', // QST_display_text
+            '%s', // QST-admin_label
+            '%s', // QST_system
+            '%s', // QST_type
+            '%d', // QST_required
+            '%s', // QST_required_text
+            '%d', // QST_order
+            '%d', // QST_admin_only
+            '%d', // QST_wp_user
+            '%d', // QST_deleted
         );
         $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_question, $this->_new_table, $cols_n_values, $datatypes));
             return 0;
         }
         $new_id = $wpdb->insert_id;
         // now take care of posisbly adding question options
-        if (in_array($old_question['question_type'], array('DROPDOWN','SINGLE','MULTIPLE'))) {
+        if (in_array($old_question['question_type'], array('DROPDOWN', 'SINGLE', 'MULTIPLE'))) {
             $options = explode(",", $old_question['response']);
             foreach ($options as $option) {
                 $this->_insert_question_option($option, $new_id);
@@ -160,14 +160,14 @@ 
             'QSO_value'=>$option,
             'QSO_deleted'=>false
         );
-        $datatypes= array(
-            '%d',// QST_ID
-            '%s',// QSO_value
-            '%d',// QSO_deleted
+        $datatypes = array(
+            '%d', // QST_ID
+            '%s', // QSO_value
+            '%d', // QSO_deleted
         );
         $success = $wpdb->insert($this->_option_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option'=>$option,'new_question_id'=>$question_id), $this->_option_table, $cols_n_values, $datatypes));
+        if ( ! $success) {
+            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option'=>$option, 'new_question_id'=>$question_id), $this->_option_table, $cols_n_values, $datatypes));
             return 0;
         }
         return $wpdb->insert_id;

core/data_migration_scripts/4_8_0_stages/EE_DMS_4_8_0_event_subtotals.dmsstage.php

Indentation +73 added lines, -73 removed lines

@@ -11,77 +11,77 @@
  */
 class EE_DMS_4_8_0_event_subtotals extends EE_Data_Migration_Script_Stage_Table
 {
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix . 'esp_line_item';
-        $this->_extra_where_sql = ' WHERE LIN_type="sub-total" AND LIN_code="pre-tax-subtotal"';
-        $this->_pretty_name = __('Event Sub-total line items', 'event_espresso');
-        parent::__construct();
-    }
-    protected function _migrate_old_row($line_item_row)
-    {
-        global $wpdb;
-        // what event is this line item for? this can be found by looking at its transaction's registration's EVT_ID
-        $event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM ' . $wpdb->prefix . 'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
-        $new_line_item_data = array(
-                    'LIN_code' => 'event-' . $event_id,
-                    'TXN_ID' => $line_item_row['TXN_ID'],
-                    'LIN_name' => __('Event', 'event_espresso'),
-                    'LIN_desc' => $line_item_row['LIN_desc'],
-                    'LIN_unit_price' => $line_item_row['LIN_unit_price'],
-                    'LIN_percent' => $line_item_row['LIN_percent'],
-                    'LIN_is_taxable' => $line_item_row['LIN_is_taxable'],
-                    'LIN_order' => $line_item_row['LIN_order'],
-                    'LIN_total' => $line_item_row['LIN_total'],
-                    'LIN_quantity' => $line_item_row['LIN_quantity'],
-                    'LIN_parent' => $line_item_row['LIN_ID'],
-                    'LIN_type' => 'sub-total',
-                    'OBJ_type' => 'Event',
-                    'OBJ_ID' => $event_id,
-                );
-        $new_line_item_datatypes = array(
-                    '%s',// LIN_code
-                    '%d',// TXN_ID
-                    '%s',// LIN_name
-                    '%s',// LIN_desc
-                    '%f',// LIN_unit_price
-                    '%f',// LIN_percent
-                    '%d',// LIN_is_taxable
-                    '%d',// LIN_order
-                    '%f',// LIN_total
-                    '%d',// LIN_quantity
-                    '%d',// LIN_parent
-                    '%s',// LIN_type
-                    '%s',// OBJ_type
-                    '%d',// OBJ_ID
-                );
-        // insert the new event subtotal line item, pointing to this line item
-        $success = $wpdb->insert($this->_old_table, $new_line_item_data, $new_line_item_datatypes);
-        if (! $success) {
-            $this->add_error($this->_create_error_message_for_db_insertion($this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes));
-        }
-        $new_line_item_id = $wpdb->insert_id;
-        $this->get_migration_script()->set_mapping($this->_old_table, $line_item_row['LIN_ID'], $this->_old_table, $new_line_item_id);
-        $query = $wpdb->prepare(
-            "UPDATE {$this->_old_table} SET LIN_parent=%d WHERE LIN_parent = %d AND LIN_ID != %d LIMIT 100",
-            $new_line_item_id,
-            $line_item_row['LIN_ID'],
-            $new_line_item_id
-        );
-        $success = $wpdb->query($query);
-        if ($success === false) {
-            $this->add_error(
-                sprintf(
-                    __('Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso'),
-                    $new_line_item_id,
-                    $line_item_row['LIN_ID'],
-                    $wpdb->last_error,
-                    $query,
-                    $success
-                )
-            );
-        }
-        return 1;
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix . 'esp_line_item';
+		$this->_extra_where_sql = ' WHERE LIN_type="sub-total" AND LIN_code="pre-tax-subtotal"';
+		$this->_pretty_name = __('Event Sub-total line items', 'event_espresso');
+		parent::__construct();
+	}
+	protected function _migrate_old_row($line_item_row)
+	{
+		global $wpdb;
+		// what event is this line item for? this can be found by looking at its transaction's registration's EVT_ID
+		$event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM ' . $wpdb->prefix . 'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
+		$new_line_item_data = array(
+					'LIN_code' => 'event-' . $event_id,
+					'TXN_ID' => $line_item_row['TXN_ID'],
+					'LIN_name' => __('Event', 'event_espresso'),
+					'LIN_desc' => $line_item_row['LIN_desc'],
+					'LIN_unit_price' => $line_item_row['LIN_unit_price'],
+					'LIN_percent' => $line_item_row['LIN_percent'],
+					'LIN_is_taxable' => $line_item_row['LIN_is_taxable'],
+					'LIN_order' => $line_item_row['LIN_order'],
+					'LIN_total' => $line_item_row['LIN_total'],
+					'LIN_quantity' => $line_item_row['LIN_quantity'],
+					'LIN_parent' => $line_item_row['LIN_ID'],
+					'LIN_type' => 'sub-total',
+					'OBJ_type' => 'Event',
+					'OBJ_ID' => $event_id,
+				);
+		$new_line_item_datatypes = array(
+					'%s',// LIN_code
+					'%d',// TXN_ID
+					'%s',// LIN_name
+					'%s',// LIN_desc
+					'%f',// LIN_unit_price
+					'%f',// LIN_percent
+					'%d',// LIN_is_taxable
+					'%d',// LIN_order
+					'%f',// LIN_total
+					'%d',// LIN_quantity
+					'%d',// LIN_parent
+					'%s',// LIN_type
+					'%s',// OBJ_type
+					'%d',// OBJ_ID
+				);
+		// insert the new event subtotal line item, pointing to this line item
+		$success = $wpdb->insert($this->_old_table, $new_line_item_data, $new_line_item_datatypes);
+		if (! $success) {
+			$this->add_error($this->_create_error_message_for_db_insertion($this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes));
+		}
+		$new_line_item_id = $wpdb->insert_id;
+		$this->get_migration_script()->set_mapping($this->_old_table, $line_item_row['LIN_ID'], $this->_old_table, $new_line_item_id);
+		$query = $wpdb->prepare(
+			"UPDATE {$this->_old_table} SET LIN_parent=%d WHERE LIN_parent = %d AND LIN_ID != %d LIMIT 100",
+			$new_line_item_id,
+			$line_item_row['LIN_ID'],
+			$new_line_item_id
+		);
+		$success = $wpdb->query($query);
+		if ($success === false) {
+			$this->add_error(
+				sprintf(
+					__('Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso'),
+					$new_line_item_id,
+					$line_item_row['LIN_ID'],
+					$wpdb->last_error,
+					$query,
+					$success
+				)
+			);
+		}
+		return 1;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -14,7 +14,7 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table = $wpdb->prefix . 'esp_line_item';
+        $this->_old_table = $wpdb->prefix.'esp_line_item';
         $this->_extra_where_sql = ' WHERE LIN_type="sub-total" AND LIN_code="pre-tax-subtotal"';
         $this->_pretty_name = __('Event Sub-total line items', 'event_espresso');
         parent::__construct();
@@ -23,9 +23,9 @@ 
     {
         global $wpdb;
         // what event is this line item for? this can be found by looking at its transaction's registration's EVT_ID
-        $event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM ' . $wpdb->prefix . 'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
+        $event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM '.$wpdb->prefix.'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
         $new_line_item_data = array(
-                    'LIN_code' => 'event-' . $event_id,
+                    'LIN_code' => 'event-'.$event_id,
                     'TXN_ID' => $line_item_row['TXN_ID'],
                     'LIN_name' => __('Event', 'event_espresso'),
                     'LIN_desc' => $line_item_row['LIN_desc'],
@@ -41,24 +41,24 @@ 
                     'OBJ_ID' => $event_id,
                 );
         $new_line_item_datatypes = array(
-                    '%s',// LIN_code
-                    '%d',// TXN_ID
-                    '%s',// LIN_name
-                    '%s',// LIN_desc
-                    '%f',// LIN_unit_price
-                    '%f',// LIN_percent
-                    '%d',// LIN_is_taxable
-                    '%d',// LIN_order
-                    '%f',// LIN_total
-                    '%d',// LIN_quantity
-                    '%d',// LIN_parent
-                    '%s',// LIN_type
-                    '%s',// OBJ_type
-                    '%d',// OBJ_ID
+                    '%s', // LIN_code
+                    '%d', // TXN_ID
+                    '%s', // LIN_name
+                    '%s', // LIN_desc
+                    '%f', // LIN_unit_price
+                    '%f', // LIN_percent
+                    '%d', // LIN_is_taxable
+                    '%d', // LIN_order
+                    '%f', // LIN_total
+                    '%d', // LIN_quantity
+                    '%d', // LIN_parent
+                    '%s', // LIN_type
+                    '%s', // OBJ_type
+                    '%d', // OBJ_ID
                 );
         // insert the new event subtotal line item, pointing to this line item
         $success = $wpdb->insert($this->_old_table, $new_line_item_data, $new_line_item_datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->_create_error_message_for_db_insertion($this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes));
         }
         $new_line_item_id = $wpdb->insert_id;