eventespresso / event-espresso-core

core/data_migration_scripts/4_7_0_stages/EE_DMS_4_7_0_Registration_Payments.dmsstage.php

Indentation +221 added lines, -221 removed lines

@@ -12,225 +12,225 @@
 class EE_DMS_4_7_0_Registration_Payments extends EE_Data_Migration_Script_Stage_Table
 {
 
-    protected $_payment_table;
-
-    protected $_registration_table;
-
-    protected $_registration_payment_table;
-
-    public function __construct()
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $this->_pretty_name = __('Registration Payment Record Generation', 'event_espresso');
-        // define tables
-        $this->_old_table                                   = $wpdb->prefix . 'esp_transaction';
-        $this->_payment_table                       = $wpdb->prefix . 'esp_payment';
-        $this->_registration_table                  = $wpdb->prefix . 'esp_registration';
-        $this->_registration_payment_table  = $wpdb->prefix . 'esp_registration_payment';
-        // build SQL WHERE clauses
-        $this->_extra_where_sql = "WHERE STS_ID IN ( 'TIN', 'TCM' ) AND TXN_Total != '0.000'";
-        parent::__construct();
-    }
-
-
-
-    /**
-     * @param array $transaction
-     * @return void
-     */
-    protected function _migrate_old_row($transaction)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $TXN_ID = absint($transaction['TXN_ID']);
-        if (! $TXN_ID) {
-            $this->add_error(
-                sprintf(
-                    __('Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso'),
-                    $TXN_ID,
-                    $wpdb->last_error
-                )
-            );
-            return;
-        }
-        // get all payments for the TXN
-        $payments = $this->_get_payments($TXN_ID);
-        if (empty($payments)) {
-            return;
-        }
-        // then the registrants
-        $registrations = $this->_get_registrations($TXN_ID);
-        if (empty($registrations)) {
-            return;
-        }
-        // now loop thru each payment and apply it to each of the registrations
-        foreach ($payments as $PAY_ID => $payment) {
-            if ($payment->STS_ID === 'PAP' && $payment->PAY_amount > 0) {
-                $this->_process_registration_payments($payment, $registrations);
-            }
-        }
-    }
-
-
-
-    /**
-     * _get_registrations
-     *
-     * @param int $TXN_ID
-     * @return array
-     */
-    protected function _get_registrations($TXN_ID)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $SQL = "SELECT * FROM {$this->_registration_table} WHERE TXN_ID = %d AND STS_ID IN ( 'RPP', 'RAP' )";
-        return $wpdb->get_results($wpdb->prepare($SQL, $TXN_ID), OBJECT_K);
-    }
-
-
-
-    /**
-     * _get_payments
-     *
-     * @param int $TXN_ID
-     * @return array
-     */
-    protected function _get_payments($TXN_ID)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        return $wpdb->get_results($wpdb->prepare("SELECT * FROM {$this->_payment_table} WHERE TXN_ID = %d", $TXN_ID), OBJECT_K);
-    }
-
-
-
-    /**
-     * _get_possibly_updated_REG_paid
-     *
-     * @param int $REG_ID
-     * @return array
-     */
-    protected function _get_possibly_updated_REG_paid($REG_ID)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        return $wpdb->get_var($wpdb->prepare("SELECT REG_paid FROM {$this->_registration_table} WHERE REG_ID = %d", $REG_ID));
-    }
-
-
-
-    /**
-     * _process_registration_payments
-     *
-     * basically a copy of the "Sequential Registration Payment Application Strategy"  logic
-     * currently in EE_Payment_Processor::process_registration_payments()
-     *
-     * @param stdClass $payment
-     * @param array $registrations
-     * @return bool
-     */
-    protected function _process_registration_payments($payment, $registrations = array())
-    {
-        // how much is available to apply to registrations?
-        $available_payment_amount = $payment->PAY_amount;
-        foreach ($registrations as $REG_ID => $registration) {
-            // nothing left, then we are done here?
-            if (! $available_payment_amount > 0) {
-                break;
-            }
-            // ensure REG_final_price has a valid value, and skip if it turns out to be zero
-            $registration->REG_final_price = ! empty($registration->REG_final_price) ? (float) $registration->REG_final_price : 0.00;
-            if (! $registration->REG_final_price > 0) {
-                continue;
-            }
-            // because REG_paid may have been updated by a previous payment, we need to retrieve the value from the db
-            $possibly_updated_REG_paid = $this->_get_possibly_updated_REG_paid($REG_ID);
-            if (is_float($possibly_updated_REG_paid)) {
-                $registration->REG_paid = $possibly_updated_REG_paid;
-            }
-            // and ensure REG_paid has a valid value
-            $registration->REG_paid = ! empty($registration->REG_paid) ? (float) $registration->REG_paid : 0.00;
-            // calculate amount owing, and skip if it turns out to be zero
-            $owing = $registration->REG_final_price - $registration->REG_paid;
-            if (! $owing > 0) {
-                continue;
-            }
-            // don't allow payment amount to exceed the available payment amount, OR the amount owing
-            $payment_amount = min($available_payment_amount, $owing);
-            // update $available_payment_amount
-            $available_payment_amount = $available_payment_amount - $payment_amount;
-            // add relation between registration and payment and set amount
-            if ($this->_insert_registration_payment($registration->REG_ID, $payment->PAY_ID, $payment_amount)) {
-                // calculate and set new REG_paid
-                $registration->REG_paid = $registration->REG_paid + $payment_amount;
-                $this->_update_registration_paid($registration->REG_ID, $registration->REG_paid);
-            }
-        }
-    }
-
-
-
-    /**
-     * _insert_registration_payment
-     *
-     * @param int $REG_ID
-     * @param int $PAY_ID
-     * @param float $PAY_amount
-     * @return bool
-     */
-    protected function _insert_registration_payment($REG_ID = 0, $PAY_ID = 0, $PAY_amount = 0.00)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $success = $wpdb->insert(
-            $this->_registration_payment_table,
-            array( 'REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount, ),  // data
-            array( '%f' )   // data format
-        );
-        if ($success === false) {
-            $this->add_error(
-                sprintf(
-                    __('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
-                    $REG_ID,
-                    $wpdb->last_error
-                )
-            );
-            return false;
-        }
-        return true;
-    }
-
-
-
-    /**
-     * _update_registration_paid
-     *
-     * @param int $REG_ID
-     * @param float $REG_paid
-     * @return bool
-     */
-    protected function _update_registration_paid($REG_ID = 0, $REG_paid = 0.00)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $success = $wpdb->update(
-            $this->_registration_table,
-            array( 'REG_paid' => $REG_paid ),  // data
-            array( 'REG_ID' => $REG_ID ),  // where
-            array( '%f' ),   // data format
-            array( '%d' )  // where format
-        );
-        if ($success === false) {
-            $this->add_error(
-                sprintf(
-                    __('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
-                    $REG_ID,
-                    $wpdb->last_error
-                )
-            );
-            return false;
-        }
-        return true;
-    }
+	protected $_payment_table;
+
+	protected $_registration_table;
+
+	protected $_registration_payment_table;
+
+	public function __construct()
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$this->_pretty_name = __('Registration Payment Record Generation', 'event_espresso');
+		// define tables
+		$this->_old_table                                   = $wpdb->prefix . 'esp_transaction';
+		$this->_payment_table                       = $wpdb->prefix . 'esp_payment';
+		$this->_registration_table                  = $wpdb->prefix . 'esp_registration';
+		$this->_registration_payment_table  = $wpdb->prefix . 'esp_registration_payment';
+		// build SQL WHERE clauses
+		$this->_extra_where_sql = "WHERE STS_ID IN ( 'TIN', 'TCM' ) AND TXN_Total != '0.000'";
+		parent::__construct();
+	}
+
+
+
+	/**
+	 * @param array $transaction
+	 * @return void
+	 */
+	protected function _migrate_old_row($transaction)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$TXN_ID = absint($transaction['TXN_ID']);
+		if (! $TXN_ID) {
+			$this->add_error(
+				sprintf(
+					__('Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso'),
+					$TXN_ID,
+					$wpdb->last_error
+				)
+			);
+			return;
+		}
+		// get all payments for the TXN
+		$payments = $this->_get_payments($TXN_ID);
+		if (empty($payments)) {
+			return;
+		}
+		// then the registrants
+		$registrations = $this->_get_registrations($TXN_ID);
+		if (empty($registrations)) {
+			return;
+		}
+		// now loop thru each payment and apply it to each of the registrations
+		foreach ($payments as $PAY_ID => $payment) {
+			if ($payment->STS_ID === 'PAP' && $payment->PAY_amount > 0) {
+				$this->_process_registration_payments($payment, $registrations);
+			}
+		}
+	}
+
+
+
+	/**
+	 * _get_registrations
+	 *
+	 * @param int $TXN_ID
+	 * @return array
+	 */
+	protected function _get_registrations($TXN_ID)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$SQL = "SELECT * FROM {$this->_registration_table} WHERE TXN_ID = %d AND STS_ID IN ( 'RPP', 'RAP' )";
+		return $wpdb->get_results($wpdb->prepare($SQL, $TXN_ID), OBJECT_K);
+	}
+
+
+
+	/**
+	 * _get_payments
+	 *
+	 * @param int $TXN_ID
+	 * @return array
+	 */
+	protected function _get_payments($TXN_ID)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		return $wpdb->get_results($wpdb->prepare("SELECT * FROM {$this->_payment_table} WHERE TXN_ID = %d", $TXN_ID), OBJECT_K);
+	}
+
+
+
+	/**
+	 * _get_possibly_updated_REG_paid
+	 *
+	 * @param int $REG_ID
+	 * @return array
+	 */
+	protected function _get_possibly_updated_REG_paid($REG_ID)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		return $wpdb->get_var($wpdb->prepare("SELECT REG_paid FROM {$this->_registration_table} WHERE REG_ID = %d", $REG_ID));
+	}
+
+
+
+	/**
+	 * _process_registration_payments
+	 *
+	 * basically a copy of the "Sequential Registration Payment Application Strategy"  logic
+	 * currently in EE_Payment_Processor::process_registration_payments()
+	 *
+	 * @param stdClass $payment
+	 * @param array $registrations
+	 * @return bool
+	 */
+	protected function _process_registration_payments($payment, $registrations = array())
+	{
+		// how much is available to apply to registrations?
+		$available_payment_amount = $payment->PAY_amount;
+		foreach ($registrations as $REG_ID => $registration) {
+			// nothing left, then we are done here?
+			if (! $available_payment_amount > 0) {
+				break;
+			}
+			// ensure REG_final_price has a valid value, and skip if it turns out to be zero
+			$registration->REG_final_price = ! empty($registration->REG_final_price) ? (float) $registration->REG_final_price : 0.00;
+			if (! $registration->REG_final_price > 0) {
+				continue;
+			}
+			// because REG_paid may have been updated by a previous payment, we need to retrieve the value from the db
+			$possibly_updated_REG_paid = $this->_get_possibly_updated_REG_paid($REG_ID);
+			if (is_float($possibly_updated_REG_paid)) {
+				$registration->REG_paid = $possibly_updated_REG_paid;
+			}
+			// and ensure REG_paid has a valid value
+			$registration->REG_paid = ! empty($registration->REG_paid) ? (float) $registration->REG_paid : 0.00;
+			// calculate amount owing, and skip if it turns out to be zero
+			$owing = $registration->REG_final_price - $registration->REG_paid;
+			if (! $owing > 0) {
+				continue;
+			}
+			// don't allow payment amount to exceed the available payment amount, OR the amount owing
+			$payment_amount = min($available_payment_amount, $owing);
+			// update $available_payment_amount
+			$available_payment_amount = $available_payment_amount - $payment_amount;
+			// add relation between registration and payment and set amount
+			if ($this->_insert_registration_payment($registration->REG_ID, $payment->PAY_ID, $payment_amount)) {
+				// calculate and set new REG_paid
+				$registration->REG_paid = $registration->REG_paid + $payment_amount;
+				$this->_update_registration_paid($registration->REG_ID, $registration->REG_paid);
+			}
+		}
+	}
+
+
+
+	/**
+	 * _insert_registration_payment
+	 *
+	 * @param int $REG_ID
+	 * @param int $PAY_ID
+	 * @param float $PAY_amount
+	 * @return bool
+	 */
+	protected function _insert_registration_payment($REG_ID = 0, $PAY_ID = 0, $PAY_amount = 0.00)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$success = $wpdb->insert(
+			$this->_registration_payment_table,
+			array( 'REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount, ),  // data
+			array( '%f' )   // data format
+		);
+		if ($success === false) {
+			$this->add_error(
+				sprintf(
+					__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
+					$REG_ID,
+					$wpdb->last_error
+				)
+			);
+			return false;
+		}
+		return true;
+	}
+
+
+
+	/**
+	 * _update_registration_paid
+	 *
+	 * @param int $REG_ID
+	 * @param float $REG_paid
+	 * @return bool
+	 */
+	protected function _update_registration_paid($REG_ID = 0, $REG_paid = 0.00)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$success = $wpdb->update(
+			$this->_registration_table,
+			array( 'REG_paid' => $REG_paid ),  // data
+			array( 'REG_ID' => $REG_ID ),  // where
+			array( '%f' ),   // data format
+			array( '%d' )  // where format
+		);
+		if ($success === false) {
+			$this->add_error(
+				sprintf(
+					__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
+					$REG_ID,
+					$wpdb->last_error
+				)
+			);
+			return false;
+		}
+		return true;
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -24,10 +24,10 @@ 
         global $wpdb;
         $this->_pretty_name = __('Registration Payment Record Generation', 'event_espresso');
         // define tables
