eventespresso / event-espresso-core

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_Data_Migration_Class_Base.core.php

Spacing +4 added lines, -4 removed lines

@@ -185,7 +185,7 @@ 
      */
     public function add_error($error, $force = false)
     {
-        if (! defined('EE_DMS_ERROR_LIMIT')) {
+        if ( ! defined('EE_DMS_ERROR_LIMIT')) {
             $limit = 50;
         } else {
             $limit = EE_DMS_ERROR_LIMIT;
@@ -201,7 +201,7 @@ 
                 $this->_errors[] = "Limit reached; removed first half of errors to save space";
                 $this->_errors[] = $error;
             } else {
-                $this->_errors[ $limit ] = 'More, but limit reached...';
+                $this->_errors[$limit] = 'More, but limit reached...';
             }
         } else {
             $this->_errors[] = $error;
@@ -343,7 +343,7 @@ 
         $new_columns_and_values_for_string = array();
         $count = 0;
         foreach ($new_row_as_array as $column => $value) {
-            $new_columns_and_values_for_string[] = " $column => $value (" . $data_types[ $count++ ] . ")";
+            $new_columns_and_values_for_string[] = " $column => $value (".$data_types[$count++].")";
         }
         return sprintf(
             __(
@@ -374,7 +374,7 @@ 
         foreach ($array_of_data as $name => $value) {
             $unserialized_data = @unserialize($value);
             if ($unserialized_data === false) {
-                $fields_to_include[ $name ] = $value;
+                $fields_to_include[$name] = $value;
             }
         }
         return wp_json_encode($fields_to_include);

Indentation +404 added lines, -404 removed lines

@@ -17,408 +17,408 @@
 abstract class EE_Data_Migration_Class_Base
 {
 
-    /**
-     * @var $records_to_migrate int count of all that have been migrated
-     */
-    protected $_records_to_migrate = 0;
-
-    /**
-     *
-     * @var $records_migrated int
-     */
-    protected $_records_migrated = 0;
-
-    /**
-     * Whether this migration script is done or not. This COULD be deduced by
-     * _records_to_migrate and _records_migrated, but that might nto be accurate
-     *
-     * @var string one of EE_Data_migration_Manager::status_* constants
-     */
-    protected $_status = null;
-
-    /**
-     * internationalized name of this class. Convention is to NOT restate that
-     * this class if a migration script or a migration script stage
-     *
-     * @var string (i18ned)
-     */
-    protected $_pretty_name = null;
-
-    /**
-     * @var array
-     */
-    protected $_errors = array();
-
-    /**
-     * @var \EventEspresso\core\services\database\TableManager $table_manager
-     */
-    protected $_table_manager;
-
-    /**
-     * @var \EventEspresso\core\services\database\TableAnalysis $table_analysis
-     */
-    protected $_table_analysis;
-
-
-    /**
-     * Just initializes the status of the migration
-     *
-     * @param TableManager  $table_manager
-     * @param TableAnalysis $table_analysis
-     */
-    public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
-    {
-        $this->_table_manager = $table_manager;
-        $this->_table_analysis = $table_analysis;
-        $this->set_status(EE_Data_Migration_Manager::status_continue);
-    }
-
-
-    /**
-     * Just gets the pretty name for this migration script or stage
-     *
-     * @throws EE_Error
-     * @return string
-     */
-    public function pretty_name()
-    {
-        if ($this->_pretty_name === null) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        "Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor",
-                        "event_espresso"
-                    ),
-                    get_class($this)
-                )
-            );
-        }
-        return $this->_pretty_name;
-    }
-
-    /**
-     *
-     * @return int
-     */
-    public function count_records_to_migrate()
-    {
-        if ($this->_records_to_migrate == null) {
-            $this->_records_to_migrate = $this->_count_records_to_migrate();
-        }
-        return $this->_records_to_migrate;
-    }
-
-    /**
-     * Counts records already migrated. This should only be implemented by EE_Data_Migration_Script_base and
-     * EE_Data_migration_Script_Stage
-     *
-     * @return int
-     */
-    abstract public function count_records_migrated();
-
-    /**
-     * Counts the records to migrate; the public version may cache it
-     *
-     * @return int
-     */
-    abstract protected function _count_records_to_migrate();
-
-    /**
-     * Returns a string indicating the migration script's status.
-     *
-     * @return string one of EE_Data_Migration_Manager::status_* constants
-     * @throws EE_Error
-     */
-    public function get_status()
-    {
-        if ($this->_status === null) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        "Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.",
-                        "event_espresso"
-                    ),
-                    get_class($this)
-                )
-            );
-        }
-        return $this->_status;
-    }
-
-    /**
-     *
-     * @param string $status
-     * @return void
-     */
-    protected function set_status($status)
-    {
-        $this->_status = $status;
-    }
-
-    /**
-     * @return array of strings
-     */
-    abstract public function get_errors();
-
-    /**
-     * Returns the last error that occurred. If none occurred, returns null
-     *
-     * @return string
-     */
-    public function get_last_error()
-    {
-        $errors = $this->get_errors();
-        if ($errors) {
-            return end($errors);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Adds an error to the array of errors on this class.
-     *
-     * @param string  $error a string describing the error that will be useful for debugging. Consider including all
-     *                       the data that led to the error, and a stack trace etc.
-     * @param boolean $force force the error to be added (because otherwise we have a limit). If forcing and errors are
-     *                       already at their limit, we will purposefully forget the first half
-     */
-    public function add_error($error, $force = false)
-    {
-        if (! defined('EE_DMS_ERROR_LIMIT')) {
-            $limit = 50;
-        } else {
-            $limit = EE_DMS_ERROR_LIMIT;
-        }
-        // make sure errors is an array, see ticket #8261
-        if (is_string($this->_errors)) {
-            $this->_errors = array($this->_errors);
-        }
-        if (count($this->_errors) >= $limit) {
-            if ($force) {
-                // get rid of the first half of the errors and any above the limit
-                $this->_errors = array_slice($this->_errors, $limit / 2, $limit / 2);
-                $this->_errors[] = "Limit reached; removed first half of errors to save space";
-                $this->_errors[] = $error;
-            } else {
-                $this->_errors[ $limit ] = 'More, but limit reached...';
-            }
-        } else {
-            $this->_errors[] = $error;
-        }
-    }
-
-    /**
-     * Indicates there was a fatal error and the migration cannot possibly continue
-     *
-     * @return boolean
-     */
-    public function is_broken()
-    {
-        return $this->get_status() == EE_Data_Migration_Manager::status_fatal_error;
-    }
-
-    /**
-     * @deprecated since 4.6.12
-     */
-    public function is_borked()
-    {
-        EE_Error::doing_it_wrong(
-            'is_borked',
-            __(
-                'The cheeky "is_borked" method had been replaced with the more proper "is_broken"',
-                'event_espresso'
-            ),
-            '4.6.12'
-        );
-        return $this->is_broken();
-    }
-
-    /**
-     * Sets the status to as having a fatal error
-     */
-    public function set_broken()
-    {
-        $this->_status = EE_Data_Migration_Manager::status_fatal_error;
-    }
-
-    /**
-     *
-     * @deprecated since 4.6.12
-     */
-    public function set_borked()
-    {
-        EE_Error::doing_it_wrong(
-            'is_borked',
-            __(
-                'The cheeky "is_borked" method had been replaced with the more proper "is_broken"',
-                'event_espresso'
-            ),
-            '4.6.12'
-        );
-        return $this->set_broken();
-    }
-
-    /**
-     * Checks if this thing believes it is completed
-     *
-     * @return boolean
-     */
-    public function is_completed()
-    {
-        return $this->get_status() == EE_Data_Migration_Manager::status_completed;
-    }
-
-    /**
-     * Checks if the current script has more to do or not (ie, if it's status is CONTINUE)
-     *
-     * @return boolean
-     */
-    public function has_more_to_do()
-    {
-        return $this->get_status() == EE_Data_Migration_Manager::status_continue;
-    }
-
-    /**
-     * Marks that we believe this migration thing is completed
-     */
-    public function set_completed()
-    {
-        $this->_status = EE_Data_Migration_Manager::status_completed;
-    }
-
-    /**
-     * Marks that we think this migration class can continue to migrate
-     */
-    public function reattempt()
-    {
-        $this->_status = EE_Data_Migration_Manager::status_continue;
-        $this->add_error(__('Reattempt migration', 'event_espresso'), true);
-    }
-
-    /**
-     * A lot like "__sleep()" magic method in purpose, this is meant for persisting this class'
-     * properties to the DB. However, we don't want to use __sleep() because its quite
-     * possible that this class is defined when it goes to sleep, but NOT available when it
-     * awakes (eg, this class is part of an addon that is deactivated at some point).
-     */
-    public function properties_as_array()
-    {
-        $properties = get_object_vars($this);
-        $properties['class'] = get_class($this);
-        unset($properties['_migration_script']);
-        unset($properties['_table_manager']);
-        unset($properties['_table_analysis']);
-        return $properties;
-    }
-
-    /**
-     * Sets all of the properties of this script stage to match what's in the array, which is assumed
-     * to have been made from the properties_as_array() function.
-     *
-     * @param array $array_of_properties like what's produced from properties_as_array() method
-     */
-    abstract public function instantiate_from_array_of_properties($array_of_properties);
-
-    /**
-     * Convenience method for showing a database insertion error
-     *
-     * @param string $old_table
-     * @param array  $old_row_as_array
-     * @param string $new_table
-     * @param array  $new_row_as_array columns=>values like used in wpdb->insert
-     * @param array  $data_types       numerically indexed
-     * @return string
-     */
-    protected function _create_error_message_for_db_insertion(
-        $old_table,
-        $old_row_as_array,
-        $new_table,
-        $new_row_as_array,
-        $data_types
-    ) {
-        global $wpdb;
-        $old_columns_and_values_for_string = array();
-        foreach ($old_row_as_array as $column => $value) {
-            $old_columns_and_values_for_string[] = "$column => $value";
-        }
-        $new_columns_and_values_for_string = array();
-        $count = 0;
-        foreach ($new_row_as_array as $column => $value) {
-            $new_columns_and_values_for_string[] = " $column => $value (" . $data_types[ $count++ ] . ")";
-        }
-        return sprintf(
-            __(
-                'Received error "%6$s" inserting row %5$s %1$s %5$s into table %2$s.%5$s Data used was %5$s %3$s %5$s from table %4$s.',
-                'event_espresso'
-            ),
-            implode(", ", $new_columns_and_values_for_string),
-            $new_table,
-            implode(", ", $old_columns_and_values_for_string),
-            $old_table,
-            '<br/>',
-            $wpdb->last_error
-        );
-    }
-
-
-    /**
-     * Same as json_encode, just avoids putting
-     * serialized arrays into the http build query, as that would
-     *
-     * @param array $array_of_data
-     * @return string
-     */
-    protected function _json_encode($array_of_data)
-    {
-        // we'd rather NOT serialize the transaction details
-        $fields_to_include = array();
-        foreach ($array_of_data as $name => $value) {
-            $unserialized_data = @unserialize($value);
-            if ($unserialized_data === false) {
-                $fields_to_include[ $name ] = $value;
-            }
-        }
-        return wp_json_encode($fields_to_include);
-    }
-
-    /**
-     * Gets the table manager (or throws an exception if it cannot be retrieved)
-     *
-     * @return TableManager
-     * @throws EE_Error
-     */
-    protected function _get_table_manager()
-    {
-        if ($this->_table_manager instanceof TableManager) {
-            return $this->_table_manager;
-        } else {
-            throw new EE_Error(
-                sprintf(
-                    __('Table manager on migration class %1$s is not set properly.', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
-
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     * @throws EE_Error
-     */
-    protected function _get_table_analysis()
-    {
-        if ($this->_table_analysis instanceof TableAnalysis) {
-            return $this->_table_analysis;
-        } else {
-            throw new EE_Error(
-                sprintf(
-                    __('Table analysis class on migration class %1$s is not set properly.', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
+	/**
+	 * @var $records_to_migrate int count of all that have been migrated
+	 */
+	protected $_records_to_migrate = 0;
+
+	/**
+	 *
+	 * @var $records_migrated int
+	 */
+	protected $_records_migrated = 0;
+
+	/**
+	 * Whether this migration script is done or not. This COULD be deduced by
+	 * _records_to_migrate and _records_migrated, but that might nto be accurate
+	 *
+	 * @var string one of EE_Data_migration_Manager::status_* constants
+	 */
+	protected $_status = null;
+
+	/**
+	 * internationalized name of this class. Convention is to NOT restate that
+	 * this class if a migration script or a migration script stage
+	 *
+	 * @var string (i18ned)
+	 */
+	protected $_pretty_name = null;
+
+	/**
+	 * @var array
+	 */
+	protected $_errors = array();
+
+	/**
+	 * @var \EventEspresso\core\services\database\TableManager $table_manager
+	 */
+	protected $_table_manager;
+
+	/**
+	 * @var \EventEspresso\core\services\database\TableAnalysis $table_analysis
+	 */
+	protected $_table_analysis;
+
+
+	/**
+	 * Just initializes the status of the migration
+	 *
+	 * @param TableManager  $table_manager
+	 * @param TableAnalysis $table_analysis
+	 */
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
+	{
+		$this->_table_manager = $table_manager;
+		$this->_table_analysis = $table_analysis;
+		$this->set_status(EE_Data_Migration_Manager::status_continue);
+	}
+
+
+	/**
+	 * Just gets the pretty name for this migration script or stage
+	 *
+	 * @throws EE_Error
+	 * @return string
+	 */
+	public function pretty_name()
+	{
+		if ($this->_pretty_name === null) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						"Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor",
+						"event_espresso"
+					),
+					get_class($this)
+				)
+			);
+		}
+		return $this->_pretty_name;
+	}
+
+	/**
+	 *
+	 * @return int
+	 */
+	public function count_records_to_migrate()
+	{
+		if ($this->_records_to_migrate == null) {
+			$this->_records_to_migrate = $this->_count_records_to_migrate();
+		}
+		return $this->_records_to_migrate;
+	}
+
+	/**
+	 * Counts records already migrated. This should only be implemented by EE_Data_Migration_Script_base and
+	 * EE_Data_migration_Script_Stage
+	 *
+	 * @return int
+	 */
+	abstract public function count_records_migrated();
+
+	/**
+	 * Counts the records to migrate; the public version may cache it
+	 *
+	 * @return int
+	 */
+	abstract protected function _count_records_to_migrate();
+
+	/**
+	 * Returns a string indicating the migration script's status.
+	 *
+	 * @return string one of EE_Data_Migration_Manager::status_* constants
+	 * @throws EE_Error
+	 */
+	public function get_status()
+	{
+		if ($this->_status === null) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						"Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.",
+						"event_espresso"
+					),
+					get_class($this)
+				)
+			);
+		}
+		return $this->_status;
+	}
+
+	/**
+	 *
+	 * @param string $status
+	 * @return void
+	 */
+	protected function set_status($status)
+	{
+		$this->_status = $status;
+	}
+
+	/**
+	 * @return array of strings
+	 */
+	abstract public function get_errors();
+
+	/**
+	 * Returns the last error that occurred. If none occurred, returns null
+	 *
+	 * @return string
+	 */
+	public function get_last_error()
+	{
+		$errors = $this->get_errors();
+		if ($errors) {
+			return end($errors);
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Adds an error to the array of errors on this class.
+	 *
+	 * @param string  $error a string describing the error that will be useful for debugging. Consider including all
+	 *                       the data that led to the error, and a stack trace etc.
+	 * @param boolean $force force the error to be added (because otherwise we have a limit). If forcing and errors are
+	 *                       already at their limit, we will purposefully forget the first half
+	 */
+	public function add_error($error, $force = false)
+	{
+		if (! defined('EE_DMS_ERROR_LIMIT')) {
+			$limit = 50;
+		} else {
+			$limit = EE_DMS_ERROR_LIMIT;
+		}
+		// make sure errors is an array, see ticket #8261
+		if (is_string($this->_errors)) {
+			$this->_errors = array($this->_errors);
+		}
+		if (count($this->_errors) >= $limit) {
+			if ($force) {
+				// get rid of the first half of the errors and any above the limit
+				$this->_errors = array_slice($this->_errors, $limit / 2, $limit / 2);
+				$this->_errors[] = "Limit reached; removed first half of errors to save space";
+				$this->_errors[] = $error;
+			} else {
+				$this->_errors[ $limit ] = 'More, but limit reached...';
+			}
+		} else {
+			$this->_errors[] = $error;
+		}
+	}
+
+	/**
+	 * Indicates there was a fatal error and the migration cannot possibly continue
+	 *
+	 * @return boolean
+	 */
+	public function is_broken()
+	{
+		return $this->get_status() == EE_Data_Migration_Manager::status_fatal_error;
+	}
+
+	/**
+	 * @deprecated since 4.6.12
+	 */
+	public function is_borked()
+	{
+		EE_Error::doing_it_wrong(
+			'is_borked',
+			__(
+				'The cheeky "is_borked" method had been replaced with the more proper "is_broken"',
+				'event_espresso'
+			),
+			'4.6.12'
+		);
+		return $this->is_broken();
+	}
+
+	/**
+	 * Sets the status to as having a fatal error
+	 */
+	public function set_broken()
+	{
+		$this->_status = EE_Data_Migration_Manager::status_fatal_error;
+	}
+
+	/**
+	 *
+	 * @deprecated since 4.6.12
+	 */
+	public function set_borked()
+	{
+		EE_Error::doing_it_wrong(
+			'is_borked',
+			__(
+				'The cheeky "is_borked" method had been replaced with the more proper "is_broken"',
+				'event_espresso'
+			),
+			'4.6.12'
+		);
+		return $this->set_broken();
+	}
+
+	/**
+	 * Checks if this thing believes it is completed
+	 *
+	 * @return boolean
+	 */
+	public function is_completed()
+	{
+		return $this->get_status() == EE_Data_Migration_Manager::status_completed;
+	}
+
+	/**
+	 * Checks if the current script has more to do or not (ie, if it's status is CONTINUE)
+	 *
+	 * @return boolean
+	 */
+	public function has_more_to_do()
+	{
+		return $this->get_status() == EE_Data_Migration_Manager::status_continue;
+	}
+
+	/**
+	 * Marks that we believe this migration thing is completed
+	 */
+	public function set_completed()
+	{
+		$this->_status = EE_Data_Migration_Manager::status_completed;
+	}
+
+	/**
+	 * Marks that we think this migration class can continue to migrate
+	 */
+	public function reattempt()
+	{
+		$this->_status = EE_Data_Migration_Manager::status_continue;
+		$this->add_error(__('Reattempt migration', 'event_espresso'), true);
+	}
+
+	/**
+	 * A lot like "__sleep()" magic method in purpose, this is meant for persisting this class'
+	 * properties to the DB. However, we don't want to use __sleep() because its quite
+	 * possible that this class is defined when it goes to sleep, but NOT available when it
+	 * awakes (eg, this class is part of an addon that is deactivated at some point).
+	 */
+	public function properties_as_array()
+	{
+		$properties = get_object_vars($this);
+		$properties['class'] = get_class($this);
+		unset($properties['_migration_script']);
+		unset($properties['_table_manager']);
+		unset($properties['_table_analysis']);
+		return $properties;
+	}
+
+	/**
+	 * Sets all of the properties of this script stage to match what's in the array, which is assumed
+	 * to have been made from the properties_as_array() function.
+	 *
+	 * @param array $array_of_properties like what's produced from properties_as_array() method
+	 */
+	abstract public function instantiate_from_array_of_properties($array_of_properties);
+
+	/**
+	 * Convenience method for showing a database insertion error
+	 *
+	 * @param string $old_table
+	 * @param array  $old_row_as_array
+	 * @param string $new_table
+	 * @param array  $new_row_as_array columns=>values like used in wpdb->insert
+	 * @param array  $data_types       numerically indexed
+	 * @return string
+	 */
+	protected function _create_error_message_for_db_insertion(
+		$old_table,
+		$old_row_as_array,
+		$new_table,
+		$new_row_as_array,
+		$data_types
+	) {
+		global $wpdb;
+		$old_columns_and_values_for_string = array();
+		foreach ($old_row_as_array as $column => $value) {
+			$old_columns_and_values_for_string[] = "$column => $value";
+		}
+		$new_columns_and_values_for_string = array();
+		$count = 0;
+		foreach ($new_row_as_array as $column => $value) {
+			$new_columns_and_values_for_string[] = " $column => $value (" . $data_types[ $count++ ] . ")";
+		}
+		return sprintf(
+			__(
+				'Received error "%6$s" inserting row %5$s %1$s %5$s into table %2$s.%5$s Data used was %5$s %3$s %5$s from table %4$s.',
+				'event_espresso'
+			),
+			implode(", ", $new_columns_and_values_for_string),
+			$new_table,
+			implode(", ", $old_columns_and_values_for_string),
+			$old_table,
+			'<br/>',
+			$wpdb->last_error
+		);
+	}
+
+
+	/**
+	 * Same as json_encode, just avoids putting
+	 * serialized arrays into the http build query, as that would
+	 *
+	 * @param array $array_of_data
+	 * @return string
+	 */
+	protected function _json_encode($array_of_data)
+	{
+		// we'd rather NOT serialize the transaction details
+		$fields_to_include = array();
+		foreach ($array_of_data as $name => $value) {
+			$unserialized_data = @unserialize($value);
+			if ($unserialized_data === false) {
+				$fields_to_include[ $name ] = $value;
+			}
+		}
+		return wp_json_encode($fields_to_include);
+	}
+
+	/**
+	 * Gets the table manager (or throws an exception if it cannot be retrieved)
+	 *
+	 * @return TableManager
+	 * @throws EE_Error
+	 */
+	protected function _get_table_manager()
+	{
+		if ($this->_table_manager instanceof TableManager) {
+			return $this->_table_manager;
+		} else {
+			throw new EE_Error(
+				sprintf(
+					__('Table manager on migration class %1$s is not set properly.', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
+
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 * @throws EE_Error
+	 */
+	protected function _get_table_analysis()
+	{
+		if ($this->_table_analysis instanceof TableAnalysis) {
+			return $this->_table_analysis;
+		} else {
+			throw new EE_Error(
+				sprintf(
+					__('Table analysis class on migration class %1$s is not set properly.', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
 }

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

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

Spacing +11 added lines, -11 removed lines

@@ -24,20 +24,20 @@ 
         // convert settings
         $gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
         // just do a part of them on this request
-        $gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items);// $this->_gateways_we_know_how_to_migrate;
+        $gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items); // $this->_gateways_we_know_how_to_migrate;
         foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
             $old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-            if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+            if (isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])) {
                 // determine the old option's name
                 $old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
-                if (! $old_gateway_settings) {
+                if ( ! $old_gateway_settings) {
                     // no settings existed for this gateway anyways... weird...
                     $items_actually_migrated++;
                     continue;
                 }
                 // now prepare the settings to make sure they're in the 4.1 format
                 $new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
-                $new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
+                $new_gateway_config_obj->payment_settings[$new_gateway_slug] = $new_gateway_settings;
                 // and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
                 // I think it's ok to do right away this time (we wont need gateway settings elsewhere)
                 delete_option($old_gateway_wp_option_name);
@@ -51,7 +51,7 @@ 
             $items_actually_migrated++;
         }
         // if we can keep going, and it hasn' tbeen done yet, convert active gateways
-        if ($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways) {
+        if ($items_actually_migrated < $num_items && ! $this->_converted_active_gateways) {
             $this->_convert_active_gateways();
             $this->_converted_active_gateways = true;
             $items_actually_migrated++;
@@ -69,7 +69,7 @@ 
         $step_of_setting_active_gateways = 1;
         $count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
     //  $button_images_to_update =
-        return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
+        return $count_of_gateways_to_convert + $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
     }
     public function __construct()
     {
@@ -115,7 +115,7 @@ 
     private function _get_old_gateway_option($new_gateway_slug)
     {
         $option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-        $settings =  get_option($option_name, null);
+        $settings = get_option($option_name, null);
     //  if( ! $settings){
     //      $this->add_error(sprintf(__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
     //  }
@@ -130,7 +130,7 @@ 
     private function _get_old_gateway_option_name($new_gateway_slug)
     {
         $new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
-        $old_gateway_slug = $new_gateway_slugs_to_new[ $new_gateway_slug ];
+        $old_gateway_slug = $new_gateway_slugs_to_new[$new_gateway_slug];
         $normal_option_prefix = 'event_espresso_';
         $normal_option_postfix = '_settings';
         switch ($new_gateway_slug) {
@@ -170,14 +170,14 @@ 
         $old_active_gateways = get_option('event_espresso_active_gateways');
         $new_active_gateways = EE_Config::instance()->gateway->active_gateways;
         foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
-            if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+            if ( ! isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])) {
                 $this->add_error(sprintf(__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
                 continue;
             }
-            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
+            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[$old_gateway_slug];
         
             // in the new format we can also upload gateways to the uploads directory and
-            $new_active_gateways[ $new_gateway_slug ] = false;
+            $new_active_gateways[$new_gateway_slug] = false;
         }
         EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
     }

Indentation +191 added lines, -191 removed lines

@@ -14,68 +14,68 @@ 
 class EE_DMS_4_1_0_gateways extends EE_Data_Migration_Script_Stage
 {
 
-    private $_converted_active_gateways = false;
+	private $_converted_active_gateways = false;
 
-    public function _migration_step($num_items = 50)
-    {
-        // loads existing EE_CONfig from DB, if it exists
-        $new_gateway_config_obj = EE_Config::instance()->gateway;
-        $items_actually_migrated = 0;
-        // convert settings
-        $gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
-        // just do a part of them on this request
-        $gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items);// $this->_gateways_we_know_how_to_migrate;
-        foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
-            $old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-            if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
-                // determine the old option's name
-                $old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
-                if (! $old_gateway_settings) {
-                    // no settings existed for this gateway anyways... weird...
-                    $items_actually_migrated++;
-                    continue;
-                }
-                // now prepare the settings to make sure they're in the 4.1 format
-                $new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
-                $new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
-                // and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
-                // I think it's ok to do right away this time (we wont need gateway settings elsewhere)
-                delete_option($old_gateway_wp_option_name);
-            } else {// it must be one of the ones we mostly leave alone
-                global $wpdb;
-                // yeah we could do this all in one query... and if you're reading this and would liek to, go ahead. Although you'll
-                // only be saving users 50 milliseconds the one time this runs...
-                $wpdb->query($wpdb->prepare("UPDATE ".$wpdb->options." SET autoload='no' WHERE option_name=%s", $old_gateway_wp_option_name));
-            }
+	public function _migration_step($num_items = 50)
+	{
+		// loads existing EE_CONfig from DB, if it exists
+		$new_gateway_config_obj = EE_Config::instance()->gateway;
+		$items_actually_migrated = 0;
+		// convert settings
+		$gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
+		// just do a part of them on this request
+		$gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items);// $this->_gateways_we_know_how_to_migrate;
+		foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
+			$old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
+			if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+				// determine the old option's name
+				$old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
+				if (! $old_gateway_settings) {
+					// no settings existed for this gateway anyways... weird...
+					$items_actually_migrated++;
+					continue;
+				}
+				// now prepare the settings to make sure they're in the 4.1 format
+				$new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
+				$new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
+				// and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
+				// I think it's ok to do right away this time (we wont need gateway settings elsewhere)
+				delete_option($old_gateway_wp_option_name);
+			} else {// it must be one of the ones we mostly leave alone
+				global $wpdb;
+				// yeah we could do this all in one query... and if you're reading this and would liek to, go ahead. Although you'll
+				// only be saving users 50 milliseconds the one time this runs...
+				$wpdb->query($wpdb->prepare("UPDATE ".$wpdb->options." SET autoload='no' WHERE option_name=%s", $old_gateway_wp_option_name));
+			}
         
-            $items_actually_migrated++;
-        }
-        // if we can keep going, and it hasn' tbeen done yet, convert active gateways
-        if ($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways) {
-            $this->_convert_active_gateways();
-            $this->_converted_active_gateways = true;
-            $items_actually_migrated++;
-        }
+			$items_actually_migrated++;
+		}
+		// if we can keep going, and it hasn' tbeen done yet, convert active gateways
+		if ($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways) {
+			$this->_convert_active_gateways();
+			$this->_converted_active_gateways = true;
+			$items_actually_migrated++;
+		}
     
-        EE_Config::instance()->update_espresso_config(false, false);
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        $count_of_gateways_to_convert = count($this->_gateways_we_know_how_to_migrate);
-        $step_of_setting_active_gateways = 1;
-        $count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
-    //  $button_images_to_update =
-        return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
-    }
-    public function __construct()
-    {
-        $this->_pretty_name = __("Gateways", "event_espresso");
-        parent::__construct();
-    }
+		EE_Config::instance()->update_espresso_config(false, false);
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		$count_of_gateways_to_convert = count($this->_gateways_we_know_how_to_migrate);
+		$step_of_setting_active_gateways = 1;
+		$count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
+	//  $button_images_to_update =
+		return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
+	}
+	public function __construct()
+	{
+		$this->_pretty_name = __("Gateways", "event_espresso");
+		parent::__construct();
+	}
 
 /**
  * Takes the old array of 3.1 gateway settings for this gateway and converts it
@@ -85,148 +85,148 @@ 
  * @param string $new_gateway_slug
  * @return array
  */
-    private function _convert_gateway_settings($old_gateway_settings, $new_gateway_slug)
-    {
-        $new_gateway_settings = $old_gateway_settings;
-        switch ($new_gateway_slug) {
-            case 'Bank':
-                $new_gateway_settings['account_number'] = $old_gateway_settings['bank_account'];
-                $new_gateway_settings['page_title'] = $old_gateway_settings['bank_title'];
-                break;
-            case 'Invoice':
-                $new_gateway_settings['invoice_logo_url'] = $old_gateway_settings['image_url'];
-                // Dont' migrate the old invoice payee address. It was usually given dummy data. And in EE4
-                // it gets used in the receipts which are available to everyone. So usually it's best to not
-                // migrate this.
-                unset($new_gateway_settings['payment_address']);
-                break;
-            case 'Paypal_Pro':
-                $new_gateway_settings['email'] = $old_gateway_settings['paypal_pro_email'];
-                $new_gateway_settings['username'] = $old_gateway_settings['paypal_api_username'];
-                $new_gateway_settings['password'] = $old_gateway_settings['paypal_api_password'];
-                $new_gateway_settings['signature'] = $old_gateway_settings['paypal_api_signature'];
-                $new_gateway_settings['credit_cards'] = explode(",", $old_gateway_settings['paypal_api_credit_cards']);
-                $new_gateway_settings['use_sandbox'] = $old_gateway_settings['paypal_pro_use_sandbox'];
-                break;
-        }
-        return $new_gateway_settings;
-    }
+	private function _convert_gateway_settings($old_gateway_settings, $new_gateway_slug)
+	{
+		$new_gateway_settings = $old_gateway_settings;
+		switch ($new_gateway_slug) {
+			case 'Bank':
+				$new_gateway_settings['account_number'] = $old_gateway_settings['bank_account'];
+				$new_gateway_settings['page_title'] = $old_gateway_settings['bank_title'];
+				break;
+			case 'Invoice':
+				$new_gateway_settings['invoice_logo_url'] = $old_gateway_settings['image_url'];
+				// Dont' migrate the old invoice payee address. It was usually given dummy data. And in EE4
+				// it gets used in the receipts which are available to everyone. So usually it's best to not
+				// migrate this.
+				unset($new_gateway_settings['payment_address']);
+				break;
+			case 'Paypal_Pro':
+				$new_gateway_settings['email'] = $old_gateway_settings['paypal_pro_email'];
+				$new_gateway_settings['username'] = $old_gateway_settings['paypal_api_username'];
+				$new_gateway_settings['password'] = $old_gateway_settings['paypal_api_password'];
+				$new_gateway_settings['signature'] = $old_gateway_settings['paypal_api_signature'];
+				$new_gateway_settings['credit_cards'] = explode(",", $old_gateway_settings['paypal_api_credit_cards']);
+				$new_gateway_settings['use_sandbox'] = $old_gateway_settings['paypal_pro_use_sandbox'];
+				break;
+		}
+		return $new_gateway_settings;
+	}
 /**
- * Figures out the correct 3.1 gateway settings option name for the given 4.1 gateway
- * @param string $new_gateway_slug
- * @return string
- */
-    private function _get_old_gateway_option($new_gateway_slug)
-    {
-        $option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-        $settings =  get_option($option_name, null);
-    //  if( ! $settings){
-    //      $this->add_error(sprintf(__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
-    //  }
-        return $settings;
-    }
+	 * Figures out the correct 3.1 gateway settings option name for the given 4.1 gateway
+	 * @param string $new_gateway_slug
+	 * @return string
+	 */
+	private function _get_old_gateway_option($new_gateway_slug)
+	{
+		$option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
+		$settings =  get_option($option_name, null);
+	//  if( ! $settings){
+	//      $this->add_error(sprintf(__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
+	//  }
+		return $settings;
+	}
 
 /**
  * Just gets the old gateways slug
  * @param string $new_gateway_slug
  * @return string
  */
-    private function _get_old_gateway_option_name($new_gateway_slug)
-    {
-        $new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
-        $old_gateway_slug = $new_gateway_slugs_to_new[ $new_gateway_slug ];
-        $normal_option_prefix = 'event_espresso_';
-        $normal_option_postfix = '_settings';
-        switch ($new_gateway_slug) {
-            case 'Bank':
-                $option_name = $normal_option_prefix.'bank_deposit'.$normal_option_postfix;
-                break;
-            case 'Aim':
-                $option_name = $normal_option_prefix.'authnet_aim'.$normal_option_postfix;
-                break;
-            case 'Check':
-                $option_name = $normal_option_prefix.'check_payment'.$normal_option_postfix;
-                break;
-            case 'Ideal':
-                $option_name = $normal_option_prefix.'ideal_mollie'.$normal_option_postfix;
-                break;
-            case 'Invoice':
-                $option_name = $normal_option_prefix.'invoice_payment'.$normal_option_postfix;
-                break;
-            case 'Purchase_Order':
-                $option_name = $normal_option_prefix.'purchase_order_payment'.$normal_option_postfix;
-                break;
-            case 'USAePay_Offsite':
-                $option_name = 'espresso_usaepay_offsite'.$normal_option_postfix;
-                break;
-            case 'USAePay_Onsite':
-                $option_name = 'espresso_usaepay_onsite'.$normal_option_postfix;
-                break;
-            default:
-                $option_name = apply_filters('FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option', $normal_option_prefix.$old_gateway_slug.$normal_option_postfix);
-        }
-        return $option_name;
-    }
+	private function _get_old_gateway_option_name($new_gateway_slug)
+	{
+		$new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
+		$old_gateway_slug = $new_gateway_slugs_to_new[ $new_gateway_slug ];
+		$normal_option_prefix = 'event_espresso_';
+		$normal_option_postfix = '_settings';
+		switch ($new_gateway_slug) {
+			case 'Bank':
+				$option_name = $normal_option_prefix.'bank_deposit'.$normal_option_postfix;
+				break;
+			case 'Aim':
+				$option_name = $normal_option_prefix.'authnet_aim'.$normal_option_postfix;
+				break;
+			case 'Check':
+				$option_name = $normal_option_prefix.'check_payment'.$normal_option_postfix;
+				break;
+			case 'Ideal':
+				$option_name = $normal_option_prefix.'ideal_mollie'.$normal_option_postfix;
+				break;
+			case 'Invoice':
+				$option_name = $normal_option_prefix.'invoice_payment'.$normal_option_postfix;
+				break;
+			case 'Purchase_Order':
+				$option_name = $normal_option_prefix.'purchase_order_payment'.$normal_option_postfix;
+				break;
+			case 'USAePay_Offsite':
+				$option_name = 'espresso_usaepay_offsite'.$normal_option_postfix;
+				break;
+			case 'USAePay_Onsite':
+				$option_name = 'espresso_usaepay_onsite'.$normal_option_postfix;
+				break;
+			default:
+				$option_name = apply_filters('FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option', $normal_option_prefix.$old_gateway_slug.$normal_option_postfix);
+		}
+		return $option_name;
+	}
 
-    private function _convert_active_gateways()
-    {
-        // just does it all one big swoop
-        $old_active_gateways = get_option('event_espresso_active_gateways');
-        $new_active_gateways = EE_Config::instance()->gateway->active_gateways;
-        foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
-            if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
-                $this->add_error(sprintf(__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
-                continue;
-            }
-            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
+	private function _convert_active_gateways()
+	{
+		// just does it all one big swoop
+		$old_active_gateways = get_option('event_espresso_active_gateways');
+		$new_active_gateways = EE_Config::instance()->gateway->active_gateways;
+		foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
+			if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+				$this->add_error(sprintf(__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
+				continue;
+			}
+			$new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
         
-            // in the new format we can also upload gateways to the uploads directory and
-            $new_active_gateways[ $new_gateway_slug ] = false;
-        }
-        EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
-    }
+			// in the new format we can also upload gateways to the uploads directory and
+			$new_active_gateways[ $new_gateway_slug ] = false;
+		}
+		EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
+	}
     
-    protected $_gateways_we_know_how_to_migrate = array(
-        'aim'=>'Aim',
-        'bank'=>'Bank',
-        'check'=>'Check',
-        'invoice'=>'Invoice',
-        'paypal'=>'Paypal_Standard',
-        'paypal_pro'=>'Paypal_Pro',
+	protected $_gateways_we_know_how_to_migrate = array(
+		'aim'=>'Aim',
+		'bank'=>'Bank',
+		'check'=>'Check',
+		'invoice'=>'Invoice',
+		'paypal'=>'Paypal_Standard',
+		'paypal_pro'=>'Paypal_Pro',
 
-    );
+	);
     
-    protected $_gateways_we_leave_alone = array(
-        '2checkout'=>'2checkout',
-        'anz'=>'Anz',
-        'atos'=>'Atos',
-        'authnet'=>'Authnet',
-        'beanstream'=>'Beanstream',
-        'evertec'=>'Evertec',
-        'eway'=>'Eway',
-        'eway_rapid3'=>'Eway_Rapid3',
-        'exact'=>'Exact',
-        'firstdata'=>'Firstdata',
-        'firstdat_e4'=>'Firstdata_E4',
-        'ideal'=>'Ideal',
-        'infusion_payment'=>'InfusionSoft',
-        'luottokunta'=>'Luottokunta',
-        'megasoft'=>'Megasoft',
-        'moneris_hpp'=>'Moneris_HPP',
-        'mwarrior'=>'Mwarrior',
-        'nab'=>'NAB',
-        'paychoice'=>'Paychoice',
-        'paytrace'=>'Paytrace',
-        'psigate'=>'Psigate',
-        'purchase_order'=>'Purchase_Order',
-        'qbms'=>'QBMS',
-        'quickpay'=>'Quickpay',
-        'realauth'=>'Realauth',
-        'securepay_aus'=>'Securepay_Aus',
-        'stripe'=>'Stripe',
-        'usaepay_offsite'=>'USAePay_Offsite',
-        'usaepay_onsite'=>'USAePay_Onsite',
-        'wepay'=>'Wepay',
-        'worldpay'=>'Worldpay'
-    );
+	protected $_gateways_we_leave_alone = array(
+		'2checkout'=>'2checkout',
+		'anz'=>'Anz',
+		'atos'=>'Atos',
+		'authnet'=>'Authnet',
+		'beanstream'=>'Beanstream',
+		'evertec'=>'Evertec',
+		'eway'=>'Eway',
+		'eway_rapid3'=>'Eway_Rapid3',
+		'exact'=>'Exact',
+		'firstdata'=>'Firstdata',
+		'firstdat_e4'=>'Firstdata_E4',
+		'ideal'=>'Ideal',
+		'infusion_payment'=>'InfusionSoft',
+		'luottokunta'=>'Luottokunta',
+		'megasoft'=>'Megasoft',
+		'moneris_hpp'=>'Moneris_HPP',
+		'mwarrior'=>'Mwarrior',
+		'nab'=>'NAB',
+		'paychoice'=>'Paychoice',
+		'paytrace'=>'Paytrace',
+		'psigate'=>'Psigate',
+		'purchase_order'=>'Purchase_Order',
+		'qbms'=>'QBMS',
+		'quickpay'=>'Quickpay',
+		'realauth'=>'Realauth',
+		'securepay_aus'=>'Securepay_Aus',
+		'stripe'=>'Stripe',
+		'usaepay_offsite'=>'USAePay_Offsite',
+		'usaepay_onsite'=>'USAePay_Onsite',
+		'wepay'=>'Wepay',
+		'worldpay'=>'Worldpay'
+	);
 }