eventespresso / event-espresso-core

core/data_migration_scripts/4_5_0_stages/EE_DMS_4_5_0_update_wp_user_for_prices.dmsstage.php

Indentation +35 added lines, -35 removed lines

@@ -9,39 +9,39 @@
 */
 class EE_DMS_4_5_0_update_wp_user_for_prices extends EE_Data_Migration_Script_Stage_Table
 {
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __("Prices", "event_espresso");
-        $this->_old_table = $wpdb->prefix."esp_price";
-        parent::__construct();
-    }
-    protected function _migrate_old_row($old_row)
-    {
-        // foreach ticket row we add the id for the current logged in user.
-        global $wpdb;
-        $user_id = EEH_Activation::get_default_creator_id();
-        $updated = $wpdb->update(
-            $this->_old_table,
-            array('PRC_wp_user'=>$user_id),
-            array('PRC_ID'=>$old_row['PRC_ID']),
-            array('%d',// PRC_wp_user
-                    ),
-            array('%d',// PRC_ID
-                    )
-        );
-        if (false === $updated) {
-            $this->add_error(
-                sprintf(
-                    __(
-                        "Error in updating table %s setting PRC_wp_user = %d where PRC_ID = %d",
-                        'event_espresso'
-                    ),
-                    $this->_old_table,
-                    $user_id,
-                    $old_row['PRC_ID']
-                )
-            );
-        }
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __("Prices", "event_espresso");
+		$this->_old_table = $wpdb->prefix."esp_price";
+		parent::__construct();
+	}
+	protected function _migrate_old_row($old_row)
+	{
+		// foreach ticket row we add the id for the current logged in user.
+		global $wpdb;
+		$user_id = EEH_Activation::get_default_creator_id();
+		$updated = $wpdb->update(
+			$this->_old_table,
+			array('PRC_wp_user'=>$user_id),
+			array('PRC_ID'=>$old_row['PRC_ID']),
+			array('%d',// PRC_wp_user
+					),
+			array('%d',// PRC_ID
+					)
+		);
+		if (false === $updated) {
+			$this->add_error(
+				sprintf(
+					__(
+						"Error in updating table %s setting PRC_wp_user = %d where PRC_ID = %d",
+						'event_espresso'
+					),
+					$this->_old_table,
+					$user_id,
+					$old_row['PRC_ID']
+				)
+			);
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -25,9 +25,9 @@
             $this->_old_table,
             array('PRC_wp_user'=>$user_id),
             array('PRC_ID'=>$old_row['PRC_ID']),
-            array('%d',// PRC_wp_user
+            array('%d', // PRC_wp_user
                     ),
-            array('%d',// PRC_ID
+            array('%d', // PRC_ID
                     )
         );
         if (false === $updated) {

core/data_migration_scripts/4_5_0_stages/EE_DMS_4_5_0_update_wp_user_for_tickets.dmsstage.php

Indentation +35 added lines, -35 removed lines

@@ -9,39 +9,39 @@
 */
 class EE_DMS_4_5_0_update_wp_user_for_tickets extends EE_Data_Migration_Script_Stage_Table
 {
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __("Tickets", "event_espresso");
-        $this->_old_table = $wpdb->prefix."esp_ticket";
-        parent::__construct();
-    }
-    protected function _migrate_old_row($old_row)
-    {
-        // foreach ticket row we add the id for the current logged in user.
-        global $wpdb;
-        $user_id = EEH_Activation::get_default_creator_id();
-        $updated = $wpdb->update(
-            $this->_old_table,
-            array('TKT_wp_user'=>$user_id),
-            array('TKT_ID'=>$old_row['TKT_ID']),
-            array('%d',// TKT_wp_user
-                    ),
-            array('%d',// TKT_ID
-                    )
-        );
-        if (false === $updated) {
-            $this->add_error(
-                sprintf(
-                    __(
-                        "Error in updating table %s setting TKT_wp_user = %d where TKT_ID = %d",
-                        'event_espresso'
-                    ),
-                    $this->_old_table,
-                    $user_id,
-                    $old_row['TKT_ID']
-                )
-            );
-        }
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __("Tickets", "event_espresso");
+		$this->_old_table = $wpdb->prefix."esp_ticket";
+		parent::__construct();
+	}
+	protected function _migrate_old_row($old_row)
+	{
+		// foreach ticket row we add the id for the current logged in user.
+		global $wpdb;
+		$user_id = EEH_Activation::get_default_creator_id();
+		$updated = $wpdb->update(
+			$this->_old_table,
+			array('TKT_wp_user'=>$user_id),
+			array('TKT_ID'=>$old_row['TKT_ID']),
+			array('%d',// TKT_wp_user
+					),
+			array('%d',// TKT_ID
+					)
+		);
+		if (false === $updated) {
+			$this->add_error(
+				sprintf(
+					__(
+						"Error in updating table %s setting TKT_wp_user = %d where TKT_ID = %d",
+						'event_espresso'
+					),
+					$this->_old_table,
+					$user_id,
+					$old_row['TKT_ID']
+				)
+			);
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -25,9 +25,9 @@
             $this->_old_table,
             array('TKT_wp_user'=>$user_id),
             array('TKT_ID'=>$old_row['TKT_ID']),
-            array('%d',// TKT_wp_user
+            array('%d', // TKT_wp_user
                     ),
-            array('%d',// TKT_ID
+            array('%d', // TKT_ID
                     )
         );
         if (false === $updated) {

core/data_migration_scripts/4_5_0_stages/EE_DMS_4_5_0_update_wp_user_for_price_types.dmsstage.php

Indentation +32 added lines, -32 removed lines

@@ -9,36 +9,36 @@
 */
 class EE_DMS_4_5_0_update_wp_user_for_price_types extends EE_Data_Migration_Script_Stage_Table
 {
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __("Price Types", "event_espresso");
-        $this->_old_table = $wpdb->prefix."esp_price_type";
-        parent::__construct();
-    }
-    protected function _migrate_old_row($old_row)
-    {
-        // foreach ticket row we add the id for the current logged in user.
-        global $wpdb;
-        $user_id = EEH_Activation::get_default_creator_id();
-        $updated = $wpdb->update(
-            $this->_old_table,
-            array('PRT_wp_user'=>$user_id),
-            array('PRT_ID'=>$old_row['PRT_ID']),
-            array('%d',// PRT_wp_user
-                    ),
-            array('%d',// PRT_ID
-                    )
-        );
-        if (false === $updated) {
-            $this->add_error(
-                sprintf(
-                    __("Error in updating table %s setting PRT_wp_user = %d where PRT_ID = %d", 'event_espresso'),
-                    $this->_old_table,
-                    $user_id,
-                    $old_row['PRT_ID']
-                )
-            );
-        }
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __("Price Types", "event_espresso");
+		$this->_old_table = $wpdb->prefix."esp_price_type";
+		parent::__construct();
+	}
+	protected function _migrate_old_row($old_row)
+	{
+		// foreach ticket row we add the id for the current logged in user.
+		global $wpdb;
+		$user_id = EEH_Activation::get_default_creator_id();
+		$updated = $wpdb->update(
+			$this->_old_table,
+			array('PRT_wp_user'=>$user_id),
+			array('PRT_ID'=>$old_row['PRT_ID']),
+			array('%d',// PRT_wp_user
+					),
+			array('%d',// PRT_ID
+					)
+		);
+		if (false === $updated) {
+			$this->add_error(
+				sprintf(
+					__("Error in updating table %s setting PRT_wp_user = %d where PRT_ID = %d", 'event_espresso'),
+					$this->_old_table,
+					$user_id,
+					$old_row['PRT_ID']
+				)
+			);
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -25,9 +25,9 @@
             $this->_old_table,
             array('PRT_wp_user'=>$user_id),
             array('PRT_ID'=>$old_row['PRT_ID']),
-            array('%d',// PRT_wp_user
+            array('%d', // PRT_wp_user
                     ),
-            array('%d',// PRT_ID
+            array('%d', // PRT_ID
                     )
         );
         if (false === $updated) {

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_country_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_6_0_country_system_question
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __('Country - System Question', 'event_espresso');
-        $this->_old_table = $wpdb->prefix.'esp_question';
-        $this->_extra_where_sql = "WHERE QST_system = 'country'";
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 *
+	 * @return EE_DMS_4_6_0_country_system_question
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __('Country - System Question', 'event_espresso');
+		$this->_old_table = $wpdb->prefix.'esp_question';
+		$this->_extra_where_sql = "WHERE QST_system = 'country'";
+		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'] == 'country') {
-            global $wpdb;
-            $success = $wpdb->update(
-                $this->_old_table,
-                array( 'QST_type' => 'COUNTRY' ),  // 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'] == 'country') {
+			global $wpdb;
+			$success = $wpdb->update(
+				$this->_old_table,
+				array( 'QST_type' => 'COUNTRY' ),  // 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' => 'COUNTRY' ),  // data
-                array( 'QST_ID' => $question['QST_ID'] ),  // where
-                array( '%s' ),   // data format
-                array( '%d' )  // where format
+                array('QST_type' => 'COUNTRY'), // 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/4_6_0_stages/EE_DMS_4_6_0_state_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_6_0_state_system_question
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __('State - System Question', 'event_espresso');
-        $this->_old_table = $wpdb->prefix.'esp_question';
-        $this->_extra_where_sql = "WHERE QST_system = 'state'";
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 *
+	 * @return EE_DMS_4_6_0_state_system_question
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __('State - System Question', 'event_espresso');
+		$this->_old_table = $wpdb->prefix.'esp_question';
+		$this->_extra_where_sql = "WHERE QST_system = 'state'";
+		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'] == 'state') {
-            global $wpdb;
-            $success = $wpdb->update(
-                $this->_old_table,
-                array( 'QST_type' => 'STATE' ),  // 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'] == 'state') {
+			global $wpdb;
+			$success = $wpdb->update(
+				$this->_old_table,
+				array( 'QST_type' => 'STATE' ),  // 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' => 'STATE' ),  // data
-                array( 'QST_ID' => $question['QST_ID'] ),  // where
-                array( '%s' ),   // data format
-                array( '%d' )  // where format
+                array('QST_type' => 'STATE'), // 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/4_6_0_stages/EE_DMS_4_6_0_invoice_settings.dmsstage.php

Indentation +47 added lines, -47 removed lines

@@ -28,59 +28,59 @@
 class EE_DMS_4_6_0_invoice_settings extends EE_Data_Migration_Script_Stage
 {
 
-    /**
-     * Just initializes the status of the migration
-     */
-    public function __construct()
-    {
-        $this->_pretty_name = __('Update Invoice Settings', 'event_espresso');
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 */
+	public function __construct()
+	{
+		$this->_pretty_name = __('Update Invoice Settings', 'event_espresso');
+		parent::__construct();
+	}
 
 
 
-    /**
-     * _count_records_to_migrate
-     * Counts the records to migrate; the public version may cache it
-     *
-     * @access protected
-     * @return int
-     */
-    protected function _count_records_to_migrate()
-    {
-        return 1;
-    }
+	/**
+	 * _count_records_to_migrate
+	 * Counts the records to migrate; the public version may cache it
+	 *
+	 * @access protected
+	 * @return int
+	 */
+	protected function _count_records_to_migrate()
+	{
+		return 1;
+	}
 
 
 
-    /**
-     *    _migration_step
-     *
-     * @access protected
-     * @param int $num_items
-     * @throws EE_Error
-     * @return int number of items ACTUALLY migrated
-     * @throws InvalidDataTypeException
-     */
-    protected function _migration_step($num_items = 1)
-    {
+	/**
+	 *    _migration_step
+	 *
+	 * @access protected
+	 * @param int $num_items
+	 * @throws EE_Error
+	 * @return int number of items ACTUALLY migrated
+	 * @throws InvalidDataTypeException
+	 */
+	protected function _migration_step($num_items = 1)
+	{
 
-        $templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-        $overridden_invoice_body = EEH_Template::locate_template($templates_relative_path . 'invoice_body.template.php', null, false, false, true);
-        $overridden_receipt_body= EEH_Template::locate_template($templates_relative_path . 'receipt_body.template.php', null, false, false, true);
-        if ($overridden_invoice_body || $overridden_receipt_body) {
-            new PersistentAdminNotice(
-                'invoice_overriding_templates',
-                esc_html__(
-                    'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
-                    'event_espresso'
-                ),
-                true
-            );
-        }
+		$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
+		$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path . 'invoice_body.template.php', null, false, false, true);
+		$overridden_receipt_body= EEH_Template::locate_template($templates_relative_path . 'receipt_body.template.php', null, false, false, true);
+		if ($overridden_invoice_body || $overridden_receipt_body) {
+			new PersistentAdminNotice(
+				'invoice_overriding_templates',
+				esc_html__(
+					'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
+					'event_espresso'
+				),
+				true
+			);
+		}
 
-        // regardless of whether it worked or not, we ought to continue the migration
-        $this->set_completed();
-        return 1;
-    }
+		// regardless of whether it worked or not, we ought to continue the migration
+		$this->set_completed();
+		return 1;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -66,8 +66,8 @@
     {
 
         $templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-        $overridden_invoice_body = EEH_Template::locate_template($templates_relative_path . 'invoice_body.template.php', null, false, false, true);
-        $overridden_receipt_body= EEH_Template::locate_template($templates_relative_path . 'receipt_body.template.php', null, false, false, true);
+        $overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', null, false, false, true);
+        $overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', null, false, false, true);
         if ($overridden_invoice_body || $overridden_receipt_body) {
             new PersistentAdminNotice(
                 'invoice_overriding_templates',

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_billing_info.dmsstage.php

Indentation +64 added lines, -64 removed lines

@@ -11,69 +11,69 @@
  */
 class EE_DMS_4_6_0_billing_info extends EE_Data_Migration_Script_Stage_Table
 {
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->postmeta;
-        $this->_pretty_name = __('Billing Info', 'event_espresso');
-        $this->_extra_where_sql = "WHERE meta_key LIKE 'billing_info_%'";
-        parent::__construct();
-    }
-    protected function _migrate_old_row($old_row)
-    {
-        $new_billing_info = array();
-        $old_billing_info = maybe_unserialize($old_row['meta_value']);
-        $gateway_name = str_replace("billing_info_", '', $old_row['meta_key']);
-        $repetitive_prefix = '_reg-page-billing-';
-        $repetitive_suffix = "-" . $gateway_name;
-        foreach ($old_billing_info as $old_input_name => $input_value) {
-            $old_input_name_important_part = str_replace(array( $repetitive_prefix, $repetitive_suffix ), array( '', ''), $old_input_name);
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->postmeta;
+		$this->_pretty_name = __('Billing Info', 'event_espresso');
+		$this->_extra_where_sql = "WHERE meta_key LIKE 'billing_info_%'";
+		parent::__construct();
+	}
+	protected function _migrate_old_row($old_row)
+	{
+		$new_billing_info = array();
+		$old_billing_info = maybe_unserialize($old_row['meta_value']);
+		$gateway_name = str_replace("billing_info_", '', $old_row['meta_key']);
+		$repetitive_prefix = '_reg-page-billing-';
+		$repetitive_suffix = "-" . $gateway_name;
+		foreach ($old_billing_info as $old_input_name => $input_value) {
+			$old_input_name_important_part = str_replace(array( $repetitive_prefix, $repetitive_suffix ), array( '', ''), $old_input_name);
 
-            switch ($old_input_name_important_part) {
-                case 'fname':
-                    $new_input_name = 'first_name';
-                    break;
-                case 'lname':
-                    $new_input_name = 'last_name';
-                    break;
-                case 'state':
-                    // we used to store the state's id ,but now we just store the name
-                    $new_input_name = $old_input_name_important_part;
-                    $input_value = $this->_get_state_name_by_ID($input_value);
-                    break;
-                case 'card-nmbr':
-                    $new_input_name = 'credit_card';
-                    break;
-                case 'card-type':// paypal pro only
-                    $new_input_name = 'credit_card_type';
-                    break;
-                case 'card-exp-date-mnth':
-                    $new_input_name = 'exp_month';
-                    $input_value = '';
-                    break;
-                case 'card-exp-date-year':
-                    $new_input_name = 'exp_year';
-                    $input_value = 0;
-                    break;
-                case 'ccv-code':
-                    $new_input_name = 'cvv';
-                    break;
-                default:
-                    $new_input_name = $old_input_name_important_part;
-            }
-            $new_billing_info[ $new_input_name ] = $input_value;
-        }
-        update_post_meta($old_row['post_id'], $old_row['meta_key'], $new_billing_info);
-    }
-    /**
-     *
-     * @global type $wpdb
-     * @param int $id
-     * @return string
-     */
-    protected function _get_state_name_by_ID($id)
-    {
-        global $wpdb;
-        return $wpdb->get_var($wpdb->prepare("SELECT STA_name FROM " . $wpdb->prefix . "esp_state WHERE STA_ID = %d", $id));
-    }
+			switch ($old_input_name_important_part) {
+				case 'fname':
+					$new_input_name = 'first_name';
+					break;
+				case 'lname':
+					$new_input_name = 'last_name';
+					break;
+				case 'state':
+					// we used to store the state's id ,but now we just store the name
+					$new_input_name = $old_input_name_important_part;
+					$input_value = $this->_get_state_name_by_ID($input_value);
+					break;
+				case 'card-nmbr':
+					$new_input_name = 'credit_card';
+					break;
+				case 'card-type':// paypal pro only
+					$new_input_name = 'credit_card_type';
+					break;
+				case 'card-exp-date-mnth':
+					$new_input_name = 'exp_month';
+					$input_value = '';
+					break;
+				case 'card-exp-date-year':
+					$new_input_name = 'exp_year';
+					$input_value = 0;
+					break;
+				case 'ccv-code':
+					$new_input_name = 'cvv';
+					break;
+				default:
+					$new_input_name = $old_input_name_important_part;
+			}
+			$new_billing_info[ $new_input_name ] = $input_value;
+		}
+		update_post_meta($old_row['post_id'], $old_row['meta_key'], $new_billing_info);
+	}
+	/**
+	 *
+	 * @global type $wpdb
+	 * @param int $id
+	 * @return string
+	 */
+	protected function _get_state_name_by_ID($id)
+	{
+		global $wpdb;
+		return $wpdb->get_var($wpdb->prepare("SELECT STA_name FROM " . $wpdb->prefix . "esp_state WHERE STA_ID = %d", $id));
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -25,9 +25,9 @@ 
         $old_billing_info = maybe_unserialize($old_row['meta_value']);
         $gateway_name = str_replace("billing_info_", '', $old_row['meta_key']);
         $repetitive_prefix = '_reg-page-billing-';
-        $repetitive_suffix = "-" . $gateway_name;
+        $repetitive_suffix = "-".$gateway_name;
         foreach ($old_billing_info as $old_input_name => $input_value) {
-            $old_input_name_important_part = str_replace(array( $repetitive_prefix, $repetitive_suffix ), array( '', ''), $old_input_name);
+            $old_input_name_important_part = str_replace(array($repetitive_prefix, $repetitive_suffix), array('', ''), $old_input_name);
 
             switch ($old_input_name_important_part) {
                 case 'fname':
@@ -61,7 +61,7 @@ 
                 default:
                     $new_input_name = $old_input_name_important_part;
             }
-            $new_billing_info[ $new_input_name ] = $input_value;
+            $new_billing_info[$new_input_name] = $input_value;
         }
         update_post_meta($old_row['post_id'], $old_row['meta_key'], $new_billing_info);
     }
@@ -74,6 +74,6 @@ 
     protected function _get_state_name_by_ID($id)
     {
         global $wpdb;
-        return $wpdb->get_var($wpdb->prepare("SELECT STA_name FROM " . $wpdb->prefix . "esp_state WHERE STA_ID = %d", $id));
+        return $wpdb->get_var($wpdb->prepare("SELECT STA_name FROM ".$wpdb->prefix."esp_state WHERE STA_ID = %d", $id));
     }
 }

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_question_types.dmsstage.php

Indentation +49 added lines, -49 removed lines

@@ -12,57 +12,57 @@
 class EE_DMS_4_6_0_question_types extends EE_Data_Migration_Script_Stage_Table
 {
 
-    protected $_question_type_conversions = array();
+	protected $_question_type_conversions = array();
 
 
 
-    /**
-     * Just initializes the status of the migration
-     *
-     * @return EE_DMS_4_6_0_question_types
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __('Question Types', 'event_espresso');
-        $this->_old_table = $wpdb->prefix.'esp_question';
-        $this->_question_type_conversions = array(
-            'MULTIPLE'          => 'CHECKBOX',
-            'SINGLE'                => 'RADIO_BTN'
-        );
-        // when fetching rows, because we automatically use a limit and offset
-        // rows counted before migrating any rows, need to ALSO be counted after a bunch of rows were counted
-        // so we need to include both the migrated rows as well as the non-migrated rows
-        $QST_types_to_count = array_merge(array_keys($this->_question_type_conversions), $this->_question_type_conversions);
-        $this->_extra_where_sql = "WHERE QST_type IN ('" . implode("', '", $QST_types_to_count) . "')" ;
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 *
+	 * @return EE_DMS_4_6_0_question_types
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __('Question Types', 'event_espresso');
+		$this->_old_table = $wpdb->prefix.'esp_question';
+		$this->_question_type_conversions = array(
+			'MULTIPLE'          => 'CHECKBOX',
+			'SINGLE'                => 'RADIO_BTN'
+		);
+		// when fetching rows, because we automatically use a limit and offset
+		// rows counted before migrating any rows, need to ALSO be counted after a bunch of rows were counted
+		// so we need to include both the migrated rows as well as the non-migrated rows
+		$QST_types_to_count = array_merge(array_keys($this->_question_type_conversions), $this->_question_type_conversions);
+		$this->_extra_where_sql = "WHERE QST_type IN ('" . implode("', '", $QST_types_to_count) . "')" ;
+		parent::__construct();
+	}
 
-    /**
-     * @param array $question an associative array where keys are column names and values are their values.
-     * @return null
-     */
-    protected function _migrate_old_row($question)
-    {
-        global $wpdb;
-        if ($question['QST_ID'] && isset($this->_question_type_conversions[ $question['QST_type'] ])) {
-            $success = $wpdb->update(
-                $this->_old_table,
-                array( 'QST_type' => $this->_question_type_conversions[ $question['QST_type'] ] ),  // 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 type %1$s for question ID=%2$d because "%3$s"', 'event_espresso'),
-                        wp_json_encode($question['QST_type']),
-                        $question['QST_ID'],
-                        $wpdb->last_error
-                    )
-                );
-            }
-        }
-    }
+	/**
+	 * @param array $question an associative array where keys are column names and values are their values.
+	 * @return null
+	 */
+	protected function _migrate_old_row($question)
+	{
+		global $wpdb;
+		if ($question['QST_ID'] && isset($this->_question_type_conversions[ $question['QST_type'] ])) {
+			$success = $wpdb->update(
+				$this->_old_table,
+				array( 'QST_type' => $this->_question_type_conversions[ $question['QST_type'] ] ),  // 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 type %1$s for question ID=%2$d because "%3$s"', 'event_espresso'),
+						wp_json_encode($question['QST_type']),
+						$question['QST_ID'],
+						$wpdb->last_error
+					)
+				);
+			}
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
         // rows counted before migrating any rows, need to ALSO be counted after a bunch of rows were counted
         // so we need to include both the migrated rows as well as the non-migrated rows
         $QST_types_to_count = array_merge(array_keys($this->_question_type_conversions), $this->_question_type_conversions);
-        $this->_extra_where_sql = "WHERE QST_type IN ('" . implode("', '", $QST_types_to_count) . "')" ;
+        $this->_extra_where_sql = "WHERE QST_type IN ('".implode("', '", $QST_types_to_count)."')";
         parent::__construct();
     }
 
@@ -45,15 +45,15 @@ 
     protected function _migrate_old_row($question)
     {
         global $wpdb;
-        if ($question['QST_ID'] && isset($this->_question_type_conversions[ $question['QST_type'] ])) {
+        if ($question['QST_ID'] && isset($this->_question_type_conversions[$question['QST_type']])) {
             $success = $wpdb->update(
                 $this->_old_table,
-                array( 'QST_type' => $this->_question_type_conversions[ $question['QST_type'] ] ),  // data
-                array( 'QST_ID' => $question['QST_ID'] ),  // where
-                array( '%s' ),   // data format
-                array( '%d' )  // where format
+                array('QST_type' => $this->_question_type_conversions[$question['QST_type']]), // 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 type %1$s for question ID=%2$d because "%3$s"', 'event_espresso'),

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_gateways.dmsstage.php

Indentation +256 added lines, -256 removed lines

@@ -14,277 +14,277 @@
 class EE_DMS_4_6_0_gateways extends EE_Data_Migration_Script_Stage
 {
 
-    protected $_new_table_name;
-    protected $_extra_meta_table_name;
-    protected $_currency_table_name;
-    protected $_currency_payment_method_table_name;
+	protected $_new_table_name;
+	protected $_extra_meta_table_name;
+	protected $_currency_table_name;
+	protected $_currency_payment_method_table_name;
 
-    /**
-     * each key is the name of a 4.1-style gateway we know how to migrate to 4.6
-     * @var array
-     */
-    protected $_gateway_we_know_to_migrate = array(
-        'Aim',
-        'Bank',
-        'Check',
-        'Invoice',
-        'Mijireh',
-        'Paypal_Pro',
-        'Paypal_Standard',
-    );
+	/**
+	 * each key is the name of a 4.1-style gateway we know how to migrate to 4.6
+	 * @var array
+	 */
+	protected $_gateway_we_know_to_migrate = array(
+		'Aim',
+		'Bank',
+		'Check',
+		'Invoice',
+		'Mijireh',
+		'Paypal_Pro',
+		'Paypal_Standard',
+	);
 
 
 
-    /**
-     * Just initializes the status of the migration
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_new_table_name = $wpdb->prefix."esp_payment_method";
-        $this->_extra_meta_table_name = $wpdb->prefix."esp_extra_meta";
-        $this->_currency_table_name = $wpdb->prefix."esp_currency";
-        $this->_currency_payment_method_table_name = $wpdb->prefix."esp_currency_payment_method";
-        $this->_pretty_name = __('Gateways', 'event_espresso');
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_new_table_name = $wpdb->prefix."esp_payment_method";
+		$this->_extra_meta_table_name = $wpdb->prefix."esp_extra_meta";
+		$this->_currency_table_name = $wpdb->prefix."esp_currency";
+		$this->_currency_payment_method_table_name = $wpdb->prefix."esp_currency_payment_method";
+		$this->_pretty_name = __('Gateways', 'event_espresso');
+		parent::__construct();
+	}
 
 
 
-    /**
-     * Counts the records to migrate; the public version may cache it
-     * @return int
-     */
-    protected function _count_records_to_migrate()
-    {
-        return count(EE_Config::instance()->gateway->payment_settings);
-    }
+	/**
+	 * Counts the records to migrate; the public version may cache it
+	 * @return int
+	 */
+	protected function _count_records_to_migrate()
+	{
+		return count(EE_Config::instance()->gateway->payment_settings);
+	}
 
 
 
-    /**
-     * 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)
-    {
-        $items_actually_migrated = 0;
-        $gateways_to_deal_with = array_slice(EE_Config::instance()->gateway->payment_settings, $this->count_records_migrated(), $num_items_to_migrate);
-        foreach ($gateways_to_deal_with as $old_gateway_slug => $old_gateway_settings) {
-            if (in_array($old_gateway_slug, $this->_gateway_we_know_to_migrate)) {
-                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
-                $success = $this->_convert_gateway_settings(
-                    $old_gateway_slug,
-                    $old_gateway_settings,
-                    isset(EE_Config::instance()->gateway->active_gateways[ $old_gateway_slug ])
-                );
-                if ($success) {
-                    EE_Config::instance()->gateway->payment_settings[ $old_gateway_slug ] = 'Deprecated';
-                }
-            }
-            $items_actually_migrated++;
-        }
+	/**
+	 * 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)
+	{
+		$items_actually_migrated = 0;
+		$gateways_to_deal_with = array_slice(EE_Config::instance()->gateway->payment_settings, $this->count_records_migrated(), $num_items_to_migrate);
+		foreach ($gateways_to_deal_with as $old_gateway_slug => $old_gateway_settings) {
+			if (in_array($old_gateway_slug, $this->_gateway_we_know_to_migrate)) {
+				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
+				$success = $this->_convert_gateway_settings(
+					$old_gateway_slug,
+					$old_gateway_settings,
+					isset(EE_Config::instance()->gateway->active_gateways[ $old_gateway_slug ])
+				);
+				if ($success) {
+					EE_Config::instance()->gateway->payment_settings[ $old_gateway_slug ] = 'Deprecated';
+				}
+			}
+			$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;
-    }
+		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;
+	}
 
-    /**
-     * Converts the 4.1-style gateway to a 4.6-style payment method and saves it to the DB
-     * @param string $old_gateway_slug
-     * @param array $old_gateway_settings
-     * @param boolean $active indicates the gateway is currently active
-     * @return boolean success
-     */
-    protected function _convert_gateway_settings($old_gateway_slug, $old_gateway_settings, $active)
-    {
-        switch ($old_gateway_slug) {
-            case 'Aim':
-                $extra_meta_key_values = array(
-                    'login_id'=>$old_gateway_settings['authnet_aim_login_id'],
-                    'transaction_key'=>$old_gateway_settings['authnet_aim_transaction_key'],
-                    'test_transactions'=>$old_gateway_settings['test_transactions']
-                );
-                $desc = __('Please provide the following billing information.', 'event_espresso');
-                break;
-            case 'Bank':
-                $extra_meta_key_values = array(
-                    'page_title'=>$old_gateway_settings['page_title'],
-                    'payment_instructions'=>
-                    sprintf(__('%1$s<br/>Name on Bank Account: %2$s<br/>Bank Account Number: %3$s<br/>Bank Name: %4$s<br/>Bank Address:%5$s', 'event_espresso'), $old_gateway_settings['bank_instructions'], $old_gateway_settings['account_name'], $old_gateway_settings['account_number'], $old_gateway_settings['bank_name'], $old_gateway_settings['bank_address']) );
-                $desc = __('Make payment using an electronic funds transfer from your bank.', 'event_espresso');
-                break;
-            case 'Check':
-                $extra_meta_key_values = array(
-                    'check_title'=> $old_gateway_settings['check_title'],
-                    'payment_instructions'=>$old_gateway_settings['check_instructions'],
-                    'address_to_send_payment'=>$old_gateway_settings['payment_address']
-                );
-                $desc = __('On the next page you will be given instructions on how to make a payment by check.', 'event_espresso');
-                break;
-            case 'Invoice':
-                $extra_meta_key_values = array(
-                    'pdf_payee_name' => $old_gateway_settings['template_invoice_payee_name'],
-                    'pdf_payee_email' => $old_gateway_settings['template_invoice_email'],
-                    'pdf_payee_tax_number' => $old_gateway_settings['template_invoice_tax_number'],
-                    'pdf_payee_address' => $old_gateway_settings['template_invoice_address'],
-                    'pdf_instructions' => $old_gateway_settings['template_payment_instructions'],
-                    'pdf_logo_image' => $old_gateway_settings['invoice_logo_url'],
-                    'page_confirmation_text' => isset($old_gateway_settings['page_instructions']) ? $old_gateway_settings['page_instructions'] : '',
-                    'page_extra_info' => isset($old_gateway_settings['payment_address']) ? $old_gateway_settings['payment_address'] : '',
-                    'legacy_invoice_css' => $old_gateway_settings['invoice_css']
-                );
-                // if they didnt want the invoiec gateway to show, pretend it was inactive
-                if (! $old_gateway_settings['show']) {
-                    $active = false;
-                }
-                $desc = __('On the next page you will be able to access your invoice and instructions on how to pay it.', 'event_espresso');
-                break;
-            case 'Mijireh':
-                $extra_meta_key_values = array(
-                    'access_key' => $old_gateway_settings['access_key']
-                );
-                $desc =  __('On the next page you will be able to enter your billing information to make the payment.', 'event_espresso');
-                break;
-            case 'Paypal_Pro':
-                $extra_meta_key_values = array(
-                    'username'=>$old_gateway_settings['username'],
-                    'password'=>$old_gateway_settings['password'],
-                    'signature'=>$old_gateway_settings['signature'],
-                    'credit_card_types'=>$old_gateway_settings['credit_cards'],
-                );
-                $desc = __('Please provide the following billing information.', 'event_espresso');
-                break;
-            case 'Paypal_Standard':
-                $extra_meta_key_values = array(
-                    'paypal_id' => $old_gateway_settings['paypal_id'],
-                    'image_url' => $old_gateway_settings['image_url'],
-                    'shipping_details' => isset($old_gateway_settings['no_shipping']) ? $old_gateway_settings['no_shipping'] : false,
+	/**
+	 * Converts the 4.1-style gateway to a 4.6-style payment method and saves it to the DB
+	 * @param string $old_gateway_slug
+	 * @param array $old_gateway_settings
+	 * @param boolean $active indicates the gateway is currently active
+	 * @return boolean success
+	 */
+	protected function _convert_gateway_settings($old_gateway_slug, $old_gateway_settings, $active)
+	{
+		switch ($old_gateway_slug) {
+			case 'Aim':
+				$extra_meta_key_values = array(
+					'login_id'=>$old_gateway_settings['authnet_aim_login_id'],
+					'transaction_key'=>$old_gateway_settings['authnet_aim_transaction_key'],
+					'test_transactions'=>$old_gateway_settings['test_transactions']
+				);
+				$desc = __('Please provide the following billing information.', 'event_espresso');
+				break;
+			case 'Bank':
+				$extra_meta_key_values = array(
+					'page_title'=>$old_gateway_settings['page_title'],
+					'payment_instructions'=>
+					sprintf(__('%1$s<br/>Name on Bank Account: %2$s<br/>Bank Account Number: %3$s<br/>Bank Name: %4$s<br/>Bank Address:%5$s', 'event_espresso'), $old_gateway_settings['bank_instructions'], $old_gateway_settings['account_name'], $old_gateway_settings['account_number'], $old_gateway_settings['bank_name'], $old_gateway_settings['bank_address']) );
+				$desc = __('Make payment using an electronic funds transfer from your bank.', 'event_espresso');
+				break;
+			case 'Check':
+				$extra_meta_key_values = array(
+					'check_title'=> $old_gateway_settings['check_title'],
+					'payment_instructions'=>$old_gateway_settings['check_instructions'],
+					'address_to_send_payment'=>$old_gateway_settings['payment_address']
+				);
+				$desc = __('On the next page you will be given instructions on how to make a payment by check.', 'event_espresso');
+				break;
+			case 'Invoice':
+				$extra_meta_key_values = array(
+					'pdf_payee_name' => $old_gateway_settings['template_invoice_payee_name'],
+					'pdf_payee_email' => $old_gateway_settings['template_invoice_email'],
+					'pdf_payee_tax_number' => $old_gateway_settings['template_invoice_tax_number'],
+					'pdf_payee_address' => $old_gateway_settings['template_invoice_address'],
+					'pdf_instructions' => $old_gateway_settings['template_payment_instructions'],
+					'pdf_logo_image' => $old_gateway_settings['invoice_logo_url'],
+					'page_confirmation_text' => isset($old_gateway_settings['page_instructions']) ? $old_gateway_settings['page_instructions'] : '',
+					'page_extra_info' => isset($old_gateway_settings['payment_address']) ? $old_gateway_settings['payment_address'] : '',
+					'legacy_invoice_css' => $old_gateway_settings['invoice_css']
+				);
+				// if they didnt want the invoiec gateway to show, pretend it was inactive
+				if (! $old_gateway_settings['show']) {
+					$active = false;
+				}
+				$desc = __('On the next page you will be able to access your invoice and instructions on how to pay it.', 'event_espresso');
+				break;
+			case 'Mijireh':
+				$extra_meta_key_values = array(
+					'access_key' => $old_gateway_settings['access_key']
+				);
+				$desc =  __('On the next page you will be able to enter your billing information to make the payment.', 'event_espresso');
+				break;
+			case 'Paypal_Pro':
+				$extra_meta_key_values = array(
+					'username'=>$old_gateway_settings['username'],
+					'password'=>$old_gateway_settings['password'],
+					'signature'=>$old_gateway_settings['signature'],
+					'credit_card_types'=>$old_gateway_settings['credit_cards'],
+				);
+				$desc = __('Please provide the following billing information.', 'event_espresso');
+				break;
+			case 'Paypal_Standard':
+				$extra_meta_key_values = array(
+					'paypal_id' => $old_gateway_settings['paypal_id'],
+					'image_url' => $old_gateway_settings['image_url'],
+					'shipping_details' => isset($old_gateway_settings['no_shipping']) ? $old_gateway_settings['no_shipping'] : false,
 
-                );
-                $desc = sprintf(__('After clicking \'Finalize Registration\', you will be forwarded to PayPal to make your payment. Make sure you return to this site in order to properly finalize your registration.', 'event_espresso'), '<strong>', '</strong>');
-                break;
-            default:
-                // if we don't recognize the payment method, just put everything in it into extra meta. At least this way its preserved somewhere
-                $extra_meta_key_values = $old_gateway_settings;
-                $desc = '';
-        }
-        $pretty_name = isset($old_gateway_settings['display_name']) ? $old_gateway_settings['display_name'] : $old_gateway_slug;
-        $offline_gateways = array( 'Bank', 'Check', 'Invoice' );
-        if ($active && in_array($old_gateway_slug, $offline_gateways)) {
-            $scope = array( 'CART', 'ADMIN');
-        } elseif ($active && ! in_array($old_gateway_slug, $offline_gateways)) {
-            $scope = array( 'CART' );
-        } elseif (! $active && in_array($old_gateway_slug, $offline_gateways)) {
-            $scope = array( 'ADMIN' );
-        } else {
-            $scope = array();
-        }
-        $payment_method_col_values = array(
-            'PMD_type' => $old_gateway_slug,
-            'PMD_name' => $pretty_name,
-            'PMD_desc' => $desc,
-            'PMD_admin_name' => $pretty_name,
-            'PMD_slug' => sanitize_key($old_gateway_slug),
-            'PMD_debug_mode' => isset($old_gateway_settings['use_sandbox']) ? $old_gateway_settings['use_sandbox'] : false,
-            'PMD_button_url' => isset($old_gateway_settings['button_url']) ? $old_gateway_settings['button_url'] : null,
-            'PMD_scope' =>  serialize($scope)
-        );
-        $db_types = array(
-            '%s',// PMD_type
-            '%s',// PMD_name
-            '%s',// PMD_desc
-            '%s',// PMD_admin_name
-            '%s',// PMD_slug
-            '%d',// PMD_debug_mode
-            '%s',// PMD_button_url
-            '%s',// PMD_scope
-        );
-        global $wpdb;
-        // first: check if it already exists
-        $id = $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM {$this->_new_table_name} WHERE PMD_slug=%s", $payment_method_col_values['PMD_slug']));
-        if ($id) {
-            // just update that payment method instead of creating a new one
-            $success = $wpdb->update(
-                $this->_new_table_name,
-                $payment_method_col_values,
-                array(
-                        'PMD_ID'=>$id
-                    ),
-                $db_types,
-                array(
-                        '%d',// PMD_ID
-                    )
-            );
-            if (! $success) {
-                $this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"), $id, wp_json_encode($payment_method_col_values), $wpdb->last_error));
-            }
-        } else {
-            $success = $wpdb->insert(
-                $this->_new_table_name,
-                $payment_method_col_values,
-                $db_types
-            );
-            if (! $success) {
-                $this->add_error($wpdb->last_error);
-                return false;
-            } else {
-                $id = $wpdb->insert_id;
-            }
-        }
+				);
+				$desc = sprintf(__('After clicking \'Finalize Registration\', you will be forwarded to PayPal to make your payment. Make sure you return to this site in order to properly finalize your registration.', 'event_espresso'), '<strong>', '</strong>');
+				break;
+			default:
+				// if we don't recognize the payment method, just put everything in it into extra meta. At least this way its preserved somewhere
+				$extra_meta_key_values = $old_gateway_settings;
+				$desc = '';
+		}
+		$pretty_name = isset($old_gateway_settings['display_name']) ? $old_gateway_settings['display_name'] : $old_gateway_slug;
+		$offline_gateways = array( 'Bank', 'Check', 'Invoice' );
+		if ($active && in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array( 'CART', 'ADMIN');
+		} elseif ($active && ! in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array( 'CART' );
+		} elseif (! $active && in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array( 'ADMIN' );
+		} else {
+			$scope = array();
+		}
+		$payment_method_col_values = array(
+			'PMD_type' => $old_gateway_slug,
+			'PMD_name' => $pretty_name,
+			'PMD_desc' => $desc,
+			'PMD_admin_name' => $pretty_name,
+			'PMD_slug' => sanitize_key($old_gateway_slug),
+			'PMD_debug_mode' => isset($old_gateway_settings['use_sandbox']) ? $old_gateway_settings['use_sandbox'] : false,
+			'PMD_button_url' => isset($old_gateway_settings['button_url']) ? $old_gateway_settings['button_url'] : null,
+			'PMD_scope' =>  serialize($scope)
+		);
+		$db_types = array(
+			'%s',// PMD_type
+			'%s',// PMD_name
+			'%s',// PMD_desc
+			'%s',// PMD_admin_name
+			'%s',// PMD_slug
+			'%d',// PMD_debug_mode
+			'%s',// PMD_button_url
+			'%s',// PMD_scope
+		);
+		global $wpdb;
+		// first: check if it already exists
+		$id = $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM {$this->_new_table_name} WHERE PMD_slug=%s", $payment_method_col_values['PMD_slug']));
+		if ($id) {
+			// just update that payment method instead of creating a new one
+			$success = $wpdb->update(
+				$this->_new_table_name,
+				$payment_method_col_values,
+				array(
+						'PMD_ID'=>$id
+					),
+				$db_types,
+				array(
+						'%d',// PMD_ID
+					)
+			);
+			if (! $success) {
+				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"), $id, wp_json_encode($payment_method_col_values), $wpdb->last_error));
+			}
+		} else {
+			$success = $wpdb->insert(
+				$this->_new_table_name,
+				$payment_method_col_values,
+				$db_types
+			);
+			if (! $success) {
+				$this->add_error($wpdb->last_error);
+				return false;
+			} else {
+				$id = $wpdb->insert_id;
+			}
+		}
 
-        if ($id) {
-            $this->_convert_extra_meta_values($id, $extra_meta_key_values);
-            $this->get_migration_script()->set_mapping('EE_Gateway_Config', $old_gateway_slug, $this->_new_table_name, $id);
-            return true;
-        }
-        return false;
-    }
+		if ($id) {
+			$this->_convert_extra_meta_values($id, $extra_meta_key_values);
+			$this->get_migration_script()->set_mapping('EE_Gateway_Config', $old_gateway_slug, $this->_new_table_name, $id);
+			return true;
+		}
+		return false;
+	}
 
 
 
-    /**
-     * Converts old gateway settings which don't map onto the Payment_Method model
-     * to extra meta fields
-     * @param int $id
-     * @param array $extra_meta_key_values
-     */
-    private function _convert_extra_meta_values($id, $extra_meta_key_values)
-    {
-        global $wpdb;
-        foreach ($extra_meta_key_values as $key => $value) {
-            $exm_args = array(
-                'OBJ_ID'=>$id,
-                'EXM_type'=>'Payment_Method',
-                'EXM_key'=>$key,
-                'EXM_value'=> maybe_serialize($value)
-            );
-            $success = $wpdb->insert(
-                $this->_extra_meta_table_name,
-                $exm_args,
-                array(
-                        '%d',// OBJ_ID
-                        '%s',// EXM_type
-                        '%s',// EXM_key
-                        '%s',// EXM_value
-                    )
-            );
-            if (! $success) {
-                $this->add_error(sprintf(__('Could not insert extra meta key with values %s. %s', "event_espresso"), wp_json_encode($exm_args), $wpdb->last_error));
-            }
-        }
-    }
+	/**
+	 * Converts old gateway settings which don't map onto the Payment_Method model
+	 * to extra meta fields
+	 * @param int $id
+	 * @param array $extra_meta_key_values
+	 */
+	private function _convert_extra_meta_values($id, $extra_meta_key_values)
+	{
+		global $wpdb;
+		foreach ($extra_meta_key_values as $key => $value) {
+			$exm_args = array(
+				'OBJ_ID'=>$id,
+				'EXM_type'=>'Payment_Method',
+				'EXM_key'=>$key,
+				'EXM_value'=> maybe_serialize($value)
+			);
+			$success = $wpdb->insert(
+				$this->_extra_meta_table_name,
+				$exm_args,
+				array(
+						'%d',// OBJ_ID
+						'%s',// EXM_type
+						'%s',// EXM_key
+						'%s',// EXM_value
+					)
+			);
+			if (! $success) {
+				$this->add_error(sprintf(__('Could not insert extra meta key with values %s. %s', "event_espresso"), wp_json_encode($exm_args), $wpdb->last_error));
+			}
+		}
+	}
 }

Spacing +26 added lines, -26 removed lines

@@ -77,7 +77,7 @@ 
         $gateways_to_deal_with = array_slice(EE_Config::instance()->gateway->payment_settings, $this->count_records_migrated(), $num_items_to_migrate);
         foreach ($gateways_to_deal_with as $old_gateway_slug => $old_gateway_settings) {
             if (in_array($old_gateway_slug, $this->_gateway_we_know_to_migrate)) {
-                if (! $old_gateway_settings) {
+                if ( ! $old_gateway_settings) {
                     // no settings existed for this gateway anyways... weird...
                     $items_actually_migrated++;
                     continue;
@@ -86,10 +86,10 @@ 
                 $success = $this->_convert_gateway_settings(
                     $old_gateway_slug,
                     $old_gateway_settings,
-                    isset(EE_Config::instance()->gateway->active_gateways[ $old_gateway_slug ])
+                    isset(EE_Config::instance()->gateway->active_gateways[$old_gateway_slug])
                 );
                 if ($success) {
-                    EE_Config::instance()->gateway->payment_settings[ $old_gateway_slug ] = 'Deprecated';
+                    EE_Config::instance()->gateway->payment_settings[$old_gateway_slug] = 'Deprecated';
                 }
             }
             $items_actually_migrated++;
@@ -148,7 +148,7 @@ 
                     'legacy_invoice_css' => $old_gateway_settings['invoice_css']
                 );
                 // if they didnt want the invoiec gateway to show, pretend it was inactive
-                if (! $old_gateway_settings['show']) {
+                if ( ! $old_gateway_settings['show']) {
                     $active = false;
                 }
                 $desc = __('On the next page you will be able to access your invoice and instructions on how to pay it.', 'event_espresso');
@@ -157,7 +157,7 @@ 
                 $extra_meta_key_values = array(
                     'access_key' => $old_gateway_settings['access_key']
                 );
-                $desc =  __('On the next page you will be able to enter your billing information to make the payment.', 'event_espresso');
+                $desc = __('On the next page you will be able to enter your billing information to make the payment.', 'event_espresso');
                 break;
             case 'Paypal_Pro':
                 $extra_meta_key_values = array(
@@ -183,13 +183,13 @@ 
                 $desc = '';
         }
         $pretty_name = isset($old_gateway_settings['display_name']) ? $old_gateway_settings['display_name'] : $old_gateway_slug;
-        $offline_gateways = array( 'Bank', 'Check', 'Invoice' );
+        $offline_gateways = array('Bank', 'Check', 'Invoice');
         if ($active && in_array($old_gateway_slug, $offline_gateways)) {
-            $scope = array( 'CART', 'ADMIN');
+            $scope = array('CART', 'ADMIN');
         } elseif ($active && ! in_array($old_gateway_slug, $offline_gateways)) {
-            $scope = array( 'CART' );
-        } elseif (! $active && in_array($old_gateway_slug, $offline_gateways)) {
-            $scope = array( 'ADMIN' );
+            $scope = array('CART');
+        } elseif ( ! $active && in_array($old_gateway_slug, $offline_gateways)) {
+            $scope = array('ADMIN');
         } else {
             $scope = array();
         }
@@ -204,14 +204,14 @@ 
             'PMD_scope' =>  serialize($scope)
         );
         $db_types = array(
-            '%s',// PMD_type
-            '%s',// PMD_name
-            '%s',// PMD_desc
-            '%s',// PMD_admin_name
-            '%s',// PMD_slug
-            '%d',// PMD_debug_mode
-            '%s',// PMD_button_url
-            '%s',// PMD_scope
+            '%s', // PMD_type
+            '%s', // PMD_name
+            '%s', // PMD_desc
+            '%s', // PMD_admin_name
+            '%s', // PMD_slug
+            '%d', // PMD_debug_mode
+            '%s', // PMD_button_url
+            '%s', // PMD_scope
         );
         global $wpdb;
         // first: check if it already exists
@@ -226,10 +226,10 @@ 
                     ),
                 $db_types,
                 array(
-                        '%d',// PMD_ID
+                        '%d', // PMD_ID
                     )
             );
-            if (! $success) {
+            if ( ! $success) {
                 $this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"), $id, wp_json_encode($payment_method_col_values), $wpdb->last_error));
             }
         } else {
@@ -238,7 +238,7 @@ 
                 $payment_method_col_values,
                 $db_types
             );
-            if (! $success) {
+            if ( ! $success) {
                 $this->add_error($wpdb->last_error);
                 return false;
             } else {
@@ -276,13 +276,13 @@ 
                 $this->_extra_meta_table_name,
                 $exm_args,
                 array(
-                        '%d',// OBJ_ID
-                        '%s',// EXM_type
-                        '%s',// EXM_key
-                        '%s',// EXM_value
+                        '%d', // OBJ_ID
+                        '%s', // EXM_type
+                        '%s', // EXM_key
+                        '%s', // EXM_value
                     )
             );
-            if (! $success) {
+            if ( ! $success) {
                 $this->add_error(sprintf(__('Could not insert extra meta key with values %s. %s', "event_espresso"), wp_json_encode($exm_args), $wpdb->last_error));
             }
         }