-        $this->_old_table                                   = $wpdb->prefix . 'esp_transaction';
-        $this->_payment_table                       = $wpdb->prefix . 'esp_payment';
-        $this->_registration_table                  = $wpdb->prefix . 'esp_registration';
-        $this->_registration_payment_table  = $wpdb->prefix . 'esp_registration_payment';
+        $this->_old_table = $wpdb->prefix.'esp_transaction';
+        $this->_payment_table                       = $wpdb->prefix.'esp_payment';
+        $this->_registration_table                  = $wpdb->prefix.'esp_registration';
+        $this->_registration_payment_table = $wpdb->prefix.'esp_registration_payment';
         // build SQL WHERE clauses
         $this->_extra_where_sql = "WHERE STS_ID IN ( 'TIN', 'TCM' ) AND TXN_Total != '0.000'";
         parent::__construct();
@@ -44,7 +44,7 @@ 
         /** @type WPDB $wpdb */
         global $wpdb;
         $TXN_ID = absint($transaction['TXN_ID']);
-        if (! $TXN_ID) {
+        if ( ! $TXN_ID) {
             $this->add_error(
                 sprintf(
                     __('Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso'),
@@ -136,12 +136,12 @@ 
         $available_payment_amount = $payment->PAY_amount;
         foreach ($registrations as $REG_ID => $registration) {
             // nothing left, then we are done here?
-            if (! $available_payment_amount > 0) {
+            if ( ! $available_payment_amount > 0) {
                 break;
             }
             // ensure REG_final_price has a valid value, and skip if it turns out to be zero
             $registration->REG_final_price = ! empty($registration->REG_final_price) ? (float) $registration->REG_final_price : 0.00;
-            if (! $registration->REG_final_price > 0) {
+            if ( ! $registration->REG_final_price > 0) {
                 continue;
             }
             // because REG_paid may have been updated by a previous payment, we need to retrieve the value from the db
@@ -153,7 +153,7 @@ 
             $registration->REG_paid = ! empty($registration->REG_paid) ? (float) $registration->REG_paid : 0.00;
             // calculate amount owing, and skip if it turns out to be zero
             $owing = $registration->REG_final_price - $registration->REG_paid;
-            if (! $owing > 0) {
+            if ( ! $owing > 0) {
                 continue;
             }
             // don't allow payment amount to exceed the available payment amount, OR the amount owing
@@ -185,8 +185,8 @@ 
         global $wpdb;
         $success = $wpdb->insert(
             $this->_registration_payment_table,
-            array( 'REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount, ),  // data
-            array( '%f' )   // data format
+            array('REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount,), // data
+            array('%f')   // data format
         );
         if ($success === false) {
             $this->add_error(
@@ -216,10 +216,10 @@ 
         global $wpdb;
         $success = $wpdb->update(
             $this->_registration_table,
-            array( 'REG_paid' => $REG_paid ),  // data
-            array( 'REG_ID' => $REG_ID ),  // where
-            array( '%f' ),   // data format
-            array( '%d' )  // where format
+            array('REG_paid' => $REG_paid), // data
+            array('REG_ID' => $REG_ID), // where
+            array('%f'), // data format
+            array('%d')  // where format
         );
         if ($success === false) {
             $this->add_error(

core/data_migration_scripts/4_7_0_stages/EE_DMS_4_7_0_Add_Taxes_To_REG_Final_Price.dmsstage.php

Indentation +200 added lines, -200 removed lines

@@ -12,73 +12,73 @@ 
 class EE_DMS_4_7_0_Add_Taxes_To_REG_Final_Price extends EE_Data_Migration_Script_Stage_Table
 {
 
-    protected $_ticket_table;
-
-    protected $_line_item_table;
-
-    public function __construct()
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $this->_pretty_name = __('Registration Final Price Tax Calculations', 'event_espresso');
-        // define tables
-        $this->_old_table               = $wpdb->prefix . 'esp_registration';
-        $this->_ticket_table            = $wpdb->prefix . 'esp_ticket';
-        $this->_line_item_table     = $wpdb->prefix . 'esp_line_item';
-        parent::__construct();
-    }
-
-
-
-    /**
-     * @return string
-     */
-    protected function _get_rest_of_sql_for_query()
-    {
-        $SQL = "FROM {$this->_old_table} AS reg ";
-        $SQL .= "JOIN {$this->_ticket_table} as tkt ON reg.TKT_ID = tkt.TKT_ID ";
-        $SQL .= "JOIN {$this->_line_item_table} as line ON reg.TXN_ID = line.TXN_ID ";
-        $SQL .= "WHERE tkt.TKT_taxable = 1 ";
-        $SQL .= "AND line.LIN_code = 'total' ";
-        $SQL .= "AND reg.REG_final_price > 0 ";
-        return $SQL;
-    }
-
-
-
-    /**
-     * Counts the records to migrate; the public version may cache it
-     * @return int
-     */
-    public function _count_records_to_migrate()
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $SQL = "SELECT count( reg.REG_ID ) ";
-        $SQL .= $this->_get_rest_of_sql_for_query();
-        $count = $wpdb->get_var($SQL);
-        return $count;
-    }
-
-
-
-    /**
-     * Gets data for all registrations with taxable tickets in the esp_line_item table
-     * @global wpdb $wpdb
-     * @param int $limit
-     * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
-     */
-    protected function _get_rows($limit)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $start_at_record = $this->count_records_migrated();
-        $SQL = "SELECT reg.REG_ID,  reg.REG_final_price, line.LIN_ID ";
-        $SQL .= $this->_get_rest_of_sql_for_query();
-        $SQL .= $wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
-
-        // produces something like:
-        /*
+	protected $_ticket_table;
+
+	protected $_line_item_table;
+
+	public function __construct()
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$this->_pretty_name = __('Registration Final Price Tax Calculations', 'event_espresso');
+		// define tables
+		$this->_old_table               = $wpdb->prefix . 'esp_registration';
+		$this->_ticket_table            = $wpdb->prefix . 'esp_ticket';
+		$this->_line_item_table     = $wpdb->prefix . 'esp_line_item';
+		parent::__construct();
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	protected function _get_rest_of_sql_for_query()
+	{
+		$SQL = "FROM {$this->_old_table} AS reg ";
+		$SQL .= "JOIN {$this->_ticket_table} as tkt ON reg.TKT_ID = tkt.TKT_ID ";
+		$SQL .= "JOIN {$this->_line_item_table} as line ON reg.TXN_ID = line.TXN_ID ";
+		$SQL .= "WHERE tkt.TKT_taxable = 1 ";
+		$SQL .= "AND line.LIN_code = 'total' ";
+		$SQL .= "AND reg.REG_final_price > 0 ";
+		return $SQL;
+	}
+
+
+
+	/**
+	 * Counts the records to migrate; the public version may cache it
+	 * @return int
+	 */
+	public function _count_records_to_migrate()
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$SQL = "SELECT count( reg.REG_ID ) ";
+		$SQL .= $this->_get_rest_of_sql_for_query();
+		$count = $wpdb->get_var($SQL);
+		return $count;
+	}
+
+
+
+	/**
+	 * Gets data for all registrations with taxable tickets in the esp_line_item table
+	 * @global wpdb $wpdb
+	 * @param int $limit
+	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
+	 */
+	protected function _get_rows($limit)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$start_at_record = $this->count_records_migrated();
+		$SQL = "SELECT reg.REG_ID,  reg.REG_final_price, line.LIN_ID ";
+		$SQL .= $this->_get_rest_of_sql_for_query();
+		$SQL .= $wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
+
+		// produces something like:
+		/*
             SELECT
               reg.REG_ID,
               reg.REG_final_price,
@@ -95,137 +95,137 @@ 
             LIMIT 1, 50
          */
 
-        return $wpdb->get_results($SQL, ARRAY_A);
-    }
-
-
-
-    /**
-     * @param array $row
-     * @return void
-     */
-    protected function _migrate_old_row($row)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        // ensure all required values are present
-        if (! isset($row['REG_ID'], $row['REG_final_price'], $row['LIN_ID'])) {
-            $this->add_error(
-                sprintf(
-                    __('Invalid query results returned with the following data:%1$s REG_ID=%2$d, REG_final_price=%3$d, LIN_ID=%4$f. Error: "%5$s"', 'event_espresso'),
-                    '<br />',
-                    isset($row['REG_ID']) ? $row['REG_ID'] : '',
-                    isset($row['REG_final_price']) ? $row['REG_final_price'] : '',
-                    isset($row['LIN_ID']) ? $row['LIN_ID'] : '',
-                    $wpdb->last_error
-                )
-            );
-            return;
-        }
-        // get tax subtotal
-        $tax_subtotal_line_item_ID = $this->_get_line_item_ID_for_tax_subtotal($row['LIN_ID']);
-        if (! $tax_subtotal_line_item_ID) {
-            $this->add_error(
-                sprintf(
-                    __('Invalid line item ID returned. Error: "%1$s"', 'event_espresso'),
-                    $wpdb->last_error
-                )
-            );
-            return;
-        }
-        // now get taxes
-        $taxes = $this->_get_tax_amounts($tax_subtotal_line_item_ID);
-        // apply taxes to registration final price
-        $this->_apply_taxes($row['REG_ID'], $row['REG_final_price'], $taxes);
-    }
-
-
-
-    /**
-     * _get_tax_subtotal
-     *
-     * @param int $LIN_ID
-     * @return int
-     */
-    protected function _get_line_item_ID_for_tax_subtotal($LIN_ID)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $SQL = "SELECT LIN_ID ";
-        $SQL .= "FROM {$this->_line_item_table} ";
-        $SQL .= "WHERE LIN_parent = %d ";
-        $SQL .= "AND LIN_code = 'taxes'";
-        return $wpdb->get_var($wpdb->prepare($SQL, $LIN_ID));
-    }
-
-
-
-    /**
-     * _get_tax_subtotal
-     *
-     * @param int $LIN_ID
-     * @return array
-     */
-    protected function _get_tax_amounts($LIN_ID)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $SQL = "SELECT LIN_percent ";
-        $SQL .= "FROM {$this->_line_item_table} ";
-        $SQL .= "WHERE LIN_parent = %d";
-        return $wpdb->get_results($wpdb->prepare($SQL, $LIN_ID), OBJECT_K);
-    }
-
-
-
-    /**
-     * _apply_taxes
-     *
-     * @param int $REG_ID
-     * @param float $final_price
-     * @param array $taxes
-     * @return void
-     */
-    protected function _apply_taxes($REG_ID = 0, $final_price = 0.00, $taxes = array())
-    {
-        if (is_array($taxes) && ! empty($taxes)) {
-            $total_taxes = 0;
-            foreach ($taxes as $tax) {
-                $total_taxes += $final_price * ( $tax->LIN_percent / 100 );
-            }
-            $final_price += $total_taxes;
-            $this->_update_registration_final_price($REG_ID, $final_price);
-        }
-    }
-
-
-
-    /**
-     * _update_registration_final_price
-     *
-     * @param int $REG_ID
-     * @param float $REG_final_price
-     * @return void
-     */
-    protected function _update_registration_final_price($REG_ID = 0, $REG_final_price = 0.00)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $success = $wpdb->update(
-            $this->_old_table,
-            array( 'REG_final_price' => $REG_final_price ),  // data
-            array( 'REG_ID' => $REG_ID ),  // where
-            array( '%f' ),   // data format
-            array( '%d' )  // where format
-        );
-        if ($success === false) {
-            $this->add_error(
-                sprintf(
-                    __('Could not update registration final price value for registration ID=%1$d because "%2$s"', 'event_espresso'),
-                    $REG_ID,
-                    $wpdb->last_error
-                )
-            );
-        }
-    }
+		return $wpdb->get_results($SQL, ARRAY_A);
+	}
+
+
+
+	/**
+	 * @param array $row
+	 * @return void
+	 */
+	protected function _migrate_old_row($row)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		// ensure all required values are present
+		if (! isset($row['REG_ID'], $row['REG_final_price'], $row['LIN_ID'])) {
+			$this->add_error(
+				sprintf(
+					__('Invalid query results returned with the following data:%1$s REG_ID=%2$d, REG_final_price=%3$d, LIN_ID=%4$f. Error: "%5$s"', 'event_espresso'),
+					'<br />',
+					isset($row['REG_ID']) ? $row['REG_ID'] : '',
+					isset($row['REG_final_price']) ? $row['REG_final_price'] : '',
+					isset($row['LIN_ID']) ? $row['LIN_ID'] : '',
+					$wpdb->last_error
+				)
+			);
+			return;
+		}
+		// get tax subtotal
+		$tax_subtotal_line_item_ID = $this->_get_line_item_ID_for_tax_subtotal($row['LIN_ID']);
+		if (! $tax_subtotal_line_item_ID) {
+			$this->add_error(
+				sprintf(
+					__('Invalid line item ID returned. Error: "%1$s"', 'event_espresso'),
+					$wpdb->last_error
+				)
+			);
+			return;
+		}
+		// now get taxes
+		$taxes = $this->_get_tax_amounts($tax_subtotal_line_item_ID);
+		// apply taxes to registration final price
+		$this->_apply_taxes($row['REG_ID'], $row['REG_final_price'], $taxes);
+	}
+
+
+
+	/**
+	 * _get_tax_subtotal
+	 *
+	 * @param int $LIN_ID
+	 * @return int
+	 */
+	protected function _get_line_item_ID_for_tax_subtotal($LIN_ID)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$SQL = "SELECT LIN_ID ";
+		$SQL .= "FROM {$this->_line_item_table} ";
+		$SQL .= "WHERE LIN_parent = %d ";
+		$SQL .= "AND LIN_code = 'taxes'";
+		return $wpdb->get_var($wpdb->prepare($SQL, $LIN_ID));
+	}
+
+
+
+	/**
+	 * _get_tax_subtotal
+	 *
+	 * @param int $LIN_ID
+	 * @return array
+	 */
+	protected function _get_tax_amounts($LIN_ID)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$SQL = "SELECT LIN_percent ";
+		$SQL .= "FROM {$this->_line_item_table} ";
+		$SQL .= "WHERE LIN_parent = %d";
+		return $wpdb->get_results($wpdb->prepare($SQL, $LIN_ID), OBJECT_K);
+	}
+
+
+
+	/**
+	 * _apply_taxes
+	 *
+	 * @param int $REG_ID
+	 * @param float $final_price
+	 * @param array $taxes
+	 * @return void
+	 */
+	protected function _apply_taxes($REG_ID = 0, $final_price = 0.00, $taxes = array())
+	{
+		if (is_array($taxes) && ! empty($taxes)) {
+			$total_taxes = 0;
+			foreach ($taxes as $tax) {
+				$total_taxes += $final_price * ( $tax->LIN_percent / 100 );
+			}
+			$final_price += $total_taxes;
+			$this->_update_registration_final_price($REG_ID, $final_price);
+		}
+	}
+
+
+
+	/**
+	 * _update_registration_final_price
+	 *
+	 * @param int $REG_ID
+	 * @param float $REG_final_price
+	 * @return void
+	 */
+	protected function _update_registration_final_price($REG_ID = 0, $REG_final_price = 0.00)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$success = $wpdb->update(
+			$this->_old_table,
+			array( 'REG_final_price' => $REG_final_price ),  // data
+			array( 'REG_ID' => $REG_ID ),  // where
+			array( '%f' ),   // data format
+			array( '%d' )  // where format
+		);
+		if ($success === false) {
+			$this->add_error(
+				sprintf(
+					__('Could not update registration final price value for registration ID=%1$d because "%2$s"', 'event_espresso'),
+					$REG_ID,
+					$wpdb->last_error
+				)
+			);
+		}
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -22,9 +22,9 @@ 
         global $wpdb;
         $this->_pretty_name = __('Registration Final Price Tax Calculations', 'event_espresso');
         // define tables
-        $this->_old_table               = $wpdb->prefix . 'esp_registration';
-        $this->_ticket_table            = $wpdb->prefix . 'esp_ticket';
-        $this->_line_item_table     = $wpdb->prefix . 'esp_line_item';
+        $this->_old_table               = $wpdb->prefix.'esp_registration';
+        $this->_ticket_table            = $wpdb->prefix.'esp_ticket';
+        $this->_line_item_table = $wpdb->prefix.'esp_line_item';
         parent::__construct();
     }
 
@@ -109,7 +109,7 @@ 
         /** @type WPDB $wpdb */
         global $wpdb;
         // ensure all required values are present
-        if (! isset($row['REG_ID'], $row['REG_final_price'], $row['LIN_ID'])) {
+        if ( ! isset($row['REG_ID'], $row['REG_final_price'], $row['LIN_ID'])) {
             $this->add_error(
                 sprintf(
                     __('Invalid query results returned with the following data:%1$s REG_ID=%2$d, REG_final_price=%3$d, LIN_ID=%4$f. Error: "%5$s"', 'event_espresso'),
@@ -124,7 +124,7 @@ 
         }
         // get tax subtotal
         $tax_subtotal_line_item_ID = $this->_get_line_item_ID_for_tax_subtotal($row['LIN_ID']);
-        if (! $tax_subtotal_line_item_ID) {
+        if ( ! $tax_subtotal_line_item_ID) {
             $this->add_error(
                 sprintf(
                     __('Invalid line item ID returned. Error: "%1$s"', 'event_espresso'),
@@ -191,7 +191,7 @@ 
         if (is_array($taxes) && ! empty($taxes)) {
             $total_taxes = 0;
             foreach ($taxes as $tax) {
-                $total_taxes += $final_price * ( $tax->LIN_percent / 100 );
+                $total_taxes += $final_price * ($tax->LIN_percent / 100);
             }
             $final_price += $total_taxes;
             $this->_update_registration_final_price($REG_ID, $final_price);
@@ -213,10 +213,10 @@ 
         global $wpdb;
         $success = $wpdb->update(
             $this->_old_table,
-            array( 'REG_final_price' => $REG_final_price ),  // data
-            array( 'REG_ID' => $REG_ID ),  // where
-            array( '%f' ),   // data format
-            array( '%d' )  // where format
+            array('REG_final_price' => $REG_final_price), // data
+            array('REG_ID' => $REG_ID), // where
+            array('%f'), // data format
+            array('%d')  // where format
         );
         if ($success === false) {
             $this->add_error(

core/data_migration_scripts/EE_DMS_Unknown_1_0_0.core.php

Indentation +40 added lines, -40 removed lines

@@ -18,44 +18,44 @@
 class EE_DMS_Unknown_1_0_0 extends EE_Data_Migration_Script_Base
 {
 
-    /**
-     * Returns whether or not this data migration script can operate on the given version of the database.
-     * Eg, if this migration script can migrate from 3.1.26 or higher (but not anything after 4.0.0), and
-     * it's passed a string like '3.1.38B', it should return true
-     *
-     * @param string $version_string
-     * @return boolean
-     */
-    public function can_migrate_from_version($version_string)
-    {
-        return false;
-    }
-
-    public function schema_changes_after_migration()
-    {
-        return;
-    }
-
-    public function schema_changes_before_migration()
-    {
-        return;
-    }
-
-
-    /**
-     * All children of this must call parent::__construct() at the end of their constructor or suffer the consequences!
-     *
-     * @param TableManager  $table_manager
-     * @param TableAnalysis $table_analysis
-     */
-    public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
-    {
-        $this->_migration_stages = array();
-        $this->_pretty_name = __("Fatal Uncatchable Error Occurred", "event_espresso");
-        parent::__construct($table_manager, $table_analysis);
-    }
-
-    public function migration_page_hooks()
-    {
-    }
+	/**
+	 * Returns whether or not this data migration script can operate on the given version of the database.
+	 * Eg, if this migration script can migrate from 3.1.26 or higher (but not anything after 4.0.0), and
+	 * it's passed a string like '3.1.38B', it should return true
+	 *
+	 * @param string $version_string
+	 * @return boolean
+	 */
+	public function can_migrate_from_version($version_string)
+	{
+		return false;
+	}
+
+	public function schema_changes_after_migration()
+	{
+		return;
+	}
+
+	public function schema_changes_before_migration()
+	{
+		return;
+	}
+
+
+	/**
+	 * All children of this must call parent::__construct() at the end of their constructor or suffer the consequences!
+	 *
+	 * @param TableManager  $table_manager
+	 * @param TableAnalysis $table_analysis
+	 */
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
+	{
+		$this->_migration_stages = array();
+		$this->_pretty_name = __("Fatal Uncatchable Error Occurred", "event_espresso");
+		parent::__construct($table_manager, $table_analysis);
+	}
+
+	public function migration_page_hooks()
+	{
+	}
 }

core/data_migration_scripts/4_9_0_stages/EE_DMS_4_9_0_Answers_With_No_Registration.dmsstage.php

Indentation +38 added lines, -38 removed lines

@@ -15,44 +15,44 @@
 
 
 
-    /**
-     * Just initializes the status of the migration
-     *
-     * @return EE_DMS_4_9_0_Answers_With_No_Registration
-     */
-    public function __construct()
-    {
-        $this->_pretty_name = __('Answer Cleanup', 'event_espresso');
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 *
+	 * @return EE_DMS_4_9_0_Answers_With_No_Registration
+	 */
+	public function __construct()
+	{
+		$this->_pretty_name = __('Answer Cleanup', 'event_espresso');
+		parent::__construct();
+	}
 
-    /**
-     * Counts the records to migrate; the public version may cache it
-     * @return int
-     */
-    protected function _count_records_to_migrate()
-    {
-        return 1;
-    }
+	/**
+	 * Counts the records to migrate; the public version may cache it
+	 * @return int
+	 */
+	protected function _count_records_to_migrate()
+	{
+		return 1;
+	}
 
-    /**
-     * IMPORTANT: if an error is encountered, or everything is finished, this stage should update its status property accordingly.
-     * Note: it should not alter the count of items migrated. That is done in the public function that calls this.
-     * IMPORTANT: The count of items migrated should ONLY be less than $num_items_to_migrate when it's the last migration step, otherwise it
-     * should always return $num_items_to_migrate. (Eg, if we're migrating attendees rows from the database, and $num_items_to_migrate is set to 50,
-     * then we SHOULD actually migrate 50 rows,but at very least we MUST report/return 50 items migrated)
-     * @param int $num_items_to_migrate
-     * @return int number of items ACTUALLY migrated
-     */
-    protected function _migration_step($num_items_to_migrate = 50)
-    {
-        global $wpdb;
-        $wpdb->delete(
-            $wpdb->prefix . 'esp_answer',
-            array( 'REG_ID' => 0 ),
-            array( '%d' )
-        );
-        $this->set_completed();
-        return 1;
-    }
+	/**
+	 * IMPORTANT: if an error is encountered, or everything is finished, this stage should update its status property accordingly.
+	 * Note: it should not alter the count of items migrated. That is done in the public function that calls this.
+	 * IMPORTANT: The count of items migrated should ONLY be less than $num_items_to_migrate when it's the last migration step, otherwise it
+	 * should always return $num_items_to_migrate. (Eg, if we're migrating attendees rows from the database, and $num_items_to_migrate is set to 50,
+	 * then we SHOULD actually migrate 50 rows,but at very least we MUST report/return 50 items migrated)
+	 * @param int $num_items_to_migrate
+	 * @return int number of items ACTUALLY migrated
+	 */
+	protected function _migration_step($num_items_to_migrate = 50)
+	{
+		global $wpdb;
+		$wpdb->delete(
+			$wpdb->prefix . 'esp_answer',
+			array( 'REG_ID' => 0 ),
+			array( '%d' )
+		);
+		$this->set_completed();
+		return 1;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -48,9 +48,9 @@
     {
         global $wpdb;
         $wpdb->delete(
-            $wpdb->prefix . 'esp_answer',
-            array( 'REG_ID' => 0 ),
-            array( '%d' )
+            $wpdb->prefix.'esp_answer',
+            array('REG_ID' => 0),
+            array('%d')
         );
         $this->set_completed();
         return 1;

core/data_migration_scripts/4_9_0_stages/EE_DMS_4_9_0_Email_System_Question.dmsstage.php

Indentation +41 added lines, -41 removed lines

@@ -14,48 +14,48 @@
 
 
 
-    /**
-     * Just initializes the status of the migration
-     *
-     * @return EE_DMS_4_9_0_Email_System_Question
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __('Email - System Question', 'event_espresso');
-        $this->_old_table = $wpdb->prefix.'esp_question';
-        $this->_extra_where_sql = "WHERE QST_system = 'email'";
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 *
+	 * @return EE_DMS_4_9_0_Email_System_Question
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __('Email - System Question', 'event_espresso');
+		$this->_old_table = $wpdb->prefix.'esp_question';
+		$this->_extra_where_sql = "WHERE QST_system = 'email'";
+		parent::__construct();
+	}
 
 
 
-    /**
-     * updates the question with the new question type
-     * @param array $question an associative array where keys are column names and values are their values.
-     * @return null
-     */
-    protected function _migrate_old_row($question)
-    {
-        if ($question['QST_ID'] && $question['QST_system'] == 'email') {
-            global $wpdb;
-            $success = $wpdb->update(
-                $this->_old_table,
-                array( 'QST_type' => 'EMAIL' ),  // data
-                array( 'QST_ID' => $question['QST_ID'] ),  // where
-                array( '%s' ),   // data format
-                array( '%d' )  // where format
-            );
-            if (! $success) {
-                $this->add_error(
-                    sprintf(
-                        __('Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso'),
-                        wp_json_encode($question['QST_system']),
-                        $question['QST_ID'],
-                        $wpdb->last_error
-                    )
-                );
-            }
-        }
-    }
+	/**
+	 * updates the question with the new question type
+	 * @param array $question an associative array where keys are column names and values are their values.
+	 * @return null
+	 */
+	protected function _migrate_old_row($question)
+	{
+		if ($question['QST_ID'] && $question['QST_system'] == 'email') {
+			global $wpdb;
+			$success = $wpdb->update(
+				$this->_old_table,
+				array( 'QST_type' => 'EMAIL' ),  // data
+				array( 'QST_ID' => $question['QST_ID'] ),  // where
+				array( '%s' ),   // data format
+				array( '%d' )  // where format
+			);
+			if (! $success) {
+				$this->add_error(
+					sprintf(
+						__('Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso'),
+						wp_json_encode($question['QST_system']),
+						$question['QST_ID'],
+						$wpdb->last_error
+					)
+				);
+			}
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -41,12 +41,12 @@
             global $wpdb;
             $success = $wpdb->update(
                 $this->_old_table,
-                array( 'QST_type' => 'EMAIL' ),  // data
-                array( 'QST_ID' => $question['QST_ID'] ),  // where
-                array( '%s' ),   // data format
-                array( '%d' )  // where format
+                array('QST_type' => 'EMAIL'), // data
+                array('QST_ID' => $question['QST_ID']), // where
+                array('%s'), // data format
+                array('%d')  // where format
             );
-            if (! $success) {
+            if ( ! $success) {
                 $this->add_error(
                     sprintf(
                         __('Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso'),

core/data_migration_scripts/EE_DMS_Core_4_8_0.dms.php

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

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,
@@ -117,9 +117,9 @@ 
 							PRIMARY KEY  (ATTM_ID),
 								KEY ATT_ID (ATT_ID),
 								KEY ATT_email (ATT_email(191))";
-        $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,
@@ -135,25 +135,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,
@@ -169,9 +169,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,
@@ -187,34 +187,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,
@@ -222,9 +222,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 '',
@@ -243,9 +243,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,
@@ -256,18 +256,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 '',
@@ -279,17 +279,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',
@@ -306,9 +306,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,
@@ -324,32 +324,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 "",
@@ -363,18 +363,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,
@@ -384,9 +384,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,
@@ -410,18 +410,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,
@@ -429,9 +429,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,
@@ -439,9 +439,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,
@@ -449,9 +449,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',
@@ -463,9 +463,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,
@@ -484,10 +484,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,
@@ -500,9 +500,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',
@@ -511,9 +511,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,
@@ -535,9 +535,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,
@@ -550,223 +550,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, 'Å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, 'Å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
@@ -775,6 +775,6 @@ 
 				p.PRC_is_default = 0 AND
 				pt.PBT_ID = %d
 					", EEM_Price_Type::base_type_tax);
-        $wpdb->query($query);
-    }
+		$wpdb->query($query);
+	}
 }

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_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;
             }
         }